@getjones/test-infra 4.5.30 → 4.5.31

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@getjones/test-infra",
-  "version": "4.5.30",
+  "version": "4.5.31",
   "description": "Providing internal and openapi interface",
   "main": "src/index.js",
   "scripts": {

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

@@ -211,7 +211,7 @@ const waitForOcrStatus = async function(recordId, context, { expectedStatus = oc
 
 const waitForAiAnalysisStatus = async (recordId, context, { expectedStatus = ocrStatuses.SUCCESS, isCheckPreviousCoi = false } = {}) => {
 	const timeout = expectedStatus === ocrStatuses.IN_PROGRESS ? 1 : 5;
-	let retries = 20;
+	let retries = 25;
 	let isExpectedStatus = false;
 
 	do {

package/src/common/utils/arrayUtils.js

@@ -1,6 +1,19 @@
 const formatToStringList = input =>
 	Array.isArray(input) ? input.join(',') : input;
 
+const shallowSort = input => {
+	if (!Array.isArray(input)) {
+		return input;
+	}
+
+	return [... input].sort((a, b) => {
+		const aKey = JSON.stringify(a);
+		const bKey = JSON.stringify(b);
+		return aKey < bKey ? -1 : aKey > bKey ? 1 : 0;
+	});
+};
+
 module.exports = {
-	formatToStringList
+	formatToStringList,
+	shallowSort
 };

package/src/common/utils/objectUtils.js

@@ -1,3 +1,6 @@
+const flatten = require('flat');
+const { diff } = require('deep-diff');
+
 const cloneObject = object => {
 	return JSON.parse(JSON.stringify(object));
 };
@@ -27,8 +30,28 @@ const removeNullValuesFromObject = obj => {
 	);
 };
 
+function objectMatchScore(actual, expected) {
+	const actualValue = flatten(actual);
+	const expectedValue = flatten(expected);
+
+	const differences = diff(expectedValue, actualValue) || [];
+
+	const totalKeys = new Set([... Object.keys(expectedValue), ... Object.keys(actualValue)]).size;
+	const score = Math.round(((totalKeys - differences.length) / totalKeys) * 100);
+
+	if (differences.length) {
+		console.log(`${differences.length} mismatches, matching score: ${score}%`);
+		differences.forEach(d =>
+			console.log(`value difference for: ${d.path.join('.')}- expected:`, d.lhs, ', actual:', d.rhs)
+		);
+	}
+
+	return { score, differences };
+}
+
 module.exports = {
 	cloneObject,
 	removeObjectKeys,
-	removeNullValuesFromObject
+	removeNullValuesFromObject,
+	objectMatchScore
 };

package/src/env.js

@@ -7,7 +7,8 @@ let privateMembers = {
 	accountCreationSecret: null,
 	threadSchedulerSecret: null,
 	dbEmailsSecrets: null,
-	crossServiceCommunicationAuthKey: null
+	crossServiceCommunicationAuthKey: null,
+	assertMinMatchScore: null
 };
 
 const init = conf => {

package/src/saas/internal-api/compliance/api/complianceSnapshot/compliance.snapshot.service.js

@@ -43,24 +43,24 @@ const getSnapshotAiReport = async (recordId, context, { expectError } = {}) => {
 	return response;
 };
 
-const waitUntilSnapshotAiAnalysisIsSuccessful = async (recordId, context, { retries = 15 } = {}) => {
+const waitForSnapshotAiAnalysisStatus = async (recordId, context, { expectedStatus = aiAnalysisStatuses.SUCCESS, retries = 15 } = {}) => {
 	let { data: aiAnalysisStatus } = await getSnapshotAiAnalysisStatus(recordId, context);
 
-	while (aiAnalysisStatus !== aiAnalysisStatuses.SUCCESS && retries > 0) {
+	while (aiAnalysisStatus !== expectedStatus && retries > 0) {
 		await timeUtils.waitFor(5).seconds;
-		console.log(`Waiting for snapshot ai analysis to be successful, retries left: ${retries}`);
+		console.log(`Waiting for snapshot ai analysis to be ${expectedStatus}, retries left: ${retries}`);
 		const aiAnalysisStatusResponse = await getSnapshotAiAnalysisStatus(recordId, context);
 		aiAnalysisStatus = aiAnalysisStatusResponse.data;
 
 		if (aiAnalysisStatus === aiAnalysisStatuses.UNKNOWN || aiAnalysisStatus === aiAnalysisStatuses.FAILED) {
-			throw new Error(`Snapshot ai analysis is not successful: status is ${aiAnalysisStatus}`);
+			throw new Error(`actual status is ${aiAnalysisStatus}, expected to be ${expectedStatus}`);
 		}
 
 		retries--;
 	}
 
-	if (aiAnalysisStatus !== aiAnalysisStatuses.SUCCESS) {
-		throw new Error(`Snapshot ai analysis is not completed successfully after all retries: status is ${aiAnalysisStatus}`);
+	if (aiAnalysisStatus !== expectedStatus) {
+		throw new Error(`actual status is ${aiAnalysisStatus}, expected to be ${expectedStatus}`);
 	}
 };
 
@@ -69,5 +69,5 @@ module.exports = {
 	initiateSnapshotAiAnalysis,
 	getSnapshotAiAnalysisStatus,
 	getSnapshotAiReport,
-	waitUntilSnapshotAiAnalysisIsSuccessful
+	waitForSnapshotAiAnalysisStatus
 };