@getjones/test-infra 2.7.8 → 2.7.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@getjones/test-infra",
-  "version": "2.7.8",
+  "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/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/projects/api/settings/project.settings.service.js

@@ -1,8 +1,6 @@
 const { getProjectSettingsByProjectId, updateProjectSettingsByProjectId } = require('./project.settings.api');
 const { validateType } = require('../../../../../common/validations/typeValidations');
 const UpdateProjectSettingsModel = require('../../models/settings/update.project.settings.model');
-const util = require('../../utils/utils');
-const httpResponseStatusCodes = require('../../../../../common/httpResponseStatusCodes.json');
 
 const updateProjectSettings = (updateProjectSettingsModel, context) => {
 	validateType(updateProjectSettingsModel, UpdateProjectSettingsModel);
@@ -13,23 +11,7 @@ const getProjectSettings = (projectId, context) => {
 	return getProjectSettingsByProjectId(projectId, context);
 };
 
-const setProjectSettings = async (projectId, settings, context) => {
-	const isUIConfig = util.isUIConfig(settings);
-
-	const settingsConfig = isUIConfig ? util.parseProjectSettingsConfig(projectId, settings) : settings;
-	const settingsModel = new UpdateProjectSettingsModel(settingsConfig);
-
-	const updateResponse = await updateProjectSettings(settingsModel, context);
-
-	if (updateResponse.status !== httpResponseStatusCodes.OK) {
-		throw new Error(`Failed to set project: ${projectId} settings\n${updateResponse.statusText}`);
-	}
-
-	return updateResponse;
-};
-
 module.exports = {
 	updateProjectSettings,
-	getProjectSettings,
-	setProjectSettings
+	getProjectSettings
 };

package/src/saas/internal-api/projects/models/settings/update.project.settings.model.js

@@ -1,43 +1,39 @@
-class UpdateProjectSettingsModel {
-	constructor(
-		{
-			autoGaps = {},
-			autoRenewals = false,
-			marketplaceSettings = {},
-			ocrEnabled = false,
-			onboardingPhase = false,
-			projectId = null,
-			qrEnabled = false,
-			tenantSolution = false,
-			autocompleteSettings = {}
-		} = {}
-	) {
-		this.autoGaps = { ... DEFAULT_AUTOGAPS, ... autoGaps };
-		this.autoRenewals = autoRenewals;
-		this.marketplaceSettings = { ... DEFAULT_MARKETPLACE, ... marketplaceSettings };
-		this.ocrEnabled = ocrEnabled;
-		this.onboardingPhase = onboardingPhase;
-		this.projectId = projectId;
-		this.qrEnabled = qrEnabled;
-		this.tenantSolution = tenantSolution;
-		this.autocompleteSettings = { ... DEFAULT_AUTOCOMPLETE_ADD_VENDORS, ... autocompleteSettings };
-	}
+function UpdateProjectSettingsModel({
+	autoGaps = defaultAutoGaps,
+	autoRenewals = false,
+	marketplace = defaultMarketplace,
+	ocrEnabled = false,
+	onboardingPhase = false,
+	projectId = null,
+	qrEnabled = false,
+	tenantSolution = false,
+	autocompleteAddVendors = defaultAutocompleteAddVendors
+}) {
+	this.autoGaps = autoGaps;
+	this.autoRenewals = autoRenewals;
+	this.marketplace = marketplace;
+	this.ocrEnabled = ocrEnabled;
+	this.onboardingPhase = onboardingPhase;
+	this.projectId = projectId;
+	this.qrEnabled = qrEnabled;
+	this.tenantSolution = tenantSolution;
+	this.autocompleteAddVendors = autocompleteAddVendors;
 }
 
 module.exports = UpdateProjectSettingsModel;
 
-const DEFAULT_MARKETPLACE = {
+const defaultMarketplace = {
 	marketplaceEnabled: false,
 	marketplacePreApproved: false,
 	marketplaceOnboardedVendors: false,
 	marketplaceCompliantVendorQuotationEnabled: false
 };
-const DEFAULT_AUTOGAPS = {
-	isAutoGapsEnabledForGuests: false,
-	isAutoGapsEnabledForTenants: false,
-	isAutoGapsEnabledForVendors: false
+const defaultAutoGaps = {
+	Guests: false,
+	Tenants: false,
+	Vendors: false
 };
-const DEFAULT_AUTOCOMPLETE_ADD_VENDORS = {
+const defaultAutocompleteAddVendors = {
 	autocompleteAddVendorsForPm: false,
 	autocompleteAddVendorsForTenants: false
 };

package/src/saas/internal-api/projects/utils/utils.js

@@ -72,85 +72,11 @@ const deleteProjectByName = (accounId, projectName, context) => {
 	return services.deleteProjectByName(accounId, projectName, context);
 };
 
-const isUIConfig = config => {
-	const allKeysSettings = { ... attributesConvertor, ... marketplaceAttributesConvertor, ... autoGapsConvertor, ... autocompleteAttributesConvertor };
-	const convectorKeys = Object.keys(allKeysSettings);
-	const configKeys = Object.keys(config);
-
-	return convectorKeys.some(key => configKeys.includes(key));
-};
-
-const assignNewSettingFormat = (target, soursKey, soursValue, dictionaryObject) => {
-	const attributeKey = dictionaryObject[soursKey];
-	const attributeValue = JSON.parse(soursValue);
-	Object.assign(target, { [attributeKey]: attributeValue });
-};
-
-const marketplaceParser = (settings, soursKey, soursValue, dictionary) => {
-	settings.marketplaceSettings = settings.marketplaceSettings || {};
-
-	assignNewSettingFormat(settings.marketplaceSettings, soursKey, soursValue, dictionary);
-};
-
-const autoGapsParser = (settings, soursKey, soursValue, dictionary) => {
-	settings.autoGaps = settings.autoGaps || {};
-
-	assignNewSettingFormat(settings.autoGaps, soursKey, soursValue, dictionary);
-};
-
-const autocompleteParser = (settings, soursKey, soursValue, dictionary) => {
-	settings.autocompleteSettings = settings.autocompleteSettings || {};
-
-	assignNewSettingFormat(settings.autocompleteSettings, soursKey, soursValue, dictionary);
-};
-
-const parseProjectSettingsConfig = (projectId, settingsConfig) => {
-	const settings = { projectId };
-
-	for (const setting in settingsConfig) {
-		marketplaceAttributesConvertor[setting] && marketplaceParser(settings, setting, settingsConfig[setting], marketplaceAttributesConvertor);
-
-		autocompleteAttributesConvertor[setting] && autocompleteParser(settings, setting, settingsConfig[setting], autocompleteAttributesConvertor);
-
-		attributesConvertor[setting] && assignNewSettingFormat(settings, setting, settingsConfig[setting], attributesConvertor);
-
-		autoGapsConvertor[setting] && autoGapsParser(settings, setting, settingsConfig[setting], autoGapsConvertor);
-	}
-
-	return settings;
-};
-
 module.exports = {
 	getProjectConfig,
 	getOrCreateProject,
 	getDefaultProjectId,
 	getCreateProjectModel,
 	getUpdateProjectModel,
-	deleteProjectByName,
-	parseProjectSettingsConfig,
-	isUIConfig
-};
-
-const attributesConvertor = {
-	'Automatic Renewal': 'autoRenewals',
-	'Onboarding Phase Enabled': 'onboardingPhase',
-	'Tenant App': 'tenantSolution'
-};
-
-const marketplaceAttributesConvertor = {
-	'Vendor Network Onboarding': 'marketplaceEnabled',
-	'Vendor Network - Show Onboarded Vendors': 'marketplaceOnboardedVendors',
-	'Pre-Approved Tab': 'marketplacePreApproved',
-	'Compliant Vendor Quotation': 'marketplaceCompliantVendorQuotationEnabled'
-};
-
-const autocompleteAttributesConvertor = {
-	'For PM': 'autocompleteAddVendorsForPm',
-	'For Tenants': 'autocompleteAddVendorsForTenants'
-};
-
-const autoGapsConvertor = {
-	'Guests': 'isAutoGapsEnabledForGuests',
-	'Tenants': 'isAutoGapsEnabledForTenants',
-	'Vendors': 'isAutoGapsEnabledForVendors'
+	deleteProjectByName
 };