@getjones/test-infra 2.9.7 → 2.9.8

package/package.json

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

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

@@ -4,14 +4,15 @@ const threadScheduler = require('../../../saas/internal-api/thread-scheduler/run
 const timeUtils = require('../../utils/timeUtils');
 const httpResponseStatusCodes = require('../../../common/httpResponseStatusCodes.json');
 const contractors = require('../../../saas/internal-api/contractors');
+const compliance = require('../../../saas/internal-api/compliance');
 
 const makeRecordNotResponsive = async function(recordId, context, { isTenant } = {}) {
-	const dates = isTenant ?
-		timeUtils.getInvitationDatesForNotResponsiveTenant() :
-		timeUtils.getInvitationDatesForNotResponsiveVendor();
+	const offsetInDaysList = isTenant ?
+		timeUtils.getInviteActionOffsetInDaysForNotResponsiveTenant() :
+		timeUtils.getInviteActionOffsetInDaysForNotResponsiveVendor();
 
-	for (const date of dates) {
-		await updateInviteDate(recordId, date, context);
+	for (const offsetInDays of offsetInDaysList) {
+		await updateLastInviteActionDate(recordId, offsetInDays, context);
 	}
 };
 
@@ -20,13 +21,41 @@ const updateInviteDate = async function(recordId, inviteDate, context) {
 	const updateResponse = await contractors.services.updateInviteDate(recordId, inviteDate, context);
 
 	if (updateResponse.status !== httpResponseStatusCodes.NO_CONTENT) {
-		throw new Error(`Record invite date could not be updated\n${updateResponse}`);
+		throw new Error(`Failed to update record invite date\n${updateResponse}`);
 	}
 
 	const threadSchedulerResponse = await threadScheduler.runForRecords([recordId]);
 
 	if (threadSchedulerResponse.status !== httpResponseStatusCodes.OK) {
-		throw new Error(`Thread scheduler has failed to run\n${threadSchedulerResponse}`);
+		throw new Error(`Failed to run thread scheduler\n${threadSchedulerResponse}`);
+	}
+
+	await timeUtils.waitFor(2.5).seconds; // calls for the same records can override each other
+};
+
+const updateLastInviteActionDate = async function(recordId, offsetInDays, context) {
+	await timeUtils.waitFor(1).seconds;
+	/*
+	To run the reminders mails successfully we must first update the compliance audit actions date,
+	Since the thread scheduler will trigger the logic of the reminders mails
+	only if last invite action date will be equal or after compliance audit actions date
+	*/
+	const updateComplianceAuditResponse = await compliance.services.audit.updateComplianceAuditActionsDate(recordId, offsetInDays, context);
+
+	if (updateComplianceAuditResponse.status !== httpResponseStatusCodes.NO_CONTENT) {
+		throw new Error(`Failed to update compliance audit date\n${updateComplianceAuditResponse}`);
+	}
+
+	const updateLastInviteActionResponse = await contractors.services.updateLastInviteActionDate(recordId, offsetInDays, context);
+
+	if (updateLastInviteActionResponse.status !== httpResponseStatusCodes.NO_CONTENT) {
+		throw new Error(`Failed to update record invite date\n${updateLastInviteActionResponse}`);
+	}
+
+	const threadSchedulerResponse = await threadScheduler.runForRecords([recordId]);
+
+	if (threadSchedulerResponse.status !== httpResponseStatusCodes.OK) {
+		throw new Error(`Failed to run thread scheduler\n${threadSchedulerResponse}`);
 	}
 
 	await timeUtils.waitFor(2.5).seconds; // calls for the same records can override each other
@@ -68,5 +97,6 @@ module.exports = {
 	runOverAllRenewalDatesForRecord,
 	updateInviteDate,
 	updatePolicyExpiryDateForRecord,
-	getHistoryEvents
+	getHistoryEvents,
+	updateLastInviteActionDate
 };

package/src/common/utils/timeUtils.js

@@ -24,6 +24,14 @@ const peroids = {
 	years: 'years'
 };
 
+const inviteActionDateOffset = {
+	twoDays: 2,
+	threeDays: 3,
+	fiveDays: 5,
+	tenDays: 10,
+	fifteenDays: 15
+};
+
 const getOneYearAgoDate = format => moment().utc().subtract(1, peroids.years).format(format || formats.threadScheduler);
 const getTwoHundredDaysAgoDate = format => moment().utc().subtract(200, peroids.days).format(format || formats.threadScheduler);
 const getSixMonthAgoDate = format => moment().utc().subtract(6, peroids.months).format(format || formats.threadScheduler);
@@ -86,6 +94,10 @@ const getInvitationDatesForNotResponsiveVendor = function() {
 	return [twoDaysAgoUtc, fiveDaysAgoUtc, eightDaysAgoUtc];
 };
 
+const getInviteActionOffsetInDaysForNotResponsiveVendor = function() {
+	return [inviteActionDateOffset.twoDays, inviteActionDateOffset.threeDays, inviteActionDateOffset.threeDays];
+};
+
 const getInvitationDatesForNotResponsiveTenant = function() {
 	const fiveDaysAgoUtc = getFiveDaysAgoDate();
 	const tenDaysAgoUtc = getTenDaysAgoDate();
@@ -94,6 +106,10 @@ const getInvitationDatesForNotResponsiveTenant = function() {
 	return [fiveDaysAgoUtc, tenDaysAgoUtc, fifteenDaysAgoUtc];
 };
 
+const getInviteActionOffsetInDaysForNotResponsiveTenant = function() {
+	return [inviteActionDateOffset.fiveDays, inviteActionDateOffset.fiveDays, inviteActionDateOffset.fiveDays];
+};
+
 const isDateAfterOther = (date, other) => {
 	return moment(date).isAfter(other);
 };
@@ -115,6 +131,10 @@ const convertDateToLongInt = value => {
 	return Date.parse(value);
 };
 
+const convertDateStringFormatToISOString = dateStringFormat => {
+	return new Date(dateStringFormat).toISOString();
+};
+
 module.exports = {
 	formats,
 	getOneYearAgoDate,
@@ -136,7 +156,9 @@ module.exports = {
 	getDateinTwentyNineDays,
 	getDateInTwoMonths,
 	getInvitationDatesForNotResponsiveVendor,
+	getInviteActionOffsetInDaysForNotResponsiveVendor,
 	getInvitationDatesForNotResponsiveTenant,
+	getInviteActionOffsetInDaysForNotResponsiveTenant,
 	getAutomaticRenewalsExpirationDates,
 	getLogTimestamp,
 	getDayInMilliseconds,
@@ -147,5 +169,7 @@ module.exports = {
 	convertDateToNewFormat,
 	getOneWeekAgoDate,
 	getOneWeekAheadDate,
-	convertDateToLongInt
+	convertDateToLongInt,
+	convertDateStringFormatToISOString,
+	inviteActionDateOffset
 };

package/src/defaults/configs/polices.js

@@ -21,8 +21,7 @@ const policyNames = {
 	agreement: 'Agreement',
 	certificateHolder: 'Certificate Holder',
 	additionalInformation: 'Additional Information',
-	additionalInsured: 'Additional Insured',
-	businessInterruptionIncomeInsurance: 'Business Interruption / Income Insurance'
+	additionalInsured: 'Additional Insured'
 };
 
 const attributeNames = {
@@ -41,10 +40,7 @@ const attributeNames = {
 	coiAuthentication: 'COI authentication',
 	signature: 'Signature',
 	occur: 'Occur',
-	text: 'text',
-	indemnityPeriod: 'Indemnity Period',
-	actualLossSustained: 'Actual Loss Sustained',
-	extraExpense: 'Extra Expense'
+	text: 'text'
 };
 
 module.exports = {

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

@@ -1,6 +1,5 @@
 const coreService = require('../api/core/accounts.core.service');
 const CreateAccountModel = require('../models/core/create.account.model');
-const configsUtil = require('../../../../common/utils/configsUtil');
 
 const getOrCreateAccount = (context, accountName, email, { password, type } = {}) => {
 	const createAccountModel = new CreateAccountModel(
@@ -31,12 +30,21 @@ const deleteAccountByName = async (context, accountName) => {
 };
 
 const isUIConfig = config => {
-	return configsUtil.isUIConfig(config, attributesConvertor);
+	const convectorKeys = Object.keys(attributesConvertor);
+	const configKeys = Object.keys(config);
+
+	return convectorKeys.some(key => configKeys.includes(key));
 };
 
 const parseAccountSettingsConfig = (accountId, settingsConfig) => {
-	const settings = configsUtil.objectConvertor(settingsConfig, attributesConvertor);
-	return { ... settings, accountId };
+	const settings = { accountId };
+
+	for (const field in settingsConfig) {
+		const attributes = attributesConvertor[field];
+		settings[attributes] = JSON.parse(settingsConfig[field]);
+	}
+
+	return settings;
 };
 
 module.exports = {

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

@@ -1,6 +1,8 @@
 const requests = require('../../../../../common/requests/cookieAuth/requests');
 const { backendUrl } = require('../../../../../env').getEnv();
 
+const { convertDateStringFormatToISOString } = require('../../../../../common/utils/timeUtils');
+
 const Endpoints = {
 	auditorContractorList: `${backendUrl}/saas/auditor/contractors`,
 	audit: `${backendUrl}/saas/auditor/contractors/submit/audits`,
@@ -10,7 +12,8 @@ const Endpoints = {
 	isReaudit: contractorId => `${backendUrl}/saas/auditor/contractors/${contractorId}/isreaudit`,
 	revertCoi: contractorId => `${backendUrl}/saas/auditor/contractors/${contractorId}/coi/revert`,
 	wrongCoi: `${backendUrl}/saas/coi/wrong-coi`,
-	getAudit: recordId => `${backendUrl}/saas/audit/${recordId}`
+	getAudit: recordId => `${backendUrl}/saas/audit/${recordId}`,
+	updateComplianceAuditActionsDate: recordId => `${backendUrl}/saas/automation/record/${recordId}/update-audit-actions-date`
 };
 
 const audit = async (contractorId, auditRequestModel, context) => {
@@ -55,6 +58,11 @@ const wrongCoi = (recordId, context) => {
 	return requests.getRequestHandler(Endpoints.wrongCoi, params, context);
 };
 
+const updateComplianceAuditActionsDate = (recordId, dateOffset, context) => {
+	const url = `${Endpoints.updateComplianceAuditActionsDate(recordId)}?offsetInDays=${dateOffset}`;
+	return requests.putRequestHandler(url, {}, context);
+};
+
 module.exports = {
 	audit,
 	submitAudit,
@@ -65,5 +73,6 @@ module.exports = {
 	enterAudit,
 	getAuditRecordModel,
 	getRequirementDetailsForAudit,
-	getAuditByRecordId
+	getAuditByRecordId,
+	updateComplianceAuditActionsDate
 };

package/src/saas/internal-api/compliance/api/audit/audit.service.js

@@ -157,6 +157,10 @@ const auditRecord = async function(
 	return auditResponse;
 };
 
+const updateComplianceAuditActionsDate = (recordId, dateOffset, context) => {
+	return auditApi.updateComplianceAuditActionsDate(recordId, dateOffset, context);
+};
+
 module.exports = {
 	audit,
 	submitAudit,
@@ -171,5 +175,6 @@ module.exports = {
 	getAuditMetadata,
 	getAuditByRecordId,
 	getAuditRequestModel,
-	auditRecord
+	auditRecord,
+	updateComplianceAuditActionsDate
 };

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

@@ -1,5 +1,6 @@
 const requests = require('../../../../common/requests/cookieAuth/requests');
 const { backendUrl } = require('../../../../env').getEnv();
+const { convertDateStringFormatToISOString } = require('../../../../common/utils/timeUtils');
 
 const Endpoints = {
 	create: `${backendUrl}/saas/contractors/invite`,
@@ -19,6 +20,7 @@ const Endpoints = {
 	changeRequirement: `${backendUrl}/saas/contractor/requirement`,
 	updateVendorExpiryDate: contractorId => `${backendUrl}/_saas/automation/contractor/${contractorId}/expiry-date`,
 	updateContractorInviteDate: contractorId => `${backendUrl}/_saas/automation/contractor/${contractorId}/invite-date`,
+	updateLastInviteActionDate: recordId => `${backendUrl}/saas/automation/record/${recordId}/update-emails-date`,
 	searchInAutocomplete: ({ tabId, searchWord }) =>
 		`${backendUrl}/saas/requests/search/audited?&tabId=${tabId}&searchWord=${searchWord}`,
 	automationUpdateContractorUploadDate: contractorId => `${backendUrl}/saas/automation/contractor/${contractorId}/upload-date`,
@@ -126,6 +128,11 @@ const getLinkedProjectsCount = async (recordId, context) => {
 	return await requests.getRequestHandler(Endpoints.linkedProjectsCount(recordId), {}, context);
 };
 
+const updateLastInviteActionDate = (recordId, offsetInDays, context) => {
+	const url = `${Endpoints.updateLastInviteActionDate(recordId)}?offsetInDays=${offsetInDays}`;
+	return requests.putRequestHandler(url, {}, context);
+};
+
 module.exports = {
 	createContractor,
 	changeRequirement,
@@ -148,5 +155,6 @@ module.exports = {
 	resendInvitation,
 	muteNotifications,
 	unmuteNotifications,
-	getLinkedProjectsCount
+	getLinkedProjectsCount,
+	updateLastInviteActionDate
 };

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

@@ -54,6 +54,10 @@ const updateInviteDate = (contractorId, inviteDate, context) => {
 	return contractorsAPI.updateInviteDate(contractorId, inviteDate, context);
 };
 
+const updateLastInviteActionDate = (recordId, dateOffset, context) => {
+	return contractorsAPI.updateLastInviteActionDate(recordId, dateOffset, context);
+};
+
 const getContractorsByTabId = (tabId, context, activityStatus = 'Active') => {
 	return contractorsAPI.getContractorsByTabId(tabId, context, activityStatus);
 };
@@ -184,5 +188,6 @@ module.exports = {
 	assignRequirement,
 	getAssignRequirementModel,
 	getLinkedProjectsCount,
-	restoreByRecordId
+	restoreByRecordId,
+	updateLastInviteActionDate
 };

package/src/saas/internal-api/requirements/models/policy.model.js

@@ -26,7 +26,6 @@ const AttributeTypes = new Enum({
 	'ENDORSMENT': 'endorsment',
 	'LIMIT': 'limit',
 	'BOOLEAN': 'boolean',
-	'NUMERIC': 'numeric',
 	'MULTIPLE': 'multiple'
 }, { name: 'AttributeTypes' });
 

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

@@ -5,7 +5,6 @@ const Endpoints = {
 	invite: `${backendUrl}/saas/project/team-member`,
 	editUserProjects: `${backendUrl}/saas/project/team-member`,
 	editUserRole: userId => `${backendUrl}/secured/users/${userId}/change-role`,
-	editUserProfile: `${backendUrl}/saas/user/update`,
 	getByProjectId: projectId =>
 		`${backendUrl}/saas/project/${projectId}/team-members`,
 	getByEmail: email => `${backendUrl}/saas/team-member/by-email/${email}`,
@@ -85,9 +84,6 @@ const sendForgetPasswordMail = userEmail => {
 	const body = { email: userEmail };
 	return requests.postRequestHandler(Endpoints.sendForgetPasswordMail, body);
 };
-const editUserProfile = (editUserProfileModel, context) => {
-	return requests.postRequestHandler(Endpoints.editUserProfile, editUserProfileModel, context);
-};
 
 module.exports = {
 	invite,
@@ -104,6 +100,5 @@ module.exports = {
 	editUserEmailNotificationsSettings,
 	sendForgetPasswordMail,
 	createInnerSystemUser,
-	getInnerSystemUsersPerRole,
-	editUserProfile
+	getInnerSystemUsersPerRole
 };

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

@@ -1,4 +1,4 @@
-const { InviteUserModel, SignupUserModel, EditUserModel, EditUserProfileModel } = require('../models/users.model');
+const { InviteUserModel, SignupUserModel, EditUserModel } = require('../models/users.model');
 const { validateType } = require('../../../../common/validations/typeValidations');
 const { getEnv } = require('../../../../env');
 const { credentials } = getEnv();
@@ -147,33 +147,6 @@ const sendForgetPasswordMail = userEmail => {
 	return userAPI.sendForgetPasswordMail(userEmail);
 };
 
-const editUserProfile = async (email, fullName, context) => {
-	const { data: user } = await getUserByEmail(email, context);
-
-	const editUserProfileModel = new EditUserProfileModel(user.id, email, user.role, fullName);
-
-	const response = await userAPI.editUserProfile(editUserProfileModel, context);
-
-	if (response.status !== httpResponseStatusCodes.OK) {
-		throw Error(`Failed to edit user id: [${user.id}] profile\n${response}`);
-	}
-
-	return getUserByEmail(email, context);
-};
-
-const editUserSettings = async (email, config, context) => {
-	const { data: user } = await getUserByEmail(email, context);
-	const settingModel = util.getSettingsModel(config);
-
-	const response = await userAPI.editUserEmailNotificationsSettings(user.id, settingModel, context);
-
-	if (response.status !== httpResponseStatusCodes.OK) {
-		throw Error(`Failed to edit user id: [${user.id}] settings\n${response}`);
-	}
-
-	return getUserByEmail(email, context);
-};
-
 module.exports = {
 	inviteUser,
 	signupUser,
@@ -189,7 +162,5 @@ module.exports = {
 	reinviteUser,
 	editUserEmailNotificationsSettings,
 	sendForgetPasswordMail,
-	getOrCreateInnerSystemUser,
-	editUserProfile,
-	editUserSettings
+	getOrCreateInnerSystemUser
 };

package/src/saas/internal-api/users/models/users.model.js

@@ -24,18 +24,8 @@ class EditUserModel {
 	}
 }
 
-class EditUserProfileModel {
-	constructor(subUserId, email, role, fullName) {
-		this.subUserId = subUserId;
-		this.email = email;
-		this.role = role;
-		this.fullName = fullName;
-	}
-}
-
 module.exports = {
 	InviteUserModel,
 	SignupUserModel,
-	EditUserModel,
-	EditUserProfileModel
+	EditUserModel
 };

package/src/saas/internal-api/users/utils/util.js

@@ -1,15 +1,6 @@
 const { SignupUserModel } = require('../models/users.model');
-const { NotificationSettingsModel } = require('../models/notification.settings.model');
 const usersApi = require('../api/users.api');
 const httpResponseStatusCodes = require('../../../../common/httpResponseStatusCodes.json');
-const objectUtils = require('../../../../common/utils/configsUtil');
-
-const attributesConvertor = {
-	'COI is not compliant.': 'auditNotCompliant',
-	'Policy is about to expire.': 'aboutToExpire',
-	'COI is compliant.': 'auditCompliant',
-	'Unresponsive contact.': 'missingCoi'
-};
 
 const getUserEncryptedData = async (email, role, context) => {
 	const response = await usersApi.getUserEncryptedData(email, role, context);
@@ -26,14 +17,4 @@ const getSignupUserModel = async (email, role, fullName, password, context) => {
 	return new SignupUserModel(fullName, role, password, userEncryptedData);
 };
 
-const getSettingsModel = settings => {
-	const isUIConfig = objectUtils.isUIConfig(settings, attributesConvertor);
-
-	const settingConfig = isUIConfig ?
-		objectUtils.objectConvertor(settings, attributesConvertor) :
-		settings;
-
-	return new NotificationSettingsModel(settingConfig);
-};
-
-module.exports = { getSignupUserModel, getSettingsModel };
+module.exports = { getSignupUserModel };

package/src/common/utils/configsUtil.js

@@ -1,22 +0,0 @@
-const isUIConfig = (config, attributesConvertor) => {
-	const converterKeys = Object.keys(attributesConvertor);
-	const configKeys = Object.keys(config);
-
-	return converterKeys.some(key => configKeys.includes(key));
-};
-
-const objectConvertor = (config, attributesConvertor) => {
-	const covertConfig = {};
-
-	for (const field in config) {
-		const attributes = attributesConvertor[field];
-		covertConfig[attributes] = JSON.parse(config[field]);
-	}
-
-	return covertConfig;
-};
-
-module.exports = {
-	isUIConfig,
-	objectConvertor
-};