refactor stuff

Author: devadathanmb

.dockerignore

@@ -17,7 +17,8 @@ pnpm-debug.log
 # .nvmrc
 .nvmrc
 
-# Environment files (don’t bake secrets into image)
+# Environment files (don't bake secrets into image)
+env/
 .env
 .env.*
 
@@ -32,8 +33,10 @@ Thumbs.db
 .gitignore
 
 # Docker-related files
+docker/
 Dockerfile*
 docker-compose*.yml
+compose*.yaml
 
 # Cache
 *.tsbuildinfo

.gitignore

@@ -26,11 +26,13 @@ pnpm-debug.log*
 gitleaks-report.json
 
 # Env files
-.env
-.env.dev*
-.env.staging*
-.env.prod*
-!.env.dev.example
+# New structure: env/prod/, env/staging/, env/dev/
+# Dev env files are tracked (contain default configs)
+# Prod/staging are gitignored (contain secrets)
+env/prod/.env
+env/staging/.env
+env/dev/.env
+!env/*/.env.example
 .env.local
 .env.*.local
 

README.md

@@ -82,17 +82,17 @@ cd ktu-bot
 
 ### 2. Configure Environment
 
-Development environment files live in the `dev/` directory. Each service/module has its own `.env` file.
+Development environment files live in the `env/dev/` directory. Each service/module has its own `.env` file.
 
 **Minimum required:**
 
-- `dev/bot.env` — Set `BOT_TOKEN` and `BOT_FILE_UPLOAD_CHANNEL_ID`
+- `env/dev/bot.env` — Set `BOT_TOKEN` and `BOT_FILE_UPLOAD_CHANNEL_ID`
 - Most files come prefilled with sensible defaults
 
 **Optional (for extra features):**
 
-- `dev/api.env` — For UptimeRobot monitoring, file uploads, etc.
-- `dev/llm.env` — For AI-powered announcement filtering
+- `env/dev/api.env` — For UptimeRobot monitoring, file uploads, etc.
+- `env/dev/llm.env` — For AI-powered announcement filtering
 
 > [!NOTE]
 > Most environment variables needed for the development setup come pre-configured in each `.env` file.
@@ -103,20 +103,20 @@ Development environment files live in the `dev/` directory. Each service/module
 > **For sensitive local secrets:**
 >
 > ```bash
-> cp .env.dev.example .env.dev
+> cp env/dev/.env.example env/dev/.env
 > # Add your personal API keys, tokens, or credentials here
 > ```
 >
-> This file is mounted **last** in Docker Compose, so values here override anything in `dev/*.env` files.
+> This file is mounted **last** in Docker Compose, so values here override anything in `env/dev/*.env` files.
 
 > [!WARNING]
 > If you don't configure certain `.env` variables, those features simply won't work or the [zod validations](https://zod.dev/) may get triggered. Review each file to see what's needed.
 
 ### 3. Run Everything
 
 ```bash
-docker compose -f docker-compose.dev.yaml down -v --remove-orphans && \
-docker compose -f docker-compose.dev.yaml up --build
+docker compose -f docker/compose.dev.yaml down -v --remove-orphans && \
+docker compose -f docker/compose.dev.yaml up --build
 ```
 
 This starts all services with hot-reload enabled. Code changes trigger automatic restarts.
@@ -126,7 +126,7 @@ This starts all services with hot-reload enabled. Code changes trigger automatic
 If you don't need the workers:
 
 ```bash
-docker compose -f docker-compose.dev.yaml up ktu-bot-app --build
+docker compose -f docker/compose.dev.yaml up ktu-bot-app --build
 ```
 
 > [!TIP]
@@ -140,13 +140,13 @@ Need just the notification worker? No problem:
 
 ```bash
 # Announcements notify worker
-docker compose -f docker-compose.dev.yaml up announcements-notify-worker --build
+docker compose -f docker/compose.dev.yaml up announcements-notify-worker --build
 
 # Data sync worker
-docker compose -f docker-compose.dev.yaml up data-sync-worker --build
+docker compose -f docker/compose.dev.yaml up data-sync-worker --build
 
 # Broadcasts worker
-docker compose -f docker-compose.dev.yaml up broadcasts-worker --build
+docker compose -f docker/compose.dev.yaml up broadcasts-worker --build
 ```
 
 > [!TIP]
@@ -156,24 +156,33 @@ docker compose -f docker-compose.dev.yaml up broadcasts-worker --build
 
 ## Production Deployment 🏭
 
-Production uses a single `.env` file approach for simplicity.
+Production uses a single `.env` file in the `env/prod/` directory.
 
 ### 1. Configure Environment
 
 ```bash
-cp .env.prod.example .env
-# Edit .env and fill in all required values
+cp env/prod/.env.example env/prod/.env
+# Edit env/prod/.env and fill in all required values
 # Most values come pre-configured — just update anything specific to your deployment.
 ```
 
-### 2. Start Services
+### 2. Start Monitoring (Optional but Recommended)
 
 ```bash
-docker compose down -v --remove-orphans && \
-docker compose up -d --build
+# Start Prometheus monitoring independently
+docker compose -f docker/compose.monitoring.yaml up -d
 ```
 
-### 3. Verify Health
+This starts Prometheus on port 9090 with persistent storage. It runs independently from the application stack.
+
+### 3. Start Application Services
+
+```bash
+docker compose -f docker/compose.yaml down -v --remove-orphans && \
+docker compose -f docker/compose.yaml up -d --build
+```
+
+### 4. Verify Health
 
 ```bash
 curl -f http://localhost:3000/health

Dockerfile docker/DockerfileDockerfile renamed to docker/Dockerfile

@@ -1,19 +1,19 @@
 services:
   ktu-bot-app:
     build:
-      context: .
-      dockerfile: Dockerfile.dev
+      context: ..
+      dockerfile: docker/Dockerfile.dev
     container_name: ktu-bot-app
     env_file:
-      - ./dev/bot.env
-      - ./dev/db.env
-      - ./dev/redis.env
-      - ./dev/api.env
-      - ./dev/llm.env
-      - ./dev/logging.env
-      - .env.dev
+      - ../env/dev/bot.env
+      - ../env/dev/db.env
+      - ../env/dev/redis.env
+      - ../env/dev/api.env
+      - ../env/dev/llm.env
+      - ../env/dev/logging.env
+      - ../env/dev/.env
     volumes:
-      - .:/app
+      - ..:/app
       - /app/node_modules
     ports:
       - "3000:3000"
@@ -49,14 +49,14 @@ services:
 
   ktu-bot-db-migrations:
     build:
-      context: .
-      dockerfile: Dockerfile.dev
+      context: ..
+      dockerfile: docker/Dockerfile.dev
     container_name: ktu-bot-db-migrations
     env_file:
-      - ./dev/db.env
-      - .env.dev
+      - ../env/dev/db.env
+      - ../env/dev/.env
     volumes:
-      - .:/app
+      - ..:/app
       - /app/node_modules
     depends_on:
       ktu-bot-postgres:
@@ -73,23 +73,23 @@ services:
 
   announcements-notify-worker:
     build:
-      context: .
-      dockerfile: Dockerfile.dev
+      context: ..
+      dockerfile: docker/Dockerfile.dev
     container_name: announcements-notify-worker
     env_file:
-      - ./dev/bot.env
-      - ./dev/db.env
-      - ./dev/redis.env
-      - ./dev/api.env
-      - ./dev/llm.env
-      - ./dev/announcements-notify-worker.env
-      - ./dev/broadcasts-worker.env
-      - ./dev/logging.env
-      - .env.dev
+      - ../env/dev/bot.env
+      - ../env/dev/db.env
+      - ../env/dev/redis.env
+      - ../env/dev/api.env
+      - ../env/dev/llm.env
+      - ../env/dev/announcements-notify-worker.env
+      - ../env/dev/broadcasts-worker.env
+      - ../env/dev/logging.env
+      - ../env/dev/.env
     ports:
       - "3001:3001"
     volumes:
-      - .:/app
+      - ..:/app
       - /app/node_modules
     depends_on:
       ktu-bot-postgres:
@@ -123,22 +123,22 @@ services:
 
   broadcasts-worker:
     build:
-      context: .
-      dockerfile: Dockerfile.dev
+      context: ..
+      dockerfile: docker/Dockerfile.dev
     container_name: broadcasts-worker
     env_file:
-      - ./dev/bot.env
-      - ./dev/db.env
-      - ./dev/redis.env
-      - ./dev/api.env
-      - ./dev/broadcasts-worker.env
-      - ./dev/llm.env
-      - ./dev/logging.env
-      - .env.dev
+      - ../env/dev/bot.env
+      - ../env/dev/db.env
+      - ../env/dev/redis.env
+      - ../env/dev/api.env
+      - ../env/dev/broadcasts-worker.env
+      - ../env/dev/llm.env
+      - ../env/dev/logging.env
+      - ../env/dev/.env
     ports:
       - "3002:3002"
     volumes:
-      - .:/app
+      - ..:/app
       - /app/node_modules
     depends_on:
       ktu-bot-postgres:
@@ -172,22 +172,22 @@ services:
 
   data-sync-worker:
     build:
-      context: .
-      dockerfile: Dockerfile.dev
+      context: ..
+      dockerfile: docker/Dockerfile.dev
     container_name: data-sync-worker
     env_file:
-      - ./dev/bot.env
-      - ./dev/db.env
-      - ./dev/api.env
-      - ./dev/data-sync-worker.env
-      - ./dev/llm.env
-      - ./dev/redis.env
-      - ./dev/logging.env
-      - .env.dev
+      - ../env/dev/bot.env
+      - ../env/dev/db.env
+      - ../env/dev/api.env
+      - ../env/dev/data-sync-worker.env
+      - ../env/dev/llm.env
+      - ../env/dev/redis.env
+      - ../env/dev/logging.env
+      - ../env/dev/.env
     ports:
       - "3003:3003"
     volumes:
-      - .:/app
+      - ..:/app
       - /app/node_modules
     depends_on:
       ktu-bot-postgres:
@@ -218,26 +218,26 @@ services:
 
   bull-board-service:
     build:
-      context: .
-      dockerfile: Dockerfile.dev
+      context: ..
+      dockerfile: docker/Dockerfile.dev
     container_name: bull-board-service
     env_file:
-      - ./dev/redis.env
-      - ./dev/bot.env
-      - ./dev/llm.env
-      - ./dev/api.env
-      - ./dev/db.env
-      - ./dev/bull-board-service.env
-      - ./dev/logging.env
-      - ./dev/broadcasts-worker.env
-      - ./dev/announcements-notify-worker.env
-      - ./dev/data-sync-worker.env
-      - ./dev/logging.env
-      - .env.dev
+      - ../env/dev/redis.env
+      - ../env/dev/bot.env
+      - ../env/dev/llm.env
+      - ../env/dev/api.env
+      - ../env/dev/db.env
+      - ../env/dev/bull-board-service.env
+      - ../env/dev/logging.env
+      - ../env/dev/broadcasts-worker.env
+      - ../env/dev/announcements-notify-worker.env
+      - ../env/dev/data-sync-worker.env
+      - ../env/dev/logging.env
+      - ../env/dev/.env
     ports:
       - "3010:3010"
     volumes:
-      - .:/app
+      - ..:/app
       - /app/node_modules
     depends_on:
       ktu-bot-redis:
@@ -268,7 +268,7 @@ services:
     image: postgres:17-alpine
     container_name: ktu-bot-postgres-dev
     env_file:
-      - ./dev/db.env
+      - ../env/dev/db.env
     volumes:
       - ktu_bot_postgres_data:/var/lib/postgresql/data
     ports:
@@ -287,7 +287,7 @@ services:
     image: redis:7-alpine
     container_name: ktu-bot-redis-dev
     env_file:
-      - ./dev/redis.env
+      - ../env/dev/redis.env
     ports:
       - "6379:6379"
     networks: