@getjones/test-infra 4.5.28 → 4.5.29

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@getjones/test-infra",
-  "version": "4.5.28",
+  "version": "4.5.29",
   "description": "Providing internal and openapi interface",
   "main": "src/index.js",
   "scripts": {
@@ -10,25 +10,25 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "axios": "^1.8.1",
-    "axios-file": "^1.0.17",
-    "chai": "^4.3.4",
+    "axios": "1.8.1",
+    "axios-file": "1.0.17",
+    "chai": "4.3.4",
     "dotenv": "16.5.0",
-    "enum": "^3.0.4",
-    "form-data": "^4.0.0",
-    "mocha": "^8.3.2"
+    "enum": "3.0.4",
+    "form-data": "4.0.0",
+    "mocha": "8.3.2"
   },
   "devDependencies": {
-    "@babel/core": "^7.26.9",
-    "@babel/eslint-parser": "^7.26.8",
-    "@babel/preset-env": "^7.26.9",
-    "@eslint/compat": "^1.2.7",
-    "@eslint/eslintrc": "^3.3.0",
-    "@eslint/js": "^9.21.0",
-    "eslint": "^9.21.0",
-    "eslint-plugin-import": "^2.31.0",
-    "globals": "^16.0.0",
-    "mocha-spec-json-output-reporter": "^1.1.7"
+    "@babel/core": "7.26.9",
+    "@babel/eslint-parser": "7.26.8",
+    "@babel/preset-env": "7.26.9",
+    "@eslint/compat": "1.2.7",
+    "@eslint/eslintrc": "3.3.0",
+    "@eslint/js": "9.21.0",
+    "eslint": "9.21.0",
+    "eslint-plugin-import": "2.31.0",
+    "globals": "16.0.0",
+    "mocha-spec-json-output-reporter": "1.1.7"
   },
   "directories": {
     "test": "tests"

package/src/common/commonFlows/records/records.js

@@ -209,20 +209,44 @@ const waitForOcrStatus = async function(recordId, context, { expectedStatus = oc
 	}
 };
 
-const waitForAiAnalysisStatus = async (recordId, context, { expectedStatus = ocrStatuses.SUCCESS } = {}) => {
+const waitForAiAnalysisStatus = async (recordId, context, { expectedStatus = ocrStatuses.SUCCESS, isCheckPreviousCoi = false } = {}) => {
 	const timeout = expectedStatus === ocrStatuses.IN_PROGRESS ? 1 : 5;
-	let retries = 15;
-	let aiAnalysisResponse;
-	let isExpectedStatus;
+	let retries = 20;
+	let isExpectedStatus = false;
 
 	do {
 		await timeUtils.waitFor(timeout).seconds;
-		aiAnalysisResponse = await aiAuditApi.getAiAnalysisStatus(recordId, context);
-		isExpectedStatus = aiAnalysisResponse.status === httpResponseStatusCodes.OK && aiAnalysisResponse.data.status === expectedStatus;
-	} while (!isExpectedStatus && retries--);
+		const aiAnalysisResponse = await aiAuditApi.getAiAnalysisStatus(recordId, context);
+		const { status: httpStatus, data } = aiAnalysisResponse;
+
+		const isNotFoundStatus = httpStatus === httpResponseStatusCodes.NOT_FOUND;
+		const isExpectingNoAnalysis = expectedStatus === ocrStatuses.UNKNOWN;
+
+		if (isNotFoundStatus) {
+			const hasExpectedMessage = data.message?.includes('COI AI analysis status not found for record ID');
+
+			if (isExpectingNoAnalysis && hasExpectedMessage) {
+				isExpectedStatus = true;
+				break;
+			}
+		} else {
+			if (isExpectingNoAnalysis) {
+				break;
+			}
+
+			const [latestAnalysis, previousAnalysis] = data;
+			const isLatestMatch = latestAnalysis?.status === expectedStatus;
+			const isPreviousMatch = isCheckPreviousCoi ? previousAnalysis?.status === expectedStatus : true;
+
+			if (isLatestMatch && isPreviousMatch) {
+				isExpectedStatus = true;
+				break;
+			}
+		}
+	} while (--retries);
 
 	if (!isExpectedStatus) {
-		throw new Error(`Record Ai Analysis status not is as expected. Expected: ${expectedStatus}, Actual: ${aiAnalysisResponse?.data?.status}`);
+		throw new Error(`AI analysis status not as expected. Expected: ${expectedStatus}`);
 	}
 };
 

package/src/saas/internal-api/coi/api/coi.api.js

@@ -11,6 +11,7 @@ const Endpoints = {
 	getCoiPresignedUrl: fileName => `${backendUrl}/saas/coi/${fileName}`,
 	getCoiPresignedUrlBeforeMerge: fileId => `${backendUrl}/saas/coi-file-before-merge/presigned-url/${fileId}`,
 	getCoiHashes: recordId => `${backendUrl}/jcsc/record/${recordId}/coi/hashes`,
+	getCombinedCoiByRecordId: recordId => `${backendUrl}/saas/record/${recordId}/coi/combined-coi-mapping`,
 	combineLastTwoCOIs: `${backendUrl}/saas/auditor/record/coi/merge-last-two`
 };
 
@@ -43,6 +44,10 @@ const getCoiHashes = recordId => {
 	return internalRequests.getRequestHandler(Endpoints.getCoiHashes(recordId));
 };
 
+const getCombinedCoiByRecordId = (recordId, context) => {
+	return requests.getRequestHandler(Endpoints.getCombinedCoiByRecordId(recordId), {}, context);
+};
+
 const combineLastTwoCOIs = (combineLastTwoCOIsModel, context) => {
 	return requests.postRequestHandler(Endpoints.combineLastTwoCOIs, combineLastTwoCOIsModel, context);
 };
@@ -54,5 +59,6 @@ module.exports = {
 	getCoiPreSignedUrl,
 	getCoiPresignedUrlBeforeMerge,
 	getCoiHashes,
+	getCombinedCoiByRecordId,
 	combineLastTwoCOIs
 };

package/src/saas/internal-api/coi/api/coi.service.js

@@ -50,6 +50,10 @@ const combineLastTwoCOIs = async (combineLastTwoCOIsModel, auditorContext) => {
 	return response;
 };
 
+const getCombinedCoiByRecordId = (recordId, context) => {
+	return coiApi.getCombinedCoiByRecordId(recordId, context);
+};
+
 module.exports = {
 	uploadToS3,
 	submitCoi,
@@ -57,5 +61,6 @@ module.exports = {
 	getCoiPresignedUrlBeforeMerge,
 	completeScan,
 	getCoiHashes,
-	combineLastTwoCOIs
+	combineLastTwoCOIs,
+	getCombinedCoiByRecordId
 };

package/src/saas/internal-api/coi/utils/utils.js

@@ -92,7 +92,8 @@ const combineLastTwoCOIs = async ({
 	uploaderEmail,
 	isContractorExist,
 	icsContext,
-	auditorContext
+	auditorContext,
+	isNewCoiOnTop
 }) => {
 	const recordResponse = await getContractorById(recordId, icsContext);
 	const recordDateModified = recordResponse.data.dateModified;
@@ -103,7 +104,8 @@ const combineLastTwoCOIs = async ({
 		uploadedBy,
 		uploaderEmail,
 		recordDateModified,
-		isContractorExist
+		isContractorExist,
+		isNewCoiOnTop
 	});
 	return services.combineLastTwoCOIs(combineLastTwoCOIsModel, auditorContext);
 };

package/src/saas/internal-api/outlook/api/outlook.api.js

@@ -2,13 +2,13 @@ const requests = require('../../../../common/requests/cookieAuth/requests');
 const { backendUrl } = require('../../../../env').getEnv();
 
 const Endpoints = {
-	getRecordReportByRecordIdBase64: base64RecordId => `${backendUrl}/secured/outlook/record/${base64RecordId}/compliance-report`
+	getRequestIdByRecordIdBase64: base64RecordId => `${backendUrl}/secured/outlook/record/${base64RecordId}/compliance-report`
 };
 
-const getRecordReportByRecordIdBase64 = async (base64RecordId, context) => {
-	return requests.getRequestHandler(Endpoints.getRecordReportByRecordIdBase64(base64RecordId), {}, context);
+const getRequestIdByRecordIdBase64 = async (base64RecordId, context) => {
+	return requests.getRequestHandler(Endpoints.getRequestIdByRecordIdBase64(base64RecordId), {}, context);
 };
 
 module.exports = {
-	getRecordReportByRecordIdBase64
+	getRequestIdByRecordIdBase64
 };

package/src/saas/internal-api/outlook/api/outlook.service.js

@@ -1,7 +1,7 @@
 const vendorProfileApi = require('./outlook.api');
 
-const getRecordReportByRecordIdBase64 = async (base64RecordId, context) => {
-	return vendorProfileApi.getRecordReportByRecordIdBase64(base64RecordId, context);
+const getRequestIdByRecordIdBase64 = async (base64RecordId, context) => {
+	return vendorProfileApi.getRequestIdByRecordIdBase64(base64RecordId, context);
 };
 
 const generateRecordIdBase64 = recordId => {
@@ -9,6 +9,6 @@ const generateRecordIdBase64 = recordId => {
 };
 
 module.exports = {
-	getRecordReportByRecordIdBase64,
+	getRequestIdByRecordIdBase64,
 	generateRecordIdBase64
 };

package/src/saas/internal-api/requests/models/draft.request.report.model.js

@@ -1,5 +1,5 @@
 class DraftRequestReportModel {
-	constructor(requestId, { emailAddress, selectedRequirementsId, additionalEmails = [], recordDateModified, overrideDateModified } = {}) {
+	constructor(requestId, { emailAddress = '', selectedRequirementsId, additionalEmails = [], recordDateModified, overrideDateModified } = {}) {
 		this.requestId = requestId;
 		this.emailAddress = emailAddress;
 		this.selectedRequirementsId = selectedRequirementsId;