Merge pull request #287 from GovStackWorkingGroup/feature/TECH-1124

TECH-1124: changed compliance details aggeration pipeline to show eac…

Author: lruzicki

backend/@types/index.d.ts

@@ -11,7 +11,7 @@ declare module 'myTypes' {
     REJECTED = 3
   }
 
-  export enum SpecificationComplianceLevel {
+  export const enum SpecificationComplianceLevel {
     NA = -1,
     LEVEL_1 = 1,
     LEVEL_2 = 2
@@ -179,7 +179,7 @@ declare module 'myTypes' {
     getAllSoftwares: () => Promise<ComplianceListFilter[]>;
     getAllBBs: () => Promise<ComplianceListFilter[]>;
     aggregateComplianceReports: (limit: number, offset: number, filters: ComplianceListFilters, isAuthenticated: Boolean) => Promise<ComplianceAggregationListResult>;
-    getSoftwareComplianceDetail: (softwareName: string) => Promise<SofwareDetailsResults>;
+    getSoftwareComplianceDetail: (softwareName: string, isAuthenticated: Boolean) => Promise<SofwareDetailsResults>;
     getFormDetail: (formId: string) => Promise<FormDetailsResults>;
     getDraftDetail: (draftUuid: string) => Promise<FormDetailsResults>;
     createOrSubmitForm: (draftData: Partial<ComplianceReport>) => Promise<string>;

backend/src/controllers/complianceController.ts

@@ -36,10 +36,10 @@ const complianceController = (
       .catch((err: any) => default500Error(res, err));
   }
 
-  const getSoftwareComplianceDetail = (req: Request, res: Response): void => {
+  const getSoftwareComplianceDetail = (req: AuthenticatedRequest, res: Response): void => {
     const softwareName = req.params.softwareName;
-
-    new GetSoftwareComplianceDetailRequestHandler(req, res, repository, softwareName)
+    const isAuthenticated = Boolean(req.user);
+    new GetSoftwareComplianceDetailRequestHandler(req, res, repository, softwareName, isAuthenticated)
       .getSoftwareComplianceDetail()
       .catch((err: any) => default500Error(res, err));
   };

backend/src/controllers/testFetchReqWithDesc.ts

@@ -0,0 +1,36 @@
+import { Request, Response } from 'express';
+import GitBookPageContentManager from '../services/gitBookService/PageContentManager';
+import BBRequirements from '../db/schemas/bbRequirements';
+import { processBBRequirements } from '../services/gitBookService/bbRequirementsProcessing';
+
+// Initialize GitBookPageContentManager instance
+const gitBookPageContentManager = new GitBookPageContentManager();
+
+// Function to fetch requirements and transform them
+async function fetchRequirements() {
+    const requirements = await BBRequirements.find().lean();
+
+    return requirements.map(bb => ({
+        bbName: bb.bbName,
+        requirements: {
+            crossCutting: (bb.requirements?.crossCutting ?? []).map((req: any) => req.requirement),
+            functional: (bb.requirements?.functional ?? []).map((req: any) => req.requirement),
+            interface: (bb.requirements?.interface ?? []).map((req: any) => req.requirement),
+            keyDigitalFunctionalities: (bb.requirements?.keyDigitalFunctionalities ?? []).map((req: any) => req.requirement),
+        }
+    }));
+}
+
+// Controller function
+export const testFetchReqWithDesc = async (_: Request, res: Response) => {
+    try {
+        const result = await processBBRequirements();
+
+        const requirements = await fetchRequirements();
+
+        res.status(200).json({ requirements: result, massage: result, good: "we good" });
+    } catch (error) {
+        console.error('Error processing requirements:', error);
+        res.status(500).json({ error: 'Failed to process requirements' });
+    }
+};

backend/src/db/pipelines/compliance/formDetailAggregation.ts

@@ -1,4 +1,5 @@
 import mongoose from "mongoose";
+import { SpecificationComplianceLevel } from "myTypes";
 
 export const formDetailAggregationPipeline = ({ formId, draftUuid }: {
   formId?: string,
@@ -21,6 +22,7 @@ export const formDetailAggregationPipeline = ({ formId, draftUuid }: {
     },
     {
       $project: {
+        originalId: "$_id",
         bbDetails: {
           $arrayToObject: {
             $map: {
@@ -30,20 +32,30 @@ export const formDetailAggregationPipeline = ({ formId, draftUuid }: {
                 "$$bbDetail.k",
                 {
                   interfaceCompliance: {
+                    level: { $ifNull: ["$$bbDetail.v.interfaceCompliance.level", SpecificationComplianceLevel.NA] },
+                    notes: { $ifNull: ["$$bbDetail.v.interfaceCompliance.notes", ""] },
                     testHarnessResult: "$$bbDetail.v.interfaceCompliance.testHarnessResult",
                     requirements: "$$bbDetail.v.interfaceCompliance.requirements"
                   },
                   requirementSpecificationCompliance: {
+                    level: { $ifNull: ["$$bbDetail.v.requirementSpecificationCompliance.level", SpecificationComplianceLevel.NA] },
+                    notes: { $ifNull: ["$$bbDetail.v.requirementSpecificationCompliance.notes", ""] },
                     crossCuttingRequirements: "$$bbDetail.v.requirementSpecificationCompliance.crossCuttingRequirements",
                     functionalRequirements: "$$bbDetail.v.requirementSpecificationCompliance.functionalRequirements",
-                    keyDigitalFunctionalitiesRequirements: "$$bbDetail.v.requirementSpecificationCompliance.keyDigitalFunctionalitiesRequirements",
+                    keyDigitalFunctionalitiesRequirements: "$$bbDetail.v.requirementSpecificationCompliance.keyDigitalFunctionalitiesRequirements"
+                  },
+                  deploymentCompliance: {
+                    level: { $ifNull: ["$$bbDetail.v.deploymentCompliance.level", SpecificationComplianceLevel.NA] },
+                    notes: { $ifNull: ["$$bbDetail.v.deploymentCompliance.notes", ""] }
                   }
                 }
               ]
             }
           }
         },
         deploymentCompliance: {
+          level: { $ifNull: ["$deploymentCompliance.level", SpecificationComplianceLevel.NA] },
+          notes: { $ifNull: ["$deploymentCompliance.notes", ""] },
           documentation: "$deploymentCompliance.documentation",
           deploymentInstructions: "$deploymentCompliance.deploymentInstructions"
         }
@@ -56,7 +68,8 @@ export const formDetailAggregationPipeline = ({ formId, draftUuid }: {
           $push: {
             version: "$version",
             bbDetails: "$bbDetails",
-            deploymentCompliance: "$deploymentCompliance"
+            deploymentCompliance: "$deploymentCompliance",
+            id: "$originalId"
           }
         }
       }