checking password before editing/deleting user

1 files changed, 6 insertions, 146 deletions

diff --git a/invoice/router.go b/invoice/router.go
index c89d667..4a3a3b0 100644
--- a/invoice/router.go
+++ b/invoice/router.go
@@ -18,156 +18,16 @@
 package invoice
 
 import (
-    "github.com/MikunoNaka/OpenBills-server/util"
+	"github.com/MikunoNaka/OpenBills-server/util"
 	"github.com/gin-gonic/gin"
-	"log"
-	"errors"
-	"net/http"
-	"go.mongodb.org/mongo-driver/bson/primitive"
-	"go.mongodb.org/mongo-driver/mongo"
 )
 
 func Routes(route *gin.Engine) {
-	i := route.Group("/invoice")
- 	i.Use(util.Authorize())
+	i := route.Group("/invoice", util.Authorize())
 	{
-		i.GET("/all", func(ctx *gin.Context) {
-			// TODO: add functionality to filter results
-			invoices, err := getInvoices(nil)
-			if err != nil {
-				ctx.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()})
-				log.Printf("ERROR: Failed to read invoices from DB: %v\n", err.Error())
-				return
-			}
-
-			ctx.JSON(http.StatusOK, invoices)
-		})
-
-		// send invoice as JSON, filtering by ID
-		i.GET("/:invoiceId", func(ctx *gin.Context) {
-			id, err := primitive.ObjectIDFromHex(ctx.Param("invoiceId"))
-			if err != nil {
-                ctx.JSON(http.StatusBadRequest, gin.H{"error": err.Error()})
-				log.Printf("ERROR: Failed to get invoice with ID, Error parsing ID: %v\n", err.Error())
-				return
-			}
-
-			invoice, err := getInvoiceById(id)
-			if err != nil {
-				if errors.Is(err, mongo.ErrNoDocuments) {
-					ctx.JSON(http.StatusNotFound, gin.H{"error": err.Error()})
-				} else {
-					ctx.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()})
-				}
-				log.Printf("ERROR: Failed to read invoice %v from DB: %v\n", id, err.Error())
-				return
-			}
-
-			ctx.JSON(http.StatusOK, invoice)
-		})
-
-		i.POST("/new", func(ctx *gin.Context) {
-			var i Invoice
-			ctx.BindJSON(&i)
-			_, err := saveInvoice(i)
-			if err != nil {
-				ctx.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()})
-				log.Printf("ERROR: Failed to add new invoice %v to DB: %v\n", i, err.Error())
-				return
-			}
-
-			log.Printf("Successfully created new Invoice: %v", i)
-			ctx.JSON(http.StatusOK, nil)
-		})
-
-		i.DELETE("/:invoiceId", func(ctx *gin.Context) {
-			id := ctx.Param("invoiceId")
-			objectId, err := primitive.ObjectIDFromHex(id)
-			if err != nil {
-				ctx.JSON(http.StatusBadRequest, gin.H{"error": err.Error()})
-				log.Printf("ERROR: Failed to delete invoice, Error parsing ID: %v\n", err.Error())
-				return
-			}
-
-			err = deleteInvoice(objectId)
-			if err != nil {
-				ctx.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()})
-				log.Printf("ERROR: Failed to delete invoice %v: %v\n", objectId, err.Error())
-				return
-			}
-
-			log.Printf("Deleted invoice %v from database.\n", objectId )
-			ctx.JSON(http.StatusOK, nil)
-		})
-	}
-
-	transport := route.Group("/transport")
-	{
-		transport.GET("/all", func(ctx *gin.Context) {
-			// TODO: add functionality to filter results
-			transports, err := getTransports(nil)
-			if err != nil {
-				ctx.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()})
-				log.Printf("ERROR: Failed to read transport vehicles from DB: %v\n", err.Error())
-				return
-			}
-
-			ctx.JSON(http.StatusOK, transports)
-		})
-
-		transport.DELETE("/:transportId", func(ctx *gin.Context) {
-			id := ctx.Param("transportId")
-			objectId, err := primitive.ObjectIDFromHex(id)
-			if err != nil {
-				ctx.JSON(http.StatusBadRequest, gin.H{"error": err.Error()})
-				log.Printf("ERROR: Failed to delete transport vehicle, Error parsing ID: %v\n", err.Error())
-				return
-			}
-
-			err = deleteTransport(objectId)
-			if err != nil {
-				ctx.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()})
-				log.Printf("ERROR: Failed to delete transport vehicle %v: %v\n", objectId, err.Error())
-				return
-			}
-
-			log.Printf("Deleted transport vehicle %v from database.\n", objectId )
-			ctx.JSON(http.StatusOK, nil)
-		})
-	}
-
-	transporter := route.Group("/transporter")
-	{
-		transporter.GET("/all", func(ctx *gin.Context) {
-			// TODO: add functionality to filter results
-			transporters, err := getTransporters(nil)
-			if err != nil {
-				ctx.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()})
-				log.Printf("ERROR: Failed to read transporters from DB: %v\n", err.Error())
-				return
-			}
-
-			ctx.JSON(http.StatusOK, transporters)
-		})
-
-		transporter.DELETE("/:transporterId", func(ctx *gin.Context) {
-			id := ctx.Param("transporterId")
-			objectId, err := primitive.ObjectIDFromHex(id)
-			if err != nil {
-				ctx.JSON(http.StatusBadRequest, gin.H{"error": err.Error()})
-				log.Printf("ERROR: Failed to delete transporter, Error parsing ID: %v\n", err.Error())
-				return
-			}
-
-			err = deleteTransporter(objectId)
-			if err != nil {
-				ctx.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()})
-				log.Printf("ERROR: Failed to delete transporter %v: %v\n", objectId, err.Error())
-				return
-			}
-
-			log.Printf("Deleted transporter %v from database.\n", objectId )
-			ctx.JSON(http.StatusOK, nil)
-		})
+		i.GET("/all", getAll)
+		i.GET("/:invoiceId", get) // send invoice as JSON, filtering by ID
+		i.POST("/new", save)
+		i.DELETE("/:invoiceId", remove)
 	}
 }