From f2d1de9b3156c2b66d001d10bec337cfefa5fb89 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20Z=C3=ADpek?= <jan@zipek.cz>
Date: Sun, 21 Aug 2022 19:33:30 +0200
Subject: [PATCH] Move server to sub-folder

---
 .env.example => server/.env.example             |  0
 .gitignore => server/.gitignore                 |  0
 Dockerfile => server/Dockerfile                 |  0
 {app => server/app}/database.go                 |  0
 {app => server/app}/server.go                   |  0
 {config => server/config}/config.go             |  0
 go.mod => server/go.mod                         |  0
 go.sum => server/go.sum                         |  0
 main.go => server/main.go                       |  0
 {routes => server/routes}/sensor_config.go      |  0
 {routes => server/routes}/sensor_values.go      |  0
 {routes => server/routes}/sensors.go            |  0
 server/services/auth_service.go                 | 17 +++++++++++++++++
 .../services}/sensor_config_service.go          |  0
 .../services}/sensor_values_service.go          |  0
 .../services}/sensors_service.go                |  0
 {services => server/services}/services.go       |  6 ++++++
 17 files changed, 23 insertions(+)
 rename .env.example => server/.env.example (100%)
 rename .gitignore => server/.gitignore (100%)
 rename Dockerfile => server/Dockerfile (100%)
 rename {app => server/app}/database.go (100%)
 rename {app => server/app}/server.go (100%)
 rename {config => server/config}/config.go (100%)
 rename go.mod => server/go.mod (100%)
 rename go.sum => server/go.sum (100%)
 rename main.go => server/main.go (100%)
 rename {routes => server/routes}/sensor_config.go (100%)
 rename {routes => server/routes}/sensor_values.go (100%)
 rename {routes => server/routes}/sensors.go (100%)
 create mode 100644 server/services/auth_service.go
 rename {services => server/services}/sensor_config_service.go (100%)
 rename {services => server/services}/sensor_values_service.go (100%)
 rename {services => server/services}/sensors_service.go (100%)
 rename {services => server/services}/services.go (72%)

diff --git a/.env.example b/server/.env.example
similarity index 100%
rename from .env.example
rename to server/.env.example
diff --git a/.gitignore b/server/.gitignore
similarity index 100%
rename from .gitignore
rename to server/.gitignore
diff --git a/Dockerfile b/server/Dockerfile
similarity index 100%
rename from Dockerfile
rename to server/Dockerfile
diff --git a/app/database.go b/server/app/database.go
similarity index 100%
rename from app/database.go
rename to server/app/database.go
diff --git a/app/server.go b/server/app/server.go
similarity index 100%
rename from app/server.go
rename to server/app/server.go
diff --git a/config/config.go b/server/config/config.go
similarity index 100%
rename from config/config.go
rename to server/config/config.go
diff --git a/go.mod b/server/go.mod
similarity index 100%
rename from go.mod
rename to server/go.mod
diff --git a/go.sum b/server/go.sum
similarity index 100%
rename from go.sum
rename to server/go.sum
diff --git a/main.go b/server/main.go
similarity index 100%
rename from main.go
rename to server/main.go
diff --git a/routes/sensor_config.go b/server/routes/sensor_config.go
similarity index 100%
rename from routes/sensor_config.go
rename to server/routes/sensor_config.go
diff --git a/routes/sensor_values.go b/server/routes/sensor_values.go
similarity index 100%
rename from routes/sensor_values.go
rename to server/routes/sensor_values.go
diff --git a/routes/sensors.go b/server/routes/sensors.go
similarity index 100%
rename from routes/sensors.go
rename to server/routes/sensors.go
diff --git a/server/services/auth_service.go b/server/services/auth_service.go
new file mode 100644
index 0000000..76694a9
--- /dev/null
+++ b/server/services/auth_service.go
@@ -0,0 +1,17 @@
+package services
+
+import "github.com/gin-gonic/gin"
+
+type AuthService struct {
+	ctx *Context
+}
+
+func (s *AuthService) FromContext(ctx *gin.Context) (*User, error) {
+	session, err := s.ctx.Services.Sessions.FromContext(ctx)
+
+	if err != nil {
+		return nil, err
+	}
+
+	return s.ctx.Services.Users.GetById(session.UserId)
+}
diff --git a/services/sensor_config_service.go b/server/services/sensor_config_service.go
similarity index 100%
rename from services/sensor_config_service.go
rename to server/services/sensor_config_service.go
diff --git a/services/sensor_values_service.go b/server/services/sensor_values_service.go
similarity index 100%
rename from services/sensor_values_service.go
rename to server/services/sensor_values_service.go
diff --git a/services/sensors_service.go b/server/services/sensors_service.go
similarity index 100%
rename from services/sensors_service.go
rename to server/services/sensors_service.go
diff --git a/services/services.go b/server/services/services.go
similarity index 72%
rename from services/services.go
rename to server/services/services.go
index 8e026d3..db81dd4 100644
--- a/services/services.go
+++ b/server/services/services.go
@@ -9,6 +9,9 @@ type Services struct {
 	SensorConfig *SensorConfigService
 	SensorValues *SensorValuesService
 	Sensors      *SensorsService
+	Sessions     *SessionsService
+	Users        *UsersService
+	Auth         *AuthService
 }
 
 type Context struct {
@@ -25,6 +28,9 @@ func InitializeServices(ctx *Context) *Services {
 	services.SensorConfig = &SensorConfigService{ctx: ctx}
 	services.SensorValues = &SensorValuesService{ctx: ctx}
 	services.Sensors = &SensorsService{ctx: ctx}
+	services.Sessions = &SessionsService{ctx: ctx}
+	services.Auth = &AuthService{ctx: ctx}
+	services.Users = &UsersService{ctx: ctx}
 
 	return &services
 }