@getjones/test-infra 2.7.7 → 2.7.9

package/package.json

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

package/src/defaults/configs/auditConfigs.js

@@ -4,7 +4,9 @@ const { getOneWeekAgoDate, getOneWeekAheadDate } = require('../../common/utils/t
 
 const DEFAULT_POLICY_DATE = '24/05/2030';
 const DEFAULT_AM_SCORE = 'A';
-const DEFAULT_POLICY_NUMBER = '12345';
+
+//Excluded from creating global record: 'ABC-12345-XYZ', 'ABC-123-XYZ', 'ABC-123'. When GR is needed - use different GL number.
+const DEFAULT_POLICY_NUMBER = 'ABC-12345-XYZ'; 
 
 const {
 	certificateIssueDate,

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.waive.waiveAll(record, context);
+	await compliance.services.overrideGap.waiveAll(record, context);
 
 	return recordId;
 };

package/src/saas/internal-api/accounts/api/settings/settings.service.js

@@ -27,7 +27,7 @@ const setAccountSettings = async (accountId, settings, context) => {
 	const updateResponse = await updateAccountSettings(settingsModel, context);
 
 	if (updateResponse.status !== httpResponseStatusCodes.OK) {
-		throw new Error(`Failed to set account: ${accountId} settings\n${updateResponse}`);
+		throw new Error(`Failed to set account: ${accountId} settings\n${updateResponse.data}`);
 	}
 
 	return updateResponse;

package/src/saas/internal-api/compliance/api/{waive/waive.api.js → overrideGap/override.gap.api.js}

@@ -3,7 +3,9 @@ const { backendUrl } = require('../../../../../env').getEnv();
 
 const Endpoints = {
 	waive: contractorId => `${backendUrl}/saas/contractors/${contractorId}/waiver`,
-	retract: 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) => {
@@ -18,4 +20,14 @@ const retract = async (contractorId, retractRequestModel, context) => {
 	return requests.postRequestHandler(Endpoints.retract(contractorId), retractRequestModel, context, {}, { status });
 };
 
-module.exports = { waive, retract };
+const overrideGap = (waiveRequestModel, isTestingBackwardCompatibility, context) => {
+	const headers = {};
+	const params = { isTestingBackwardCompatibility };
+	return requests.postRequestHandler(Endpoints.overrideGap, waiveRequestModel, context, headers, params);
+};
+
+const retractOverride = (retractRequestModel, context) => {
+	return requests.postRequestHandler(Endpoints.retractOverride, retractRequestModel, context);
+};
+
+module.exports = { waive, retract, overrideGap, retractOverride };

package/src/saas/internal-api/compliance/api/{waive/waive.service.js → overrideGap/override.gap.service.js}

@@ -1,6 +1,6 @@
 const env = require('../../../../../env');
 
-const waiveApi = require('./waive.api');
+const overrideGapApi = require('./override.gap.api');
 const { WaiveRequestModel, RetractRequestModel, WAIVER_REASONS } = require('../../models/waive/waive.model');
 const { validateType } = require('../../../../../common/validations/typeValidations');
 const auditUtil = require('../../utils/auditUtil');
@@ -11,12 +11,22 @@ const userTypes = require('../../../../../common/consts/userTypes');
 
 const waive = (waiveRequestModel, context) => {
 	validateType(waiveRequestModel, WaiveRequestModel);
-	return waiveApi.waive(waiveRequestModel.contractorId, waiveRequestModel, context);
+	return overrideGapApi.waive(waiveRequestModel.contractorId, waiveRequestModel, context);
 };
 
 const retract = (retractRequestModel, context) => {
 	validateType(retractRequestModel, RetractRequestModel);
-	return waiveApi.retract(retractRequestModel.contractorId, retractRequestModel, context);
+	return overrideGapApi.retract(retractRequestModel.contractorId, retractRequestModel, context);
+};
+
+const overrideGap = ({ waiveRequestModel, isTestingBackwardCompatibility = false, context }) => {
+	validateType(waiveRequestModel, WaiveRequestModel);
+	return overrideGapApi.overrideGap(waiveRequestModel, isTestingBackwardCompatibility, context);
+};
+
+const retractOverride = (retractRequestModel, context) => {
+	validateType(retractRequestModel, RetractRequestModel);
+	return overrideGapApi.retractOverride(retractRequestModel, context);
 };
 
 const getWaiveModel = (
@@ -111,5 +121,7 @@ module.exports = {
 	retract,
 	getWaiveModel,
 	getRetractModel,
-	getWaiveModelByGap
+	getWaiveModelByGap,
+	overrideGap,
+	retractOverride
 };

package/src/saas/internal-api/compliance/index.js

@@ -2,12 +2,13 @@ const auditModels = require('./models/audit/audit.model');
 const auditServices = require('./api/audit/audit.service');
 
 const waiveModels = require('./models/waive/waive.model');
-const waiveServices = require('./api/waive/waive.service');
+const overrideGapServices = require('./api/overrideGap/override.gap.service');
 
 const convertServices = require('./api/convert/convert.service');
 const coverageServices = require('./api/coverage/coverage.service');
 
 const auditConsts = require('./consts/audit');
+const auditUtils = require('./utils/auditUtil');
 
 const models = {
 	audit: auditModels,
@@ -18,11 +19,15 @@ const consts = {
 	audit: auditConsts
 };
 
+const utils = {
+	audit: auditUtils
+};
+
 const services = {
 	audit: auditServices,
-	waive: waiveServices,
+	overrideGap: overrideGapServices,
 	convert: convertServices,
 	coverage: coverageServices
 };
 
-module.exports = { services, models, consts };
+module.exports = { services, models, consts, utils };

package/src/saas/internal-api/compliance/models/waive/waive.model.js

@@ -5,8 +5,9 @@ const WAIVE_ACTIONS = {
 
 const WAIVER_REASONS = {
 	BUSINESS_DECISION: 'Business Decision',
-	NO_EXPOSURE: 'No Exposure',
-	EXECUTIVE_APPROVAL: 'Executive Approval'
+	EXECUTIVE_APPROVAL: 'Executive Approval',
+	ACCEPT_NO_EXPOSURE: 'Accept / No Exposure',
+	NO_EXPOSURE: 'No Exposure' // DEPRECATED - BACKWARD COMPATIBILITY
 };
 
 function WaiveRequestModel({

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

@@ -127,9 +127,9 @@ const deleteAllRecordsInAccount = async (accountId, context, { activationStatus
 	}
 };
 
-const getRecordVerificationModel = async (recordId, context) => {
+const getRecordVerificationModel = async (recordId, context, { requirementId, requirementDateModified } = {}) => {
 	const { data: recordData } = await getContractorById(recordId, context);
-	return new RecordModifyDateVerificationModel(recordData.id, { contractorDateModified: recordData.dateModified });
+	return new RecordModifyDateVerificationModel(recordData.id, { contractorDateModified: recordData.dateModified, requirementId, requirementDateModified });
 };
 
 const getAssignRequirementModel = (requirementId, companyName, emailAddress) => {

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

@@ -52,7 +52,7 @@ const getRequestsByAccountId = (accountId, context, activationStatus) => {
 	return requestsAPI.getRequestsByAccountId(accountId, context, params);
 };
 
-const getCreateRequestModel = (requirementId, contractor, { tabId, publicLink, sendMail } = {}) => {
+const getCreateRequestModel = (requirementId, contractor, { tabId, publicLink, sendMail, requirementDateModified } = {}) => {
 	const { recordType, email, companyName, additionalEmails } = contractor;
 	const contractorInfoModel = new ContractorInfo(recordType, email, companyName, additionalEmails);
 
@@ -63,12 +63,13 @@ const getCreateRequestModel = (requirementId, contractor, { tabId, publicLink, s
 		{
 			tabId,
 			publicLink,
-			sendMail
+			sendMail,
+			requirementDateModified
 		}
 	);
 };
 
-const getOrCreateRequest = async (context, tabId, requirementId, contractor, activationStatus, { sendMail } = {}) => {
+const getOrCreateRequest = async (context, tabId, requirementId, contractor, activationStatus, { sendMail, requirementDateModified } = {}) => {
 	const { data: existingRequests } = await getRequestsByTabId(tabId, context, activationStatus);
 
 	const filteredRequests = Array.isArray(existingRequests) ? existingRequests.filter(({ record }) =>
@@ -78,8 +79,7 @@ const getOrCreateRequest = async (context, tabId, requirementId, contractor, act
 		return filteredRequests[0];
 	}
 
-	const createContractorModel = getCreateRequestModel(requirementId, contractor, { tabId, sendMail });
-	//JON-8788: add optional parameter dateModified otherwise doesn't work for updated req
+	const createContractorModel = getCreateRequestModel(requirementId, contractor, { tabId, sendMail, requirementDateModified });
 	const createContractorResponse = await createRequest(createContractorModel, context);
 	return createContractorResponse.data;
 };

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

@@ -1,27 +1,33 @@
 const { getEnv } = require('../../../../env');
 const { credentials } = getEnv();
 
-const { validateType } = require('../../../../common/validations/typeValidations');
+const { validateType, validateDateString } = require('../../../../common/validations/typeValidations');
 
 const superUserEmail = credentials.superUser;
 
-function CreateRequestModel(requirementId, inviterEmail, vendorInfo, { tabId = null, sendMail = false, publicLink } = {}) {
-	this.reqId = requirementId;
-	this.inviterEmail = inviterEmail || superUserEmail;
-	this.vendorInfo = vendorInfo;
-	this.disableMail = !sendMail;
-	this.tabId = tabId;
-	this.publicLink = publicLink;
+class CreateRequestModel {
+	constructor(requirementId, inviterEmail, vendorInfo, { tabId = null, sendMail = false, publicLink, requirementDateModified } = {}) {
+		this.reqId = requirementId;
+		this.inviterEmail = inviterEmail || superUserEmail;
+		this.vendorInfo = vendorInfo;
+		this.disableMail = !sendMail;
+		this.tabId = tabId;
+		this.publicLink = publicLink;
+		this.dateModified = requirementDateModified;
 
-	vendorInfo && validateType(vendorInfo, ContractorInfo);
+		vendorInfo && validateType(vendorInfo, ContractorInfo);
+		requirementDateModified && validateDateString(requirementDateModified);
+	}
 }
 
-function ContractorInfo(recordType, email, companyName, additionalEmails) {
-	this.recordType = recordType;
-	this.email = email;
-	this.companyName = companyName;
-	this.title = email;
-	this.additionalEmails = additionalEmails;
+class ContractorInfo {
+	constructor(recordType, email, companyName, additionalEmails) {
+		this.recordType = recordType;
+		this.email = email;
+		this.companyName = companyName;
+		this.title = email;
+		this.additionalEmails = additionalEmails;
+	}
 }
 
 module.exports = { CreateRequestModel, ContractorInfo };

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

@@ -106,6 +106,16 @@ const getUpdatedRequirementModel = async (updatedRequirement, tabId, context, {
 	return requirementUtils.getUpdateRequirementModel(updatedRequirement);
 };
 
+const getRequirementDateModified = async (tabId, requirementName, context) => {
+	const requirementRes = await getRequirementByName(tabId, requirementName, context);
+
+	if (!requirementRes) {
+		throw new Error(`Failed to retrieve requirement - ${requirementName}`);
+	}
+
+	return requirementRes.dateModified;
+};
+
 module.exports = {
 	createRequirement,
 	getRequirementById,
@@ -119,5 +129,6 @@ module.exports = {
 	deleteRequirementByName,
 	deleteAllRequirementsInTabs,
 	getCreateRequirementModel,
-	getUpdatedRequirementModel
+	getUpdatedRequirementModel,
+	getRequirementDateModified
 };