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 --- item/controller.go | 91 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ item/db_actions.go | 82 ------------------------------------------------ item/router.go | 79 ++++------------------------------------------- item/service.go | 82 ++++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 179 insertions(+), 155 deletions(-) create mode 100644 item/controller.go delete mode 100644 item/db_actions.go create mode 100644 item/service.go (limited to 'item') diff --git a/item/controller.go b/item/controller.go new file mode 100644 index 0000000..f8fe58e --- /dev/null +++ b/item/controller.go @@ -0,0 +1,91 @@ +/* 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 item + +import ( + "github.com/gin-gonic/gin" + "go.mongodb.org/mongo-driver/bson/primitive" + "log" + "net/http" +) + +func getAll(ctx *gin.Context) { + items, err := getItems(nil) + if err != nil { + log.Printf("ERROR: Failed to read items from DB: %v\n", err.Error()) + ctx.AbortWithStatusJSON(http.StatusInternalServerError, gin.H{"error": err.Error()}) + } + + ctx.JSON(http.StatusOK, items) +} + +func save(ctx *gin.Context) { + var i Item + ctx.BindJSON(&i) + _, err := saveItem(i) + if err != nil { + ctx.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()}) + log.Printf("ERROR: Failed to add new item %v to DB: %v\n", i, err.Error()) + return + } + + log.Printf("Successfully saved new item to DB: %v", i) + ctx.JSON(http.StatusOK, nil) +} + +func modify(ctx *gin.Context) { + id := ctx.Param("itemId") + objectId, err := primitive.ObjectIDFromHex(id) + if err != nil { + ctx.JSON(http.StatusBadRequest, gin.H{"error": err.Error()}) + log.Printf("ERROR: Failed to modify item, Error parsing ID: %v\n", err.Error()) + return + } + + var i Item + ctx.BindJSON(&i) + err = modifyItem(objectId, i) + if err != nil { + ctx.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()}) + log.Printf("ERROR: Failed to modify item %v: %v\n", objectId, err.Error()) + return + } + + log.Printf("Modified item %v to %v.\n", objectId, i) + ctx.JSON(http.StatusOK, nil) +} + +func remove(ctx *gin.Context) { + id := ctx.Param("itemId") + objectId, err := primitive.ObjectIDFromHex(id) + if err != nil { + ctx.JSON(http.StatusBadRequest, gin.H{"error": err.Error()}) + log.Printf("ERROR: Failed to delete item, Error parsing ID: %v\n", err.Error()) + return + } + + err = deleteItem(objectId) + if err != nil { + ctx.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()}) + log.Printf("ERROR: Failed to delete item %v: %v\n", objectId, err.Error()) + return + } + + log.Printf("Deleted item %v from database.\n", objectId) + ctx.JSON(http.StatusOK, nil) +} diff --git a/item/db_actions.go b/item/db_actions.go deleted file mode 100644 index 36f8364..0000000 --- a/item/db_actions.go +++ /dev/null @@ -1,82 +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 item - -import ( - "context" - "go.mongodb.org/mongo-driver/bson" - "go.mongodb.org/mongo-driver/bson/primitive" - "github.com/MikunoNaka/OpenBills-server/database" - "github.com/MikunoNaka/OpenBills-server/brand" - "go.mongodb.org/mongo-driver/mongo" -) - -var brands *mongo.Collection = database.DB.Collection("Brands") - -// Add item to db -func saveItem(i Item) (primitive.ObjectID, error) { - res, err := db.InsertOne(context.TODO(), i) - return res.InsertedID.(primitive.ObjectID), err -} - -// Delete item from DB -func deleteItem(id primitive.ObjectID) error { - _, err := db.DeleteOne(context.TODO(), bson.M{"_id": id}) - return err -} - -// modify item in DB -func modifyItem(id primitive.ObjectID, ni Item) error { - _, err := db.UpdateOne(context.TODO(), bson.D{{"_id", id}}, bson.D{{"$set", ni}}) - return err -} - -/* GetItems queries the database and - * returns items based on the given filter - * if filter is nil every item is returned - */ -func getItems(filter bson.M) ([]Item, error) { - var items []Item - - cursor, err := db.Find(context.TODO(), filter) - if err != nil { - return items, err - } - - err = cursor.All(context.TODO(), &items) - if err != nil { - return items, err - } - - for id, i := range items { - // continue if item doesn't have a brand - if (i.Brand.Id == primitive.ObjectID{}) { - continue - } - - var b brand.Brand - - err := brands.FindOne(context.TODO(), bson.M{"_id": i.Brand.Id}).Decode(&b) - if err != nil { - return items, err - } - items[id].Brand = b - } - - return items, err -} diff --git a/item/router.go b/item/router.go index c65af8f..614e7f2 100644 --- a/item/router.go +++ b/item/router.go @@ -18,84 +18,17 @@ package item import ( + //"github.com/MikunoNaka/OpenBills-server/util" "github.com/gin-gonic/gin" - "github.com/MikunoNaka/OpenBills-server/util" - "go.mongodb.org/mongo-driver/bson/primitive" - "log" - "net/http" ) func Routes(route *gin.Engine) { i := route.Group("/item") - i.Use(util.Authorize()) + //i.Use(util.Authorize()) { - // TODO: add functionality to filter results - // /all returns all the saved items - i.GET("/all", func(ctx *gin.Context) { - items, err := getItems(nil) - if err != nil { - ctx.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()}) - log.Printf("ERROR: Failed to read items from DB: %v\n", err.Error()) - return - } - - ctx.JSON(http.StatusOK, items) - }) - - i.POST("/new", func(ctx *gin.Context) { - var i Item - ctx.BindJSON(&i) - _, err := saveItem(i) - if err != nil { - ctx.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()}) - log.Printf("ERROR: Failed to add new item %v to DB: %v\n", i, err.Error()) - return - } - - log.Printf("Successfully saved new item to DB: %v", i) - ctx.JSON(http.StatusOK, nil) - }) - - i.PUT("/:itemId", func(ctx *gin.Context) { - id := ctx.Param("itemId") - objectId, err := primitive.ObjectIDFromHex(id) - if err != nil { - ctx.JSON(http.StatusBadRequest, gin.H{"error": err.Error()}) - log.Printf("ERROR: Failed to modify item, Error parsing ID: %v\n", err.Error()) - return - } - - var i Item - ctx.BindJSON(&i) - err = modifyItem(objectId, i) - if err != nil { - ctx.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()}) - log.Printf("ERROR: Failed to modify item %v: %v\n", objectId, err.Error()) - return - } - - log.Printf("Modified item %v to %v.\n", objectId, i) - ctx.JSON(http.StatusOK, nil) - }) - - i.DELETE("/:itemId", func(ctx *gin.Context) { - id := ctx.Param("itemId") - objectId, err := primitive.ObjectIDFromHex(id) - if err != nil { - ctx.JSON(http.StatusBadRequest, gin.H{"error": err.Error()}) - log.Printf("ERROR: Failed to delete item, Error parsing ID: %v\n", err.Error()) - return - } - - err = deleteItem(objectId) - if err != nil { - ctx.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()}) - log.Printf("ERROR: Failed to delete item %v: %v\n", objectId, err.Error()) - return - } - - log.Printf("Deleted item %v from database.\n", objectId ) - ctx.JSON(http.StatusOK, nil) - }) + i.GET("/all", getAll) // TODO: add functionality to filter results + i.POST("/new", save) + i.PUT("/:itemId", modify) + i.DELETE("/:itemId", remove) } } diff --git a/item/service.go b/item/service.go new file mode 100644 index 0000000..36f8364 --- /dev/null +++ b/item/service.go @@ -0,0 +1,82 @@ +/* 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 item + +import ( + "context" + "go.mongodb.org/mongo-driver/bson" + "go.mongodb.org/mongo-driver/bson/primitive" + "github.com/MikunoNaka/OpenBills-server/database" + "github.com/MikunoNaka/OpenBills-server/brand" + "go.mongodb.org/mongo-driver/mongo" +) + +var brands *mongo.Collection = database.DB.Collection("Brands") + +// Add item to db +func saveItem(i Item) (primitive.ObjectID, error) { + res, err := db.InsertOne(context.TODO(), i) + return res.InsertedID.(primitive.ObjectID), err +} + +// Delete item from DB +func deleteItem(id primitive.ObjectID) error { + _, err := db.DeleteOne(context.TODO(), bson.M{"_id": id}) + return err +} + +// modify item in DB +func modifyItem(id primitive.ObjectID, ni Item) error { + _, err := db.UpdateOne(context.TODO(), bson.D{{"_id", id}}, bson.D{{"$set", ni}}) + return err +} + +/* GetItems queries the database and + * returns items based on the given filter + * if filter is nil every item is returned + */ +func getItems(filter bson.M) ([]Item, error) { + var items []Item + + cursor, err := db.Find(context.TODO(), filter) + if err != nil { + return items, err + } + + err = cursor.All(context.TODO(), &items) + if err != nil { + return items, err + } + + for id, i := range items { + // continue if item doesn't have a brand + if (i.Brand.Id == primitive.ObjectID{}) { + continue + } + + var b brand.Brand + + err := brands.FindOne(context.TODO(), bson.M{"_id": i.Brand.Id}).Decode(&b) + if err != nil { + return items, err + } + items[id].Brand = b + } + + return items, err +} -- cgit v1.2.3