@getjones/test-infra 2.8.7 → 2.8.9

package/package.json

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

package/src/common/consts/userTypes.js

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

package/src/common/utils/complianceUtil.js

@@ -1,8 +1,18 @@
 const { getEnv, getSystemUserIdentity } = require('../../env');
+const auditConfigs = require('../../defaults/configs/auditConfigs');
+
 const { credentials } = getEnv();
 
 const auditApi = require('../../saas/internal-api/compliance/api/audit/audit.api');
 
+const complianceStatuses = {
+	complaint: 'complaint',
+	notCompliant: 'notCompliant',
+	expired: 'expired',
+	aboutToExpired: 'aboutToExpired',
+	awaitingNewCoi: 'awaitingNewCoi'
+};
+
 const isReaudit = (contractorId, context) => {
 	return auditApi.isReaudit(contractorId, context);
 };
@@ -51,6 +61,23 @@ const getAuditMetadata = async (
 	return metadata;
 };
 
+const getAuditConfigByStatus = (status, { glPolicyNumber } = {}) => {
+	switch (status) {
+		case complianceStatuses.notCompliant:
+		case complianceStatuses.awaitingNewCoi:
+			return auditConfigs.getNotCompliantConfig({ glPolicyNumber });
+		case complianceStatuses.expired:
+			return auditConfigs.getExpiredConfig({ glPolicyNumber });
+		case complianceStatuses.aboutToExpired:
+			return auditConfigs.getAboutExpiredConfig({ glPolicyNumber });
+		default:
+			return auditConfigs.getCompliantAuditConfig({ glPolicyNumber });
+	}
+};
+
 module.exports = {
-	getAuditMetadata
+	getAuditMetadata,
+	isReaudit,
+	getAuditConfigByStatus,
+	complianceStatuses
 };

package/src/factory/globalRecord/globalRecord.js

@@ -0,0 +1,70 @@
+const auth = require('../../saas/internal-api/auth');
+const compliance = require('../../saas/internal-api/compliance');
+const requests = require('../../saas/internal-api/requests');
+const globalRecord = require('../../saas/internal-api/globalRecord');
+
+const { complianceStatuses, getAuditConfigByStatus } = require('../../common/utils/complianceUtil');
+const httpResponseStatusCodes = require('../../common/httpResponseStatusCodes.json');
+const timeUtils = require('../../common/utils/timeUtils');
+
+const preparePublishGlobalRecord = async (recordId, tabId, status, glPolicyNumber, threadName, primaryEmail, context) => {
+	const requestResponse = await requests.services.getRequestFromTabByRecordId(recordId, tabId, context);
+
+	if (!(requestResponse && requestResponse.id)) {
+		throw Error(`Failed to create record ${recordCompany}\n${requestData}`);
+	}
+
+	const accountId = requestResponse.record.userId;
+	const projectId = requestResponse.projectInfo.projectId;
+	const requirementId = requestResponse.record.requirementId;
+
+	const auditorContext = await auth.services.getAuditorCookie();
+
+	const auditConfig = getAuditConfigByStatus(status, { glPolicyNumber });
+
+	let auditResponse, retries = 5;
+	do {
+		await timeUtils.waitFor(1).seconds;
+		auditResponse = await compliance.services.audit.auditRecord(
+			auditorContext,
+			accountId,
+			projectId,
+			requirementId,
+			recordId,
+			auditConfig
+		);
+	} while (auditResponse.status !== httpResponseStatusCodes.NO_CONTENT && retries--);
+
+	if (auditResponse.status !== httpResponseStatusCodes.NO_CONTENT) {
+		throw Error(`Failed to audit record ${recordCompany}\n${auditResponse}`);
+	}
+
+	const operatorContext = await auth.services.getOperatorCookie();
+
+	const { data: newGlobalByGlNumber } = await globalRecord.services.getGlobalRecordByPolicyNumber(glPolicyNumber);
+	const globalRecordId = newGlobalByGlNumber[0]._id;
+
+	const globalConfig = globalRecord.utils.createPublishGlobalConfig(threadName, globalRecordId, primaryEmail);
+	const publishGlobalRecordModel = globalRecord.utils.createGlobalRecordModel(globalConfig);
+
+	const { data: publishResponseDetails } = await globalRecord.services.publishGlobalRecord(publishGlobalRecordModel, operatorContext);
+
+	if (publishResponseDetails.status !== 'Published') {
+		throw Error(`Failed to publish global record with id ${globalRecordId}`);
+	}
+
+	return publishResponseDetails;
+};
+
+const prepareCompliantGlobalRecord = (recordId, tabId, glPolicyNumber, threadName, primaryEmail, context) => {
+	return preparePublishGlobalRecord(recordId, tabId, complianceStatuses.complaint, glPolicyNumber, threadName, primaryEmail, context);
+};
+
+const prepareNotCompliantGlobalRecord = (recordId, tabId, glPolicyNumber, threadName, primaryEmail, context) => {
+	return preparePublishGlobalRecord(recordId, tabId, complianceStatuses.notCompliant, glPolicyNumber, threadName, primaryEmail, context);
+};
+
+module.exports = {
+	prepareCompliantGlobalRecord,
+	prepareNotCompliantGlobalRecord
+};

