@getjones/test-infra 4.4.10 → 4.4.11

package/package.json

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

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

@@ -131,7 +131,7 @@ const getLatestHistoryEventId = async function(recordId, context) {
 	return recordHistory.data[0].itemId;
 };
 
-const getLatestRecordHistoryEventIdByItemTitle = async function(recordId, itemTitle, context) {
+const getLatestRecordHistoryEventByItemTitle = async function(recordId, itemTitle, context) {
 	const recordHistory = await contractors.services.getRecordHistory(recordId, context);
 	expect(recordHistory.status, 'Expected record history response status to equal 200.').to.equal(httpResponseStatusCodes.OK);
 
@@ -141,9 +141,21 @@ const getLatestRecordHistoryEventIdByItemTitle = async function(recordId, itemTi
 		throw new Error(`History event with title ${itemTitle} not found`);
 	}
 
+	return latestHistoryByTitle;
+};
+
+const getLatestRecordHistoryEventIdByItemTitle = async function(recordId, itemTitle, context) {
+	const latestHistoryByTitle = await getLatestRecordHistoryEventByItemTitle(recordId, itemTitle, context);
+
 	return latestHistoryByTitle.itemId;
 };
 
+const getRecordHistoryItemById = async (recordId, itemId, context) => {
+	const recordHistory = await contractors.services.getRecordHistory(recordId, context);
+
+	return recordHistory.data.find(item => item.itemId === itemId);
+};
+
 const waitForOcrStatus = async function(recordId, context, { expectedStatus = ocrStatuses.SUCCESS } = {}) {
 	let { data: recordOcrStatus } = await contractors.services.getRecordOcrStatus(recordId, context);
 	let maxRetries = 25;
@@ -178,6 +190,23 @@ const generateSubscriptionModelFromMail = async function(recipients) {
 	return contractors.services.getSubscriptionModel(data);
 };
 
+const overrideGap = async (recordId, reason, note, policyName, attributeName, context) => {
+	const { data: record } = await contractors.services.getContractorById(recordId, context);
+	const overrideModel = compliance.services.overrideGap.getWaiveModel(record, policyName, attributeName, reason, note);
+	return compliance.services.overrideGap.overrideGap({ waiveRequestModel: overrideModel, context });
+};
+
+const retractOverriddenGap = async (recordId, policyName, attributeName, context) => {
+	const { data: record } = await contractors.services.getContractorById(recordId, context);
+	const retractModel = compliance.services.overrideGap.getRetractModel(record, policyName, attributeName);
+	return compliance.services.overrideGap.retractOverride(retractModel, context);
+};
+
+const waiveAllGaps = async (recordId, context) => {
+	const { data: record } = await contractors.services.getContractorById(recordId, context);
+	await compliance.services.overrideGap.waiveAll(record, context);
+};
+
 module.exports = {
 	makeRecordNotResponsive,
 	runOverAllRenewalDatesForRecord,
@@ -191,5 +220,10 @@ module.exports = {
 	waitForOcrStatus,
 	generateSubscriptionModelFromMail,
 	deleteAllRequestsInProject,
-	getLatestRecordHistoryEventIdByItemTitle
+	getLatestRecordHistoryEventIdByItemTitle,
+	getRecordHistoryItemById,
+	getLatestRecordHistoryEventByItemTitle,
+	waiveAllGaps,
+	overrideGap,
+	retractOverriddenGap
 };

package/src/defaults/configs/auditConfigs.js

@@ -35,7 +35,8 @@ const {
 const policySelections = {
 	YES: 'Yes',
 	NO: 'No',
-	OTHER: 'Other'
+	OTHER: 'Other',
+	EMPTY: 'Empty'
 };
 
 const getCompliantAuditConfig = ({ glPolicyNumber = DEFAULT_POLICY_NUMBER } = {}) => {

package/src/factory/records/records.js

@@ -93,9 +93,9 @@ const prepareNotCompliantRecord = (recordCompany, recordEmail, tabId, requiremen
 	return prepareRecord(recordCompany, recordEmail, complianceStatuses.notCompliant, tabId, requirementId, context, { inviterEmail, shouldSendNotificationToPM, recordConfig, expiryStatus, glPolicyNumber });
 };
 
-const prepareWaivedRecord = async (recordCompany, recordEmail, tabId, requirementId, context, { recordConfig, expiryStatus, glPolicyNumber } = {}) => {
-	const recordId = await prepareRecord(recordCompany, recordEmail, complianceStatuses.notCompliant, tabId, requirementId, context, { recordConfig, expiryStatus, glPolicyNumber });
-	await waiveAllGaps(recordId, context);
+const prepareWaivedRecord = async (recordCompany, recordEmail, tabId, requirementId, context, { inviterEmail, recordConfig, expiryStatus, glPolicyNumber } = {}) => {
+	const recordId = await prepareRecord(recordCompany, recordEmail, complianceStatuses.notCompliant, tabId, requirementId, context, { inviterEmail, recordConfig, expiryStatus, glPolicyNumber });
+	await recordFlows.waiveAllGaps(recordId, context);
 	return recordId;
 };
 
@@ -145,11 +145,6 @@ const sendGaps = async (recordId, tabId, context) => {
 	}
 };
 
-const waiveAllGaps = async (recordId, context) => {
-	const { data: record } = await contractors.services.getContractorById(recordId, context);
-	await compliance.services.overrideGap.waiveAll(record, context);
-};
-
 const acceptAllGaps = async (recordId, context) => {
 	const { data: record } = await contractors.services.getContractorById(recordId, context);
 	await compliance.services.overrideGap.acceptAll(record, context);
@@ -172,6 +167,9 @@ const validateInsuranceAndExpiryStatus = async (insuranceStatus, expiryStatus) =
 		case complianceStatuses.underReview:
 			isValid = true;
 			break;
+		case complianceStatuses.noCoiRequire:
+			isValid = isWithoutExpiryStatus;
+			break;
 		default:
 			throw new Error(`Invalid insurance status: ${insuranceStatus}`);
 	}

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

@@ -8,6 +8,7 @@ const Endpoints = {
 	getContractorById: contractorId => `${backendUrl}/saas/contractor/${contractorId}`,
 	getRecordHistory: contractorId => `${backendUrl}/saas/record/${contractorId}/history`,
 	getRecordHistoryEventReport: recordHistoryId => `${backendUrl}/saas/record/compliance-history-report/${recordHistoryId}`,
+	getRecordHistoryOverrideEventGapData: recordHistoryId => `${backendUrl}/saas/record/gap/history/${recordHistoryId}/report`,
 	getRecordOcrStatus: contractorId => `${backendUrl}/saas/contractor/${contractorId}/ocr/status`,
 	delete: contractorId => `${backendUrl}/saas/contractor/${contractorId}`,
 	archive: contractorId => `${backendUrl}/saas/contractor/${contractorId}/archive`,
@@ -53,6 +54,10 @@ const getRecordHistoryEventReport = (recordHistoryId, context) => {
 	return requests.getRequestHandler(Endpoints.getRecordHistoryEventReport(recordHistoryId), {}, context);
 };
 
+const getRecordHistoryOverrideEventGapData = (recordHistoryId, context) => {
+	return requests.getRequestHandler(Endpoints.getRecordHistoryOverrideEventGapData(recordHistoryId), {}, context);
+};
+
 const getComplianceReport = (encryptedData, context) => {
 	return requests.getRequestHandler(Endpoints.getComplianceReport(encryptedData), {}, context);
 };
@@ -176,6 +181,7 @@ module.exports = {
 	getContractorById,
 	getRecordHistory,
 	getRecordHistoryEventReport,
+	getRecordHistoryOverrideEventGapData,
 	getRecordOcrStatus,
 	getComplianceReport,
 	deleteByContractorId,

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

@@ -39,6 +39,18 @@ const getRecordHistoryEventReport = async (recordHistoryId, context, { expectErr
 	return historyEventReportResponse.data;
 };
 
+const getRecordHistoryOverrideEventGapData = async (recordHistoryId, context, { expectError } = {}) => {
+	const gapDataResponse = await contractorsAPI.getRecordHistoryOverrideEventGapData(recordHistoryId, context);
+
+	if (expectError) {
+		return gapDataResponse;
+	} else if (gapDataResponse.status !== httpResponseStatusCodes.OK) {
+		throw new Error(`Failed to get record history event gap data: ${gapDataResponse.statusText}`);
+	}
+
+	return gapDataResponse.data;
+};
+
 const getRecordOcrStatus = (recordId, context) => {
 	return contractorsAPI.getRecordOcrStatus(recordId, context);
 };
@@ -302,6 +314,7 @@ module.exports = {
 	getContractorById,
 	getRecordHistory,
 	getRecordHistoryEventReport,
+	getRecordHistoryOverrideEventGapData,
 	getRecordOcrStatus,
 	getComplianceReport,
 	archiveRecord,