re-include monitoring and citations service, add processData

Author: hardwarehuman

src/services/citations.ts

@@ -100,7 +100,7 @@ export async function getCitationsByGrantIds(
           'reviewName', dr.review_name,
           'reportDeliveryDate', dr.report_delivery_date,
           'findingType', c.calculated_finding_type,
-          'findingSource', c.source_category,
+          'findingSource', c.calculated_category,
           'monitoringFindingStatusName', c.raw_status,
           'citation', c.citation,
           'severity', CASE

src/services/monitoring.testHelpers.ts

@@ -423,7 +423,7 @@ async function createReportAndCitationData(
       calculated_status: 'Complete',
       raw_finding_type: 'Noncompliance',
       calculated_finding_type: 'Deficiency',
-      source_category: 'source',
+      calculated_category: 'source',
       active: true,
       last_review_delivered: true,
     },

src/services/monitoring.ts

@@ -267,7 +267,7 @@ interface IFactCitationRow {
   calculated_status: string | null;
   raw_finding_type: string | null;
   calculated_finding_type: string | null;
-  source_category: string | null;
+  calculated_category: string | null;
 }
 
 interface IGrantCitationRow {
@@ -364,7 +364,7 @@ interface IFactCitationForReviewRow {
   calculated_status: string | null;
   raw_finding_type: string | null;
   calculated_finding_type: string | null;
-  source_category: string | null;
+  calculated_category: string | null;
   finding_deadline: string | null;
 }
 
@@ -442,7 +442,7 @@ function toGrantCitationRow(
       calculated_status: optionalString(citation.calculated_status),
       raw_finding_type: optionalString(citation.raw_finding_type),
       calculated_finding_type: optionalString(citation.calculated_finding_type),
-      source_category: optionalString(citation.source_category),
+      calculated_category: optionalString(citation.calculated_category),
     },
   };
 }
@@ -572,7 +572,7 @@ function toDeliveredReviewCitationWithCitationRow(
       calculated_status: optionalString(citation.calculated_status),
       raw_finding_type: optionalString(citation.raw_finding_type),
       calculated_finding_type: optionalString(citation.calculated_finding_type),
-      source_category: optionalString(citation.source_category),
+      calculated_category: optionalString(citation.calculated_category),
       finding_deadline: optionalString(citation.finding_deadline),
     },
   };
@@ -607,7 +607,7 @@ async function ttaByCitationsFromFactTables(
           'calculated_status',
           'raw_finding_type',
           'calculated_finding_type',
-          'source_category',
+          'calculated_category',
         ],
       },
     ],
@@ -638,7 +638,7 @@ async function ttaByCitationsFromFactTables(
         citationNumber: citationData.citation,
         status: citationData.calculated_status || citationData.raw_status || '',
         findingType: citationData.calculated_finding_type || '',
-        category: citationData.source_category || '',
+        category: citationData.calculated_category || '',
         grantNumbers: [],
         grantNumbersSeen: new Set<string>(),
         lastTTADateMoment: null,
@@ -904,7 +904,7 @@ async function ttaByReviewsFromFactTables(
           'calculated_status',
           'raw_finding_type',
           'calculated_finding_type',
-          'source_category',
+          'calculated_category',
           'finding_deadline',
         ],
       },
@@ -996,7 +996,7 @@ async function ttaByReviewsFromFactTables(
           correctionDeadline: citation.finding_deadline
             ? moment(citation.finding_deadline, 'YYYY-MM-DD').format('MM/DD/YYYY')
             : '',
-          category: citation.source_category || '',
+          category: citation.calculated_category || '',
           objectives,
         },
       ];

src/services/standardGoalsData.test.js

@@ -167,7 +167,6 @@ describe('standardGoals with Data', () => {
         citation: 'Citation on approved report',
         raw_finding_type: 'Type 1',
         calculated_finding_type: 'Type 1',
-        source_category: 'Source 1',
       });
 
       normalizedCitationOnNonApprovedReport = await Citation.create({
@@ -176,7 +175,6 @@ describe('standardGoals with Data', () => {
         citation: 'Citation on non-approved report',
         raw_finding_type: 'Type 2',
         calculated_finding_type: 'Type 2',
-        source_category: 'Source 2',
       });
 
       await GrantCitation.create({

src/services/ttaByCitation.test.js

@@ -320,7 +320,7 @@ describe('ttaByCitations', () => {
           calculated_status: 'Active',
           raw_finding_type: 'Deficiency',
           calculated_finding_type: 'Deficiency',
-          source_category: 'mismatch-source',
+          calculated_category: 'mismatch-source',
           active: true,
           last_review_delivered: true,
         },

src/services/ttaByReview.test.js

@@ -254,7 +254,7 @@ describe('ttaByReviews', () => {
           raw_finding_type: 'Deficiency',
           // Citation-level calculated type differs from the review-specific value below
           calculated_finding_type: 'Deficiency',
-          source_category: 'crft-source',
+          calculated_category: 'crft-source',
           active: true,
           last_review_delivered: true,
         },
@@ -369,7 +369,7 @@ describe('ttaByReviews', () => {
           calculated_status: 'Active',
           raw_finding_type: 'Deficiency',
           calculated_finding_type: 'Deficiency',
-          source_category: 'mismatch-source',
+          calculated_category: 'mismatch-source',
           active: true,
           last_review_delivered: true,
         },

src/tools/processData.test.js

@@ -487,7 +487,6 @@ describe('processData', () => {
         citation: 'Citation',
         raw_finding_type: 'Deficiency',
         calculated_finding_type: 'Deficiency',
-        source_category: 'Monitoring',
       });
       const citation = await ActivityReportObjectiveCitation.create({
         activityReportObjectiveId: aro.id,

src/widgets/monitoring/monitoringTta.test.js

@@ -109,7 +109,6 @@ describe('monitoringTta', () => {
       raw_finding_type: findingType,
       calculated_finding_type: findingType,
       calculated_category: category,
-      source_category: category,
       active,
       last_review_delivered: true,
     });