refactor: unify solution retrieval logic from database and client

### What was done
- Updated endpoint URLs and consolidated result endpoints into getResults.
- Refactored result retrieval by replacing individual queries with a unified query in getResults.
- Adjusted client calls to reflect the new unified /results/{applicationId} endpoint.
- Modified integration to parse the unified result data for solution and graph values.

Author: dmitryesin

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

@@ -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,58 +132,19 @@ 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):

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

@@ -1,7 +1,5 @@
 package com.solver;
 
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.ObjectMapper;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.dao.DataAccessException;
@@ -12,7 +10,6 @@
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.ArrayList;
 import java.util.concurrent.CompletableFuture;
 import java.util.HashMap;
 import java.util.List;
@@ -147,80 +144,25 @@ public CompletableFuture<List<Map<String, Object>>> getApplications(Integer user
 
     @Async
     @Transactional
-    public CompletableFuture<Optional<List<Double>>> getXValues(int applicationId) {
-        logger.debug("Fetching x values for applicationId: {}", applicationId);
+    public CompletableFuture<List<Map<String, Object>>> getResults(Integer applicationId) {
+        logger.debug("Fetching results for applicationId: {}", applicationId);
         return CompletableFuture.supplyAsync(() -> {
             String query = """
-                SELECT jsonb_array_elements_text(data->'xvalues')::double precision AS x_value
+                SELECT id, data, created_at
                 FROM results
                 WHERE application_id = ?
                 """;
             try {
-                List<Double> xValues = jdbcTemplate.queryForList(query, Double.class, applicationId);
-                return xValues.isEmpty() ? Optional.empty() : Optional.of(xValues);
-            } catch (DataAccessException e) {
-                logger.error("Database error while fetching x values for applicationId: {}", applicationId, e);
-                throw new SolverException("Failed to fetch x values", e);
-            }
-        });
-    }
-
-    @Async
-    @Transactional
-    public CompletableFuture<Optional<List<double[]>>> getYValues(int applicationId) {
-        logger.debug("Fetching y values for applicationId: {}", applicationId);
-        return CompletableFuture.supplyAsync(() -> {
-            String query = """
-                SELECT jsonb_array_elements(data->'yvalues')::jsonb AS y_value
-                FROM results
-                WHERE application_id = ?
-                """;
-            try {
-                List<String> yValuesJson = jdbcTemplate.queryForList(query, String.class, applicationId);
-                if (yValuesJson.isEmpty()) {
-                    return Optional.empty();
-                }
-                
-                ObjectMapper objectMapper = new ObjectMapper();
-                List<double[]> yValues = new ArrayList<>();
-                for (String json : yValuesJson) {
-                    yValues.add(objectMapper.readValue(json, double[].class));
-                }
-                return Optional.of(yValues);
-            } catch (DataAccessException e) {
-                logger.error("Database error while fetching y values for applicationId: {}", applicationId, e);
-                throw new SolverException("Failed to fetch y values", e);
-            } catch (JsonProcessingException e) {
-                logger.error("JSON processing error while parsing y values for applicationId: {}", applicationId, e);
-                throw new SolverException("Failed to parse y values", e);
-            }
-        });
-    }
-
-    @Async
-    @Transactional
-    public CompletableFuture<Optional<double[]>> getSolution(int applicationId) {
-        logger.debug("Fetching solution for applicationId: {}", applicationId);
-        return CompletableFuture.supplyAsync(() -> {
-            String query = """
-                SELECT data->>'solution' AS solution
-                FROM results
-                WHERE application_id = ?
-                """;
-            try {
-                List<String> solutions = jdbcTemplate.queryForList(query, String.class, applicationId);
-                if (solutions.isEmpty()) {
-                    return Optional.empty();
-                }
-                
-                ObjectMapper objectMapper = new ObjectMapper();
-                return Optional.of(objectMapper.readValue(solutions.getFirst(), double[].class));
+                return jdbcTemplate.query(query, (rs, rowNum) -> {
+                    Map<String, Object> result = new HashMap<>();
+                    result.put("id", rs.getInt("id"));
+                    result.put("data", rs.getString("data"));
+                    result.put("created_at", rs.getString("created_at"));
+                    return result;
+                }, applicationId);
             } catch (DataAccessException e) {
-                logger.error("Database error while fetching solution for applicationId: {}", applicationId, e);
-                throw new SolverException("Failed to fetch solution", e);
-            } catch (JsonProcessingException e) {
-                logger.error("JSON processing error while parsing solution for applicationId: {}", applicationId, e);
-                throw new SolverException("Failed to parse solution", e);
+                logger.error("Database error while fetching results for applicationId: {}", applicationId, e);
+                throw new SolverException("Failed to fetch results", e);
             }
         });
     }

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

@@ -110,7 +110,7 @@ public CompletableFuture<ResponseEntity<String>> getApplicationStatus(@PathVaria
                     .orElseThrow(() -> new SolverException("Application status not found for applicationId: " + applicationId)));
     }
 
-    @GetMapping("/applications/list/{userId}")
+    @GetMapping("/applications/{userId}")
     public CompletableFuture<ResponseEntity<List<Map<String, Object>>>> getApplications(@PathVariable("userId") Integer userId) {
         logger.debug("Getting applications list for userId: {}", userId);
         return dbService.getApplications(userId)
@@ -122,30 +122,15 @@ public CompletableFuture<ResponseEntity<List<Map<String, Object>>>> getApplicati
                 });
     }
 
-    @GetMapping("/results/{applicationId}/solution")
-    public CompletableFuture<ResponseEntity<double[]>> getSolution(@PathVariable("applicationId") int applicationId) {
-        logger.debug("Getting solution for applicationId: {}", applicationId);
-        return dbService.getSolution(applicationId)
-                .thenApply(optionalSolution -> optionalSolution
-                    .map(ResponseEntity::ok)
-                    .orElseThrow(() -> new SolverException("Solution not found for applicationId: " + applicationId)));
-    }
-
-    @GetMapping("/results/{applicationId}/xvalues")
-    public CompletableFuture<ResponseEntity<List<Double>>> getXValues(@PathVariable("applicationId") int applicationId) {
-        logger.debug("Getting x values for applicationId: {}", applicationId);
-        return dbService.getXValues(applicationId)
-                .thenApply(optionalXValues -> optionalXValues
-                    .map(ResponseEntity::ok)
-                    .orElseThrow(() -> new SolverException("xValues not found for applicationId: " + applicationId)));
-    }
-
-    @GetMapping("/results/{applicationId}/yvalues")
-    public CompletableFuture<ResponseEntity<List<double[]>>> getYValues(@PathVariable("applicationId") int applicationId) {
-        logger.debug("Getting y values for applicationId: {}", applicationId);
-        return dbService.getYValues(applicationId)
-                .thenApply(optionalYValues -> optionalYValues
-                    .map(ResponseEntity::ok)
-                    .orElseThrow(() -> new SolverException("yValues not found for applicationId: " + applicationId)));
+    @GetMapping("/results/{applicationId}")
+    public CompletableFuture<ResponseEntity<List<Map<String, Object>>>> getResults(@PathVariable("applicationId") Integer applicationId) {
+        logger.debug("Getting results for applicationId: {}", applicationId);
+        return dbService.getResults(applicationId)
+                .thenApply(results -> {
+                    if (results.isEmpty()) {
+                        throw new SolverException("Results not found for applicationId: " + applicationId);
+                    }
+                    return ResponseEntity.ok(results);
+                });
     }
 }