fix bugs and import codecs from privacy-types

transcend-io · Jan 22, 2025 · b60400d · b60400d
1 parent 0c7030f
commit b60400d
Show file tree

Hide file tree

Showing 9 changed files with 26 additions and 39 deletions.
diff --git a/src/oneTrust/helpers/constants.ts b/src/oneTrust/helpers/constants.ts
@@ -1,6 +1,6 @@
 import { createDefaultCodec } from '@transcend-io/type-utils';
-import { OneTrustEnrichedAssessment } from '../codecs';
 import { flattenOneTrustAssessment } from './flattenOneTrustAssessment';
+import { OneTrustEnrichedAssessment } from '@transcend-io/privacy-types';
 
 /**
  * An object with default values of type OneTrustEnrichedAssessment. It's very

diff --git a/src/oneTrust/helpers/enrichOneTrustAssessment.ts b/src/oneTrust/helpers/enrichOneTrustAssessment.ts
@@ -44,15 +44,7 @@ export const enrichOneTrustAssessment = ({
         const details = riskDetailsById[risk.riskId];
         return {
           ...risk,
-          description: details.description,
-          name: details.name,
-          treatment: details.treatment,
-          treatmentStatus: details.treatmentStatus,
-          type: details.type,
-          state: details.state,
-          stage: details.stage,
-          result: details.result,
-          categories: details.categories,
+          ...details,
         };
       });
       return {
@@ -98,17 +90,17 @@ export const enrichOneTrustAssessment = ({
 
   // grab respondents details
   const respondentsDetailsById = keyBy(respondentsDetails, 'id');
-  const enrichedRespondents = assessmentDetails.respondents.map(
-    (respondent) => ({
+  const enrichedRespondents = assessmentDetails.respondents
+    .filter((r) => !r.name.includes('@')) // search only internal respondents
+    .map((respondent) => ({
       ...respondent,
       active: respondentsDetailsById[respondent.id].active,
       userType: respondentsDetailsById[respondent.id].userType,
       emails: respondentsDetailsById[respondent.id].emails,
       title: respondentsDetailsById[respondent.id].title,
       givenName: respondentsDetailsById[respondent.id].name.givenName ?? null,
       familyName: respondentsDetailsById[respondent.id].name.familyName ?? null,
-    }),
-  );
+    }));
 
   // combine everything into a single enriched assessment
   return {

diff --git a/src/oneTrust/helpers/flattenOneTrustAssessment.ts b/src/oneTrust/helpers/flattenOneTrustAssessment.ts
@@ -7,14 +7,13 @@ import {
   OneTrustAssessmentResponses,
   OneTrustAssessmentSectionHeader,
   OneTrustAssessmentSectionHeaderRiskStatistics,
-  OneTrustRiskCategories,
-} from '@transcend-io/privacy-types';
-import {
   OneTrustEnrichedAssessment,
   OneTrustEnrichedAssessmentQuestion,
   OneTrustEnrichedAssessmentSection,
   OneTrustEnrichedRisk,
-} from '../codecs';
+  OneTrustRiskCategories,
+} from '@transcend-io/privacy-types';
+
 import {
   flattenObject,
   aggregateObjects,

diff --git a/src/oneTrust/helpers/oneTrustAssessmentToCsv.ts b/src/oneTrust/helpers/oneTrustAssessmentToCsv.ts
@@ -1,4 +1,4 @@
-import { OneTrustEnrichedAssessment } from '../codecs';
+import { OneTrustEnrichedAssessment } from '@transcend-io/privacy-types';
 import { oneTrustAssessmentToCsvRecord } from './oneTrustAssessmentToCsvRecord';
 
 /**

diff --git a/src/oneTrust/helpers/oneTrustAssessmentToCsvRecord.ts b/src/oneTrust/helpers/oneTrustAssessmentToCsvRecord.ts
@@ -1,8 +1,10 @@
 import { decodeCodec } from '@transcend-io/type-utils';
-import { OneTrustEnrichedAssessment } from '../codecs';
 import { DEFAULT_ONE_TRUST_ASSESSMENT_CSV_HEADER } from './constants';
 import { flattenOneTrustAssessment } from './flattenOneTrustAssessment';
-import { OneTrustAssessmentCsvRecord } from '@transcend-io/privacy-types';
+import {
+  OneTrustAssessmentCsvRecord,
+  OneTrustEnrichedAssessment,
+} from '@transcend-io/privacy-types';
 
 /**
  * Converts the assessment into a csv record (i.e. a map from the csv header

diff --git a/src/oneTrust/helpers/oneTrustAssessmentToJson.ts b/src/oneTrust/helpers/oneTrustAssessmentToJson.ts
@@ -1,4 +1,4 @@
-import { OneTrustEnrichedAssessment } from '../codecs';
+import { OneTrustEnrichedAssessment } from '@transcend-io/privacy-types';
 
 /**
  * Converts the assessment into a json entry.

diff --git a/src/oneTrust/helpers/syncOneTrustAssessmentToDisk.ts b/src/oneTrust/helpers/syncOneTrustAssessmentToDisk.ts
@@ -2,9 +2,9 @@ import { logger } from '../../logger';
 import colors from 'colors';
 import { OneTrustFileFormat } from '../../enums';
 import fs from 'fs';
-import { OneTrustEnrichedAssessment } from '../codecs';
 import { oneTrustAssessmentToJson } from './oneTrustAssessmentToJson';
 import { oneTrustAssessmentToCsv } from './oneTrustAssessmentToCsv';
+import { OneTrustEnrichedAssessment } from '@transcend-io/privacy-types';
 
 /**
  * Write the assessment to disk at the specified file path.

diff --git a/src/oneTrust/helpers/syncOneTrustAssessmentToTranscend.ts b/src/oneTrust/helpers/syncOneTrustAssessmentToTranscend.ts
@@ -6,7 +6,7 @@ import {
   makeGraphQLRequest,
 } from '../../graphql';
 import { ImportOnetrustAssessmentsInput } from '../../codecs';
-import { OneTrustEnrichedAssessment } from '../codecs';
+import { OneTrustEnrichedAssessment } from '@transcend-io/privacy-types';
 
 export interface AssessmentForm {
   /** ID of Assessment Form */

