From ac7aa8c6e95023def1eba7615d8a42ad52271500 Mon Sep 17 00:00:00 2001 From: Vidhu Kant Sharma Date: Sun, 29 Jan 2023 20:11:09 +0530 Subject: checking password before editing/deleting user --- client/controller.go | 93 ++++++++++++++++++++++++++++++++++++++++++++++++++++ client/db_actions.go | 62 ----------------------------------- client/router.go | 79 ++++---------------------------------------- client/service.go | 62 +++++++++++++++++++++++++++++++++++ 4 files changed, 161 insertions(+), 135 deletions(-) create mode 100644 client/controller.go delete mode 100644 client/db_actions.go create mode 100644 client/service.go (limited to 'client') diff --git a/client/controller.go b/client/controller.go new file mode 100644 index 0000000..b9a9abe --- /dev/null +++ b/client/controller.go @@ -0,0 +1,93 @@ +/* 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 ( + "github.com/gin-gonic/gin" + "go.mongodb.org/mongo-driver/bson/primitive" + "log" + "net/http" +) + +func getAll(ctx *gin.Context) { + // TODO: add functionality to filter results + clients, err := 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) +} + +func save(ctx *gin.Context) { + var c Client + ctx.BindJSON(&c) + _, err := saveClient(c) + if err != nil { + ctx.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()}) + log.Printf("ERROR: Failed to add new client %v to DB: %v\n", c, err.Error()) + return + } + + log.Printf("Successfully saved new client to DB: %v", c) + ctx.JSON(http.StatusOK, nil) +} + +func modify(ctx *gin.Context) { + id := ctx.Param("clientId") + objectId, err := primitive.ObjectIDFromHex(id) + if err != nil { + ctx.JSON(http.StatusBadRequest, gin.H{"error": err.Error()}) + log.Printf("ERROR: Failed to modify client, Error parsing ID: %v\n", err.Error()) + return + } + + var c Client + ctx.BindJSON(&c) + err = modifyClient(objectId, c) + if err != nil { + ctx.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()}) + log.Printf("ERROR: Failed to modify client %v: %v\n", objectId, err.Error()) + return + } + + log.Printf("Modified client %v to %v.\n", objectId, c) + ctx.JSON(http.StatusOK, nil) +} + +func remove(ctx *gin.Context) { + id := ctx.Param("clientId") + objectId, err := primitive.ObjectIDFromHex(id) + if err != nil { + ctx.JSON(http.StatusBadRequest, gin.H{"error": err.Error()}) + log.Printf("ERROR: Failed to delete client, Error parsing ID: %v\n", err.Error()) + return + } + + err = deleteClient(objectId) + if err != nil { + ctx.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()}) + log.Printf("ERROR: Failed to delete client %v: %v\n", objectId, err.Error()) + return + } + + log.Printf("Deleted client %v from database.\n", objectId) + ctx.JSON(http.StatusOK, nil) +} diff --git a/client/db_actions.go b/client/db_actions.go deleted file mode 100644 index bf32d97..0000000 --- a/client/db_actions.go +++ /dev/null @@ -1,62 +0,0 @@ -/* 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 ( - "context" - "go.mongodb.org/mongo-driver/bson" - "go.mongodb.org/mongo-driver/bson/primitive" -) - -/* TODO: Handle errors properly - * Send an API error response instead of log.Fatal - */ - -// Add client to db -func saveClient(c Client) (primitive.ObjectID, error) { - res, err := db.InsertOne(context.TODO(), c) - return res.InsertedID.(primitive.ObjectID), err -} - -// Delete client from DB -func deleteClient(id primitive.ObjectID) error { - _, err := db.DeleteOne(context.TODO(), bson.M{"_id": id}) - return err -} - -// modify client in DB -func modifyClient(id primitive.ObjectID, nc Client) error { - _, err := db.UpdateOne(context.TODO(), bson.D{{"_id", id}}, bson.D{{"$set", nc}}) - return err -} - -/* GetClients queries the database and - * returns clients based on the given filter - * if filter is nil every client is returned - */ -func getClients(filter bson.M) ([]Client, error) { - var clients []Client - - cursor, err := db.Find(context.TODO(), filter) - if err != nil { - return clients, err - } - - err = cursor.All(context.TODO(), &clients) - return clients, err -} diff --git a/client/router.go b/client/router.go index 232ad83..6bf1ba9 100644 --- a/client/router.go +++ b/client/router.go @@ -18,83 +18,16 @@ package client import ( - "github.com/MikunoNaka/OpenBills-server/util" + "github.com/MikunoNaka/OpenBills-server/util" "github.com/gin-gonic/gin" - "log" - "net/http" - "go.mongodb.org/mongo-driver/bson/primitive" ) func Routes(route *gin.Engine) { - c := route.Group("/client") - c.Use(util.Authorize()) + c := route.Group("/client", util.Authorize()) { - c.GET("/all", func(ctx *gin.Context) { - // TODO: add functionality to filter results - clients, err := 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("/new", func(ctx *gin.Context) { - var c Client - ctx.BindJSON(&c) - _, err := saveClient(c) - if err != nil { - ctx.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()}) - log.Printf("ERROR: Failed to add new client %v to DB: %v\n", c, err.Error()) - return - } - - log.Printf("Successfully saved new client to DB: %v", c) - ctx.JSON(http.StatusOK, nil) - }) - - c.PUT("/:clientId", func(ctx *gin.Context) { - id := ctx.Param("clientId") - objectId, err := primitive.ObjectIDFromHex(id) - if err != nil { - ctx.JSON(http.StatusBadRequest, gin.H{"error": err.Error()}) - log.Printf("ERROR: Failed to modify client, Error parsing ID: %v\n", err.Error()) - return - } - - var c Client - ctx.BindJSON(&c) - err = modifyClient(objectId, c) - if err != nil { - ctx.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()}) - log.Printf("ERROR: Failed to modify client %v: %v\n", objectId, err.Error()) - return - } - - log.Printf("Modified client %v to %v.\n", objectId, c) - ctx.JSON(http.StatusOK, nil) - }) - - c.DELETE("/:clientId", func(ctx *gin.Context) { - id := ctx.Param("clientId") - objectId, err := primitive.ObjectIDFromHex(id) - if err != nil { - ctx.JSON(http.StatusBadRequest, gin.H{"error": err.Error()}) - log.Printf("ERROR: Failed to delete client, Error parsing ID: %v\n", err.Error()) - return - } - - err = deleteClient(objectId) - if err != nil { - ctx.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()}) - log.Printf("ERROR: Failed to delete client %v: %v\n", objectId, err.Error()) - return - } - - log.Printf("Deleted client %v from database.\n", objectId ) - ctx.JSON(http.StatusOK, nil) - }) + c.GET("/all", getAll) + c.POST("/new", save) + c.PUT("/:brandId", modify) + c.DELETE("/:brandId", remove) } } diff --git a/client/service.go b/client/service.go new file mode 100644 index 0000000..bf32d97 --- /dev/null +++ b/client/service.go @@ -0,0 +1,62 @@ +/* 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 ( + "context" + "go.mongodb.org/mongo-driver/bson" + "go.mongodb.org/mongo-driver/bson/primitive" +) + +/* TODO: Handle errors properly + * Send an API error response instead of log.Fatal + */ + +// Add client to db +func saveClient(c Client) (primitive.ObjectID, error) { + res, err := db.InsertOne(context.TODO(), c) + return res.InsertedID.(primitive.ObjectID), err +} + +// Delete client from DB +func deleteClient(id primitive.ObjectID) error { + _, err := db.DeleteOne(context.TODO(), bson.M{"_id": id}) + return err +} + +// modify client in DB +func modifyClient(id primitive.ObjectID, nc Client) error { + _, err := db.UpdateOne(context.TODO(), bson.D{{"_id", id}}, bson.D{{"$set", nc}}) + return err +} + +/* GetClients queries the database and + * returns clients based on the given filter + * if filter is nil every client is returned + */ +func getClients(filter bson.M) ([]Client, error) { + var clients []Client + + cursor, err := db.Find(context.TODO(), filter) + if err != nil { + return clients, err + } + + err = cursor.All(context.TODO(), &clients) + return clients, err +} -- cgit v1.2.3