Merged OpenBills-lib code into OpenBills-server

3 files changed, 114 insertions, 7 deletions

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 <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 (
+	"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/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 <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 (
+	"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/brand_router.go b/brand/router.go
index 5d9a163..75c4eb4 100644
--- a/brand/brand_router.go
+++ b/brand/router.go
@@ -20,7 +20,6 @@ package brand
 import (
 	"github.com/gin-gonic/gin"
 	"go.mongodb.org/mongo-driver/bson/primitive"
-	"github.com/MikunoNaka/OpenBills-lib/brand"
 	"log"
 	"net/http"
 )
@@ -31,7 +30,7 @@ func Routes(route *gin.Engine) {
 	{
 		b.GET("/all", func(ctx *gin.Context) {
 			// TODO: add functionality to filter results
-			brands, err := brand.GetBrands(nil)
+			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())
@@ -42,9 +41,9 @@ func Routes(route *gin.Engine) {
 		})
 
 		b.POST("/new", func(ctx *gin.Context) {
-			var b brand.Brand
+			var b Brand
 			ctx.BindJSON(&b)
-			_, err := brand.SaveBrand(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())
@@ -64,9 +63,9 @@ func Routes(route *gin.Engine) {
 				return
 			}
 
-			var b brand.Brand
+			var b Brand
 			ctx.BindJSON(&b)
-			err = brand.ModifyBrand(objectId, 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())
@@ -86,7 +85,7 @@ func Routes(route *gin.Engine) {
 				return
 			}
 
-			err = brand.DeleteBrand(objectId)
+			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())