diff --git a/src/oneTrust/helpers/syncOneTrustAssessments.ts b/src/oneTrust/helpers/syncOneTrustAssessments.ts
@@ -58,9 +58,7 @@ export const syncOneTrustAssessments = async ({
    */
   await mapSeries(assessments, async (assessment, index) => {
     logger.info(
-      `Fetching details about assessment ${index + 1} of ${
-        assessments.length
-      }...`,
+      `[assessment ${index + 1} of ${assessments.length}]: fetching details...`,
     );
     const assessmentDetails = await getOneTrustAssessment({
       oneTrust,
@@ -72,9 +70,9 @@ export const syncOneTrustAssessments = async ({
     let creator = oneTrustCachedUsers[creatorId];
     if (!creator) {
       logger.info(
-        `Fetching details about assessment ${index + 1} of ${
+        `[assessment ${index + 1} of ${
           assessments.length
-        } creator...`,
+        }]: fetching creator...`,
       );
       creator = await getOneTrustUser({
         oneTrust,
@@ -88,9 +86,9 @@ export const syncOneTrustAssessments = async ({
     let approversDetails: OneTrustGetUserResponse[] = [];
     if (approvers.length > 0) {
       logger.info(
-        `Fetching details about ${approvers.length} approvers for assessment ${
-          index + 1
-        } of ${assessments.length}...`,
+        `[assessment ${index + 1} of ${
+          assessments.length
+        }]: fetching approvers...`,
       );
       approversDetails = await map(
         approvers.map(({ id }) => id),
@@ -115,11 +113,9 @@ export const syncOneTrustAssessments = async ({
     let respondentsDetails: OneTrustGetUserResponse[] = [];
     if (internalRespondents.length > 0) {
       logger.info(
-        `Fetching details about ${
-          internalRespondents.length
-        } internal responds for assessment ${index + 1} of ${
+        `[assessment ${index + 1} of ${
           assessments.length
-        }...`,
+        }]: fetching respondents...`,
       );
       respondentsDetails = await map(
         internalRespondents.map(({ id }) => id),
@@ -146,9 +142,7 @@ export const syncOneTrustAssessments = async ({
     );
     if (riskIds.length > 0) {
       logger.info(
-        `Fetching details about ${riskIds.length} risks for assessment ${
-          index + 1
-        } of ${assessments.length}...`,
+        `[assessment ${index + 1} of ${assessments.length}]: fetching risks...`,
       );
       riskDetails = await map(
         riskIds,