@getjones/test-infra 4.5.4 → 4.5.5

package/package.json

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

package/src/saas/internal-api/compliance/api/overrideGap/override.gap.service.js

@@ -40,7 +40,7 @@ const getAllWaiveModels = (
 		userRole,
 		auditId
 	} = {}) => {
-	const auditIds = [auditId] || getPolicyAuditIdsFromRecord(record, policyName, auditUtil.getAttributeKey(attributeName));
+	const auditIds = auditId ? [auditId] : getPolicyAuditIdsFromRecord(record, policyName, auditUtil.getAttributeKey(attributeName));
 	userId = userId || env.getSystemUserIdentity(credentials.superUser).id;
 	userRole = userRole || userTypes.ICS;
 
@@ -77,6 +77,7 @@ const getWaiveModel = (
 	return getAllWaiveModels(record, policyName, attributeName, waiverReason, remarks, { userId, userRole, auditId })[0];
 };
 
+// used by automation. has to return a single model
 const getWaiveModelByGap = (
 	record,
 	policyName,
@@ -87,25 +88,27 @@ const getWaiveModelByGap = (
 		userId,
 		userRole
 	} = {}) => {
-	const attributeName = auditUtil.getAttributeNameByGap(record, policyName, gap);
-	const auditorContractorId = auditUtil.getAuditorContractorIdByGap(record, policyName, gap);
+	const { attributeName, auditId } = auditUtil.getAttributeNameAndAuditIdByGap(record, policyName, gap);
 
-	return getWaiveModel(record, policyName, attributeName, reason, note, { userId, userRole, auditId: auditorContractorId });
+	return getWaiveModel(record, policyName, attributeName, reason, note, { userId, userRole, auditId });
 };
 
-const getRetractModel = (record, policyName, attributeName) => {
-	const auditId = getPolicyAuditIdsFromRecord(record, policyName, auditUtil.getAttributeKey(attributeName))[0];
+const getRetractModel = (record, policyName, attributeName, { isAttributeMultipleComments } = {}) => {
+	const auditIds = getPolicyAuditIdsFromRecord(record, policyName, auditUtil.getAttributeKey(attributeName));
 	const userId = env.getSystemUserIdentity(credentials.superUser).id;
 	const userRole = userTypes.ICS;
 
-	const retractModel = new RetractRequestModel({
-		contractorId: record.id,
-		auditId,
-		userId,
-		userRole
-	});
-
-	return retractModel;
+	const retractModels = [];
+	for (const auditId of auditIds) {
+		const model = new RetractRequestModel({
+			contractorId: record.id,
+			auditId,
+			userId,
+			userRole
+		});
+		retractModels.push(model);
+	}
+	return isAttributeMultipleComments ? retractModels : retractModels[0];
 };
 
 const getPolicyAuditIdsFromRecord = (record, policyName, attributeName) => {

package/src/saas/internal-api/compliance/utils/auditUtil.js

@@ -26,7 +26,7 @@ const getWaiveReason = reason => {
 	return waiveReasons[reason] || reason;
 };
 
-const getAttributeNameByGap = function(record, policyName, gap) {
+const getAttributeNameAndAuditIdByGap = function(record, policyName, gap) {
 	const policy = record.reviewbyAuditor.find(contractorCoverage =>
 		contractorCoverage.insuranceName === policyName);
 
@@ -40,24 +40,7 @@ const getAttributeNameByGap = function(record, policyName, gap) {
 		throw new Error(`Gap ${gap} don't exist in record`);
 	}
 
-	return attribute.limitname;
-};
-
-const getAuditorContractorIdByGap = function(record, policyName, gap) {
-	const policy = record.reviewbyAuditor.find(contractorCoverage =>
-		contractorCoverage.insuranceName === policyName);
-
-	if (!policy) {
-		throw new Error(`Policy name ${policyName} don't exist in record`);
-	}
-
-	const attribute = policy.errorList.find(error => error.errorHeadline === gap);
-
-	if (!attribute) {
-		throw new Error(`Gap ${gap} don't exist in record`);
-	}
-
-	return attribute.auditId;
+	return { attributeName: attribute.limitName, auditId: attribute.auditId };
 };
 
 const getAllWaivablePolicies = function(record) {
@@ -230,10 +213,9 @@ module.exports = {
 	getPolicyId,
 	createAuditEntity,
 	getAttributeKey,
-	getAttributeNameByGap,
+	getAttributeNameAndAuditIdByGap,
 	getWaiveReason,
-	getAllWaivablePolicies,
-	getAuditorContractorIdByGap
+	getAllWaivablePolicies
 };
 
 const certificateEndorsementsList = [