3 files changed, 99 insertions, 73 deletions
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 <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 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/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/db_actions.go b/client/service.go
index bf32d97..bf32d97 100644
--- a/client/db_actions.go
+++ b/client/service.go