DB2

.gitignore

@@ -4,4 +4,5 @@ coverage.out
 .vscode
 c.out
 .env
-pgdata
+pgdata
+auth_test.go

Makefile

@@ -9,6 +9,9 @@ up-all:
 down:
 	docker compose down
 
+test:
+	go test -coverprofile=c.out ./... -coverpkg="./..." && go tool cover -func c.out | grep total
+
 up-db:
 	docker compose up -d postgres
 

cmd/server/main.go

@@ -4,23 +4,23 @@ import (
 	"log"
 	"net/http"
 
-	"kudago/internal/db"
-
 	"kudago/config"
 	_ "kudago/docs"
 	"kudago/internal/http/auth"
 	"kudago/internal/http/events"
+	"kudago/internal/logger"
 	"kudago/internal/middleware"
-	eventRepository "kudago/internal/repository/events"
+	"kudago/internal/repository/postgres"
+	eventRepository "kudago/internal/repository/postgres/events"
+	userRepository "kudago/internal/repository/postgres/users"
 	sessionRepository "kudago/internal/repository/session"
-	userRepository "kudago/internal/repository/users"
+
 	authService "kudago/internal/service/auth"
 	eventService "kudago/internal/service/events"
 
 	httpSwagger "github.com/swaggo/http-swagger"
 
 	"github.com/gorilla/mux"
-	"go.uber.org/zap"
 )
 
 // swag init
@@ -33,25 +33,25 @@ import (
 func main() {
 	port := config.LoadConfig()
 
-	logger, err := zap.NewProduction()
+	appLogger, err := logger.NewLogger()
 	if err != nil {
 		log.Fatalf("Server failed to start logger: %v", err)
 	}
-	defer logger.Sync()
-	sugar := logger.Sugar()
+	defer appLogger.Logger.Sync()
 
-	pool, err := db.InitDB(sugar)
+	redisConfig, err := sessionRepository.GetRedisConfig()
 	if err != nil {
-		log.Fatalf("Failed to connect to the database: %v", err)
+		log.Fatalf("Failed to connect to the redis database")
 	}
-	defer pool.Close()
-	redisClient, err := db.InitRedis()
+	postgresConfig, err := postgres.GetPostgresConfig()
+	pool, err := postgres.InitPostgres(postgresConfig, appLogger)
 	if err != nil {
-		log.Fatalf("Failed to connect to the database: %v", err)
+		log.Fatalf("Failed to connect to the postgres database")
 	}
+	defer pool.Close()
 
 	userDB := userRepository.NewDB(pool)
-	sessionDB := sessionRepository.NewDB(redisClient)
+	sessionDB := sessionRepository.NewDB(redisConfig)
 	eventDB := eventRepository.NewDB(pool)
 
 	authService := authService.NewService(userDB, sessionDB)
@@ -74,9 +74,10 @@ func main() {
 	r.HandleFunc("/profile", authHandler.Profile).Methods("GET")
 
 	r.HandleFunc("/events/{id:[0-9]+}", eventHandler.GetEventByID).Methods("GET")
-	r.HandleFunc("/events/tags/{tag}", eventHandler.GetEventsByTag).Methods("GET")
+	r.HandleFunc("/events/tags", eventHandler.GetEventsByTags).Methods("GET")
 	r.HandleFunc("/events/categories/{category}", eventHandler.GetEventsByCategory).Methods("GET")
 	r.HandleFunc("/events", eventHandler.GetAllEvents).Methods("GET")
+	r.HandleFunc("/categories", eventHandler.GetCategories).Methods("GET")
 	r.HandleFunc("/events/{id:[0-9]+}", eventHandler.UpdateEvent).Methods("PUT")
 	r.HandleFunc("/events/{id:[0-9]+}", eventHandler.DeleteEvent).Methods("DELETE")
 	r.HandleFunc("/events", eventHandler.AddEvent).Methods("POST")
@@ -88,13 +89,13 @@ func main() {
 		"/static",
 		"/session",
 		"/logout",
-		"/swagger",
 		"/docs",
+		"/categories",
 	}
 
 	handlerWithAuth := middleware.AuthMiddleware(whitelist, authHandler, r)
 	handlerWithCORS := middleware.CORSMiddleware(handlerWithAuth)
-	handlerWithLogging := middleware.LoggingMiddleware(handlerWithCORS, sugar)
+	handlerWithLogging := middleware.LoggingMiddleware(handlerWithCORS, appLogger.Logger)
 	handler := middleware.PanicMiddleware(handlerWithLogging)
 
 	err = http.ListenAndServe(":"+port, handler)

docs/docs.go

@@ -16,6 +16,38 @@ const docTemplate = `{
     "host": "{{.Host}}",
     "basePath": "{{.BasePath}}",
     "paths": {
+        "/categories": {
+            "get": {
+                "description": "Получить список всех доступных категорий событий",
+                "consumes": [
+                    "application/json"
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "tags": [
+                    "categories"
+                ],
+                "summary": "Получить все категории",
+                "responses": {
+                    "200": {
+                        "description": "Список категорий",
+                        "schema": {
+                            "type": "array",
+                            "items": {
+                                "$ref": "#/definitions/models.Category"
+                            }
+                        }
+                    },
+                    "500": {
+                        "description": "Internal Server Error",
+                        "schema": {
+                            "$ref": "#/definitions/httpErrors.HttpError"
+                        }
+                    }
+                }
+            }
+        },
         "/events": {
             "get": {
                 "description": "Получить все существующие события",
@@ -29,6 +61,20 @@ const docTemplate = `{
                     "events"
                 ],
                 "summary": "Получить все события",
+                "parameters": [
+                    {
+                        "type": "integer",
+                        "description": "Номер страницы (по умолчанию 1)",
+                        "name": "page",
+                        "in": "query"
+                    },
+                    {
+                        "type": "integer",
+                        "description": "Количество событий на странице (по умолчанию 30)",
+                        "name": "limit",
+                        "in": "query"
+                    }
+                ],
                 "responses": {
                     "200": {
                         "description": "OK",
@@ -86,7 +132,7 @@ const docTemplate = `{
         },
         "/events/categories/{category}": {
             "get": {
-                "description": "Возвращает события по категории",
+                "description": "Возвращает события по ID категории",
                 "produces": [
                     "application/json"
                 ],
@@ -459,8 +505,8 @@ const docTemplate = `{
                 "capacity": {
                     "type": "integer"
                 },
-                "category": {
-                    "type": "string"
+                "category_id": {
+                    "type": "integer"
                 },
                 "description": {
                     "type": "string"
@@ -474,6 +520,9 @@ const docTemplate = `{
                 "id": {
                     "type": "integer"
                 },
+                "image": {
+                    "type": "string"
+                },
                 "location": {
                     "type": "string"
                 },
@@ -521,6 +570,17 @@ const docTemplate = `{
                 }
             }
         },
+        "models.Category": {
+            "type": "object",
+            "properties": {
+                "id": {
+                    "type": "integer"
+                },
+                "name": {
+                    "type": "string"
+                }
+            }
+        },
         "utils.ValidationErrResponse": {
             "type": "object",
             "properties": {