From 9d5c19f6715178df387eb6c727816c697eb4e6b6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Z=C3=ADpek?= <jan@zipek.cz>
Date: Sat, 13 Aug 2022 23:39:18 +0200
Subject: [PATCH] Routes package

---
 main.go                          | 11 ++++++-----
 {app => routes}/sensor_config.go |  7 ++++---
 {app => routes}/sensor_values.go |  7 ++++---
 {app => routes}/sensors.go       |  5 +++--
 4 files changed, 17 insertions(+), 13 deletions(-)
 rename {app => routes}/sensor_config.go (82%)
 rename {app => routes}/sensor_values.go (84%)
 rename {app => routes}/sensors.go (71%)

diff --git a/main.go b/main.go
index a3777d5..dd192c2 100644
--- a/main.go
+++ b/main.go
@@ -2,6 +2,7 @@ package main
 
 import (
 	"basic-sensor-receiver/app"
+	"basic-sensor-receiver/routes"
 	"fmt"
 
 	"github.com/gin-gonic/gin"
@@ -23,11 +24,11 @@ func main() {
 	protected.Static("/js", "client/js")
 	protected.Static("/css", "client/css")
 
-	protected.GET("/api/sensors", server.GetSensors())
-	protected.GET("/api/sensors/:sensor/values", server.HandleGetSensorValues())
-	protected.POST("/api/sensors/:sensor/values", server.HandlePostSensorValues())
-	protected.GET("/api/sensors/:sensor/config", server.GetSensorConfig())
-	protected.PUT("/api/sensors/:sensor/config/:key", server.HandlePutSensorConfig())
+	protected.GET("/api/sensors", routes.GetSensors(server))
+	protected.GET("/api/sensors/:sensor/values", routes.HandleGetSensorValues(server))
+	protected.POST("/api/sensors/:sensor/values", routes.HandlePostSensorValues(server))
+	protected.GET("/api/sensors/:sensor/config", routes.GetSensorConfig(server))
+	protected.PUT("/api/sensors/:sensor/config/:key", routes.HandlePutSensorConfig(server))
 
 	router.Run(fmt.Sprintf("%s:%d", server.Config.Ip, server.Config.Port))
 }
diff --git a/app/sensor_config.go b/routes/sensor_config.go
similarity index 82%
rename from app/sensor_config.go
rename to routes/sensor_config.go
index 4a8ed82..193df41 100644
--- a/app/sensor_config.go
+++ b/routes/sensor_config.go
@@ -1,6 +1,7 @@
-package app
+package routes
 
 import (
+	"basic-sensor-receiver/app"
 	"net/http"
 
 	"github.com/gin-gonic/gin"
@@ -10,7 +11,7 @@ type sensorConfigValue struct {
 	Value string `json:"value"`
 }
 
-func (s *Server) HandlePutSensorConfig() gin.HandlerFunc {
+func HandlePutSensorConfig(s *app.Server) gin.HandlerFunc {
 	return func(c *gin.Context) {
 		var configValue sensorConfigValue
 		sensor := c.Param("sensor")
@@ -30,7 +31,7 @@ func (s *Server) HandlePutSensorConfig() gin.HandlerFunc {
 	}
 }
 
-func (s *Server) GetSensorConfig() gin.HandlerFunc {
+func GetSensorConfig(s *app.Server) gin.HandlerFunc {
 	return func(c *gin.Context) {
 		sensor := c.Param("sensor")
 
diff --git a/app/sensor_values.go b/routes/sensor_values.go
similarity index 84%
rename from app/sensor_values.go
rename to routes/sensor_values.go
index 00bc72c..df6ef8f 100644
--- a/app/sensor_values.go
+++ b/routes/sensor_values.go
@@ -1,6 +1,7 @@
-package app
+package routes
 
 import (
+	"basic-sensor-receiver/app"
 	"net/http"
 
 	"github.com/gin-gonic/gin"
@@ -15,7 +16,7 @@ type getSensorQuery struct {
 	To   int64 `form:"to"`
 }
 
-func (s *Server) HandlePostSensorValues() gin.HandlerFunc {
+func HandlePostSensorValues(s *app.Server) gin.HandlerFunc {
 	return func(c *gin.Context) {
 		var newValue postSensorValueBody
 		sensor := c.Param("sensor")
@@ -34,7 +35,7 @@ func (s *Server) HandlePostSensorValues() gin.HandlerFunc {
 	}
 }
 
-func (s *Server) HandleGetSensorValues() gin.HandlerFunc {
+func HandleGetSensorValues(s *app.Server) gin.HandlerFunc {
 	return func(c *gin.Context) {
 		var query getSensorQuery
 
diff --git a/app/sensors.go b/routes/sensors.go
similarity index 71%
rename from app/sensors.go
rename to routes/sensors.go
index 7616d0f..c849877 100644
--- a/app/sensors.go
+++ b/routes/sensors.go
@@ -1,12 +1,13 @@
-package app
+package routes
 
 import (
+	"basic-sensor-receiver/app"
 	"net/http"
 
 	"github.com/gin-gonic/gin"
 )
 
-func (s *Server) GetSensors() gin.HandlerFunc {
+func GetSensors(s *app.Server) gin.HandlerFunc {
 	return func(c *gin.Context) {
 		sensors, err := s.Services.Sensors.GetList()