@getjones/test-infra 2.6.8 → 2.7.1

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

@@ -1,17 +1,22 @@
 const auditApi = require('./audit.api');
 const { AuditRequestModel, AuditListParametersModel, AuditDatesModel } = require('../../models/audit/audit.model');
 const { validateType } = require('../../../../../common/validations/typeValidations');
-const util = require('../../utils/util');
+const auditUtil = require('../../utils/auditUtil');
 const dataTypeUtils = require('../../../../../common/utils/dataTypeUtils');
 const { cloneObject } = require('../../../../../common/utils/objectUtils');
+const complianceUtil = require('../../../../../common/utils/complianceUtil');
 
 const audit = (auditRequestModel, context) => {
 	validateType(auditRequestModel, AuditRequestModel);
 	return auditApi.audit(auditRequestModel.auditData.contractorId, auditRequestModel, context);
 };
 
+const revertCoi = (contractorId, dateModified, context) => {
+	return auditApi.revertCoi(contractorId, dateModified, context);
+};
+
 const isReaudit = (contractorId, context) => {
-	return auditApi.isReaudit(contractorId, context);
+	return complianceUtil.isReaudit(contractorId, context);
 };
 
 const getAuditorContractorList = (auditListParametersModel, context) => {
@@ -34,36 +39,21 @@ const getAuditMetadata = async (
 	requirementId,
 	recordId,
 	{
-		isProjectOnboarding = false,
-		shouldSendNotificationToPM = false
-	} = {}) => {
-	const metadata = {
+		isProjectOnboarding,
+		shouldSendNotificationToPM
+	} = {}
+) => {
+	return complianceUtil.getAuditMetadata(
+		auditorContext,
 		accountId,
 		projectId,
 		requirementId,
-		contractorId: recordId,
-		isProjectOnboarding,
-		shouldSendNotificationToPM
-	};
-
-	const isReauditResponse = await isReaudit(recordId, auditorContext);
-	metadata.isReaudit = isReauditResponse.data.isReaudit;
-
-	const recordDetailsResponse = await getContractorDetailsForAudit(recordId, auditorContext);
-	const { vendorDetails } = recordDetailsResponse.data;
-
-	metadata.certificateId = vendorDetails.certificateDetails.certificateuploadId;
-	metadata.auditDates = {
-		contractorId: recordId,
-		contractorDateModified: vendorDetails.dateModified,
-		dateStartedAudit: recordDetailsResponse.dateStartedAudit,
-		contractorOverrideDateModified: vendorDetails.contractorOverrideDateModified,
-		contractCreateDate: vendorDetails.contractCreateDate
-	};
-
-	metadata.auditorId = await util.getAuditorId();
-
-	return metadata;
+		recordId,
+		{
+			isProjectOnboarding,
+			shouldSendNotificationToPM
+		}
+	);
 };
 
 const getAuditEntities = async (recordId, auditData, auditorContext) => {
@@ -72,7 +62,7 @@ const getAuditEntities = async (recordId, auditData, auditorContext) => {
 
 	const auditEntities = [];
 	auditData.forEach(auditEntity => auditEntities.push(
-		util.createAuditEntity(requirement, { ... auditEntity }))
+		auditUtil.createAuditEntity(requirement, { ... auditEntity }))
 	);
 	return auditEntities;
 };
