@getjones/test-infra 2.8.6 → 2.8.8

package/package.json

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

package/src/common/consts/dashboardCharts.js

@@ -1,7 +1,8 @@
 const chartTypes = {
 	requiringAttention: 'requiringAttention',
 	expirationDatePerMonth: 'expirationDatePerMonth',
-	waivedByRequirement: 'waivedByRequirement'
+	waivedByRequirement: 'waivedByRequirement',
+	notCompliantForRequirement: 'notCompliantForRequirement'
 };
 const sortBy = {
 	companyName: 'SORT_BY_COMPANYNAME',

package/src/common/consts/userTypes.js

@@ -1,5 +1,6 @@
 module.exports = {
 	ICS: 'ICS',
 	PM: 'PM',
-	AUDITOR: 'AUDITOR'
+	AUDITOR: 'AUDITOR',
+	VENDOR: 'Vendor'
 };

package/src/factory/records/records.js

@@ -121,8 +121,9 @@ const prepareWaivedRecord = async (recordCompany, recordEmail, tabId, requiremen
 const prepareAwaitingNewCoiRecord = async (recordCompany, recordEmail, tabId, requirementId, context) => {
 	const recordId = await prepareRecord(recordCompany, recordEmail, complianceStatuses.awaitingNewCoi, tabId, requirementId, context);
 
+	const { id: requestId } = await requests.services.getRequestFromTabByRecordId(recordId, tabId, context);
 	const recordVerificationModel = await contractors.services.getRecordVerificationModel(recordId, context);
-	const sendGapsResponse = await contractors.services.sendGaps(recordVerificationModel, context);
+	const sendGapsResponse = await contractors.services.sendGaps(requestId, recordVerificationModel, context);
 
 	if (sendGapsResponse.status !== httpResponseStatusCodes.OK) {
 		throw Error(`Failed to send gaps to ${recordCompany}\n${sendGapsResponse}`);

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

@@ -5,7 +5,7 @@ const agreementConsts = require('./consts/consts');
 const models = { create: createModel };
 
 const consts = {
-	audit: agreementConsts
+	agreement: agreementConsts
 };
 
 module.exports = { services, models, consts };

package/src/saas/internal-api/coi/consts/uploaderTypes.js

@@ -1,5 +1,5 @@
-const { ICS, PM, AUDITOR } = require('../../../../common/consts/userTypes');
+const { ICS, PM, AUDITOR, VENDOR } = require('../../../../common/consts/userTypes');
 
-const UPLOADER_TYPES = { ICS, PM, AUDITOR };
+const UPLOADER_TYPES = { ICS, PM, AUDITOR, VENDOR };
 
 module.exports = UPLOADER_TYPES;

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

@@ -8,7 +8,8 @@ const Endpoints = {
 	contractorDetailsForAudit: contractorId => `${backendUrl}/saas/auditor/contractors/${contractorId}/master-audit`,
 	requirementDetailsForAudit: contractorId => `${backendUrl}/saas/auditor/contractor/${contractorId}/requirement`,
 	isReaudit: contractorId => `${backendUrl}/saas/auditor/contractors/${contractorId}/isreaudit`,
-	revertCoi: contractorId => `${backendUrl}/saas/auditor/contractors/${contractorId}/coi/revert`
+	revertCoi: contractorId => `${backendUrl}/saas/auditor/contractors/${contractorId}/coi/revert`,
+	wrongCoi: `${backendUrl}/saas/coi/wrong-coi`
 };
 
 const audit = async (contractorId, auditRequestModel, context) => {
@@ -36,9 +37,15 @@ const getRequirementDetailsForAudit = (contractorId, context) => {
 	return requests.getRequestHandler(Endpoints.requirementDetailsForAudit(contractorId), {}, context);
 };
 
+const wrongCoi = (recordId, context) => {
+	const params = { contractorId: recordId };
+	return requests.getRequestHandler(Endpoints.wrongCoi, params, context);
+};
+
 module.exports = {
 	audit,
 	revertCoi,
+	wrongCoi,
 	isReaudit,
 	getAuditorContractorList,
 	getContractorDetailsForAudit,

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

@@ -12,7 +12,12 @@ const audit = (auditRequestModel, context) => {
 };
 
 const revertCoi = (contractorId, dateModified, context) => {
-	return auditApi.revertCoi(contractorId, dateModified, context);
+	const dateModifiedObj = { dateModified };
+	return auditApi.revertCoi(contractorId, dateModifiedObj, context);
+};
+
+const wrongCoi = (recordId, context) => {
+	return auditApi.wrongCoi(recordId, context);
 };
 
 const isReaudit = (contractorId, context) => {
@@ -114,9 +119,10 @@ const auditRecord = async function(
 	projectId,
 	requirementId,
 	recordId,
-	auditConfig
+	auditConfig,
+	{ shouldSendNotificationToPM = false } = {}
 ) {
-	const auditMetadata = await getAuditMetadata(auditorContext, accountId, projectId, requirementId, recordId);
+	const auditMetadata = await getAuditMetadata(auditorContext, accountId, projectId, requirementId, recordId, { shouldSendNotificationToPM });
 
 	const auditApiConfig = dataTypeUtils.isObject(auditConfig) ?
 		auditUtil.parseAuditConfig(cloneObject(auditConfig)) :
@@ -133,6 +139,7 @@ module.exports = {
 	audit,
 	revertCoi,
 	isReaudit,
+	wrongCoi,
 	getAuditorContractorList,
 	getContractorDetailsForAudit,
 	getRequirementDetailsForAudit,

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

@@ -102,12 +102,13 @@ const getPolicyAuditIdFromRecord = (record, policyName, attributeName) => {
 	return attribute.auditId;
 };
 
-const waiveAll = async (record, context, { reason = WAIVER_REASONS.BUSINESS_DECISION, note = 'WAIVED AUTOMATICALLY' } = {}) => {
+// private method - please refer to waiveAll / acceptAll
+const overrideAll = async (record, reason, context, { note = 'OVERRIDDEN 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 waiveResponse = await overrideGap({ waiveRequestModel: waiveModel, context });
 
 		if (waiveResponse.status !== httpResponseStatusCodes.OK) {
 			throw Error(`Failed to waive ${waivable.policyName} - ${waivable.attributeName} for ${record.company}`);
@@ -115,9 +116,26 @@ const waiveAll = async (record, context, { reason = WAIVER_REASONS.BUSINESS_DECI
 	}
 };
 
+const waiveAll = async (record, context, { reason = WAIVER_REASONS.BUSINESS_DECISION, note = 'WAIVED AUTOMATICALLY' } = {}) => {
+	if (reason === WAIVER_REASONS.ACCEPT_NO_EXPOSURE) {
+		throw Error('Invalid override gap reason to waive');
+	}
+
+	await overrideAll(record, reason, context, { note });
+};
+
+const acceptAll = async (record, context, { reason = WAIVER_REASONS.ACCEPT_NO_EXPOSURE, note = 'ACCEPTED AUTOMATICALLY' } = {}) => {
+	if (reason !== WAIVER_REASONS.ACCEPT_NO_EXPOSURE) {
+		throw Error('Invalid override gap reason to accept');
+	}
+
+	await overrideAll(record, reason, context, { note });
+};
+
 module.exports = {
 	waive,
 	waiveAll,
+	acceptAll,
 	retract,
 	getWaiveModel,
 	getRetractModel,

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

@@ -10,7 +10,7 @@ const Endpoints = {
 	archive: contractorId => `${backendUrl}/saas/contractor/${contractorId}/archive`,
 	restore: contractorId => `${backendUrl}/saas/contractor/${contractorId}/restore`,
 	edit: contractorId => `${backendUrl}/saas/contractors/${contractorId}/update`,
-	sendGaps: `${backendUrl}/saas/contractor/compliance/status`,
+	sendGaps: requestId => `${backendUrl}/saas/request/${requestId}/compliance/status`,
 	resendInvitation: requestId => `${backendUrl}/saas/contractor/${requestId}/reminders/reset`,
 	requestNewCoiAboutToExpire: requestId => `${backendUrl}/saas/coi/${requestId}/about-to-expire`,
 	requestNewCoiExpired: requestId => `${backendUrl}/saas/coi/${requestId}/expired`,
@@ -50,7 +50,7 @@ const archiveByContractorId = (contractorId, context) => {
 	return requests.deleteRequestHandler(Endpoints.archive(contractorId), context);
 };
 
-const restoreContractor = (recordVerificationModel, context) => {
+const restoreRecord = (recordVerificationModel, context) => {
 	return requests.postRequestHandler(Endpoints.restore(recordVerificationModel.contractorId), recordVerificationModel, context);
 };
 
@@ -76,8 +76,8 @@ const assignRequirement = (requestId, assignRequirementModel, context) => {
 	return requests.putRequestHandler(Endpoints.assignRequirement(requestId), assignRequirementModel, context);
 };
 
-const sendGaps = (recordModifyDateVerificationModel, context) => {
-	return requests.postRequestHandler(Endpoints.sendGaps, recordModifyDateVerificationModel, context);
+const sendGaps = (requestId, recordModifyDateVerificationModel, context) => {
+	return requests.postRequestHandler(Endpoints.sendGaps(requestId), recordModifyDateVerificationModel, context);
 };
 
 const requestNewCoiAboutToExpire = (requestId, recordModifyDateVerificationModel, context) => {
@@ -135,7 +135,7 @@ module.exports = {
 	getRecordHistory,
 	deleteByContractorId,
 	archiveByContractorId,
-	restoreContractor,
+	restoreRecord,
 	editContractor,
 	updateInviteDate,
 	updateExpiryDate,

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

@@ -31,9 +31,9 @@ const archiveByContractorId = (contractorId, context) => {
 	return contractorsAPI.archiveByContractorId(contractorId, context);
 };
 
-const restoreContractor = (recordVerificationModel, context) => {
+const restoreRecord = (recordVerificationModel, context) => {
 	validateType(recordVerificationModel, RecordModifyDateVerificationModel);
-	return contractorsAPI.restoreContractor(recordVerificationModel, context);
+	return contractorsAPI.restoreRecord(recordVerificationModel, context);
 };
 
 const editContractor = (editRequestModel, context) => {
@@ -71,9 +71,9 @@ const changeRequirement = (recordModifyDateVerificationModel, context) => {
 	return contractorsAPI.changeRequirement(recordModifyDateVerificationModel, context);
 };
 
-const sendGaps = (recordModifyDateVerificationModel, context) => {
+const sendGaps = (requestId, recordModifyDateVerificationModel, context) => {
 	validateType(recordModifyDateVerificationModel, RecordModifyDateVerificationModel);
-	return contractorsAPI.sendGaps(recordModifyDateVerificationModel, context);
+	return contractorsAPI.sendGaps(requestId, recordModifyDateVerificationModel, context);
 };
 
 const requestNewCoiAboutToExpire = (requestId, recordModifyDateVerificationModel, context) => {
@@ -140,6 +140,17 @@ const getLinkedProjectsCount = (recordId, context) => {
 	return contractorsAPI.getLinkedProjectsCount(recordId, context);
 };
 
+const restoreByRecordId = async (recordId, context) => {
+	const recordModifyModel = await getRecordVerificationModel(recordId, context);
+	const restoreResponse = await restoreRecord(recordModifyModel, context);
+
+	if (restoreResponse.status !== httpResponseStatusCodes.OK) {
+		throw new Error(`Failed to restore record "${recordId}"\n${restoreResponse.statusText}`);
+	}
+
+	return restoreResponse;
+};
+
 module.exports = {
 	createContractor,
 	changeRequirement,
@@ -147,7 +158,7 @@ module.exports = {
 	getContractorById,
 	getRecordHistory,
 	archiveByContractorId,
-	restoreContractor,
+	restoreRecord,
 	editContractor,
 	updateInviteDate,
 	updateExpiryDate,
@@ -165,5 +176,6 @@ module.exports = {
 	getRecordVerificationModel,
 	assignRequirement,
 	getAssignRequirementModel,
-	getLinkedProjectsCount
+	getLinkedProjectsCount,
+	restoreByRecordId
 };

package/src/saas/internal-api/dbEmails/api/db.emails.service.js

@@ -87,13 +87,15 @@ const getLastMessage = async (
 
 	// In case the format is 'First Last <username@domain.com>' we need the email part only
 	const emailModel = new EmailModel(
-		util.extractEmailFromNameAndEmailFormat(recipients.from),
-		recipientsTo,
-		includesOneOfRecipientsTo,
-		recipients.cc,
-		textInSubject,
-		textInBody,
-		excludingPhrasesInBody
+		{
+			from: util.extractEmailFromNameAndEmailFormat(recipients.from),
+			recipientsTo,
+			includesOneOfRecipientsTo,
+			recipientsCc: recipients.cc,
+			textInSubject,
+			textInBody,
+			excludingPhrasesInBody
+		}
 	);
 
 	const response = await getAllMessages(emailModel);

package/src/saas/internal-api/dbEmails/consts/consts.js

@@ -2,6 +2,7 @@ const DEFAULT_EMAIL_SENDER = 'hellogetjonestest@gmail.com';
 
 const EMAIL_TYPES = {
 	COMPLIANT: 'compliant',
+	NOT_COMPLIANT: 'notCompliant',
 	SEND_GAPS: 'sendGaps',
 	REQUEST_NEW_COI_EXPIRED: 'requestNewCoiExpired',
 	FIRST_REMINDER: 'firstReminder',
@@ -19,6 +20,8 @@ const EMAIL_TYPES = {
 
 const EMAIL_SUBJECT = {
 	compliant: ({ recordCompanyName }) => `Compliant COI - ${recordCompanyName}`,
+	notCompliant: ({ recordCompanyName, requesterName }) => `Please Review COI Gaps - ${recordCompanyName} (${requesterName})`,
+	wrongCoi: ({ recordCompanyName, requesterName }) => `Incorrect File Submission - COI Still Required for ${recordCompanyName} - ${requesterName}`,
 	sendGaps: ({ requesterName }) => `New Insurance Docs Required for ${requesterName}`, //doesn't includes text for guest or tenant
 	requestNewCoiExpired: ({ recordCompanyName }) => `${recordCompanyName}'s COI is`,
 	firstReminder: ({ requesterName }) => `We are still awaiting the Insurance Docs for ${requesterName}`,
@@ -31,7 +34,8 @@ const EMAIL_SUBJECT = {
 	sameDayExpirationRecordAutoRenewal: ({ requesterName }) => `Your COI for ${requesterName} expires TODAY`,
 	sameDayExpirationPMAutoRenewal: ({ recordCompanyName }) => `COI expired for ${recordCompanyName} at`,
 	requirementsUpdatedNotification: ({ requesterName }) => `Updated Requirements - Your Insurance Docs are needed for ${requesterName}`,
-	updatedRequirementsSubjectPrefix: () => 'Updated Requirements - '
+	updatedRequirementsSubjectPrefix: () => 'Updated Requirements - ',
+	thankYou: 'Thank you for submitting your COI'
 };
 
 module.exports = { DEFAULT_EMAIL_SENDER, EMAIL_TYPES, EMAIL_SUBJECT };

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

@@ -1,5 +1,6 @@
 const services = require('./api/db.emails.service');
 const consts = require('./consts/consts');
 const utils = require('./utils/util');
+const { EmailModel } = require('./models/db.emails.model');
 
-module.exports = { services, consts, utils };
+module.exports = { services, consts, utils, models: { EmailModel } };

package/src/saas/internal-api/dbEmails/models/db.emails.model.js

@@ -1,5 +1,5 @@
 class EmailModel {
-	constructor(
+	constructor({
 		from,
 		recipientsTo,
 		includesOneOfRecipientsTo,
@@ -7,6 +7,7 @@ class EmailModel {
 		textInSubject,
 		textInBody,
 		excludingPhrasesInBody
+	} = {}
 	) {
 		this.from = from;
 		this.recipientsTo = recipientsTo;

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

@@ -1,11 +1,14 @@
 const { EMAIL_SUBJECT } = require('../consts/consts');
 
+//compare method for sorting with ignore caseSensitive
+const compareFn = (a, b) => a.toLowerCase().localeCompare(b.toLowerCase());
+
 const compareUnorderedArrays = (arr, other, { caseSensitive = true } = {}) => {
-	const isEachElementEqual = arr.sort().every((mail, i) => {
+	const isEachElementEqual = arr.sort(compareFn).every((mail, i) => {
 		if (caseSensitive) {
-			return mail === other.sort()[i];
+			return mail === other.sort((compareFn))[i];
 		} else {
-			return mail.toLowerCase() === other.sort()[i].toLowerCase();
+			return mail.toLowerCase() === other.sort(compareFn)[i].toLowerCase();
 		}
 	});
 	return arr.length === other.length && isEachElementEqual;

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

@@ -13,7 +13,8 @@ const Endpoints = {
 	reinvite: `${backendUrl}/saas/project/team-member/reinvite`,
 	getUserEncryptedData: (email, userRole) => `${backendUrl}/saas/team-member/email/${email}/role/${userRole}/signup-data`,
 	signupUser: `${backendUrl}/_saas/guests/signup`,
-	removeAllUserTraceFromDb: userId => `${backendUrl}/saas/user/automation/${userId}`
+	removeAllUserTraceFromDb: userId => `${backendUrl}/saas/user/automation/${userId}`,
+	userEmailNotificationsSettings: `${backendUrl}/saas/account/notification/set`
 };
 
 const invite = (invitedUser, context, { disableSendMail = true } = {}) => {
@@ -62,6 +63,11 @@ const reinviteUser = (userId, context) => {
 	return requests.postRequestHandler(Endpoints.reinvite, {}, context, {}, params);
 };
 
+const editUserEmailNotificationsSettings = (userId, notificationSettingsModel, context) => {
+	const params = { userId };
+	return requests.postRequestHandler(Endpoints.userEmailNotificationsSettings, notificationSettingsModel, context, {}, params);
+};
+
 module.exports = {
 	invite,
 	signupUser,
@@ -73,5 +79,6 @@ module.exports = {
 	removeAllUserTraceFromDb,
 	editUserRole,
 	editUserProjects,
-	reinviteUser
+	reinviteUser,
+	editUserEmailNotificationsSettings
 };

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

@@ -5,6 +5,7 @@ const { credentials } = getEnv();
 const userAPI = require('./users.api');
 const util = require('../utils/util');
 const httpResponseStatusCodes = require('../../../../common/httpResponseStatusCodes.json');
+const { NotificationSettingsModel } = require('../models/notification.settings.model');
 
 const inviteUser = async (invitedUser, context, { disableSendMail } = {}) => {
 	return userAPI.invite(invitedUser, context, { disableSendMail });
@@ -85,6 +86,11 @@ const reinviteUser = (userId, context) => {
 	return userAPI.reinviteUser(userId, context);
 };
 
+const editUserEmailNotificationsSettings = (userId, notificationSettingsModel, context) => {
+	validateType(notificationSettingsModel, NotificationSettingsModel);
+	return userAPI.editUserEmailNotificationsSettings(userId, notificationSettingsModel, context);
+};
+
 module.exports = {
 	inviteUser,
 	signupUser,
@@ -97,5 +103,6 @@ module.exports = {
 	removeAllUserTraceFromDb,
 	editUserRole,
 	editUserProjects,
-	reinviteUser
+	reinviteUser,
+	editUserEmailNotificationsSettings
 };

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

@@ -1,4 +1,5 @@
-const models = require('./models/users.model');
+const userModels = require('./models/users.model');
+const { NotificationSettingsModel } = require('./models/notification.settings.model');
 const services = require('./api/users.service');
 const util = require('./utils/util');
 
@@ -8,4 +9,6 @@ const tenants = {
 	services: tenantUserService
 };
 
+const models = { ... userModels, NotificationSettingsModel };
+
 module.exports = { services, models, util, tenants };

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

@@ -0,0 +1,12 @@
+class NotificationSettingsModel {
+	constructor({ aboutToExpire = true, auditCompliant = true, auditNotCompliant = true, missingCoi = true } = {}) {
+		this.aboutToExpire = aboutToExpire;
+		this.auditCompliant = auditCompliant;
+		this.auditNotCompliant = auditNotCompliant;
+		this.missingCoi = missingCoi;
+	}
+}
+
+module.exports = {
+	NotificationSettingsModel
+};