fixed all the delete routes, temporarily disabled adding new documents

1 files changed, 30 insertions, 17 deletions

diff --git a/brand/brand_router.go b/brand/brand_router.go
index c6aa661..264c693 100644
--- a/brand/brand_router.go
+++ b/brand/brand_router.go
@@ -1,7 +1,25 @@
+/* OpenBills-server - Server for libre billing software OpenBills-web
+ * Copyright (C) 2022  Vidhu Kant Sharma <vidhukant@vidhukant.xyz>
+
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
 package brand
 
 import (
 	"github.com/gin-gonic/gin"
+	"go.mongodb.org/mongo-driver/bson/primitive"
 	"github.com/MikunoNaka/OpenBills-lib/brand"
 	"log"
 	"net/http"
@@ -11,40 +29,35 @@ import (
 func Routes(route *gin.Engine) {
 	b := route.Group("/brand")
 	{
-		b.GET("/", func(ctx *gin.Context) {
+		b.GET("/all", func(ctx *gin.Context) {
 			// TODO: add functionality to filter results
 			brands, err := brand.GetBrands(nil)
 			if err != nil {
 				ctx.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()})
 				log.Printf("ERROR: Failed to read brands from DB: %v\n", err.Error())
+				return
 			}
 
 			ctx.JSON(http.StatusOK, brands)
 		})
 
-		b.POST("/", func(ctx *gin.Context) {
-			var x brand.Brand
-			ctx.Bind(&x)
-			err := x.Save()
+		b.DELETE("/:brandId", func(ctx *gin.Context) {
+			id := ctx.Param("brandId")
+			objectId, err := primitive.ObjectIDFromHex(id)
 			if err != nil {
-				ctx.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()})
-				log.Printf("ERROR: Failed to add new brand \"%s\": %v\n", x.Name, err.Error())
+				ctx.JSON(http.StatusBadRequest, gin.H{"error": err.Error()})
+				log.Printf("ERROR: Failed to delete brand, Error parsing ID: %v\n", err.Error())
+				return
 			}
 
-			log.Println("Added new brand to database: ", x.Name)
-			ctx.JSON(http.StatusOK, nil)
-		})
-
-		b.DELETE("/", func(ctx *gin.Context) {
-			var x brand.Brand
-			ctx.Bind(&x)
-			err := x.Delete()
+			err = brand.DeleteBrand(objectId)
 			if err != nil {
 				ctx.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()})
-				log.Printf("ERROR: Failed to delete brand \"%s\": %v\n", x.Name, err.Error())
+				log.Printf("ERROR: Failed to delete brand %v: %v\n", objectId, err.Error())
+				return
 			}
 
-			log.Println("Delete brand: ", x.Name)
+			log.Printf("Deleted brand %v from database.\n", objectId )
 			ctx.JSON(http.StatusOK, nil)
 		})
 	}