Feature/172 fixa export (#520)

* fix: populate diagnostic from precomputed report in generate-report endpoint

* refactor: simplify generate-report to use precomputed report directly

* fix: update request body from result to report

---------

Signed-off-by: Mats Johansson <extern.mats.johansson@digg.se>

Author: mmjohansson

openapi.yaml

@@ -158,13 +158,13 @@ paths:
               schema:
                 type: object
                 required:
-                  - result
+                  - report
                 properties:
-                  result:
+                  report:
                     type: array
                     items:
-                      $ref: '#/components/schemas/RapLPCustomSpectralDiagnosticItem'
-                    description: An array of result items used to generate the Excel report.
+                      $ref: '#/components/schemas/DiagnosticReport'
+                    description: An array of precomputed report items used to generate the Excel report.
         responses:
           '200':
             description: Successful operation
@@ -489,12 +489,12 @@ components:
         id:
           type: string
           example: "UFN.05"
-        omrade:
+        område:
           type: string
           example: "URL Format och namngivning"
       required:
         - id
-        - omrade
+        - område
 
     PopulatedDiagnosticRuleInfo:
       allOf:

src/routes/validate.ts

@@ -61,18 +61,15 @@ export const registerValidationRoutes = (app: Express) => {
       const data = req.body;
       const context = new RuleExecutionContext();
 
-      if (!data || !data.result || !Array.isArray(data.result)) {
-        return res.status(400).json({ error: 'Invalid data format. Expected an object with a "result" array.' });
+      if (!data || !Array.isArray(data.report)) {
+        return res.status(400).json({ error: 'Invalid data format. Expected an object with a "report" array.' });
       }
 
       const reportHandler = new ExcelReportProcessor();
       let buffer: Buffer;
 
-      const ruleCategories = data.categories && data.categories.length > 0 ? data.categories : undefined;
-
-      const enabledRulesAndCategorys = await importAndCreateRuleInstances(ruleCategories);
       const customDiagnostic = new RapLPDiagnostic(context);
-      customDiagnostic.processRuleExecutionInformation(data.result, enabledRulesAndCategorys.rules,enabledRulesAndCategorys.instanceCategoryMap);
+      customDiagnostic.setFromPrecomputedReport(data.report);
       const diagnosticReports: DiagnosticReport[] = customDiagnostic.processDiagnosticInformation();
 
       try {

src/util/RapLPDiagnostic.ts

@@ -99,6 +99,21 @@ class RapLPDiagnostic {
       }
     }
   }
+  setFromPrecomputedReport(reports: { Notering: string; regler: { id: string; område: string; krav?: string; helpUrl?: string; status: string }[] }[]): void {
+    for (const report of reports) {
+      for (const regel of report.regler) {
+        const ruleInfo = { id: regel.id, område: regel.område, krav: regel.krav ?? '', helpUrl: regel.helpUrl };
+        if (regel.status === 'OK') {
+          this._ruleSets.executedUniqueRules.push(ruleInfo);
+        } else if (regel.status === 'EJ OK') {
+          this._ruleSets.executedUniqueRulesWithError.push(ruleInfo);
+        } else {
+          this._ruleSets.notApplicableRules.push(ruleInfo);
+        }
+      }
+    }
+  }
+
   processDiagnosticInformation(): DiagnosticReport[] {
     const allReports: DiagnosticReport[] = [];
     // Populate the diagnostic reports and add them to the array