@getjones/test-infra 2.7.12 → 2.7.13

package/package.json

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

package/src/factory/records/records.js

@@ -113,7 +113,7 @@ const prepareWaivedRecord = async (recordCompany, recordEmail, tabId, requiremen
 	const recordId = await prepareRecord(recordCompany, recordEmail, complianceStatuses.notCompliant, tabId, requirementId, context);
 
 	const { data: record } = await contractors.services.getContractorById(recordId, context);
-	await compliance.services.overrideGap.waiveAll(record, context);
+	await compliance.services.overrideGap.waiveAllGaps(record, context);
 
 	return recordId;
 };

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

@@ -2,24 +2,10 @@ const requests = require('../../../../../common/requests/cookieAuth/requests');
 const { backendUrl } = require('../../../../../env').getEnv();
 
 const Endpoints = {
-	waive: contractorId => `${backendUrl}/saas/contractors/${contractorId}/waiver`,
-	retract: contractorId => `${backendUrl}/saas/contractors/${contractorId}/waiver`,
 	overrideGap: `${backendUrl}/saas/record/override-gap`,
 	retractOverride: `${backendUrl}/saas/record/retract-override`
 };
 
-const waive = async (contractorId, waiveRequestModel, context) => {
-	const status = waiveRequestModel.status;
-	delete waiveRequestModel.status;
-	return requests.postRequestHandler(Endpoints.waive(contractorId), waiveRequestModel, context, {}, { status });
-};
-
-const retract = async (contractorId, retractRequestModel, context) => {
-	const status = retractRequestModel.status;
-	delete retractRequestModel.status;
-	return requests.postRequestHandler(Endpoints.retract(contractorId), retractRequestModel, context, {}, { status });
-};
-
 const overrideGap = ({ overrideGapModel, isTestingBackwardCompatibility = false, context }) => {
 	const headers = {};
 	const params = { isTestingBackwardCompatibility };
@@ -30,4 +16,4 @@ const retractOverride = (retractModel, context) => {
 	return requests.postRequestHandler(Endpoints.retractOverride, retractModel, context);
 };
 
-module.exports = { waive, retract, overrideGap, retractOverride };
+module.exports = { overrideGap, retractOverride };

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

@@ -11,16 +11,6 @@ const httpResponseStatusCodes = require('../../../../../common/httpResponseStatu
 const { credentials } = env.getEnv();
 const userTypes = require('../../../../../common/consts/userTypes');
 
-const waive = (waiveRequestModel, context) => {
-	validateType(waiveRequestModel, OverrideGapModel);
-	return overrideGapApi.waive(waiveRequestModel.contractorId, waiveRequestModel, context);
-};
-
-const retract = (retractRequestModel, context) => {
-	validateType(retractRequestModel, RetractOverrideGapModel);
-	return overrideGapApi.retract(retractRequestModel.contractorId, retractRequestModel, context);
-};
-
 const overrideGap = ({ overrideGapModel, isTestingBackwardCompatibility = false, context }) => {
 	validateType(overrideGapModel, OverrideGapModel);
 	return overrideGapApi.overrideGap({ overrideGapModel, isTestingBackwardCompatibility, context });
@@ -31,7 +21,7 @@ const retractOverride = (retractModel, context) => {
 	return overrideGapApi.retractOverride(retractModel, context);
 };
 
-const getWaiveModel = (
+const getOverrideGapModel = (
 	record,
 	policyName,
 	attributeName,
@@ -69,7 +59,7 @@ const getWaiveModelByGap = (
 	} = {}) => {
 	const attributeName = auditUtil.getAttributeNameByGap(record, policyName, gap);
 
-	return getWaiveModel(record, policyName, attributeName, reason, note, { userId, userRole });
+	return getOverrideGapModel(record, policyName, attributeName, reason, note, { userId, userRole });
 };
 
 const getRetractModel = (record, policyName, attributeName) => {
@@ -104,12 +94,13 @@ const getPolicyAuditIdFromRecord = (record, policyName, attributeName) => {
 	return attribute.auditId;
 };
 
-const waiveAll = async (record, context, { reason = OVERRIDE_GAP_REASONS.BUSINESS_DECISION, note = 'WAIVED AUTOMATICALLY' } = {}) => {
+// PRIVATE METHOD - please refer to waiveAllGaps / acceptAllGaps according to your needs
+const overrideAllGaps = async (record, context, { reason = OVERRIDE_GAP_REASONS.BUSINESS_DECISION, note = 'WAIVED AUTOMATICALLY' } = {}) => {
 	const allWaivablePolicies = auditUtil.getAllWaivablePolicies(record, context);
 
 	for (const waivable of allWaivablePolicies) {
-		const waiveModel = getWaiveModel(record, waivable.policyName, waivable.attributeName, reason, note);
-		const waiveResponse = await waive(waiveModel, context);
+		const overrideGapModel = getOverrideGapModel(record, waivable.policyName, waivable.attributeName, reason, note);
+		const waiveResponse = await overrideGap({ overrideGapModel, context });
 
 		if (waiveResponse.status !== httpResponseStatusCodes.OK) {
 			throw Error(`Failed to waive ${waivable.policyName} - ${waivable.attributeName} for ${record.company}`);
@@ -117,11 +108,24 @@ const waiveAll = async (record, context, { reason = OVERRIDE_GAP_REASONS.BUSINES
 	}
 };
 
+const waiveAllGaps = async (record, context, { reason = OVERRIDE_GAP_REASONS.BUSINESS_DECISION, note = 'WAIVED AUTOMATICALLY' } = {}) => {
+	const waivedReasons = new Set([OVERRIDE_GAP_REASONS.BUSINESS_DECISION, OVERRIDE_GAP_REASONS.EXECUTIVE_APPROVAL, OVERRIDE_GAP_REASONS.NO_EXPOSURE]);
+
+	if (!waivedReasons.has(reason)) {
+		throw Error(`Invalid waive reason ${reason} provided when trying to waive all gaps to waive`);
+	}
+
+	await overrideAllGaps(record, context, { reason, note });
+};
+
+const acceptAllGaps = async (record, context, { note = 'ACCEPTED AUTOMATICALLY' } = {}) => {
+	overrideAllGaps(record, context, { reason: OVERRIDE_GAP_REASONS.ACCEPT_NO_EXPOSURE, note });
+};
+
 module.exports = {
-	waive,
-	waiveAll,
-	retract,
-	getWaiveModel,
+	acceptAllGaps,
+	waiveAllGaps,
+	getOverrideGapModel,
 	getRetractModel,
 	getWaiveModelByGap,
 	overrideGap,