Refactor result retrieval, unify solution logic, and improve Docker deployment workflow

- Refactor `getResults` method in `DBService` to return a more detailed result set.  
- Refactor `getApplications` and `getResults` endpoints in `SolverController` for simplification and improved readability.  
- Unify and simplify solution retrieval logic by renaming `get_solution` to `get_results` in both server and client code.  
- Update and standardize `docker-compose.yml` configuration, including service names and dependencies.  
- Set up and improve GitHub Actions workflows for Docker deployment.  
- Remove unnecessary `.env` file copying from Dockerfiles.  
- Update scheduled task to run cleanup of old applications at midnight.  
- Minor improvements to log file paths and project versioning.

Author: dmitryesin

.github/workflows/build-and-push.yml

@@ -0,0 +1,44 @@
+name: Build and Push Docker Images
+
+on:
+  push:
+    branches:
+      - main
+  workflow_dispatch:
+
+jobs:
+  build-and-push:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Verify DockerHub credentials
+        run: |
+          if [ -z "${{ secrets.DOCKERHUB_USERNAME }}" ] || [ -z "${{ secrets.DOCKERHUB_PASSWORD }}" ]; then
+            echo "Missing DockerHub credentials"
+            exit 1
+          fi
+
+      - name: Log in to Docker Hub
+        uses: docker/login-action@v3
+        with:
+          registry: docker.io
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_PASSWORD }}
+
+      - name: Build and push diffy-bot-client
+        uses: docker/build-push-action@v4
+        with:
+          context: .
+          file: solver-bot/Dockerfile
+          push: true
+          tags: ${{ secrets.DOCKERHUB_USERNAME }}/diffy-bot-client:latest
+
+      - name: Build and push diffy-bot-server
+        uses: docker/build-push-action@v4
+        with:
+          context: .
+          file: solver-common/Dockerfile
+          push: true
+          tags: ${{ secrets.DOCKERHUB_USERNAME }}/diffy-bot-server:latest

docker-compose.yml

@@ -1,36 +1,37 @@
 services:
-  solver-bot:
+  client:
     build:
       context: .
       dockerfile: solver-bot/Dockerfile
-    container_name: diffy-bot-client-container
+    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://server:8080/api/solver
     ports:
       - "8001:8000"
     volumes:
       - ./solver-bot/src:/solver-client/src
+      - .env:/solver-client/.env
     depends_on:
-      - solver-db
-      - solver-common
+      - database
+      - server
     networks:
-      - solver-network
+      - net
 
-  solver-common:
+  server:
     build:
       context: .
       dockerfile: solver-common/Dockerfile
-    container_name: diffy-bot-server-container
+    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=database
       - DB_PORT=${DB_PORT}
       - DB_DATABASE=${DB_DATABASE}
       - DB_USERNAME=${DB_USERNAME}
@@ -39,14 +40,15 @@ services:
       - "8081:8080"
     volumes:
       - ./solver-common/src:/solver-server/src
+      - .env:/solver-server/.env
     depends_on:
-      - solver-db
+      - database
     networks:
-      - solver-network
+      - net
 
-  solver-db:
+  database:
     image: postgres:17.5-alpine
-    container_name: diffy-bot-db-container
+    container_name: diffy-bot-database
     environment:
       POSTGRES_USER: ${DB_USERNAME}
       POSTGRES_PASSWORD: ${DB_PASSWORD}
@@ -57,11 +59,11 @@ services:
       - pgdata:/var/lib/postgresql/data
       - ./database/schema.sql:/docker-entrypoint-initdb.d/init.sql:ro
     networks:
-      - solver-network
+      - net
 
 volumes:
   pgdata:
 
 networks:
-  solver-network:
+  net:
     driver: bridge

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-bot/src/main/python/shell.py

@@ -10,10 +10,8 @@
     set_parameters,
     set_user_settings,
     get_user_settings,
-    get_x_values,
-    get_y_values,
-    get_solution,
     get_recent_applications,
