From 831b6f0167b9c1747d128b4a5a648d4de42ff0a9 Mon Sep 17 00:00:00 2001
From: Zach Berwaldt <zberwaldt@tutamail.com>
Date: Thu, 7 Mar 2024 20:20:36 -0500
Subject: Refactor router and middleware packages

- Move middleware functions from `main.go` to `middleware.go` in the `middleware` package.
- Update import statements in `main.go` and use the `router` package instead of the `controllers` package.

```
Refactor router and middleware packages

Move middleware functions from `main.go` to `middleware.go` in the `middleware` package. Update import statements in `main.go` and use the `router` package instead of the `controllers` package.
```
---
 api/internal/router/router.go | 42 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 42 insertions(+)
 create mode 100644 api/internal/router/router.go

(limited to 'api/internal/router/router.go')

diff --git a/api/internal/router/router.go b/api/internal/router/router.go
new file mode 100644
index 0000000..adf96d0
--- /dev/null
+++ b/api/internal/router/router.go
@@ -0,0 +1,42 @@
+package router
+
+import (
+	"github.com/gin-gonic/gin"
+	"water/api/internal/controllers"
+	"water/api/internal/middleware"
+)
+
+func SetupRouter() *gin.Engine {
+	// Disable Console Color
+	//	gin.DisableConsoleColor()
+	r := gin.Default()
+	r.Use(middleware.CORSMiddleware())
+	r.Use(gin.Logger())
+	r.Use(gin.Recovery())
+
+	api := r.Group("api/v1")
+
+	api.POST("/auth", controllers.AuthHandler)
+
+	user := api.Group("/user/:uuid")
+	user.Use(middleware.TokenRequired())
+	{
+		user.GET("", controllers.GetUser)
+		user.GET("preferences", controllers.GetUserPreferences)
+		user.PATCH("preferences", controllers.UpdateUserPreferences)
+	}
+
+	stats := api.Group("/stats")
+	stats.Use(middleware.TokenRequired())
+	{
+		stats.GET("/", controllers.GetAllStatistics)
+		stats.POST("/", controllers.PostNewStatistic)
+		stats.GET("weekly/", controllers.GetWeeklyStatistics)
+		stats.GET("daily/", controllers.GetDailyUserStatistics)
+		stats.GET("user/:uuid", controllers.GetUserStatistics)
+		stats.PATCH("user/:uuid", controllers.UpdateUserStatistic)
+		stats.DELETE("user/:uuid", controllers.DeleteUserStatistic)
+	}
+
+	return r
+}
\ No newline at end of file
-- 
cgit v1.1


From 9cae9c1d2a0b4f7fa72f3075541b9ffafe1a7275 Mon Sep 17 00:00:00 2001
From: Zach Berwaldt <zberwaldt@tutamail.com>
Date: Fri, 15 Mar 2024 18:49:43 -0400
Subject: Add routes for preference, clean up and add types

---
 api/internal/router/router.go | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'api/internal/router/router.go')

diff --git a/api/internal/router/router.go b/api/internal/router/router.go
index adf96d0..3c86b8c 100644
--- a/api/internal/router/router.go
+++ b/api/internal/router/router.go
@@ -17,13 +17,14 @@ func SetupRouter() *gin.Engine {
 	api := r.Group("api/v1")
 
 	api.POST("/auth", controllers.AuthHandler)
+	api.GET("/sizes", middleware.TokenRequired(), controllers.GetSizes)
+	api.PATCH("/user/preferences", controllers.UpdateUserPreferences)
 
-	user := api.Group("/user/:uuid")
+	user := api.Group("/user/:id")
 	user.Use(middleware.TokenRequired())
 	{
 		user.GET("", controllers.GetUser)
 		user.GET("preferences", controllers.GetUserPreferences)
-		user.PATCH("preferences", controllers.UpdateUserPreferences)
 	}
 
 	stats := api.Group("/stats")
-- 
cgit v1.1


From fd1332a3df191577e91c6d846a8b5db1747099fd Mon Sep 17 00:00:00 2001
From: Zach Berwaldt <zberwaldt@tutamail.com>
Date: Fri, 15 Mar 2024 22:00:10 -0400
Subject: cleanup

---
 api/internal/router/router.go | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'api/internal/router/router.go')

diff --git a/api/internal/router/router.go b/api/internal/router/router.go
index 3c86b8c..a71c3e6 100644
--- a/api/internal/router/router.go
+++ b/api/internal/router/router.go
@@ -30,10 +30,10 @@ func SetupRouter() *gin.Engine {
 	stats := api.Group("/stats")
 	stats.Use(middleware.TokenRequired())
 	{
-		stats.GET("/", controllers.GetAllStatistics)
-		stats.POST("/", controllers.PostNewStatistic)
-		stats.GET("weekly/", controllers.GetWeeklyStatistics)
-		stats.GET("daily/", controllers.GetDailyUserStatistics)
+		stats.GET("", controllers.GetAllStatistics)
+		stats.POST("", controllers.PostNewStatistic)
+		stats.GET("weekly", controllers.GetWeeklyStatistics)
+		stats.GET("daily", controllers.GetDailyUserStatistics)
 		stats.GET("user/:uuid", controllers.GetUserStatistics)
 		stats.PATCH("user/:uuid", controllers.UpdateUserStatistic)
 		stats.DELETE("user/:uuid", controllers.DeleteUserStatistic)
-- 
cgit v1.1