worked on the remove budget and history functionality to give me mess…

…ages if the data is not present

cmd/root.go

@@ -9,7 +9,7 @@ import (
 	"github.com/spf13/cobra"
 )
 
-const version = "v0.1.89"
+const version = "v0.1.90"
 
 // rootCmd represents the base command when called without any subcommands
 var RootCmd = &cobra.Command{

cmd/spend/sub_handler/show.go

@@ -1,6 +1,7 @@
 package spend_subhandler
 
 import (
+	"fmt"
 	"log"
 
 	"github.com/ibilalkayy/flow/db/budget_db"
@@ -13,10 +14,11 @@ var ShowCmd = &cobra.Command{
 	Short: "Show the history data",
 	Run: func(cmd *cobra.Command, args []string) {
 		category, _ := cmd.Flags().GetString("category")
-		err := budget_db.ViewHistory(category)
+		table, err := budget_db.ViewHistory(category)
 		if err != nil {
 			log.Fatal(err)
 		}
+		fmt.Println(table[0])
 	},
 }
 

db/budget_db/budget_db.go

@@ -43,7 +43,7 @@ func CreateBudget(bv *structs.BudgetVariables, basePath string) error {
 		}
 		fmt.Println("Budget data is successfully inserted!")
 	} else {
-		return errors.New("enter the category")
+		return errors.New("enter the category or set the total amount. see 'flow total-amount -h'")
 	}
 	return nil
 }
@@ -108,24 +108,51 @@ func RemoveBudget(category string) error {
 	if err != nil {
 		return err
 	}
+	defer db.Close()
 
-	query := "DELETE FROM Budget WHERE categories=$1"
-	remove, err := db.Prepare(query)
+	data, err := ViewBudget(category)
 	if err != nil {
 		return err
 	}
 
-	defer remove.Close()
+	foundCategory, ok := data[1].(string)
+	if !ok {
+		return errors.New("unable to convert data to string")
+	}
+
+	query := "DELETE FROM Budget"
+	var args []interface{}
 
 	if len(category) != 0 {
-		_, err = remove.Exec(category)
-		if err != nil {
-			return err
+		if len(foundCategory) != 0 {
+			query += " WHERE categories=$1"
+			args = append(args, category)
+		} else {
+			return errors.New("category is not found")
 		}
+	}
+
+	remove, err := db.Prepare(query)
+	if err != nil {
+		return err
+	}
+	defer remove.Close()
+
+	_, err = remove.Exec(args...)
+	if err != nil {
+		return err
+	}
+
+	if len(category) != 0 {
 		fmt.Printf("'%s' category is successfully removed!\n", category)
 	} else {
-		fmt.Println("First enter the category and then remove it")
+		if len(foundCategory) != 0 {
+			fmt.Printf("Budget data is successfully deleted!")
+		} else {
+			return errors.New("no data is present")
+		}
 	}
+
 	return nil
 }
 

db/budget_db/history_db.go

@@ -49,12 +49,12 @@ func InsertHistory(hv *structs.HistoryVariables, basePath string) error {
 	return nil
 }
 
-func ViewHistory(category string) error {
+func ViewHistory(category string) ([2]interface{}, error) {
 	hv := new(structs.HistoryVariables)
 
 	db, err := db.Connection()
 	if err != nil {
-		return err
+		return [2]interface{}{}, err
 	}
 
 	defer db.Close()
@@ -71,14 +71,14 @@ func ViewHistory(category string) error {
 		rows, err = db.Query(query)
 	}
 	if err != nil {
-		return err
+		return [2]interface{}{}, err
 	}
 
 	defer rows.Close()
 
 	for rows.Next() {
 		if err := rows.Scan(&hv.Date, &hv.Time, &hv.Category, &hv.Amount, &hv.TransactionID, &hv.Blockchain, &hv.Address); err != nil {
-			return err
+			return [2]interface{}{}, err
 		}
 
 		if len(hv.Category) != 0 && hv.Amount != 0 {
@@ -87,8 +87,8 @@ func ViewHistory(category string) error {
 	}
 
 	tableRender := "History Data\n" + tw.Render()
-	fmt.Println(tableRender)
-	return nil
+	details := [2]interface{}{tableRender, hv.Category}
+	return details, nil
 }
 
 func RemoveHistory(category string) error {
@@ -98,12 +98,26 @@ func RemoveHistory(category string) error {
 	}
 	defer db.Close()
 
+	data, err := ViewHistory(category)
+	if err != nil {
+		return err
+	}
+
+	foundCategory, ok := data[1].(string)
+	if !ok {
+		return errors.New("unable to convert data to string")
+	}
+
 	query := "DELETE FROM History"
 	var args []interface{}
 
 	if len(category) != 0 {
-		query += " WHERE categories=$1"
-		args = append(args, category)
+		if len(foundCategory) != 0 {
+			query += " WHERE categories=$1"
+			args = append(args, category)
+		} else {
+			return errors.New("category is not found")
+		}
 	}
 
 	remove, err := db.Prepare(query)
@@ -120,7 +134,11 @@ func RemoveHistory(category string) error {
 	if len(category) != 0 {
 		fmt.Printf("'%s' category is successfully removed!\n", category)
 	} else {
-		fmt.Printf("History is successfully deleted!")
+		if len(foundCategory) != 0 {
+			fmt.Printf("History data is successfully deleted!")
+		} else {
+			return errors.New("no data is present")
+		}
 	}
 
 	return nil