fix

Author: cottonBlanket

vtb.backend/SqlAnalyzer.Api/Dto/QueryAnalysis/QueryAnalysisResultDto.cs

@@ -38,11 +38,6 @@ public class QueryAnalysisResultDto
     /// </summary>
     public SqlLlmAnalysisResult? LlmRecommendations { get; init; }
 
-    /// <summary>
-    /// Айдишники найденных кастомных правил
-    /// </summary>
-    public IReadOnlyCollection<Guid> FindindCustomRules { get; init; } = [];
-    
     /// <summary>
     /// Результат сравнения EXPLAIN для входного запроса и запроса с LLM
     /// </summary>

vtb.backend/SqlAnalyzer.Api/Services/QueryAnalysis/QueryService.cs

@@ -8,6 +8,8 @@
 using SqlAnalyzer.Api.Services.LlmClient.Interfaces;
 using SqlAnalyzer.Api.Services.QueryAnalysis.Interfaces;
 using SqlAnalyzerLib.Facade.Interfaces;
+using SqlAnalyzerLib.SqlStaticAnalysis.Constants;
+using SqlAnalyzerLib.SqlStaticAnalysis.Models;
 
 namespace SqlAnalyzer.Api.Services.QueryAnalysis;
 
@@ -126,7 +128,6 @@ public async Task<QueryAnalysisResultDto> Analyze(Guid queryId, bool useLlm, IRe
                 ExplainResult = query.ExplainResult,
                 AlgorithmRecommendation = analysis.Recommendations,
                 LlmRecommendations = analysis.LlmResult,
-                FindindCustomRules = analysis.FindindCustomRules ?? [],
                 ExplainComparisonDto = _explainer.Compare(query.ExplainResult, analysis.LlmResult?.ExplainResult)
             };
         }
@@ -152,6 +153,7 @@ public async Task<QueryAnalysisResultDto> Analyze(Guid queryId, bool useLlm, IRe
         _db.QueryAnalysisResults.Add(result);
         await _db.SaveChangesAsync();
 
+        await AddCustomToAnalysisResult(customFindings, analysisResult);
 
         return new QueryAnalysisResultDto
         {
@@ -161,11 +163,28 @@ public async Task<QueryAnalysisResultDto> Analyze(Guid queryId, bool useLlm, IRe
             ExplainResult = query.ExplainResult,
             AlgorithmRecommendation = analysisResult,
             LlmRecommendations = llmAnswer,
-            FindindCustomRules = customFindings,
             ExplainComparisonDto = _explainer.Compare(query.ExplainResult, llmAnswer?.ExplainResult)
         };
     }
 
+    private async Task AddCustomToAnalysisResult(IReadOnlyCollection<Guid> customFindings,
+        SqlAlgorithmAnalysisResult analysisResult)
+    {
+        // todo! переделать чтобы у всех правил был айдишник
+        var customRules = await _db.SqlAnalyzeRules.Where(x => customFindings.Contains(x.Id)).ToListAsync();
+        foreach (var customRule in customRules)
+        {
+            analysisResult.QueryAnalysisResult.Findings.Add(
+                new StaticAnalysisPoint(
+                    StaticRules.Custom,
+                    customRule.Severity,
+                    customRule.Problem,
+                    customRule.Recommendation
+                )
+            );
+        }
+    }
+
     private async Task<SqlLlmAnalysisResult> GetLlmResult(QueryAnalysis query)
     {
         var llmAnswer = await _llm.GetRecommendation(
@@ -196,16 +215,17 @@ private async Task UpdateQueryAnalysisResult(bool useLlm, IReadOnlyCollection<Gu
         }
 
         var newRules = ruleIds?.Except(analysisResult.FindindCustomRules ?? []).ToList();
+        IReadOnlyCollection<Guid> customFindings = [];
         if (newRules?.Count > 0)
         {
-            var newFindings = await _customRulesService.ApplyForQuery(analysisResult.Query, newRules);
+            customFindings = await _customRulesService.ApplyForQuery(analysisResult.Query, newRules);
             if (analysisResult.FindindCustomRules is null)
             {
-                analysisResult.FindindCustomRules = newFindings.ToList();
+                analysisResult.FindindCustomRules = customFindings.ToList();
             }
             else
             {
-                analysisResult.FindindCustomRules.AddRange(newFindings);
+                analysisResult.FindindCustomRules.AddRange(customFindings);
             }
 
             isUpdated = true;
@@ -215,5 +235,7 @@ private async Task UpdateQueryAnalysisResult(bool useLlm, IReadOnlyCollection<Gu
         {
             await _db.SaveChangesAsync();
         }
+        
+        await AddCustomToAnalysisResult(customFindings, analysisResult.Recommendations);
     }
 }

vtb.backend/SqlAnalyzer.Api/SqlAnalyzerLib/SqlStaticAnalysis/Constants/StaticRules.cs

@@ -48,5 +48,6 @@ public enum StaticRules
     ImplicitCastInJoinOrWhere,
     CaseInWhere,
     AggregateOnUnindexed,
-    SelectWithoutFrom
+    SelectWithoutFrom,
+    Custom
 }

vtb.backend/SqlAnalyzer.Api/SqlAnalyzerLib/SqlStaticAnalysis/Models/StaticAnalysisResult.cs

@@ -5,5 +5,5 @@ namespace SqlAnalyzerLib.SqlStaticAnalysis.Models;
 /// </summary>
 public record StaticAnalysisResult(
     string Query,
-    IReadOnlyList<StaticAnalysisPoint> Findings,
+    ICollection<StaticAnalysisPoint> Findings,
     DateTime AnalyzedAt);