From 019fb13d4ea1ce9f905edbacff39717892af01dc Mon Sep 17 00:00:00 2001 From: Vidhu Kant Sharma Date: Mon, 26 Sep 2022 23:59:01 +0530 Subject: fixed all the delete routes, temporarily disabled adding new documents --- client/client_router.go | 47 ++++++++++++++++++++++++++++++----------------- 1 file changed, 30 insertions(+), 17 deletions(-) (limited to 'client') diff --git a/client/client_router.go b/client/client_router.go index cc9e19d..3011a8b 100644 --- a/client/client_router.go +++ b/client/client_router.go @@ -1,3 +1,20 @@ +/* OpenBills-server - Server for libre billing software OpenBills-web + * Copyright (C) 2022 Vidhu Kant Sharma + + * 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 . + */ + package client import ( @@ -5,45 +22,41 @@ import ( "github.com/MikunoNaka/OpenBills-lib/client" "log" "net/http" + "go.mongodb.org/mongo-driver/bson/primitive" ) func Routes(route *gin.Engine) { c := route.Group("/client") { - c.GET("/", func(ctx *gin.Context) { + c.GET("/all", func(ctx *gin.Context) { // TODO: add functionality to filter results clients, err := client.GetClients(nil) if err != nil { ctx.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()}) log.Printf("ERROR: Failed to read clients from DB: %v\n", err.Error()) + return } ctx.JSON(http.StatusOK, clients) }) - c.POST("/", func(ctx *gin.Context) { - var x client.Client - ctx.Bind(&x) - err := x.Save() + c.DELETE("/:clientId", func(ctx *gin.Context) { + id := ctx.Param("clientId") + objectId, err := primitive.ObjectIDFromHex(id) if err != nil { - ctx.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()}) - log.Printf("ERROR: Failed to add new client \"%s\": %v\n", x.Name, err.Error()) + ctx.JSON(http.StatusBadRequest, gin.H{"error": err.Error()}) + log.Printf("ERROR: Failed to delete client, Error parsing ID: %v\n", err.Error()) + return } - log.Println("Added new client to database: ", x.Name) - ctx.JSON(http.StatusOK, nil) - }) - - c.DELETE("/", func(ctx *gin.Context) { - var x client.Client - ctx.Bind(&x) - err := x.Delete() + err = client.DeleteClient(objectId) if err != nil { ctx.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()}) - log.Printf("ERROR: Failed to delete client \"%s\": %v\n", x.Name, err.Error()) + log.Printf("ERROR: Failed to delete client %v: %v\n", objectId, err.Error()) + return } - log.Println("Deleted client: ", x.Name) + log.Printf("Deleted client %v from database.\n", objectId ) ctx.JSON(http.StatusOK, nil) }) } -- cgit v1.2.3