added the entities directory in order to improve the structure of the…

… code
ibilalkayy · Apr 28, 2024 · 6fe3fad · 6fe3fad
1 parent c07a3a7
commit 6fe3fad
Show file tree

Hide file tree

Showing 34 changed files with 153 additions and 147 deletions.
diff --git a/cmd/budget/handler/create.go b/cmd/budget/handler/create.go
@@ -5,7 +5,7 @@ import (
 
 	"github.com/ibilalkayy/flow/db/budget_db"
 	"github.com/ibilalkayy/flow/internal/common/functions"
-	"github.com/ibilalkayy/flow/internal/common/structs"
+	"github.com/ibilalkayy/flow/internal/entities"
 	"github.com/spf13/cobra"
 )
 
@@ -18,7 +18,7 @@ var CreateCmd = &cobra.Command{
 		amount, _ := cmd.Flags().GetString("amount")
 		amountInt := functions.StringToInt(amount)
 
-		bv := structs.BudgetVariables{Category: category, Amount: amountInt}
+		bv := entities.BudgetVariables{Category: category, Amount: amountInt}
 		err := budget_db.CreateBudget(&bv, "db/migrations/")
 		if err != nil {
 			log.Fatal(err)

diff --git a/cmd/budget/budget.go → cmd/budget/main.go b/cmd/budget/budget.go → cmd/budget/main.go
diff --git a/cmd/budget/sub_handler/setup.go b/cmd/budget/sub_handler/setup.go
@@ -5,7 +5,7 @@ import (
 
 	internal_alert "github.com/ibilalkayy/flow/internal/app/alert"
 	"github.com/ibilalkayy/flow/internal/common/functions"
-	"github.com/ibilalkayy/flow/internal/common/structs"
+	"github.com/ibilalkayy/flow/internal/entities"
 	"github.com/spf13/cobra"
 )
 
@@ -28,7 +28,7 @@ var SetupCmd = &cobra.Command{
 		minuteInt := functions.StringToInt(minute)
 		secondInt := functions.StringToInt(second)
 
-		av := structs.AlertVariables{
+		av := entities.AlertVariables{
 			Category:  category,
 			Method:    method,
 			Frequency: frequency,

diff --git a/cmd/budget/sub_handler/update.go b/cmd/budget/sub_handler/update.go
@@ -5,7 +5,7 @@ import (
 
 	"github.com/ibilalkayy/flow/db/alert_db"
 	"github.com/ibilalkayy/flow/internal/common/functions"
-	"github.com/ibilalkayy/flow/internal/common/structs"
+	"github.com/ibilalkayy/flow/internal/entities"
 	"github.com/spf13/cobra"
 )
 
@@ -28,7 +28,7 @@ var UpdateCmd = &cobra.Command{
 		minuteInt := functions.StringToInt(minute)
 		secondInt := functions.StringToInt(second)
 
-		av := structs.AlertVariables{
+		av := entities.AlertVariables{
 			Category:  category,
 			Method:    method,
 			Frequency: frequency,

diff --git a/cmd/init/init.go → cmd/init/main.go b/cmd/init/init.go → cmd/init/main.go
@@ -7,7 +7,7 @@ import (
 	"github.com/ibilalkayy/flow/cmd"
 	"github.com/ibilalkayy/flow/db"
 	internal_init "github.com/ibilalkayy/flow/internal/app/init"
-	"github.com/ibilalkayy/flow/internal/common/structs"
+	"github.com/ibilalkayy/flow/internal/entities"
 	"github.com/spf13/cobra"
 )
 
@@ -38,13 +38,13 @@ func initApp(cmd *cobra.Command, args []string) {
 	postgresDBName, _ := cmd.Flags().GetString("dbname")
 	sslMode, _ := cmd.Flags().GetString("sslmode")
 
-	authParams := &structs.AuthVariables{
+	authParams := &entities.AuthVariables{
 		Username:    username,
 		Gmail:       gmail,
 		AppPassword: appPassword,
 	}
 
-	dbParams := &structs.DatabaseVariables{
+	dbParams := &entities.DatabaseVariables{
 		Host:     dbHost,
 		Port:     postgresPort,
 		User:     postgresUser,
@@ -68,7 +68,7 @@ func initApp(cmd *cobra.Command, args []string) {
 	}
 }
 
-func initializeApplication(authParams *structs.AuthVariables, dbParams *structs.DatabaseVariables) error {
+func initializeApplication(authParams *entities.AuthVariables, dbParams *entities.DatabaseVariables) error {
 	err := internal_init.WriteEnvFile(authParams, dbParams)
 	if err != nil {
 		return fmt.Errorf("error writing to .env file: %v", err)

diff --git a/cmd/root.go b/cmd/root.go
@@ -9,7 +9,7 @@ import (
 	"github.com/spf13/cobra"
 )
 
-const version = "v0.1.91"
+const version = "v0.1.92"
 
 // rootCmd represents the base command when called without any subcommands
 var RootCmd = &cobra.Command{

diff --git a/cmd/spend/spend.go → cmd/spend/main.go b/cmd/spend/spend.go → cmd/spend/main.go
diff --git a/cmd/total_amount/handler/update.go b/cmd/total_amount/handler/update.go
@@ -5,7 +5,7 @@ import (
 
 	"github.com/ibilalkayy/flow/db/total_amount_db"
 	"github.com/ibilalkayy/flow/internal/common/functions"
-	"github.com/ibilalkayy/flow/internal/common/structs"
+	"github.com/ibilalkayy/flow/internal/entities"
 	"github.com/spf13/cobra"
 )
 
@@ -20,7 +20,7 @@ var UpdateCmd = &cobra.Command{
 		label, _ := cmd.Flags().GetString("label")
 		totalAmount := functions.StringToInt(amount)
 
-		tv := structs.TotalAmountVariables{
+		tv := entities.TotalAmountVariables{
 			Included:    old_category,
 			NewCategory: new_category,
 			TotalAmount: totalAmount,

diff --git a/cmd/total_amount/total_amount.go → cmd/total_amount/main.go b/cmd/total_amount/total_amount.go → cmd/total_amount/main.go
diff --git a/cmd/total_amount/sub_handler/active.go b/cmd/total_amount/sub_handler/active.go
@@ -6,7 +6,7 @@ import (
 	"log"
 
 	"github.com/ibilalkayy/flow/db/total_amount_db"
-	"github.com/ibilalkayy/flow/internal/common/structs"
+	"github.com/ibilalkayy/flow/internal/entities"
 	"github.com/spf13/cobra"
 )
 
@@ -28,7 +28,7 @@ var ActiveCmd = &cobra.Command{
 		if status == "active" {
 			fmt.Println(errors.New("the status is already active"))
 		} else {
-			updateStatus := structs.TotalAmountVariables{
+			updateStatus := entities.TotalAmountVariables{
 				Status: "Active",
 			}
 			total_amount_db.UpdateStatus(&updateStatus)

diff --git a/cmd/total_amount/sub_handler/inactive.go b/cmd/total_amount/sub_handler/inactive.go
@@ -6,7 +6,7 @@ import (
 	"log"
 
 	"github.com/ibilalkayy/flow/db/total_amount_db"
-	"github.com/ibilalkayy/flow/internal/common/structs"
+	"github.com/ibilalkayy/flow/internal/entities"
 	"github.com/spf13/cobra"
 )
 
@@ -28,7 +28,7 @@ var InactiveCmd = &cobra.Command{
 		if status == "inactive" {
 			fmt.Println(errors.New("the status is already inactive"))
 		} else {
-			updateStatus := structs.TotalAmountVariables{
+			updateStatus := entities.TotalAmountVariables{
 				Status: "Inactive",
 			}
 			total_amount_db.UpdateStatus(&updateStatus)

diff --git a/db/alert_db/alert_db.go b/db/alert_db/alert_db.go
@@ -8,11 +8,11 @@ import (
 	"strings"
 
 	"github.com/ibilalkayy/flow/db"
-	"github.com/ibilalkayy/flow/internal/common/structs"
+	"github.com/ibilalkayy/flow/internal/entities"
 	"github.com/jedib0t/go-pretty/v6/table"
 )
 
-func CreateAlert(av *structs.AlertVariables, basePath string) error {
+func CreateAlert(av *entities.AlertVariables, basePath string) error {
 	data, err := db.Table(basePath, "002_create_alert_table.sql", 0)
 	if err != nil {
 		return err
@@ -37,7 +37,7 @@ func CreateAlert(av *structs.AlertVariables, basePath string) error {
 }
 
 func ViewAlert(category string) ([9]interface{}, error) {
-	av := new(structs.AlertVariables)
+	av := new(entities.AlertVariables)
 
 	db, err := db.Connection()
 	if err != nil {
@@ -131,7 +131,7 @@ func RemoveAlert(category string) error {
 	return nil
 }
 
-func UpdateAlert(av *structs.AlertVariables) error {
+func UpdateAlert(av *entities.AlertVariables) error {
 	db, err := db.Connection()
 	if err != nil {
 		return err

diff --git a/db/budget_db/budget_db.go b/db/budget_db/budget_db.go
@@ -9,11 +9,11 @@ import (
 
 	"github.com/ibilalkayy/flow/db"
 	"github.com/ibilalkayy/flow/internal/common/functions"
-	"github.com/ibilalkayy/flow/internal/common/structs"
+	"github.com/ibilalkayy/flow/internal/entities"
 	"github.com/jedib0t/go-pretty/v6/table"
 )
 
-func CreateBudget(bv *structs.BudgetVariables, basePath string) error {
+func CreateBudget(bv *entities.BudgetVariables, basePath string) error {
 	data, err := db.Table(basePath, "001_create_budget_table.sql", 0)
 	if err != nil {
 		return err
@@ -50,7 +50,7 @@ func CreateBudget(bv *structs.BudgetVariables, basePath string) error {
 
 func ViewBudget(category string) ([5]interface{}, error) {
 	// Create a new instance of BudgetVariables to hold the retrieved data
-	bv := new(structs.BudgetVariables)
+	bv := new(entities.BudgetVariables)
 
 	// Connect to the database
 	db, err := db.Connection()
@@ -262,7 +262,7 @@ func AddBudgetExpenditure(spent int, category string) error {
 }
 
 func GetBudgetData(filepath, filename string) error {
-	bv := new(structs.BudgetVariables)
+	bv := new(entities.BudgetVariables)
 	db, err := db.Connection()
 	if err != nil {
 		return err

diff --git a/db/budget_db/history_db.go b/db/budget_db/history_db.go
@@ -7,11 +7,11 @@ import (
 
 	"github.com/ibilalkayy/flow/db"
 	"github.com/ibilalkayy/flow/internal/common/functions"
-	"github.com/ibilalkayy/flow/internal/common/structs"
+	"github.com/ibilalkayy/flow/internal/entities"
 	"github.com/jedib0t/go-pretty/v6/table"
 )
 
-func InsertHistory(hv *structs.HistoryVariables, basePath string) error {
+func InsertHistory(hv *entities.HistoryVariables, basePath string) error {
 	data, err := db.Table(basePath, "001_create_budget_table.sql", 1)
 	if err != nil {
 		return err
@@ -50,7 +50,7 @@ func InsertHistory(hv *structs.HistoryVariables, basePath string) error {
 }
 
 func ViewHistory(category string) ([2]interface{}, error) {
-	hv := new(structs.HistoryVariables)
+	hv := new(entities.HistoryVariables)
 
 	db, err := db.Connection()
 	if err != nil {

diff --git a/db/connection.go b/db/connection.go
@@ -7,16 +7,16 @@ import (
 	"os"
 	"strings"
 
-	"github.com/ibilalkayy/flow/internal/common/structs"
+	"github.com/ibilalkayy/flow/internal/entities"
 	"github.com/ibilalkayy/flow/internal/middleware"
 	_ "github.com/lib/pq"
 )
 
 func Connection() (*sql.DB, error) {
-	var dv structs.DatabaseVariables
+	var dv entities.DatabaseVariables
 
 	if middleware.LoadEnvVariable("DB_HOST") != "" {
-		dv = structs.DatabaseVariables{
+		dv = entities.DatabaseVariables{
 			Host:     middleware.LoadEnvVariable("DB_HOST"),
 			Port:     middleware.LoadEnvVariable("DB_PORT"),
 			User:     middleware.LoadEnvVariable("DB_USER"),

diff --git a/db/total_amount_db/total_amount_category.go b/db/total_amount_db/total_amount_category.go
@@ -5,11 +5,11 @@ import (
 	"errors"
 
 	"github.com/ibilalkayy/flow/db"
-	"github.com/ibilalkayy/flow/internal/common/structs"
+	"github.com/ibilalkayy/flow/internal/entities"
 	"github.com/jedib0t/go-pretty/v6/table"
 )
 
-func InsertTotalAmountCategory(tv *structs.TotalAmountVariables, basepath string) error {
+func InsertTotalAmountCategory(tv *entities.TotalAmountVariables, basepath string) error {
 	data, err := db.Table(basepath, "003_create_total_amount_table.sql", 1)
 	if err != nil {
 		return err
@@ -35,7 +35,7 @@ func InsertTotalAmountCategory(tv *structs.TotalAmountVariables, basepath string
 }
 
 func ViewTotalAmountCategory() (string, [][2]string, error) {
-	tv := new(structs.TotalAmountVariables)
+	tv := new(entities.TotalAmountVariables)
 	var values [][2]string
 
 	db, err := db.Connection()

diff --git a/db/total_amount_db/total_amount_db.go b/db/total_amount_db/total_amount_db.go
@@ -6,11 +6,11 @@ import (
 	"fmt"
 
 	"github.com/ibilalkayy/flow/db"
-	"github.com/ibilalkayy/flow/internal/common/structs"
+	"github.com/ibilalkayy/flow/internal/entities"
 	"github.com/jedib0t/go-pretty/v6/table"
 )
 
-func InsertTotalAmount(tv *structs.TotalAmountVariables, basepath string) error {
+func InsertTotalAmount(tv *entities.TotalAmountVariables, basepath string) error {
 	data, err := db.Table(basepath, "003_create_total_amount_table.sql", 0)
 	if err != nil {
 		return err
@@ -37,7 +37,7 @@ func InsertTotalAmount(tv *structs.TotalAmountVariables, basepath string) error
 }
 
 func ViewTotalAmount() ([5]interface{}, error) {
-	tv := new(structs.TotalAmountVariables)
+	tv := new(entities.TotalAmountVariables)
 
 	db, err := db.Connection()
 	if err != nil {
@@ -118,7 +118,7 @@ func RemoveTotalAmount(category string) error {
 	return nil
 }
 
-func UpdateTotalAmount(tv *structs.TotalAmountVariables) error {
+func UpdateTotalAmount(tv *entities.TotalAmountVariables) error {
 	var query string
 	var params []interface{}
 
@@ -147,7 +147,7 @@ func UpdateTotalAmount(tv *structs.TotalAmountVariables) error {
 	return nil
 }
 
-func UpdateStatus(tv *structs.TotalAmountVariables) error {
+func UpdateStatus(tv *entities.TotalAmountVariables) error {
 	db, err := db.Connection()
 	if err != nil {
 		return err

diff --git a/email/email.go b/email/email.go
@@ -6,7 +6,7 @@ import (
 	"text/template"
 
 	"github.com/ibilalkayy/flow/db/budget_db"
-	"github.com/ibilalkayy/flow/internal/common/structs"
+	"github.com/ibilalkayy/flow/internal/entities"
 	"github.com/ibilalkayy/flow/internal/middleware"
 	"gopkg.in/gomail.v2"
 )
@@ -36,7 +36,7 @@ func SendAlertEmail(category string) error {
 		return errors.New("unable to convert category and amount to int and string")
 	}
 
-	emailVariables := structs.EmailVariables{
+	emailVariables := entities.EmailVariables{
 		Username:       myUsername,
 		Category:       categoryName,
 		CategoryAmount: categoryAmount,

diff --git a/internal/app/alert/alert.go b/internal/app/alert/alert.go
@@ -10,10 +10,10 @@ import (
 	"github.com/ibilalkayy/flow/db/budget_db"
 	internal_budget "github.com/ibilalkayy/flow/internal/app/budget"
 	internal_spending "github.com/ibilalkayy/flow/internal/app/spend"
-	"github.com/ibilalkayy/flow/internal/common/structs"
+	"github.com/ibilalkayy/flow/internal/entities"
 )
 
-func AlertSetup(av *structs.AlertVariables) error {
+func AlertSetup(av *entities.AlertVariables) error {
 	if len(av.Category) != 0 && len(av.Frequency) != 0 && len(av.Method) != 0 {
 		validMethods := map[string]bool{"email": true, "cli": true}
 		validFrequencies := map[string]bool{"hourly": true, "daily": true, "weekly": true, "monthly": true}

diff --git a/internal/app/budget/budget.go b/internal/app/budget/budget.go
@@ -4,11 +4,11 @@ import (
 	"errors"
 
 	"github.com/ibilalkayy/flow/db"
-	"github.com/ibilalkayy/flow/internal/common/structs"
+	"github.com/ibilalkayy/flow/internal/entities"
 )
 
 func CategoryAmount(category string) (int, error) {
-	bv := new(structs.BudgetVariables)
+	bv := new(entities.BudgetVariables)
 
 	db, err := db.Connection()
 	if err != nil {

diff --git a/internal/app/init/init.go b/internal/app/init/init.go
@@ -4,10 +4,10 @@ import (
 	"fmt"
 	"os"
 
-	"github.com/ibilalkayy/flow/internal/common/structs"
+	"github.com/ibilalkayy/flow/internal/entities"
 )
 
-func WriteEnvFile(av *structs.AuthVariables, dv *structs.DatabaseVariables) error {
+func WriteEnvFile(av *entities.AuthVariables, dv *entities.DatabaseVariables) error {
 	f, err := os.Create(".env")
 	if err != nil {
 		return err

diff --git a/internal/app/spend/history.go b/internal/app/spend/history.go
@@ -4,14 +4,14 @@ import (
 	"time"
 
 	"github.com/ibilalkayy/flow/db/budget_db"
-	"github.com/ibilalkayy/flow/internal/common/structs"
+	"github.com/ibilalkayy/flow/internal/entities"
 )
 
 func StoreHistory(category string, spending_amount int) error {
 	currentDate := time.Now().Format("2006-01-02")
 	currentTime := time.Now().Format("03:04:05 PM")
 
-	hv := structs.HistoryVariables{
+	hv := entities.HistoryVariables{
 		Date:          currentDate,
 		Time:          currentTime,
 		Category:      category,