From 2f4a92b0f1d02096427a2d1c97746bb52cdcc38a Mon Sep 17 00:00:00 2001 From: Vidhu Kant Sharma Date: Fri, 11 Nov 2022 21:22:31 +0530 Subject: Merged OpenBills-lib code into OpenBills-server --- brand/brand.go | 39 ++++++++++++++++++++ brand/brand_router.go | 100 -------------------------------------------------- brand/db_actions.go | 69 ++++++++++++++++++++++++++++++++++ brand/router.go | 99 +++++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 207 insertions(+), 100 deletions(-) create mode 100644 brand/brand.go delete mode 100644 brand/brand_router.go create mode 100644 brand/db_actions.go create mode 100644 brand/router.go (limited to 'brand') diff --git a/brand/brand.go b/brand/brand.go new file mode 100644 index 0000000..7aaf5e6 --- /dev/null +++ b/brand/brand.go @@ -0,0 +1,39 @@ +/* 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 brand + +import ( + "go.mongodb.org/mongo-driver/bson/primitive" + "go.mongodb.org/mongo-driver/mongo" + "github.com/MikunoNaka/OpenBills-server/database" +) + +// initialise a database connection for this package +// not sure if I should do this but I am... +var db *mongo.Collection = database.DB.Collection("Brands") + +/* An item may or may not be + * assigned to a brand + * + * brands can be used to group products + * to perform certain actions + */ +type Brand struct { + Id primitive.ObjectID `bson:"_id,omitempty" json:"Id"` + Name string `bson:"Name" json:"Name"` +} diff --git a/brand/brand_router.go b/brand/brand_router.go deleted file mode 100644 index 5d9a163..0000000 --- a/brand/brand_router.go +++ /dev/null @@ -1,100 +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 brand - -import ( - "github.com/gin-gonic/gin" - "go.mongodb.org/mongo-driver/bson/primitive" - "github.com/MikunoNaka/OpenBills-lib/brand" - "log" - "net/http" -) - - -func Routes(route *gin.Engine) { - b := route.Group("/brand") - { - 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("/new", func(ctx *gin.Context) { - var b brand.Brand - ctx.BindJSON(&b) - _, err := brand.SaveBrand(b) - if err != nil { - ctx.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()}) - log.Printf("ERROR: Failed to add new brand %v to DB: %v\n", b, err.Error()) - return - } - - log.Printf("Successfully saved new brand to DB: %v", b) - ctx.JSON(http.StatusOK, nil) - }) - - b.PUT("/:brandId", func(ctx *gin.Context) { - id := ctx.Param("brandId") - objectId, err := primitive.ObjectIDFromHex(id) - if err != nil { - ctx.JSON(http.StatusBadRequest, gin.H{"error": err.Error()}) - log.Printf("ERROR: Failed to modify brand, Error parsing ID: %v\n", err.Error()) - return - } - - var b brand.Brand - ctx.BindJSON(&b) - err = brand.ModifyBrand(objectId, b) - if err != nil { - ctx.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()}) - log.Printf("ERROR: Failed to modify brand %v: %v\n", objectId, err.Error()) - return - } - - log.Printf("Modified brand %v to %v.\n", objectId, b) - ctx.JSON(http.StatusOK, nil) - }) - - b.DELETE("/:brandId", func(ctx *gin.Context) { - id := ctx.Param("brandId") - objectId, err := primitive.ObjectIDFromHex(id) - if err != nil { - ctx.JSON(http.StatusBadRequest, gin.H{"error": err.Error()}) - log.Printf("ERROR: Failed to delete brand, Error parsing ID: %v\n", err.Error()) - return - } - - err = brand.DeleteBrand(objectId) - if err != nil { - ctx.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()}) - log.Printf("ERROR: Failed to delete brand %v: %v\n", objectId, err.Error()) - return - } - - log.Printf("Deleted brand %v from database.\n", objectId ) - ctx.JSON(http.StatusOK, nil) - }) - } -} diff --git a/brand/db_actions.go b/brand/db_actions.go new file mode 100644 index 0000000..eb5961c --- /dev/null +++ b/brand/db_actions.go @@ -0,0 +1,69 @@ +/* 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 brand + +import ( + "context" + "go.mongodb.org/mongo-driver/bson" + "go.mongodb.org/mongo-driver/bson/primitive" + "go.mongodb.org/mongo-driver/mongo" + "github.com/MikunoNaka/OpenBills-server/database" +) + +var items *mongo.Collection = database.DB.Collection("Items") + +// Add brand to db +func saveBrand(b Brand) (primitive.ObjectID, error) { + res, err := db.InsertOne(context.TODO(), b) + return res.InsertedID.(primitive.ObjectID), err +} + +// Delete brand from DB +func deleteBrand(id primitive.ObjectID) error { + // delete brand + _, err := db.DeleteOne(context.TODO(), bson.M{"_id": id}) + if err != nil { + return err + } + + // delete items associated with this brand + _, err = items.DeleteMany(context.TODO(), bson.M{"Brand._id": id}) + return err +} + +// modify brand in DB +func modifyBrand(id primitive.ObjectID, nb Brand) error { + _, err := db.UpdateOne(context.TODO(), bson.D{{"_id", id}}, bson.D{{"$set", nb}}) + return err +} + +/* GetBrands queries the database and + * returns brands based on the given filter + * if filter is nil every brand is returned + */ +func getBrands(filter bson.M) ([]Brand, error) { + var brands []Brand + + cursor, err := db.Find(context.TODO(), filter) + if err != nil { + return brands, err + } + + err = cursor.All(context.TODO(), &brands) + return brands, err +} diff --git a/brand/router.go b/brand/router.go new file mode 100644 index 0000000..75c4eb4 --- /dev/null +++ b/brand/router.go @@ -0,0 +1,99 @@ +/* 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 brand + +import ( + "github.com/gin-gonic/gin" + "go.mongodb.org/mongo-driver/bson/primitive" + "log" + "net/http" +) + + +func Routes(route *gin.Engine) { + b := route.Group("/brand") + { + b.GET("/all", func(ctx *gin.Context) { + // TODO: add functionality to filter results + brands, err := 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("/new", func(ctx *gin.Context) { + var b Brand + ctx.BindJSON(&b) + _, err := saveBrand(b) + if err != nil { + ctx.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()}) + log.Printf("ERROR: Failed to add new brand %v to DB: %v\n", b, err.Error()) + return + } + + log.Printf("Successfully saved new brand to DB: %v", b) + ctx.JSON(http.StatusOK, nil) + }) + + b.PUT("/:brandId", func(ctx *gin.Context) { + id := ctx.Param("brandId") + objectId, err := primitive.ObjectIDFromHex(id) + if err != nil { + ctx.JSON(http.StatusBadRequest, gin.H{"error": err.Error()}) + log.Printf("ERROR: Failed to modify brand, Error parsing ID: %v\n", err.Error()) + return + } + + var b Brand + ctx.BindJSON(&b) + err = modifyBrand(objectId, b) + if err != nil { + ctx.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()}) + log.Printf("ERROR: Failed to modify brand %v: %v\n", objectId, err.Error()) + return + } + + log.Printf("Modified brand %v to %v.\n", objectId, b) + ctx.JSON(http.StatusOK, nil) + }) + + b.DELETE("/:brandId", func(ctx *gin.Context) { + id := ctx.Param("brandId") + objectId, err := primitive.ObjectIDFromHex(id) + if err != nil { + ctx.JSON(http.StatusBadRequest, gin.H{"error": err.Error()}) + log.Printf("ERROR: Failed to delete brand, Error parsing ID: %v\n", err.Error()) + return + } + + err = deleteBrand(objectId) + if err != nil { + ctx.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()}) + log.Printf("ERROR: Failed to delete brand %v: %v\n", objectId, err.Error()) + return + } + + log.Printf("Deleted brand %v from database.\n", objectId ) + ctx.JSON(http.StatusOK, nil) + }) + } +} -- cgit v1.2.3