@getjones/test-infra 2.7.6 → 2.7.8

package/package.json

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

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/accounts/models/settings/update.settings.model.js

@@ -10,7 +10,8 @@ class UpdateAccountSettingsModel {
 			isCoverageAudit = false,
 			isAccountRequirementsEnabled = false,
 			isAccountRequirementsAutoRenewalsEnabled = false,
-			autoGaps = {}
+			autoGaps = {},
+			auditSlaHours = 24
 		} = {}
 	) {
 		this.accountId = accountId;
@@ -23,6 +24,7 @@ class UpdateAccountSettingsModel {
 		this.isAccountRequirementsEnabled = isAccountRequirementsEnabled;
 		this.isAccountRequirementsAutoRenewalsEnabled = isAccountRequirementsAutoRenewalsEnabled;
 		this.autoGaps = { ... DEFAULT_AUTO_GAPS, ... autoGaps };
+		this.auditSlaHours = auditSlaHours;
 	}
 }
 

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/projects/api/settings/project.settings.service.js

@@ -1,6 +1,8 @@
 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);
@@ -11,7 +13,23 @@ 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
+	getProjectSettings,
+	setProjectSettings
 };

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

@@ -1,39 +1,43 @@
-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;
+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 };
+	}
 }
 
 module.exports = UpdateProjectSettingsModel;
 
-const defaultMarketplace = {
+const DEFAULT_MARKETPLACE = {
 	marketplaceEnabled: false,
 	marketplacePreApproved: false,
 	marketplaceOnboardedVendors: false,
 	marketplaceCompliantVendorQuotationEnabled: false
 };
-const defaultAutoGaps = {
-	Guests: false,
-	Tenants: false,
-	Vendors: false
+const DEFAULT_AUTOGAPS = {
+	isAutoGapsEnabledForGuests: false,
+	isAutoGapsEnabledForTenants: false,
+	isAutoGapsEnabledForVendors: false
 };
-const defaultAutocompleteAddVendors = {
+const DEFAULT_AUTOCOMPLETE_ADD_VENDORS = {
 	autocompleteAddVendorsForPm: false,
 	autocompleteAddVendorsForTenants: false
 };

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

@@ -72,11 +72,85 @@ 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
+	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'
 };

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
 };