diff --git a/src/assets/htmx/expenses.html b/src/assets/htmx/expenses.html index d4a2528..d2fdbac 100644 --- a/src/assets/htmx/expenses.html +++ b/src/assets/htmx/expenses.html @@ -1,29 +1,4 @@ {{ define "expenses" }} -
- FILTERS -
-
-
- - - - - - - - - - - - {{ range .expenses }} - - - - - - - - - {{ end }} -
IDOWNERDESCPRICEDATECategory
{{ .ExpID }}{{ .Owner.UserName }}{{ .Description }}{{ formatPrice .Value }}{{ formatDate .Date }}{{ .Category.CategoryName }}
+{{ template "expensesFilterBox" . }} +{{ template "expensesTable" . }} {{ end }} diff --git a/src/assets/htmx/expensesFilterBox.html b/src/assets/htmx/expensesFilterBox.html new file mode 100644 index 0000000..e64fada --- /dev/null +++ b/src/assets/htmx/expensesFilterBox.html @@ -0,0 +1,91 @@ +{{ define "expensesFilterBox" }} + + +
+ FILTERS +
+ + + + + + + +

+ + +
+ +
+ + +
+ + +
+ + +
+ + +
+ + +
+
+ + + + +
+ +
+
+{{ end }} diff --git a/src/assets/htmx/expensesTable.html b/src/assets/htmx/expensesTable.html new file mode 100644 index 0000000..5f717fc --- /dev/null +++ b/src/assets/htmx/expensesTable.html @@ -0,0 +1,22 @@ +{{ define "expensesTable" }} + + + + + + + + + + {{ range .expenses }} + + + + + + + + + {{ end }} +
IDOWNERDESCPRICEDATECategory
{{ .ExpID }}{{ .Owner.UserName }}{{ .Description }}{{ formatPrice .Value }}{{ formatDate .Date }}{{ .Category.CategoryName }}
+{{ end }} diff --git a/src/expenses/repo/expenseRepo.go.go b/src/expenses/repo/expenseRepo.go.go index 503233a..c91b3b9 100644 --- a/src/expenses/repo/expenseRepo.go.go +++ b/src/expenses/repo/expenseRepo.go.go @@ -10,15 +10,21 @@ import ( // ExpFilter has the fields required to query the database. type ExpFilter struct { - Start *time.Time - End *time.Time + Start *time.Time // Start is the earliest an expense can be + End *time.Time // End is the latest an expense can be + CatIDs []int32 // CatIDs is a list of categories to match against + StoreIDs []int32 // StoreIDs is a list of stores to match against + TypeIDs []int32 // TypeIDs is a list of types to match against } // NewExpFilter returns a newly initialized ExpFilter. func NewExpFilter() ExpFilter { return ExpFilter{ - Start: nil, - End: nil, + Start: nil, + End: nil, + CatIDs: nil, + StoreIDs: nil, + TypeIDs: nil, } } diff --git a/src/expenses/repo/pg_expenseRepo.go b/src/expenses/repo/pg_expenseRepo.go index 035e077..882dd63 100644 --- a/src/expenses/repo/pg_expenseRepo.go +++ b/src/expenses/repo/pg_expenseRepo.go @@ -62,6 +62,9 @@ func (p PgExpRepo) GetAll(ctx context.Context, filter ExpFilter, uID int32, Startdate: startPg, Enddate: endPg, UserID: uID, + Catids: filter.CatIDs, + Storeids: filter.StoreIDs, + Typeids: filter.TypeIDs, }) if err != nil { return mod.Expenses{}, err diff --git a/src/expenses/repo/pgdb/pgsqlc/expenses.sql.go b/src/expenses/repo/pgdb/pgsqlc/expenses.sql.go index 2607978..253444b 100644 --- a/src/expenses/repo/pgdb/pgsqlc/expenses.sql.go +++ b/src/expenses/repo/pgdb/pgsqlc/expenses.sql.go @@ -106,12 +106,22 @@ AND ($2::timestamp IS NULL OR expenses."ExpDate" >= $2::timestamp) AND ($3::timestamp IS NULL OR expenses."ExpDate" <= $3::timestamp) +AND + ($4::int[] IS NULL OR expenses."CategoryID" = ANY($4::int[])) +AND + ($5::int[] IS NULL OR expenses."StoreID" = ANY($5::int[])) +AND + ($6::int[] IS NULL OR expenses."TypeID" = ANY($6::int[])) +ORDER BY expenses."ExpDate" ` type GetExpensesParams struct { UserID int32 Startdate pgtype.Timestamp Enddate pgtype.Timestamp + Catids []int32 + Storeids []int32 + Typeids []int32 } type GetExpensesRow struct { @@ -123,7 +133,14 @@ type GetExpensesRow struct { } func (q *Queries) GetExpenses(ctx context.Context, arg GetExpensesParams) ([]GetExpensesRow, error) { - rows, err := q.db.Query(ctx, getExpenses, arg.UserID, arg.Startdate, arg.Enddate) + rows, err := q.db.Query(ctx, getExpenses, + arg.UserID, + arg.Startdate, + arg.Enddate, + arg.Catids, + arg.Storeids, + arg.Typeids, + ) if err != nil { return nil, err } diff --git a/src/expenses/repo/pgdb/queries/expenses.sql b/src/expenses/repo/pgdb/queries/expenses.sql index 92426c7..d385893 100644 --- a/src/expenses/repo/pgdb/queries/expenses.sql +++ b/src/expenses/repo/pgdb/queries/expenses.sql @@ -19,7 +19,14 @@ WHERE AND (sqlc.narg(StartDate)::timestamp IS NULL OR expenses."ExpDate" >= sqlc.narg(StartDate)::timestamp) AND - (sqlc.narg(EndDate)::timestamp IS NULL OR expenses."ExpDate" <= sqlc.narg(EndDate)::timestamp); + (sqlc.narg(EndDate)::timestamp IS NULL OR expenses."ExpDate" <= sqlc.narg(EndDate)::timestamp) +AND + (sqlc.narg(CatIDs)::int[] IS NULL OR expenses."CategoryID" = ANY(sqlc.narg(CatIDs)::int[])) +AND + (sqlc.narg(StoreIDs)::int[] IS NULL OR expenses."StoreID" = ANY(sqlc.narg(StoreIDs)::int[])) +AND + (sqlc.narg(TypeIDs)::int[] IS NULL OR expenses."TypeID" = ANY(sqlc.narg(TypeIDs)::int[])) +ORDER BY expenses."ExpDate"; -- name: GetExpense :one SELECT diff --git a/src/ginAux/ginAux.go b/src/ginAux/ginAux.go new file mode 100644 index 0000000..d62535e --- /dev/null +++ b/src/ginAux/ginAux.go @@ -0,0 +1,2 @@ +// Package ginaux will have auxiliary functions for common gin stuff +package ginaux diff --git a/src/ginAux/query.go b/src/ginAux/query.go new file mode 100644 index 0000000..cf5cd7c --- /dev/null +++ b/src/ginAux/query.go @@ -0,0 +1,29 @@ +package ginaux + +import ( + "log" + "strconv" + + "github.com/gin-gonic/gin" +) + +// QueryIntArray will return an array of ints of a given query paramenter. +func QueryIntArray(c *gin.Context, param string) ([]int32, error) { + selCategories := c.QueryArray(param) + var newArr []int32 + if len(selCategories) > 0 { + newArr = make([]int32, len(selCategories)) + + for k, val := range selCategories { + id, err := strconv.ParseInt(val, 10, 32) + if err != nil { + log.Printf("error converting id [%s]: %v", val, err) + return nil, err + } + + newArr[k] = int32(id) + } + } + + return newArr, nil +} diff --git a/src/pages/expenses.go b/src/pages/expenses.go index ec170c7..d80998e 100644 --- a/src/pages/expenses.go +++ b/src/pages/expenses.go @@ -41,6 +41,31 @@ func expensesPartial(c *gin.Context) { }) } +func getExpenses(c *gin.Context) { + ctx, err := getLoggedInUserCTX(c) + if err != nil { + ServerErrorView(c, "Could not get logged in user") + return + } + + eFilter, err := expenseFilterFromQuery(c) + if err != nil { + ServerErrorView(c, "Could not get logged in user") + return + } + + expenses, err := exp.App.GetAllExpenses(ctx, eFilter) + if err != nil { + log.Println("error:", err) + ServerErrorView(c, "Could not get logged in user") + return + } + + c.HTML(http.StatusOK, "expensesTable", gin.H{ + "expenses": expenses, + }) +} + func expensesGlobalPage(c *gin.Context) { ctx, err := getLoggedInUserCTX(c) if err != nil { @@ -56,11 +81,35 @@ func expensesGlobalPage(c *gin.Context) { return } + categories, err := exp.App.GetAllCategories(ctx) + if err != nil { + log.Println("error:", err) + ServerErrorView(c, "Unable to get categories") + return + } + + stores, err := exp.App.GetAllStores(ctx) + if err != nil { + log.Println("error:", err) + ServerErrorView(c, "Unable to get stores") + return + } + + types, err := exp.App.GetAllTypes(ctx) + if err != nil { + log.Println("error:", err) + ServerErrorView(c, "Unable to get types") + return + } + c.HTML(http.StatusOK, "terminal", gin.H{ "page": "expenses", "renderNavBar": true, "content": "expenses", "expenses": expenses, + "categories": categories, + "stores": stores, + "types": types, }) } @@ -301,9 +350,9 @@ func qrRequest(c *gin.Context) { // RouteExpenses routes the endpoints for the HTML frontend. func RouteExpenses(router *gin.RouterGroup) { - router.GET(ExpensesPath, expensesGlobalPage) + router.GET(ExpensesPath, getExpenses) router.GET(ExpensesPath+"/:id", expensePage) - router.POST(ExpensesPath, expensesPartial) + router.GET("/main", expensesGlobalPage) router.GET(ExpensesPath+"/new", newExpensePage) router.POST(ExpensesPath+"/new", createExpense) diff --git a/src/pages/expensesHelper.go b/src/pages/expensesHelper.go index 3f52f97..b9bd52f 100644 --- a/src/pages/expensesHelper.go +++ b/src/pages/expensesHelper.go @@ -8,6 +8,7 @@ import ( expenses "github.com/ESilva15/expenses/expenses" mod "github.com/ESilva15/expenses/expenses/models" "github.com/ESilva15/expenses/expenses/repo" + ginaux "github.com/ESilva15/expenses/ginAux" "github.com/gin-gonic/gin" "github.com/shopspring/decimal" @@ -40,6 +41,24 @@ func expenseFilterFromQuery(c *gin.Context) (repo.ExpFilter, error) { filter.End = &end } + filter.CatIDs, err = ginaux.QueryIntArray(c, "cat-dropdown[]") + if err != nil { + log.Printf("Failed to retrieve IDs from cat-dropdown[] %+v", err) + return repo.ExpFilter{}, nil + } + + filter.StoreIDs, err = ginaux.QueryIntArray(c, "store-dropdown[]") + if err != nil { + log.Printf("Failed to retrieve IDs from store-dropdown[] %+v", err) + return repo.ExpFilter{}, nil + } + + filter.TypeIDs, err = ginaux.QueryIntArray(c, "type-dropdown[]") + if err != nil { + log.Printf("Failed to retrieve IDs from type-dropdown[] %+v", err) + return repo.ExpFilter{}, nil + } + return filter, nil } diff --git a/src/pages/home.go b/src/pages/home.go index 6ed299a..57ebee1 100644 --- a/src/pages/home.go +++ b/src/pages/home.go @@ -6,8 +6,9 @@ import ( "github.com/gin-gonic/gin" ) +// RouteHome routes the home pages. func RouteHome(router *gin.RouterGroup) { router.GET("/", func(c *gin.Context) { - c.Redirect(http.StatusFound, ExpensesPath) + c.Redirect(http.StatusFound, "/main") }) } diff --git a/src/pgImage/Makefile b/src/pgImage/Makefile index 15fd99b..f8660b6 100644 --- a/src/pgImage/Makefile +++ b/src/pgImage/Makefile @@ -31,7 +31,7 @@ test: remove-dev-container --name $(container)-dev \ --env-file .env \ -v ./pgsql-data-dev/:/var/lib/postgresql/data/ \ - -it $(registry)/$(repo)/expensesdb:$(tag) + -it $(registry)/$(repo)/expensesdb:v0.0.91-alpha build_image: make -C ./