From a6087d0a4f177973b9d27e544f85736d90039089 Mon Sep 17 00:00:00 2001 From: Vidhu Kant Sharma Date: Mon, 4 Dec 2023 01:46:17 +0530 Subject: added API route to get drafts only --- invoice/controller.go | 27 ++++++++++++++++++++++++++- invoice/router.go | 1 + invoice/service.go | 4 ++-- main.go | 2 +- 4 files changed, 30 insertions(+), 4 deletions(-) diff --git a/invoice/controller.go b/invoice/controller.go index 7260834..6bd5ad5 100644 --- a/invoice/controller.go +++ b/invoice/controller.go @@ -74,7 +74,32 @@ func handleGetInvoices (ctx *gin.Context) { userId := uId.(uint) - err := getInvoices(&invoices, userId) + err := getInvoices(&invoices, userId, false) + if err != nil { + ctx.Error(err) + ctx.Abort() + return + } + + ctx.JSON(http.StatusOK, gin.H{ + "message": "success", + "data": invoices, + }) +} + +func handleGetDrafts (ctx *gin.Context) { + var invoices []Invoice + + uId, ok := ctx.Get("UserID") + if !ok { + ctx.Error(e.ErrUnauthorized) + ctx.Abort() + return + } + + userId := uId.(uint) + + err := getInvoices(&invoices, userId, true) if err != nil { ctx.Error(err) ctx.Abort() diff --git a/invoice/router.go b/invoice/router.go index 8e0a0ca..7631cb9 100644 --- a/invoice/router.go +++ b/invoice/router.go @@ -25,6 +25,7 @@ func Routes(route *gin.RouterGroup) { g := route.Group("/invoice") { g.GET("/", handleGetInvoices) + g.GET("/draft", handleGetDrafts) g.GET("/:id", handleGetSingleInvoice) g.POST("/", handleSaveInvoice) g.DELETE("/:id", handleDelInvoice) diff --git a/invoice/service.go b/invoice/service.go index 9408a0d..91e2707 100644 --- a/invoice/service.go +++ b/invoice/service.go @@ -66,8 +66,8 @@ func getInvoice(invoice *Invoice, id uint) error { return nil } -func getInvoices(invoices *[]Invoice, userId uint) error { - res := db.Where("user_id = ?", userId).Find(&invoices) +func getInvoices(invoices *[]Invoice, userId uint, isDraft bool) error { + res := db.Where("user_id = ? and is_draft = ?", userId, isDraft).Find(&invoices) // TODO: handle potential errors if res.Error != nil { diff --git a/main.go b/main.go index dd961cf..f4392e2 100644 --- a/main.go +++ b/main.go @@ -38,7 +38,7 @@ import ( "log" ) -const OPENBILLS_VERSION = "v0.2.1" +const OPENBILLS_VERSION = "v0.3.0" func init() { if !viper.GetBool("debug_mode") { -- cgit v1.2.3