update flattenOneTrustAssessment type

transcend-io · Jan 12, 2025 · ee8b072 · ee8b072
1 parent e104337
commit ee8b072
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 19 deletions.
diff --git a/src/oneTrust/codecs.ts b/src/oneTrust/codecs.ts
@@ -1075,4 +1075,16 @@ export type OneTrustEnrichedAssessmentResponseCodec = t.TypeOf<
   typeof OneTrustEnrichedAssessmentResponseCodec
 >;
 
+// TODO: do not add to privacy-types
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
+const { status, ...OneTrustAssessmentCodecWithoutStatus } =
+  OneTrustAssessmentCodec.props;
+export const CombinedAssessmentCodec = t.intersection([
+  t.type(OneTrustAssessmentCodecWithoutStatus),
+  OneTrustEnrichedAssessmentResponseCodec,
+]);
+
+/** Type override */
+export type CombinedAssessmentCodec = t.TypeOf<typeof CombinedAssessmentCodec>;
+
 /* eslint-enable max-lines */
diff --git a/src/oneTrust/flattenOneTrustAssessment.ts b/src/oneTrust/flattenOneTrustAssessment.ts
@@ -6,13 +6,12 @@ import {
   extractProperties,
 } from '../helpers';
 import {
-  OneTrustAssessmentCodec,
+  CombinedAssessmentCodec,
   OneTrustAssessmentNestedQuestionCodec,
   OneTrustAssessmentQuestionOptionCodec,
   OneTrustAssessmentQuestionResponseCodec,
   OneTrustAssessmentSectionHeaderCodec,
   OneTrustEnrichedAssessmentQuestionCodec,
-  OneTrustEnrichedAssessmentResponseCodec,
   OneTrustEnrichedAssessmentSectionCodec,
   OneTrustEnrichedRiskCodec,
   OneTrustRiskCategories,
@@ -237,15 +236,9 @@ const flattenOneTrustSections = (
   return { ...sectionsFlat, ...headersFlat, ...questionsFlat };
 };
 
-export const flattenOneTrustAssessment = ({
-  assessment,
-  assessmentDetails,
-}: {
-  /** the assessment */
-  assessment: OneTrustAssessmentCodec;
-  /** the assessment with details and enriched with risk */
-  assessmentDetails: OneTrustEnrichedAssessmentResponseCodec;
-}): any => {
+export const flattenOneTrustAssessment = (
+  combinedAssessment: CombinedAssessmentCodec,
+): any => {
   /**
    * TODO: experiment creating a default assessment with
    *     const result = createDefaultCodec(OneTrustGetAssessmentResponseCodec);
@@ -255,15 +248,14 @@ export const flattenOneTrustAssessment = ({
 
   // add default values to assessments
   const transformedAssessmentDetails = {
-    ...assessmentDetails,
+    ...combinedAssessment,
     primaryEntityDetails: enrichPrimaryEntityDetailsWithDefault(
-      assessmentDetails.primaryEntityDetails,
+      combinedAssessment.primaryEntityDetails,
     ),
-    sections: enrichSectionsWithDefault(assessmentDetails.sections),
+    sections: enrichSectionsWithDefault(combinedAssessment.sections),
   };
 
   const {
-    // TODO: handle these
     approvers,
     primaryEntityDetails,
     respondents,
@@ -273,7 +265,6 @@ export const flattenOneTrustAssessment = ({
     ...rest
   } = transformedAssessmentDetails;
 
-  // console.log({ approvers: flattenApprovers(approvers) });
   const flatApprovers = approvers.map((approver) =>
     flattenObject(approver, 'approvers'),
   );
@@ -286,7 +277,6 @@ export const flattenOneTrustAssessment = ({
   );
 
   return {
-    ...flattenObject(assessment),
     ...flattenObject(rest),
     ...aggregateObjects({ objs: flatApprovers }),
     ...aggregateObjects({ objs: flatRespondents }),

diff --git a/src/oneTrust/writeOneTrustAssessment.ts b/src/oneTrust/writeOneTrustAssessment.ts
@@ -115,8 +115,8 @@ export const writeOneTrustAssessment = ({
     }
 
     const flattened = flattenOneTrustAssessment({
-      assessment,
-      assessmentDetails: enrichedAssessment,
+      ...assessment,
+      ...enrichedAssessment,
     });
     const stringifiedFlattened = JSON.stringify(flattened, null, 2);
     // TODO: do not forget to ensure we have the same set of keys!!!