+    get_results,
     wait_for_application_completion)
 from equation.equation_parser import format_equation
 from equation.equation_validator import (
@@ -450,6 +448,7 @@ async def solve_history_details(update: Update, context: ContextTypes.DEFAULT_TY
 
     application = recent_applications[application_index]
     application_id = application.get('id')
+    results = await get_results(application_id)
 
     try:
         parameters = json.loads(application.get("parameters", "{}"))
@@ -462,9 +461,10 @@ async def solve_history_details(update: Update, context: ContextTypes.DEFAULT_TY
         reach_point = parameters.get("reachPoint", "")
         step_size = parameters.get("stepSize", "")
 
-        x_values = await get_x_values(application_id)
-        y_values = await get_y_values(application_id)
-        solution = await get_solution(application_id)
+        data = json.loads(results[0].get("data", "{}"))
+        x_values = data.get("xvalues", [])
+        y_values = data.get("yvalues", [])
+        solution = data.get("solution", "")
 
         plot_graph = plot_solution(x_values, y_values, order)
 
@@ -839,10 +839,13 @@ async def solution(update: Update, context: ContextTypes.DEFAULT_TYPE):
         )
         return MENU
 
+    results = await get_results(application_id)
+
     try:
-        result = await get_solution(application_id)
-        x_values = await get_x_values(application_id)
-        y_values = await get_y_values(application_id)
+        data = json.loads(results[0].get("data", "{}"))
+        x_values = data.get("xvalues", [])
+        y_values = data.get("yvalues", [])
+        solution = data.get("solution", "")
     except Exception:
         logger.error("Error while getting solution for application %s", application_id)
         await save_user_settings(context)
@@ -853,7 +856,7 @@ async def solution(update: Update, context: ContextTypes.DEFAULT_TYPE):
         )
         return MENU
 
-    if result is None:
+    if solution is None:
         logger.info("User %s used unsupported symbols", user.id)
         await save_user_settings(context)
         await processing_message.edit_text(
@@ -870,7 +873,7 @@ async def solution(update: Update, context: ContextTypes.DEFAULT_TYPE):
     )
 
     print_result = print_solution(
-        result,
+        solution,
         context.user_data['order'],
         context.user_data['rounding']
     )

solver-bot/src/main/python/spring_client.py

@@ -38,7 +38,7 @@ async def set_parameters(
             timeout = ClientTimeout(total=REQUEST_TIMEOUT)
             async with ClientSession(timeout=timeout) as session:
                 async with session.post(
-                    f"{os.getenv("CLIENT_API_URL")}/solve/{user_id}",
+                    f"{os.getenv('CLIENT_API_URL')}/solve/{user_id}",
                     json=payload
                 ) as response:
                     response.raise_for_status()
@@ -61,7 +61,7 @@ async def set_user_settings(user_id, method, rounding, language, hints):
     timeout = ClientTimeout(total=REQUEST_TIMEOUT)
     async with ClientSession(timeout=timeout) as session:
         async with session.post(
-            f"{os.getenv("CLIENT_API_URL")}/users/{user_id}",
+            f"{os.getenv('CLIENT_API_URL')}/users/{user_id}",
             params=payload
         ) as response:
             response.raise_for_status()
@@ -72,7 +72,7 @@ async def get_user_settings(user_id, method, rounding, language, hints):
     timeout = ClientTimeout(total=REQUEST_TIMEOUT)
     async with ClientSession(timeout=timeout) as session:
         async with session.get(
-            f"{os.getenv("CLIENT_API_URL")}/users/{user_id}"
+            f"{os.getenv('CLIENT_API_URL')}/users/{user_id}"
         ) as response:
             if response.status == 500:
                 return {
@@ -95,7 +95,7 @@ async def get_recent_applications(user_id):
     timeout = ClientTimeout(total=REQUEST_TIMEOUT)
     async with ClientSession(timeout=timeout) as session:
         async with session.get(
-            f"{os.getenv("CLIENT_API_URL")}/applications/list/{user_id}"
+            f"{os.getenv('CLIENT_API_URL')}/applications/{user_id}"
         ) as response:
             if response.status == 500:
                 return []
@@ -132,65 +132,26 @@ async def get_recent_applications(user_id):
             return []
 
 
-async def get_solution(application_id):
+async def get_results(application_id):
     timeout = ClientTimeout(total=REQUEST_TIMEOUT)
     async with ClientSession(timeout=timeout) as session:
         async with session.get(
-            f"{os.getenv("CLIENT_API_URL")}/results/{application_id}/solution"
+            f"{os.getenv('CLIENT_API_URL')}/results/{application_id}"
         ) as response:
-            if response.status == 500:
-                return []
-
-            response.raise_for_status()
-            text = await response.text()
-            try:
-                data = json.loads(text)
-            except json.JSONDecodeError:
-                raise ValueError(f"Failed to parse solution data: {text}")
-            return np.array(data)
-
-
-async def get_x_values(application_id):
-    timeout = ClientTimeout(total=REQUEST_TIMEOUT)
-    async with ClientSession(timeout=timeout) as session:
-        async with session.get(
-            f"{os.getenv("CLIENT_API_URL")}/results/{application_id}/xvalues"
-        ) as response:
-            if response.status == 500:
-                return []
-
             response.raise_for_status()
             text = await response.text()
             try:
                 data = json.loads(text)
             except json.JSONDecodeError:
-                raise ValueError(f"Failed to parse x-values data: {text}")
-            return np.array(data)
-
-
-async def get_y_values(application_id):
-    timeout = ClientTimeout(total=REQUEST_TIMEOUT)
-    async with ClientSession(timeout=timeout) as session:
-        async with session.get(
-            f"{os.getenv("CLIENT_API_URL")}/results/{application_id}/yvalues"
-        ) as response:
-            if response.status == 500:
-                return []
-
-            response.raise_for_status()
-            text = await response.text()
-            try:
-                data = json.loads(text)
-            except json.JSONDecodeError:
-                raise ValueError(f"Failed to parse y-values data: {text}")
-            return np.array(data)
+                return text
+            return data
 
 
 async def get_application_status(application_id):
     timeout = ClientTimeout(total=REQUEST_TIMEOUT)
     async with ClientSession(timeout=timeout) as session:
         async with session.get(
-            f"{os.getenv("CLIENT_API_URL")}/applications/{application_id}/status"
+            f"{os.getenv('CLIENT_API_URL')}/applications/{application_id}/status"
         ) as response:
             response.raise_for_status()
             return await response.text()

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
+COPY --from=builder /solver-server/target/solver-0.1.1-alpha.jar /solver-server/target/solver-0.1.1-alpha.jar
 
-CMD ["java", "-jar", "target/solver-0.1.0-alpha.jar"]
+CMD ["java", "-jar", "target/solver-0.1.1-alpha.jar"]

solver-common/pom.xml

@@ -7,7 +7,7 @@
 
   <artifactId>solver</artifactId>
   <groupId>com.solver</groupId>
-  <version>0.1.0-alpha</version>
+  <version>0.1.1-alpha</version>
 
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>