DB2

.gitignore

@@ -2,4 +2,7 @@
 pkg
 coverage.out
 .vscode
-c.out
+c.out
+.env
+pgdata
+auth_test.go

Makefile

@@ -0,0 +1,31 @@
+MIGRATION_FOLDER=$(INTERNAL_REPO_PATH)migrations
+
+build:
+	docker compose build
+
+up-all:
+	docker compose up -d 
+
+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
+
+stop-db:
+	docker compose stop postgres
+
+start-db:
+	docker compose start postgres
+
+down-db:
+	docker compose down postgres
+
+migration-up-oms:
+	goose -dir "$(MIGRATION_FOLDER)" postgres "$(POSTGRES_OMS_SETUP)" up
+
+migration-down-oms:
+	goose -dir "$(MIGRATION_FOLDER)" postgres "$(POSTGRES_OMS_SETUP)" down

cmd/server/main.go

@@ -8,17 +8,19 @@ import (
 	_ "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
@@ -31,16 +33,26 @@ 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()
+
+	redisConfig, err := sessionRepository.GetRedisConfig()
+	if err != nil {
+		log.Fatalf("Failed to connect to the redis database")
+	}
+	postgresConfig, err := postgres.GetPostgresConfig()
+	pool, err := postgres.InitPostgres(postgresConfig, appLogger)
+	if err != nil {
+		log.Fatalf("Failed to connect to the postgres database")
+	}
+	defer pool.Close()
 
-	userDB := userRepository.NewDB()
-	sessionDB := sessionRepository.NewDB()
-	eventDB := eventRepository.NewDB()
+	userDB := userRepository.NewDB(pool)
+	sessionDB := sessionRepository.NewDB(redisConfig)
+	eventDB := eventRepository.NewDB(pool)
 
 	authService := authService.NewService(userDB, sessionDB)
 	eventService := eventService.NewService(eventDB)
@@ -62,8 +74,10 @@ func main() {
 	r.HandleFunc("/profile", authHandler.Profile).Methods("GET")
 
 	r.HandleFunc("/events/{id:[0-9]+}", eventHandler.GetEventByID).Methods("GET")
-	r.HandleFunc("/events/{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")
@@ -75,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)

docker-compose.yml

@@ -0,0 +1,37 @@
+version: '3.8'
+services:
+  api:
+    build:
+      context: .
+      dockerfile: Dockerfile
+    ports:
+      - "8080:8080"
+    depends_on:
+      - postgres
+    environment:
+      POSTGRES_DB: kudago_db
+      POSTGRES_USER: postgres
+      POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
+    env_file:
+      - .env
+    volumes:
+      - .:/app
+
+  postgres:
+    image: postgres:latest
+    container_name: my_postgres_container
+    restart: unless-stopped
+    env_file:
+      - .env
+    ports:
+      - "5432:5432"
+    volumes:
+      - postgres_data:/var/lib/postgresql/data
+  redis:
+    image: redis:latest
+    ports:
+    - "6379:6379" 
+
+volumes:
+  postgres_data:
+    driver: local

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,12 +61,32 @@ 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",
                         "schema": {
                             "$ref": "#/definitions/events.GetEventsResponse"
                         }
+                    },
+                    "500": {
+                        "description": "Internal Server Error",
+                        "schema": {
+                            "$ref": "#/definitions/httpErrors.HttpError"
+                        }
                     }
                 }
             },
@@ -78,6 +130,58 @@ const docTemplate = `{
                 }
             }
         },
+        "/events/categories/{category}": {
+            "get": {
+                "description": "Возвращает события по ID категории",
+                "produces": [
+                    "application/json"
+                ],
+                "tags": [
+                    "events"
+                ],
+                "summary": "Получение событий по категори",
+                "responses": {
+                    "200": {
+                        "description": "OK",
+                        "schema": {
+                            "$ref": "#/definitions/events.GetEventsResponse"
+                        }
+                    },
+                    "500": {
+                        "description": "Internal Server Error",
+                        "schema": {
+                            "$ref": "#/definitions/httpErrors.HttpError"
+                        }
+                    }
+                }
+            }
+        },
+        "/events/tags/{tag}": {
+            "get": {
+                "description": "Возвращает события по тегу",
+                "produces": [
+                    "application/json"
+                ],
+                "tags": [
+                    "events"
+                ],
+                "summary": "Получение событий по тегу",
+                "responses": {
+                    "200": {
+                        "description": "OK",
+                        "schema": {
+                            "$ref": "#/definitions/events.GetEventsResponse"
+                        }
+                    },
+                    "500": {
+                        "description": "Internal Server Error",
+                        "schema": {
+                            "$ref": "#/definitions/httpErrors.HttpError"
+                        }
+                    }
+                }
+            }
+        },
         "/events/{id}": {
             "get": {
                 "description": "Возвращает информацию о событии по его идентификатору",
@@ -200,32 +304,6 @@ const docTemplate = `{
                 }
             }
         },
-        "/events/{tag}": {
-            "get": {
-                "description": "Возвращает события по тегу",
-                "produces": [
-                    "application/json"
-                ],
-                "tags": [
-                    "events"
-                ],
-                "summary": "Получение событий по тегу",
-                "responses": {
-                    "200": {
-                        "description": "OK",
-                        "schema": {
-                            "$ref": "#/definitions/events.GetEventsResponse"
-                        }
-                    },
-                    "500": {
-                        "description": "Internal Server Error",
-                        "schema": {
-                            "$ref": "#/definitions/httpErrors.HttpError"
-                        }
-                    }
-                }
-            }
-        },
         "/login": {
             "post": {
                 "description": "Авторизует пользователя",
@@ -424,18 +502,30 @@ const docTemplate = `{
                 "author": {
                     "type": "integer"
                 },
-                "date_end": {
+                "capacity": {
+                    "type": "integer"
+                },
+                "category_id": {
+                    "type": "integer"
+                },
+                "description": {
                     "type": "string"
                 },
-                "date_start": {
+                "event_end": {
                     "type": "string"
                 },
-                "description": {
+                "event_start": {
                     "type": "string"
                 },
                 "id": {
                     "type": "integer"
                 },
+                "image": {
+                    "type": "string"
+                },
+                "location": {
+                    "type": "string"
+                },
                 "tag": {
                     "type": "array",
                     "items": {
@@ -480,6 +570,17 @@ const docTemplate = `{
                 }
             }
         },
+        "models.Category": {
+            "type": "object",
+            "properties": {
+                "id": {
+                    "type": "integer"
+                },
+                "name": {
+                    "type": "string"
+                }
+            }
+        },
         "utils.ValidationErrResponse": {
             "type": "object",
             "properties": {