@@ -129,7 +119,7 @@ const auditRecord = async function(
 	const auditMetadata = await getAuditMetadata(auditorContext, accountId, projectId, requirementId, recordId);
 
 	const auditApiConfig = dataTypeUtils.isObject(auditConfig) ?
-		util.parseAuditConfig(cloneObject(auditConfig)) :
+		auditUtil.parseAuditConfig(cloneObject(auditConfig)) :
 		auditConfig;
 
 	const auditEntities = await getAuditEntities(recordId, auditApiConfig, auditorContext);
@@ -141,12 +131,13 @@ const auditRecord = async function(
 
 module.exports = {
 	audit,
+	revertCoi,
 	isReaudit,
 	getAuditorContractorList,
 	getContractorDetailsForAudit,
 	getRequirementDetailsForAudit,
-	getAuditMetadata,
 	getAuditEntities,
+	getAuditMetadata,
 	getAuditRequestModel,
 	auditRecord
 };

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

@@ -1,4 +1,9 @@
+const { getEnv, getSystemUserIdentity } = require('../../../../../env');
+const { credentials } = getEnv();
+
 const coverageApi = require('./coverage.api');
+const { getAuditMetadata } = require('../../../../../common/utils/complianceUtil');
+const { getCoverageConfig } = require('../../utils/coverageUtil');
 
 const saveCoverageNode = (coverage, nodeBackendSecret) => {
 	return coverageApi.saveCoverageNode(coverage, nodeBackendSecret);
@@ -16,9 +21,28 @@ const deleteCoverageByCoiId = (coiId, icsContext) => {
 	return coverageApi.deleteCoverageByCoiId(coiId, icsContext);
 };
 
+const addCoverage = async function(
+	accountId,
+	projectId,
+	requirementId,
+	recordId,
+	coverageConfig
+) {
+	const { cookie: auditorContext } = getSystemUserIdentity(credentials.auditorUser);
+	const { auditDates } = await getAuditMetadata(accountId, projectId, requirementId, recordId, auditorContext);
+
+	const coverageApiConfig = dataTypeUtils.isObject(coverageConfig) ?
+		getCoverageConfig(cloneObject(coverageConfig)) :
+		coverageConfig;
+
+	const coverageResponse = await saveCoverageJava(auditorContext, auditDates, coverageApiConfig);
+	return coverageResponse;
+};
+
 module.exports = {
 	saveCoverageNode,
 	saveCoverageJava,
 	getCoverageByCoiId,
-	deleteCoverageByCoiId
+	deleteCoverageByCoiId,
+	addCoverage
 };

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

@@ -3,7 +3,7 @@ const env = require('../../../../../env');
 const waiveApi = require('./waive.api');
 const { WaiveRequestModel, RetractRequestModel, WAIVER_REASONS } = require('../../models/waive/waive.model');
 const { validateType } = require('../../../../../common/validations/typeValidations');
-const util = require('../../utils/util');
+const auditUtil = require('../../utils/auditUtil');
 const httpResponseStatusCodes = require('../../../../../common/httpResponseStatusCodes.json');
 
 const { credentials } = env.getEnv();
@@ -29,7 +29,7 @@ const getWaiveModel = (
 		userId,
 		userRole
 	} = {}) => {
-	const auditId = getPolicyAuditIdFromRecord(record, policyName, util.getAttributeKey(attributeName));
+	const auditId = getPolicyAuditIdFromRecord(record, policyName, auditUtil.getAttributeKey(attributeName));
 	userId = userId || env.getSystemUserIdentity(credentials.superUser).id;
 	userRole = userRole || userTypes.ICS;
 
@@ -55,13 +55,13 @@ const getWaiveModelByGap = (
 		userId,
 		userRole
 	} = {}) => {
-	const attributeName = util.getAttributeNameByGap(record, policyName, gap);
+	const attributeName = auditUtil.getAttributeNameByGap(record, policyName, gap);
 
 	return getWaiveModel(record, policyName, attributeName, reason, note, { userId, userRole });
 };
 
 const getRetractModel = (record, policyName, attributeName) => {
-	const auditId = getPolicyAuditIdFromRecord(record, policyName, util.getAttributeKey(attributeName));
+	const auditId = getPolicyAuditIdFromRecord(record, policyName, auditUtil.getAttributeKey(attributeName));
 	const userId = env.getSystemUserIdentity(credentials.superUser).id;
 	const userRole = userTypes.ICS;
 
@@ -93,7 +93,7 @@ const getPolicyAuditIdFromRecord = (record, policyName, attributeName) => {
 };
 
 const waiveAll = async (record, context, { reason = WAIVER_REASONS.BUSINESS_DECISION, note = 'WAIVED AUTOMATICALLY' } = {}) => {
-	const allWaivablePolicies = util.getAllWaivablePolicies(record, context);
+	const allWaivablePolicies = auditUtil.getAllWaivablePolicies(record, context);
 
 	for (const waivable of allWaivablePolicies) {
 		const waiveModel = getWaiveModel(record, waivable.policyName, waivable.attributeName, reason, note);

package/src/saas/internal-api/compliance/utils/{util.js → auditUtil.js}

@@ -4,9 +4,6 @@ const timeUtils = require('../../../../common/utils/timeUtils');
 const auditModels = require('../models/audit/audit.model');
 const waiveModels = require('../models/waive/waive.model');
 
-const { getEnv, getSystemUserIdentity } = require('../../../../env');
-const { credentials } = getEnv();
-
 const emptyValue = '';
 
 const getValueBySelection = selection => {
@@ -173,16 +170,10 @@ const createAuditEntity = (
 	return auditEntityModel;
 };
 
-const getAuditorId = () => {
-	const auditorIdentity = getSystemUserIdentity(credentials.auditorUser);
-	return auditorIdentity.id;
-};
-
 module.exports = {
 	parseAuditConfig,
 	getPolicyId,
 	createAuditEntity,
-	getAuditorId,
 	getAttributeKey,
 	getAttributeNameByGap,
 	getWaiveReason,

package/src/saas/internal-api/compliance/utils/coverageUtil.js

@@ -0,0 +1,40 @@
+const { cloneObject } = require('../../../../common/utils/objectUtils');
+const { policiesConfig } = require('../../../../defaults/configs/coverage');
+
+const getCoverageConfig = function(coiId, policiesArr) {
+	const config = cloneObject(configBase);
+
+	config.coiId = coiId;
+	const coveragePolicies = config.documents[0].pages[0].policies;
+
+	for (const policyName of policiesArr) {
+		const policy = policiesConfig[policyName];
+
+		if (! policy) {
+			throw Error(`There is no config for ${policyName}. Config available for policies: ${Object.keys(policiesConfig).join(', ')}`);
+		}
+
+		coveragePolicies.push(cloneObject(policy));
+	}
+
+	return config;
+};
+
+const configBase = {
+	'coiId': 'REPLACE_WITH_REAL_VALUE',
+	'documents': [
+		{
+			'documentType': 'accord25',
+			'pages': [
+				{
+					'pageNumber': 1,
+					'policies': []
+				}
+			]
+		}
+	]
+};
+
+module.exports = {
+	getCoverageConfig
+};

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

@@ -21,7 +21,8 @@ const Endpoints = {
 	updateContractorInviteDate: contractorId => `${backendUrl}/_saas/automation/contractor/${contractorId}/invite-date`,
 	searchInAutocomplete: ({ tabId, searchWord }) =>
 		`${backendUrl}/saas/requests/search/audited?&tabId=${tabId}&searchWord=${searchWord}`,
-	automationUpdateContractorUploadDate: contractorId => `${backendUrl}/saas/automation/contractor/${contractorId}/upload-date`
+	automationUpdateContractorUploadDate: contractorId => `${backendUrl}/saas/automation/contractor/${contractorId}/upload-date`,
+	assignRequirement: recordId => `${backendUrl}/saas/contractor/${recordId}/assign-requirement`
 };
 
 const createContractor = (createContractorModel, context) => {
@@ -70,6 +71,10 @@ const changeRequirement = (recordModifyDateVerificationModel, context) => {
 	return requests.putRequestHandler(Endpoints.changeRequirement, recordModifyDateVerificationModel, context);
 };
 
+const assignRequirement = (recordId, assignRequirementModel, context) => {
+	return requests.putRequestHandler(Endpoints.assignRequirement(recordId), assignRequirementModel, context);
+};
+
 const sendGaps = (recordModifyDateVerificationModel, context) => {
 	return requests.postRequestHandler(Endpoints.sendGaps, recordModifyDateVerificationModel, context);
 };
@@ -120,6 +125,7 @@ const updateContractorUploadDate = (contractorId, uploadDate, context) => {
 module.exports = {
 	createContractor,
 	changeRequirement,
+	assignRequirement,
 	getContractorsByAccountId,
 	getContractorById,
 	getRecordHistory,

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

@@ -3,6 +3,7 @@ const { CreateContractorModel } = require('../models/create.contractor.model');
 const { RequestModel } = require('../../requests/models/edit.request.model');
 const { validateType } = require('../../../../common/validations/typeValidations');
 const { RecordModifyDateVerificationModel } = require('../models/verification.contractor.model');
+const { AssignRequirementModel } = require('../models/assign.requirement.model');
 const httpResponseStatusCodes = require('../../../../common/httpResponseStatusCodes.json');
 
 const createContractor = async (createContractorModel, context) => {
@@ -44,6 +45,10 @@ const updateExpiryDate = (contractorId, expiryDate, policyName) => {
 	return contractorsAPI.updateExpiryDate(contractorId, expiryDate, policyName);
 };
 
+const assignRequirement = (recordId, assignRequirementModel, context) => {
+	return contractorsAPI.assignRequirement(recordId, assignRequirementModel, context);
+};
+
 const updateInviteDate = (contractorId, inviteDate, context) => {
 	return contractorsAPI.updateInviteDate(contractorId, inviteDate, context);
 };
@@ -127,6 +132,10 @@ const getRecordVerificationModel = async (recordId, context) => {
 	return new RecordModifyDateVerificationModel(recordData.id, { contractorDateModified: recordData.dateModified });
 };
 
+const getAssignRequirementModel = (requirementId, companyName, emailAddress) => {
+	return new AssignRequirementModel(requirementId, companyName, emailAddress);
+};
+
 module.exports = {
 	createContractor,
 	changeRequirement,
@@ -149,5 +158,7 @@ module.exports = {
 	unmuteNotifications,
 	deleteByContractorId,
 	deleteAllRecordsInAccount,
-	getRecordVerificationModel
+	getRecordVerificationModel,
+	assignRequirement,
+	getAssignRequirementModel
 };

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

@@ -1,8 +1,9 @@
 const createModel = require('./models/create.contractor.model');
 const editModel = require('./models/edit.contractor.model');
 const verificationModel = require('./models/verification.contractor.model');
+const assignRequirementModel = require('./models/assign.requirement.model');
 const services = require('./api/contractors.service');
 
-const models = { create: createModel, edit: editModel, verification: verificationModel };
+const models = { create: createModel, edit: editModel, verification: verificationModel, assignRequirementModel };
 
 module.exports = { services, models };

package/src/saas/internal-api/contractors/models/assign.requirement.model.js

@@ -0,0 +1,10 @@
+class AssignRequirementModel {
+	constructor(requirementId, companyName, emailAddress, { fileName = null, disableMail = false } = {}) {
+		this.requirementId = requirementId;
+		this.companyName = companyName;
+		this.emailAddress = emailAddress;
+		this.fileName = fileName;
+		this.disableMail = disableMail;
+	}
+}
+module.exports = { AssignRequirementModel };

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

@@ -1,3 +1,37 @@
 const DEFAULT_EMAIL_SENDER = 'hellogetjonestest@gmail.com';
 
-module.exports = { DEFAULT_EMAIL_SENDER };
+const EMAIL_TYPES = {
+	COMPLIANT: 'compliant',
+	SEND_GAPS: 'sendGaps',
+	REQUEST_NEW_COI_EXPIRED: 'requestNewCoiExpired',
+	FIRST_REMINDER: 'firstReminder',
+	SECOND_REMINDER: 'secondReminder',
+	FINAL_REMINDER: 'finalReminder',
+	ABOUT_TO_EXPIRE_PM: 'aboutToExpirePM',
+	ABOUT_TO_EXPIRE_MONTH_AUTO_RENEWAL: 'aboutToExpireMonthAutoRenewal',
+	ABOUT_TO_EXPIRE_TWO_WEEKS_AUTO_RENEWAL: 'aboutToExpireTwoWeeksAutoRenewal',
+	ABOUT_TO_EXPIRE_WEEK_AUTO_RENEWAL: 'aboutToExpireWeekAutoRenewal',
+	SAME_DAY_EXPIRATION_RECORD_AUTO_RENEWAL: 'sameDayExpirationRecordAutoRenewal',
+	SAME_DAY_EXPIRATION_PM_AUTO_RENEWAL: 'sameDayExpirationPMAutoRenewal',
+	REQUIREMENTS_UPDATED_NOTIFICATION: 'requirementsUpdatedNotification',
+	UPDATE_REQUIREMENTS_PREFIX: 'updatedRequirementsSubjectPrefix'
+};
+
+const EMAIL_SUBJECT = {
+	compliant: ({ recordCompanyName }) => `Compliant COI - ${recordCompanyName}`,
+	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}`,
+	secondReminder: ({ requesterName }) => `We are still awaiting the Insurance Docs for ${requesterName}`,
+	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`,
+	aboutToExpireTwoWeeksAutoRenewal: ({ requesterName }) => `Your COI for ${requesterName} expires in 14 days`,
+	aboutToExpireWeekAutoRenewal: ({ requesterName }) => `Only 7 days! Your COI for ${requesterName} expires`,
+	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 - '
+};
+
+module.exports = { DEFAULT_EMAIL_SENDER, EMAIL_TYPES, EMAIL_SUBJECT };

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

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

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

@@ -1,3 +1,5 @@
+const { EMAIL_SUBJECT } = require('../consts/consts');
+
 const compareUnorderedArrays = (arr, other, { caseSensitive = true } = {}) => {
 	const isEachElementEqual = arr.sort().every((mail, i) => {
 		if (caseSensitive) {
@@ -51,9 +53,16 @@ const logRetrievedEmailInfo = (to, subject, { cc } = {}) => {
 	log += `\n| Subject: ${subject}`;
 };
 
+const getEmailTextInSubject = (recordCompanyName, emailType, isAfterUpdateRequirements = false, { requesterName = 'Default' } = {}) => {
+	const subject = EMAIL_SUBJECT[emailType]({ recordCompanyName, requesterName });
+
+	return isAfterUpdateRequirements ? `Updated Requirements - ${subject}` : subject;
+};
+
 module.exports = {
 	recipientsMatchVerification,
 	regexVerification,
 	extractEmailFromNameAndEmailFormat,
-	logRetrievedEmailInfo
+	logRetrievedEmailInfo,
+	getEmailTextInSubject
 };

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

@@ -29,7 +29,7 @@ const getCreateProjectModel = (accountId, projectData) => {
 		projectData.city || projectData['City'] || 'N/A',
 		projectData.state || projectData['State'] || 'Alabama',
 		projectData.zipCode || projectData['Zip Code'] || '11111',
-		projectData.companyNameForProject || projectData['Company Name (for external communications)']
+		projectData.companyNameForProject || projectData['Company Name (for external communications)'] || projectData.name
 	);
 	return createProjectModel;
 };

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

@@ -11,7 +11,8 @@ const Endpoints = {
 	getByTabId: `${backendUrl}/saas/requests`,
 	requestsGlobalSearch: (projectId, searchWord) =>
 		`${backendUrl}/saas/requests/search?&projectId=${projectId}&searchWord=${searchWord}`,
-	getAutocompleteAutoSelect: `${backendUrl}/saas/request/auto/selection`
+	getAutocompleteAutoSelect: `${backendUrl}/saas/request/auto/selection`,
+	getTabTenantRequestsInProject: projectId => `${backendUrl}/saas/project/${projectId}/tenants/companies`
 };
 
 const createRequest = (createRequestModel, context) => {
@@ -53,6 +54,10 @@ const requestsGlobalSearch = (projectId, searchWord, context) => {
 	return requests.getRequestHandler(Endpoints.requestsGlobalSearch(projectId, searchWord), {}, context);
 };
 
+const getTabTenantRequestsInProject = (projectId, context) => {
+	return requests.getRequestHandler(Endpoints.getTabTenantRequestsInProject(projectId), {}, context);
+};
+
 module.exports = {
 	createRequest,
 	addRequestToRecord,
@@ -62,5 +67,6 @@ module.exports = {
 	getRequestsByAccountId,
 	getRequestsByTabId,
 	requestsGlobalSearch,
-	getAutocompleteAutoSelect
+	getAutocompleteAutoSelect,
+	getTabTenantRequestsInProject
 };

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

@@ -79,6 +79,7 @@ const getOrCreateRequest = async (context, tabId, requirementId, contractor, act
 	}
 
 	const createContractorModel = getCreateRequestModel(requirementId, contractor, { tabId, sendMail });
+	//JON-8788: add optional parameter dateModified otherwise doesn't work for updated req
 	const createContractorResponse = await createRequest(createContractorModel, context);
 	return createContractorResponse.data;
 };
@@ -87,6 +88,16 @@ const requestsGlobalSearch = (projectId, searchWord, context) => {
 	return requestsAPI.requestsGlobalSearch(projectId, searchWord, context);
 };
 
+const getTabTenantRequestsInProject = async (projectId, context) => {
+	const response = await requestsAPI.getTabTenantRequestsInProject(projectId, context);
+
+	if (response.status !== httpResponseStatusCodes.OK) {
+		throw Error(`Failed to get the tab tenants in project, status - ${response.status}`);
+	}
+
+	return response.data;
+};
+
 module.exports = {
 	createRequest,
 	getAutocompleteAutoSelect,
@@ -98,5 +109,6 @@ module.exports = {
 	getRequestsByAccountId,
 	getOrCreateRequest,
 	getCreateRequestModel,
-	requestsGlobalSearch
+	requestsGlobalSearch,
+	getTabTenantRequestsInProject
 };

package/src/saas/internal-api/requests/models/create.request.model.js

@@ -1,8 +1,12 @@
+const env = require('../../../../../../../src/env');
+
 const { validateType } = require('../../../../common/validations/typeValidations');
 
+const superUserEmail = env.credentials.superUser;
+
 function CreateRequestModel(requirementId, inviterEmail, vendorInfo, { tabId = null, sendMail = false, publicLink } = {}) {
 	this.reqId = requirementId;
-	this.inviterEmail = inviterEmail;
+	this.inviterEmail = inviterEmail || superUserEmail;
 	this.vendorInfo = vendorInfo;
 	this.disableMail = !sendMail;
 	this.tabId = tabId;

package/src/saas/internal-api/requestsTable/api/requests.table.api.js

@@ -2,13 +2,19 @@ const { backendUrl } = require('../../../../env').getEnv();
 const requests = require('../../../../common/requests/cookieAuth/requests');
 
 const Endpoints = {
-	getRequestsByEmail: email => `${backendUrl}/saas/records/email/${email}`
+	getRequestsByEmail: email => `${backendUrl}/saas/records/email/${email}`,
+	getGapsPageDataByRecordId: recordId => `${backendUrl}/saas/gaps/recordId/${recordId}`
 };
 
 const getRequestsByEmail = (email, context) => {
 	return requests.getRequestHandler(Endpoints.getRequestsByEmail(email), {}, context);
 };
 
+const getGapsPageDataByRecordId = (recordId, context) => {
+	return requests.getRequestHandler(Endpoints.getGapsPageDataByRecordId(recordId), {}, context);
+};
+
 module.exports = {
-	getRequestsByEmail
+	getRequestsByEmail,
+	getGapsPageDataByRecordId
 };

package/src/saas/internal-api/requestsTable/api/requests.table.service.js

@@ -4,6 +4,11 @@ const getRequestsByEmail = (email, context) => {
 	return requestsTableAPI.getRequestsByEmail(email, context);
 };
 
+const getGapsPageDataByRecordId = (recordId, context) => {
+	return requestsTableAPI.getGapsPageDataByRecordId(recordId, context);
+};
+
 module.exports = {
-	getRequestsByEmail
+	getRequestsByEmail,
+	getGapsPageDataByRecordId
 };

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

@@ -65,25 +65,19 @@ const deleteByRequirementId = (requirementId, context) => {
 
 const deleteRequirementByName = async (requirementName, tabId, context) => {
 	const requirementToDelete = await getRequirementByName(tabId, requirementName, context);
-	return deleteByRequirementId(requirementToDelete.id, context);
-};
-
-const getCreateRequirementModel = requirement => {
-	return requirementUtils.getCreateRequirementModel(requirement);
-};
 
-const getUpdatedRequirementModel = async (updatedRequirement, tabId, context) => {
-	const { name: requirementName } = updatedRequirement;
-	const existingRequirement = await getRequirementByName(tabId, requirementName, context);
-	updatedRequirement.dateModified = existingRequirement.dateModified;
+	if (!requirementToDelete) {
+		return;
+	}
 
-	return requirementUtils.getUpdateRequirementModel(updatedRequirement);
+	return deleteByRequirementId(requirementToDelete.id, context);
 };
 
 const deleteAllRequirementsInTabs = async (tabIds, context) => {
 	const failedToDeleteRequirements = [];
 	for (const tabId of tabIds) {
 		const { data: existingRequirements } = await getRequirementsByTabId(tabId, context);
+
 		for (const requirement of existingRequirements) {
 			const response = await deleteByRequirementId(requirement.id, context);
 
@@ -99,6 +93,19 @@ const deleteAllRequirementsInTabs = async (tabIds, context) => {
 	}
 };
 
+const getCreateRequirementModel = requirement => {
+	return requirementUtils.getCreateRequirementModel(requirement);
+};
+
+const getUpdatedRequirementModel = async (updatedRequirement, tabId, context, { originalRequirementName } = {}) => {
+	const requirementName = originalRequirementName || updatedRequirement.name;
+	const existingRequirement = await getRequirementByName(tabId, requirementName, context);
+	updatedRequirement.id = existingRequirement.id;
+	updatedRequirement.dateModified = existingRequirement.dateModified;
+
+	return requirementUtils.getUpdateRequirementModel(updatedRequirement);
+};
+
 module.exports = {
 	createRequirement,
 	getRequirementById,
@@ -110,7 +117,7 @@ module.exports = {
 	updateRequirementWithNotification,
 	deleteByRequirementId,
 	deleteRequirementByName,
+	deleteAllRequirementsInTabs,
 	getCreateRequirementModel,
-	getUpdatedRequirementModel,
-	deleteAllRequirementsInTabs
+	getUpdatedRequirementModel
 };

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

@@ -1,8 +1,7 @@
-const { VENDORS } = require('../../../../common/consts/recordTypes');
 const { validateType } = require('../../../../common/validations/typeValidations');
 const { REQUIREMENT_SHARING_LEVELS } = require('../consts/consts');
 const { PolicyModel } = require('./policy.model');
-
+const { VENDORS } = require('../../../../common/consts/recordTypes');
 class UpdateRequirementModel {
 	constructor({ id, name, policies, dateModified, sharingLevel = REQUIREMENT_SHARING_LEVELS.TAB, recordType = VENDORS }) {
 		this.id = id;

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

@@ -1,4 +1,5 @@
 const models = require('./models/users.model');
 const services = require('./api/users.service');
+const util = require('./utils/util');
 
-module.exports = { services, models };
+module.exports = { services, models, util };

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

@@ -1,8 +1,14 @@
 const { SignupUserModel } = require('../models/users.model');
 const usersApi = require('../api/users.api');
+const httpResponseStatusCodes = require('../../../../common/httpResponseStatusCodes.json');
 
 const getUserEncryptedData = async (email, role, context) => {
 	const response = await usersApi.getUserEncryptedData(email, role, context);
+
+	if (response.status !== httpResponseStatusCodes.OK) {
+		throw new Error(`Failed to retrieve user: ${email} encrypted data\n${response}`);
+	}
+
 	return response.data;
 };