package/src/factory/index.js

@@ -1,7 +1,8 @@
 const records = require('./records/records');
 const users = require('./users/users');
-
+const globalRecord = require('./globalRecord/globalRecord');
 module.exports = {
 	records,
-	users
+	users,
+	globalRecord
 };

package/src/factory/records/records.js

@@ -9,21 +9,13 @@ const compliance = require('../../saas/internal-api/compliance');
 const contractors = require('../../saas/internal-api/contractors');
 const requests = require('../../saas/internal-api/requests');
 
-const auditConfigs = require('../../defaults/configs/auditConfigs');
+const { complianceStatuses, getAuditConfigByStatus } = require('../../common/utils/complianceUtil');
 const httpResponseStatusCodes = require('../../common/httpResponseStatusCodes.json');
 const timeUtils = require('../../common/utils/timeUtils');
 
 const filePath = path.join(__dirname, '../../resources/coi/coi.pdf');
 
-const complianceStatuses = {
-	complaint: 'complaint',
-	notCompliant: 'notCompliant',
-	expired: 'expired',
-	aboutToExpired: 'aboutToExpired',
-	awaitingNewCoi: 'awaitingNewCoi'
-};
-
-const prepareRecord = async (recordCompany, recordEmail, status, tabId, requirementId, context) => {
+const prepareRecord = async (recordCompany, recordEmail, status, tabId, requirementId, context, { shouldSendNotificationToPM = false } = {}) => {
 	const requestData = await requests.services.getOrCreateRequest(
 		context,
 		tabId,
@@ -54,24 +46,13 @@ const prepareRecord = async (recordCompany, recordEmail, status, tabId, requirem
 		throw Error(`Failed to upload COI for record ${recordCompany}\n${coiUpload}`);
 	}
 
+	if (complianceStatuses.underReview === status) {
+		return recordId;
+	}
+
 	const auditorContext = await auth.services.getAuditorCookie();
 
-	let auditConfig;
-	switch (status) {
-		case complianceStatuses.notCompliant:
-		case complianceStatuses.awaitingNewCoi:
-			auditConfig = auditConfigs.getNotCompliantConfig();
-			break;
-		case complianceStatuses.expired:
-			auditConfig = auditConfigs.getExpiredConfig();
-			break;
-		case complianceStatuses.aboutToExpired:
-			auditConfig = auditConfigs.getAboutExpiredConfig();
-			break;
-		default:
-			auditConfig = auditConfigs.getCompliantAuditConfig();
-			break;
-	}
+	const auditConfig = getAuditConfigByStatus(status);
 
 	let auditResponse, retries = 5;
 	do {
@@ -82,7 +63,8 @@ const prepareRecord = async (recordCompany, recordEmail, status, tabId, requirem
 			projectId,
 			requirementId,
 			recordId,
-			auditConfig
+			auditConfig,
+			{ shouldSendNotificationToPM }
 		);
 	} while (auditResponse.status !== httpResponseStatusCodes.NO_CONTENT && retries--);
 
@@ -97,8 +79,8 @@ const prepareCompliantRecord = (recordCompany, recordEmail, tabId, requirementId
 	return prepareRecord(recordCompany, recordEmail, complianceStatuses.complaint, tabId, requirementId, context);
 };
 
-const prepareNotCompliantRecord = (recordCompany, recordEmail, tabId, requirementId, context) => {
-	return prepareRecord(recordCompany, recordEmail, complianceStatuses.notCompliant, tabId, requirementId, context);
+const prepareNotCompliantRecord = (recordCompany, recordEmail, tabId, requirementId, context, { shouldSendNotificationToPM = false } = {}) => {
+	return prepareRecord(recordCompany, recordEmail, complianceStatuses.notCompliant, tabId, requirementId, context, {	shouldSendNotificationToPM });
 };
 
 const prepareExpiredRecord = (recordCompany, recordEmail, tabId, requirementId, context) => {
@@ -131,6 +113,9 @@ const prepareAwaitingNewCoiRecord = async (recordCompany, recordEmail, tabId, re
 
 	return recordId;
 };
+const prepareUnderReviewRecord = (recordCompany, recordEmail, tabId, requirementId, context) => {
+	return prepareRecord(recordCompany, recordEmail, complianceStatuses.underReview, tabId, requirementId, context);
+};
 
 module.exports = {
 	prepareCompliantRecord,
@@ -138,5 +123,6 @@ module.exports = {
 	prepareExpiredRecord,
 	prepareWaivedRecord,
 	prepareAboutToExpiredRecord,
-	prepareAwaitingNewCoiRecord
+	prepareAwaitingNewCoiRecord,
+	prepareUnderReviewRecord
 };

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/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,10 +20,14 @@ 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
+	sendGapsRecordFullName: ({ requesterName, recordFirstName, recordLastName }) => `New Insurance Docs Required for ${requesterName} - ${recordFirstName} ${recordLastName}`,
 	requestNewCoiExpired: ({ recordCompanyName }) => `${recordCompanyName}'s COI is`,
 	firstReminder: ({ requesterName }) => `We are still awaiting the Insurance Docs for ${requesterName}`,
 	secondReminder: ({ requesterName }) => `We are still awaiting the Insurance Docs for ${requesterName}`,
+	secondReminderAccountRequirement: ({ requesterName }) => `${requesterName} still needs your Insurance Docs`,
 	finalReminder: ({ recordCompanyName, requesterName }) => `Missing ${recordCompanyName}'s Insurance Docs for ${requesterName}`,
 	aboutToExpirePM: ({ recordCompanyName }) => `Insurance Policy of ${recordCompanyName} expires Soon`,
 	aboutToExpireMonthAutoRenewal: ({ requesterName }) => `Your COI for ${requesterName} expires in 30 days`,
@@ -31,7 +36,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/globalRecord/api/global.record.api.js

@@ -1,4 +1,4 @@
-const cookieAuthRequests = require('../../../../common/requests/cookieAuth/requests');
+const requests = require('../../../../common/requests/cookieAuth/requests');
 const apiKeyAuthRequests = require('../../../../common/requests/apiKeyAuth/requests');
 
 const { nodeBackendUrl, backendUrl } = require('../../../../env').getEnv();
@@ -15,55 +15,66 @@ const Endpoints = {
 	publishGlobalRecord: `${backendUrl}/saas/global-record/publish`,
 	getGlobalRecordLinkedRecords: id => `${backendUrl}/saas/global-record/${id}/linked-records`,
 	splitToNewGlobalRecord: `${backendUrl}/saas/global-record/split-to-new`,
-	getGlobalByRecordId: recordId => `${backendUrl}/saas/global-record/${recordId}`
+	splitToExistingRecord: `${backendUrl}/saas/global-record/split-to-existing`,
+	getGlobalByRecordId: recordId => `${backendUrl}/saas/global-record/${recordId}`,
+	dismiss: `${backendUrl}/saas/global-record/dismiss`
 };
 
-const getGlobalRecord = async (id, nodeBackendSecret) => {
+const getGlobalRecord = (id, nodeBackendSecret) => {
 	return apiKeyAuthRequests.getRequestHandler(Endpoints.getGlobalRecordById(id), nodeBackendSecret);
 };
 
-const createGlobalRecord = async (globalRecord, nodeBackendSecret) => {
+const createGlobalRecord = (globalRecord, nodeBackendSecret) => {
 	return apiKeyAuthRequests.postRequestHandler(Endpoints.createGlobalRecord, nodeBackendSecret, globalRecord);
 };
 
-const getAllGlobalRecords = async (data, pageNumber, itemsInPage, context) => {
-	return cookieAuthRequests.postRequestHandler(Endpoints.getAllGlobalRecords(pageNumber, itemsInPage), data, context);
+const getAllGlobalRecords = (data, pageNumber, itemsInPage, context) => {
+	return requests.postRequestHandler(Endpoints.getAllGlobalRecords(pageNumber, itemsInPage), data, context);
 };
 
-const deleteGlobalRecord = async (id, nodeBackendSecret, globalRecordModel) => {
+const deleteGlobalRecord = (id, nodeBackendSecret, globalRecordModel) => {
 	return apiKeyAuthRequests.deleteRequestHandler(Endpoints.deleteGlobalRecord(id), nodeBackendSecret, {}, {}, globalRecordModel);
 };
 
-const updateGlobalRecord = async (id, nodeBackendSecret, updatedGlobalRecord) => {
+const updateGlobalRecord = (id, nodeBackendSecret, updatedGlobalRecord) => {
 	return apiKeyAuthRequests.putRequestHandler(Endpoints.updateGlobalRecord(id), nodeBackendSecret, updatedGlobalRecord);
 };
 
-const getGlobalRecordServiceAreas = async context => {
-	return cookieAuthRequests.getRequestHandler(Endpoints.getGlobalRecordServiceAreas, {}, context);
+const getGlobalRecordServiceAreas = context => {
+	return requests.getRequestHandler(Endpoints.getGlobalRecordServiceAreas, {}, context);
 };
 
-const getRecordProfileDetails = async (id, context) => {
-	return cookieAuthRequests.getRequestHandler(Endpoints.getRecordProfileDetails(id), {}, context);
+const getRecordProfileDetails = (id, context) => {
+	return requests.getRequestHandler(Endpoints.getRecordProfileDetails(id), {}, context);
 };
 
-const publishGlobalRecord = async (globalRecordDetails, context) => {
-	return cookieAuthRequests.putRequestHandler(Endpoints.publishGlobalRecord, globalRecordDetails, context);
+const publishGlobalRecord = (globalRecordDetails, context) => {
+	return requests.putRequestHandler(Endpoints.publishGlobalRecord, globalRecordDetails, context);
 };
 
-const getGlobalRecordByPolicyNumber = async (policyNumber, nodeBackendSecret) => {
+const getGlobalRecordByPolicyNumber = (policyNumber, nodeBackendSecret) => {
 	return apiKeyAuthRequests.getRequestHandler(Endpoints.getGlobalRecordByPolicyNumber(policyNumber), nodeBackendSecret);
 };
 
-const getGlobalRecordLinkedRecords = async (id, context) => {
-	return cookieAuthRequests.getRequestHandler(Endpoints.getGlobalRecordLinkedRecords(id), {}, context);
+const getGlobalRecordLinkedRecords = (id, context) => {
+	return requests.getRequestHandler(Endpoints.getGlobalRecordLinkedRecords(id), {}, context);
 };
 
 const splitToNewGlobalRecord = ({ recordId, glPolicyNumber }, context) => {
-	return cookieAuthRequests.postRequestHandler(Endpoints.splitToNewGlobalRecord, { recordId, glPolicyNumber }, context);
+	return requests.postRequestHandler(Endpoints.splitToNewGlobalRecord, { recordId, glPolicyNumber }, context);
+};
+
+const splitToExistGlobalRecord = ({ recordId, glPolicyNumber, newGlobalRecordId }, context) => {
+	return requests.putRequestHandler(Endpoints.splitToExistingRecord, { recordId, glPolicyNumber, newGlobalRecordId }, context);
 };
 
 const getGlobalRecordByRecordId = (recordId, context) => {
-	return cookieAuthRequests.getRequestHandler(Endpoints.getGlobalByRecordId(recordId), {}, context);
+	return requests.getRequestHandler(Endpoints.getGlobalByRecordId(recordId), {}, context);
+};
+
+const dismissGlobalChanges = (id, context) => {
+	const body = { id, userName: 'Main Operator' };
+	return requests.putRequestHandler(Endpoints.dismiss, body, context);
 };
 
 module.exports = {
@@ -78,5 +89,7 @@ module.exports = {
 	publishGlobalRecord,
 	getGlobalRecordLinkedRecords,
 	splitToNewGlobalRecord,
-	getGlobalRecordByRecordId
+	splitToExistGlobalRecord,
+	getGlobalRecordByRecordId,
+	dismissGlobalChanges
 };

package/src/saas/internal-api/globalRecord/api/global.record.service.js

@@ -1,81 +1,90 @@
 const globalRecordAPI = require('./global.record.api');
-const { CreateGlobalRecordModel } = require('../models/global.record.model');
+const { CreateGlobalRecordModel, CreateGlobalRecordSearchModel } = require('../models/global.record.model');
 const { validateType } = require('../../../../common/validations/typeValidations');
 const { nodeBackendSecret } = require('../../../../env').getEnv();
 const httpResponseStatusCodes = require('../../../../common/httpResponseStatusCodes.json');
 
-const getGlobalRecordById = async id => {
+const getGlobalRecordById = id => {
 	return globalRecordAPI.getGlobalRecord(id, nodeBackendSecret);
 };
 
-const getGlobalRecordByPolicyNumber = async policyNumber => {
+const getGlobalRecordByPolicyNumber = policyNumber => {
 	return globalRecordAPI.getGlobalRecordByPolicyNumber(policyNumber, nodeBackendSecret);
 };
 
-const createGlobalRecord = async createGlobalRecordModel => {
+const createGlobalRecord = createGlobalRecordModel => {
 	validateType(createGlobalRecordModel, CreateGlobalRecordModel);
 	return globalRecordAPI.createGlobalRecord(createGlobalRecordModel, nodeBackendSecret);
 };
 
-const getAllGlobalRecordsInPage = async (pageNumber, context, itemsInPage = 10) => {
+const getAllGlobalRecordsInPage = (pageNumber, context, itemsInPage = 10) => {
 	const param = {};
 	return globalRecordAPI.getAllGlobalRecords(param, pageNumber, itemsInPage, context);
 };
 
-const getAllGlobalRecordsInPageByServiceAreas = async (serviceAreas, pageNumber, contxet, itemsInPage = 10) => {
+const getAllGlobalRecordsInPageByServiceAreas = (serviceAreas, pageNumber, context, itemsInPage = 10) => {
 	const data = Array.isArray(serviceAreas) ? { serviceAreas } : { serviceAreas: new Array(serviceAreas) };
-	return globalRecordAPI.getAllGlobalRecords(data, pageNumber, itemsInPage, contxet);
+	return globalRecordAPI.getAllGlobalRecords(data, pageNumber, itemsInPage, context);
 };
 
-const getAllGlobalRecordsInPageBySearchTerm = async (searchTerm, pageNumber, context, itemsInPage = 10) => {
-	const data = searchTerm;
-	return globalRecordAPI.getAllGlobalRecords(data, pageNumber, itemsInPage, context);
+const getAllGlobalRecordsInPageBySearchTerm = (searchTerm, pageNumber, context, itemsInPage = 10) => {
+	const searchModel = new CreateGlobalRecordSearchModel(searchTerm);
+	return globalRecordAPI.getAllGlobalRecords(searchModel, pageNumber, itemsInPage, context);
 };
 
-const getAllGlobalRecordsInPageByCombinedSearch = async (combinedSearch, pageNumber, context, itemsInPage = 10) => {
+const getAllGlobalRecordsInPageByCombinedSearch = (combinedSearch, pageNumber, context, itemsInPage = 10) => {
 	const data = combinedSearch;
 	return globalRecordAPI.getAllGlobalRecords(data, pageNumber, itemsInPage, context);
 };
 
-const getGlobalRecordServiceAreas = async context => {
+const getGlobalRecordServiceAreas = context => {
 	return globalRecordAPI.getGlobalRecordServiceAreas(context);
 };
 
-const deleteGlobalRecord = async (id, globalRecordModel) => {
+const deleteGlobalRecord = (id, globalRecordModel) => {
 	return globalRecordAPI.deleteGlobalRecord(id, nodeBackendSecret, globalRecordModel);
 };
 
-const updateGlobalRecord = async (id, updatedGlobalRecordModel) => {
+const updateGlobalRecord = (id, updatedGlobalRecordModel) => {
 	return globalRecordAPI.updateGlobalRecord(id, nodeBackendSecret, updatedGlobalRecordModel);
 };
 
-const getRecordProfileDetails = async (id, context) => {
+const getRecordProfileDetails = (id, context) => {
 	return globalRecordAPI.getRecordProfileDetails(id, context);
 };
 
-const publishGlobalRecord = async (globalRecordDetails, context) => {
+const publishGlobalRecord = (globalRecordDetails, context) => {
 	return globalRecordAPI.publishGlobalRecord(globalRecordDetails, context);
 };
 
-const getGlobalRecordLinkedRecords = async (id, context) => {
+const getGlobalRecordLinkedRecords = (id, context) => {
 	return globalRecordAPI.getGlobalRecordLinkedRecords(id, context);
 };
 
-const splitToNewGlobalRecord = async (recordId, glPolicyNumber, context) => {
+const splitToNewGlobalRecord = (recordId, glPolicyNumber, context) => {
 	const requestData = { recordId, glPolicyNumber };
 	return globalRecordAPI.splitToNewGlobalRecord(requestData, context);
 };
 
+const splitToExistGlobalRecord = (recordId, glPolicyNumber, globalRecordId, context) => {
+	const requestData = { recordId, glPolicyNumber, newGlobalRecordId: globalRecordId };
+	return globalRecordAPI.splitToExistGlobalRecord(requestData, context);
+};
+
 const getGlobalRecordByRecordId = async (recordId, context) => {
 	const response = await globalRecordAPI.getGlobalRecordByRecordId(recordId, context);
 
 	if (response.status !== httpResponseStatusCodes.OK) {
-		throw Error(`Failed to get global record by recordId - ${recordId}`, response.data);
+		throw Error(`Failed to get global record by recordId - ${recordId}\n${response.data}`);
 	}
 
 	return response.data;
 };
 
+const dismissGlobalChanges = (id, context) => {
+	return globalRecordAPI.dismissGlobalChanges(id, context);
+};
+
 module.exports = {
 	createGlobalRecord,
 	getGlobalRecordById,
@@ -91,5 +100,7 @@ module.exports = {
 	publishGlobalRecord,
 	getGlobalRecordLinkedRecords,
 	splitToNewGlobalRecord,
-	getGlobalRecordByRecordId
+	getGlobalRecordByRecordId,
+	splitToExistGlobalRecord,
+	dismissGlobalChanges
 };

package/src/saas/internal-api/globalRecord/models/global.record.model.js

@@ -1,3 +1,5 @@
+const { isObject } = require('../../../../common/utils/dataTypeUtils');
+
 class CreateGlobalRecordModel {
 	constructor(
 		header,
@@ -38,6 +40,21 @@ class CreateGlobalRecordModel {
 	}
 }
 
+class CreateGlobalRecordSearchModel {
+	constructor(
+		searchTerm,
+		{
+			sortBy = 'status',
+			sortOrderFlag = true
+		} = {}
+	) {
+		this.searchTerm = isObject(searchTerm) ? [searchTerm] : searchTerm,
+		this.sortBy = sortBy,
+		this.sortOrderFlag = sortOrderFlag;
+	}
+}
+
 module.exports = {
-	CreateGlobalRecordModel
+	CreateGlobalRecordModel,
+	CreateGlobalRecordSearchModel
 };

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

@@ -10,6 +10,7 @@ const {
 } = require('../../../../common/utils/numberUtils');
 
 const { SERVICE_AREAS } = require('../consts');
+const { cloneObject } = require('../../../../common/utils/objectUtils');
 
 const createGlobalRecordConfig = (
 	name,
@@ -135,12 +136,24 @@ const getGlobalRecordsDefaultNameList = (nameBase, listLength) => {
 	);
 };
 
+const createPublishGlobalConfig = (recordName, id, primaryEmail, { additionalContacts, brokerEmails } = {}) => {
+	return cloneObject({
+		recordName,
+		id,
+		primaryEmail,
+		additionalContacts: additionalContacts || [],
+		brokerEmails: brokerEmails || []
+
+	});
+};
+
 module.exports = {
 	createGlobalRecords,
 	createGlobalRecordConfig,
 	createGlobalRecordConfigs,
 	createGlobalRecordModel,
 	createGlobalRecordModels,
+	createPublishGlobalConfig,
 	getCreateRandomGlobalRecordModels,
 	getGlobalRecordsDefaultNameList,
 	getGlobalRecordsByNumberOfPages,

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