Merge branch 'develop' into feature/get-applications-endpoints

Author: dmitryesin

.github/workflows/deploy.yml

@@ -0,0 +1,61 @@
+name: Deploy
+
+on:
+  push:
+    branches:
+      - develop
+      - main
+  workflow_dispatch:
+
+jobs:
+  build-and-push:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+
+      - name: Log in to Docker Registry
+        if: github.ref == 'refs/heads/main'
+        uses: docker/login-action@v2
+        with:
+          registry: docker.io
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_PASSWORD }}
+
+      - name: Build diffy-bot-client Image
+        run: |
+          docker build -t ${{ secrets.DOCKERHUB_USERNAME }}/diffy-bot-client:latest -f solver-bot/Dockerfile .
+
+      - name: Build diffy-bot-server Image
+        run: |
+          docker build -t ${{ secrets.DOCKERHUB_USERNAME }}/diffy-bot-server:latest -f solver-common/Dockerfile .
+
+      - name: Push diffy-bot-client Image
+        if: github.ref == 'refs/heads/main'
+        run: |
+          docker push ${{ secrets.DOCKERHUB_USERNAME }}/diffy-bot-client:latest
+
+      - name: Push diffy-bot-server Image
+        if: github.ref == 'refs/heads/main'
+        run: |
+          docker push ${{ secrets.DOCKERHUB_USERNAME }}/diffy-bot-server:latest
+
+  deploy:
+    needs: build-and-push
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+      - name: Create .env file from secrets
+        run: |
+          echo "CLIENT_API_KEY=${{ secrets.CLIENT_API_KEY }}" >> .env
+          echo "DB_CONNECTION=${{ secrets.DB_CONNECTION }}" >> .env
+          echo "DB_PORT=${{ secrets.DB_PORT }}" >> .env
+          echo "DB_DATABASE=${{ secrets.DB_DATABASE }}" >> .env
+          echo "DB_USERNAME=${{ secrets.DB_USERNAME }}" >> .env
+          echo "DB_PASSWORD=${{ secrets.DB_PASSWORD }}" >> .env
+
+      - name: Run Docker Compose
+        run: |
+          docker compose -f docker-compose.yml pull || true
+          docker compose -f docker-compose.yml up -d

docker-compose.yml

@@ -1,36 +1,34 @@
 services:
-  solver-bot:
-    build:
-      context: .
-      dockerfile: solver-bot/Dockerfile
-    container_name: diffy-bot-client-container
+  diffy-bot-client:
+    container_name: diffy-bot-client
     working_dir: /solver-client
     env_file:
       - .env
     environment:
       - CLIENT_API_KEY=${CLIENT_API_KEY}
-      - CLIENT_API_URL=http://solver-common:8080/api/solver
+      - CLIENT_API_URL=http://diffy-bot-server:8080/api/solver
     ports:
       - "8001:8000"
     volumes:
       - ./solver-bot/src:/solver-client/src
+      - .env:/solver-client/.env
     depends_on:
-      - solver-db
-      - solver-common
+      - diffy-bot-db
+      - diffy-bot-server
     networks:
       - solver-network
-
-  solver-common:
     build:
       context: .
-      dockerfile: solver-common/Dockerfile
-    container_name: diffy-bot-server-container
+      dockerfile: solver-bot/Dockerfile
+
+  diffy-bot-server:
+    container_name: diffy-bot-server
     working_dir: /solver-server
     env_file:
       - .env
     environment:
       - DB_CONNECTION=${DB_CONNECTION}
-      - DB_HOST=diffy-bot-db-container
+      - DB_HOST=diffy-bot-db
       - DB_PORT=${DB_PORT}
       - DB_DATABASE=${DB_DATABASE}
       - DB_USERNAME=${DB_USERNAME}
@@ -39,14 +37,18 @@ services:
       - "8081:8080"
     volumes:
       - ./solver-common/src:/solver-server/src
+      - .env:/solver-server/.env
     depends_on:
-      - solver-db
+      - diffy-bot-db
     networks:
       - solver-network
+    build:
+      context: .
+      dockerfile: solver-common/Dockerfile
 
-  solver-db:
+  diffy-bot-db:
     image: postgres:17.5-alpine
-    container_name: diffy-bot-db-container
+    container_name: diffy-bot-db
     environment:
       POSTGRES_USER: ${DB_USERNAME}
       POSTGRES_PASSWORD: ${DB_PASSWORD}

solver-bot/Dockerfile

@@ -3,7 +3,6 @@ FROM python:3.13.3-slim
 WORKDIR /solver-client
 
 COPY solver-bot .
-COPY .env .
 
 RUN pip install --no-cache-dir -r requirements.txt
 

solver-common/Dockerfile

@@ -11,14 +11,12 @@ COPY solver-common/pom.xml .
 RUN mvn dependency:go-offline
 
 COPY solver-common .
-COPY .env .
 RUN mvn clean package -DskipTests -B
 
 FROM openjdk:21-slim
 
 WORKDIR /solver-server
 
 COPY --from=builder /solver-server/target/solver-0.1.0-alpha.jar /solver-server/target/solver-0.1.0-alpha.jar
-COPY --from=builder /solver-server/.env /solver-server/.env
 
 CMD ["java", "-jar", "target/solver-0.1.0-alpha.jar"]

solver-common/src/main/java/com/solver/DBService.java

@@ -225,7 +225,7 @@ INSERT INTO results (application_id, data)
     }
 
     @Async
-    @Scheduled(cron = "0 */15 * * * *") // Every 15 minutes
+    @Scheduled(cron = "0 0 0,12 * * *") // Runs every day at midnight and noon
     @Transactional
     public CompletableFuture<Void> cleanOldApplications() {
         logger.debug("Starting scheduled cleanup of old applications");