@getjones/test-infra 4.3.0 → 4.4.1

package/package.json

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

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

@@ -9,8 +9,12 @@ const compliance = require('../../../saas/internal-api/compliance');
 const requests = require('../../../saas/internal-api/requests');
 const dbEmails = require('../../../saas/internal-api/dbEmails');
 const activationStatuses = require('../../../common/consts/activationStatuses');
+const recordTypes = require('../../../common/consts/recordTypes');
+
+const makeRecordNotResponsive = async function(recordId, context) {
+	const { data: record } = await contractors.services.getContractorById(recordId, context);
+	const isTenant = record.recordType === recordTypes.TENANTS;
 
-const makeRecordNotResponsive = async function(recordId, context, { isTenant } = {}) {
 	const offsetInDaysList = isTenant ?
 		timeUtils.getInviteActionOffsetInDaysForNotResponsiveTenant() :
 		timeUtils.getInviteActionOffsetInDaysForNotResponsiveVendor();

package/src/common/consts/s3FileTypes.js

@@ -8,5 +8,6 @@ module.exports = {
 	ATTACHMENT: 'ATTACHMENT',
 	OCRDATA: 'OCRDATA',
 	VENDORREPORT: 'VENDORREPORT',
-	TEMP_DOCUMENTS: 'TEMP_DOCUMENTS'
+	TEMP_DOCUMENTS: 'TEMP_DOCUMENTS',
+	TEMP_POLICY: 'TEMP_POLICY'
 };

package/src/defaults/configs/auditConfigs.js

@@ -3,6 +3,8 @@ const { cloneObject } = require('../../common/utils/objectUtils');
 const { getOneWeekAgoDate, getOneWeekAheadDate } = require('../../common/utils/timeUtils');
 
 const DEFAULT_POLICY_DATE = '24/05/2030';
+const DEFAULT_EXPIRED_POLICY_DATE = '17/08/2022';
+
 const DEFAULT_AM_SCORE = 'A';
 
 //Excluded from creating global record: 'ABC-12345-XYZ', 'ABC-123-XYZ', 'ABC-123'. When GR is needed - use different GL number.
@@ -59,6 +61,26 @@ const getCompliantAuditConfig = ({ glPolicyNumber = DEFAULT_POLICY_NUMBER } = {}
 	return config;
 };
 
+const getCompliantAuditConfigWithoutPolicies = () => {
+	const config = cloneObject({
+		[certificateIssueDate]: `${DEFAULT_POLICY_DATE}`,
+		[insuredAddress]: policySelections.YES,
+		[insuredName]: policySelections.YES,
+		[amScore]: DEFAULT_AM_SCORE,
+		[cancellationTerms]: policySelections.YES,
+		[coiAuthentication]: policySelections.YES,
+		[signature]: policySelections.YES
+	});
+	return config;
+};
+
+const getNotCompliantAuditConfigWithoutPolicies = () => {
+	const compliantConfig = getCompliantAuditConfigWithoutPolicies();
+	compliantConfig[signature] = policySelections.NO;
+
+	return compliantConfig;
+};
+
 const getNotCompliantConfig = ({ glPolicyNumber } = {}) => {
 	const compliantConfig = getCompliantAuditConfig({ glPolicyNumber });
 	compliantConfig[signature] = policySelections.NO;
@@ -87,13 +109,16 @@ const setExpiredConfig = config =>
 
 module.exports = {
 	getCompliantAuditConfig,
+	getCompliantAuditConfigWithoutPolicies,
 	getNotCompliantConfig,
+	getNotCompliantAuditConfigWithoutPolicies,
 	getAboutExpiredConfig,
 	getExpiredConfig,
 	setExpiredConfig,
 	setAboutExpiredConfig,
 	policySelections,
 	defaultPolicyDate: DEFAULT_POLICY_DATE,
+	defaultExpiredPolicyDate: DEFAULT_EXPIRED_POLICY_DATE,
 	defaultAMScore: DEFAULT_AM_SCORE,
 	defaultPolicyNumber: DEFAULT_POLICY_NUMBER
 };

package/src/defaults/configs/polices.js

@@ -61,7 +61,12 @@ const attributeNames = {
 	waiverOfSubrogation: 'Waiver of Subrogation',
 	waiverOfSubrogationEndorsement: 'Waiver of Subrogation Endorsement',
 	amBestRating: 'AM Best Rating',
-	amBestFinancialSizeCategory: 'AM Best Financial Size Category'
+	amBestFinancialSizeCategory: 'AM Best Financial Size Category',
+	additionalInsuredEndorsementCoveringOngoingOperations: 'Additional Insured Endorsement Covering Ongoing Operations',
+	anyAuto: 'Any Auto',
+	scheduled: 'Scheduled',
+	multiple: 'multiple',
+	other: 'Other'
 };
 
 module.exports = {

package/src/factory/records/records.js

@@ -14,7 +14,6 @@ const httpResponseStatusCodes = require('../../common/httpResponseStatusCodes.js
 const activationStatuses = require('../../common/consts/activationStatuses');
 const timeUtils = require('../../common/utils/timeUtils');
 const recordFlows = require('../../common/commonFlows/records/records');
-const recordTypes = require('../../common/consts/recordTypes');
 
 const filePath = path.join(__dirname, '../../resources/coi/coi.pdf');
 
@@ -100,13 +99,19 @@ const prepareWaivedRecord = async (recordCompany, recordEmail, tabId, requiremen
 	return recordId;
 };
 
+const prepareAcceptedRecord = async (recordCompany, recordEmail, tabId, requirementId, context, { recordConfig, expiryStatus, glPolicyNumber } = {}) => {
+	const recordId = await prepareRecord(recordCompany, recordEmail, complianceStatuses.notCompliant, tabId, requirementId, context, { recordConfig, expiryStatus, glPolicyNumber });
+	await acceptAllGaps(recordId, context);
+	return recordId;
+};
+
 const prepareAwaitingNewCoiRecord = async (recordCompany, recordEmail, tabId, requirementId, context, { recordConfig, expiryStatus, isNotResponsive = false, glPolicyNumber } = {}) => {
 	const recordId = await prepareRecord(recordCompany, recordEmail, complianceStatuses.awaitingNewCoi, tabId, requirementId, context, { recordConfig, expiryStatus, glPolicyNumber });
 
 	await sendGaps(recordId, tabId, context);
 
 	if (isNotResponsive) {
-		await makeRecordNotResponsive(recordId, context);
+		await recordFlows.makeRecordNotResponsive(recordId, context);
 	}
 
 	return recordId;
@@ -116,7 +121,7 @@ const prepareAwaitingCoiRecord = async (recordCompany, recordEmail, tabId, requi
 	const recordId = await prepareRecord(recordCompany, recordEmail, complianceStatuses.awaitingCoi, tabId, requirementId, context, { recordConfig });
 
 	if (isNotResponsive) {
-		await makeRecordNotResponsive(recordId, context);
+		await recordFlows.makeRecordNotResponsive(recordId, context);
 	}
 
 	return recordId;
@@ -130,12 +135,6 @@ const prepareUnderReviewRecord = (recordCompany, recordEmail, tabId, requirement
 	return prepareRecord(recordCompany, recordEmail, complianceStatuses.underReview, tabId, requirementId, context, { recordConfig });
 };
 
-const makeRecordNotResponsive = async (recordId, context) => {
-	const { data: record } = await contractors.services.getContractorById(recordId, context);
-	const isTenant = record.recordType === recordTypes.TENANTS;
-	await recordFlows.makeRecordNotResponsive(recordId, context, { isTenant });
-};
-
 const sendGaps = async (recordId, tabId, context) => {
 	const { id: requestId } = await requests.services.getRequestFromTabByRecordId(recordId, tabId, context);
 	const recordVerificationModel = await contractors.services.getRecordVerificationModel(recordId, context);
@@ -151,6 +150,11 @@ const waiveAllGaps = async (recordId, context) => {
 	await compliance.services.overrideGap.waiveAll(record, context);
 };
 
+const acceptAllGaps = async (recordId, context) => {
+	const { data: record } = await contractors.services.getContractorById(recordId, context);
+	await compliance.services.overrideGap.acceptAll(record, context);
+};
+
 const validateInsuranceAndExpiryStatus = async (insuranceStatus, expiryStatus) => {
 	let isValid = false;
 	const isWithoutExpiryStatus = !Boolean(expiryStatus);
@@ -218,6 +222,7 @@ module.exports = {
 	prepareCompliantRecord,
 	prepareNotCompliantRecord,
 	prepareWaivedRecord,
+	prepareAcceptedRecord,
 	prepareAwaitingNewCoiRecord,
 	prepareUnderReviewRecord,
 	prepareAwaitingCoiRecord,

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

@@ -2,13 +2,43 @@ const requests = require('../../../../common/requests/cookieAuth/requests');
 const { backendUrl } = require('../../../../env').getEnv();
 
 const Endpoints = {
-	recordTable: `${backendUrl}/saas/account-directory/record-table`
+	recordTable: `${backendUrl}/saas/account-directory/record-table`,
+	recordsCount: `${backendUrl}/saas/account-directory/records-count`,
+	projectLocations: `${backendUrl}/saas/account-directory/filter/location`,
+	requestTable: `${backendUrl}/saas/account-directory/request-table`,
+	requestTableFilters: `${backendUrl}/saas/account-directory/request-table/filters`,
+	requestActivityCount: `${backendUrl}/saas/account-directory/request-activity-count`
 };
 
 const getRecordTable = (accountDirectoryRecordTableFilterModel, context) => {
 	return requests.postRequestHandler(Endpoints.recordTable, accountDirectoryRecordTableFilterModel, context);
 };
 
+const getRecordsCount = (accountId, context) => {
+	return requests.getRequestHandler(Endpoints.recordsCount, { accountId }, context);
+};
+
+const getProjectLocations = (accountId, context) => {
+	return requests.getRequestHandler(Endpoints.projectLocations, { accountId }, context);
+};
+
+const getRequestTable = (accountDirectoryRequestTableFilterModel, context) => {
+	return requests.postRequestHandler(Endpoints.requestTable, accountDirectoryRequestTableFilterModel, context);
+};
+
+const getRequestTableFilters = (accountDirectoryRequestTableFilterModel, context) => {
+	return requests.postRequestHandler(Endpoints.requestTableFilters, accountDirectoryRequestTableFilterModel, context);
+};
+
+const getRequestActivityCount = (accountDirectoryRequestTableFilterModel, context) => {
+	return requests.postRequestHandler(Endpoints.requestActivityCount, accountDirectoryRequestTableFilterModel, context);
+};
+
 module.exports = {
-	getRecordTable
+	getRecordTable,
+	getRecordsCount,
+	getProjectLocations,
+	getRequestTable,
+	getRequestTableFilters,
+	getRequestActivityCount
 };

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

@@ -8,11 +8,20 @@ const RECORD_TABLE_SORT_BY = {
 	PROJECTS_COUNT: 'PROJECTS_COUNT'
 };
 
-const getRecordTableData = async (accountDirectoryRecordTableFilterModel, context) => {
+const activationStatuses = {
+	ACTIVE: 'ACTIVE',
+	IN_ACTIVE: 'IN_ACTIVE'
+};
+
+const getRecordTableData = async (accountDirectoryRecordTableFilterModel, context, { expectError } = {}) => {
 	validateType(accountDirectoryRecordTableFilterModel, accountDirectoryModels.AccountDirectoryRecordTableFilterModel);
 
 	const recordTableResponse = await accountDirectoryAPI.getRecordTable(accountDirectoryRecordTableFilterModel, context);
 
+	if (expectError) {
+		return recordTableResponse;
+	}
+
 	if (recordTableResponse.status !== httpResponseStatusCodes.OK) {
 		throw Error(`Failed to get main page record table. Status code: ${recordTableResponse.status}`);
 	}
@@ -20,13 +29,130 @@ const getRecordTableData = async (accountDirectoryRecordTableFilterModel, contex
 	return recordTableResponse.data.tableRowsData;
 };
 
-const getRecordTableByAccountId = (accountId, context, { sortBy } = {}) => {
-	const accountDirectoryRecordTableFilterModel = new accountDirectoryModels.AccountDirectoryRecordTableFilterModel({ accountId, sortBy });
+const getRecordTableByAccountId = (accountId, context, { sortBy, selectedRecordTypes, selectedStates, searchTerm, pageNum, rowsPerPage, sortOrder, expectError } = {}) => {
+	const accountDirectoryRecordTableFilterModel = new accountDirectoryModels.AccountDirectoryRecordTableFilterModel(
+		{
+			accountId,
+			sortBy,
+			selectedRecordTypes,
+			selectedStates,
+			searchTerm,
+			pageNum,
+			rowsPerPage,
+			sortOrder
+		});
+
+	return getRecordTableData(accountDirectoryRecordTableFilterModel, context, { expectError });
+};
+
+const getProjectLocations = async (accountId, context) => {
+	const locationFilterResponse = await accountDirectoryAPI.getProjectLocations(accountId, context);
+
+	if (locationFilterResponse.status !== httpResponseStatusCodes.OK) {
+		throw Error(`Failed to get projects locations. Status code: ${locationFilterResponse.status}`);
+	}
+
+	return locationFilterResponse.data;
+};
+
+const getRecordsCount = async (accountId, context) => {
+	const recordsCountResponse = await accountDirectoryAPI.getRecordsCount(accountId, context);
+
+	if (recordsCountResponse.status !== httpResponseStatusCodes.OK) {
+		throw Error(`Failed to get records count. Status code: ${recordsCountResponse.status}`);
+	}
+
+	return recordsCountResponse.data;
+};
+
+const getRequestTableData = async (accountDirectoryRequestTableFilterModel, context, { expectError } = {}) => {
+	validateType(accountDirectoryRequestTableFilterModel, accountDirectoryModels.AccountDirectoryRequestTableFilterModel);
+
+	const requestTableResponse = await accountDirectoryAPI.getRequestTable(accountDirectoryRequestTableFilterModel, context);
+
+	if (expectError) {
+		return requestTableResponse;
+	} else if (requestTableResponse.status !== httpResponseStatusCodes.OK) {
+		throw Error(`Failed to get inner page request table. Status code: ${requestTableResponse.status}`);
+	}
+
+	return requestTableResponse.data;
+};
+
+const getRequestTableByRecordId = (accountId, context, { globalRecordId, recordId, activityStatus, expectError } = {}) => {
+	const accountDirectoryRequestTableFilterModel = new accountDirectoryModels.AccountDirectoryRequestTableFilterModel(
+		{
+			accountId,
+			globalRecordId,
+			recordId,
+			activityStatus
+		});
+
+	return getRequestTableData(accountDirectoryRequestTableFilterModel, context, { expectError });
+};
+
+const getRequestTableFilters = async (accountDirectoryRequestTableFilterModel, context, { expectError } = {}) => {
+	validateType(accountDirectoryRequestTableFilterModel, accountDirectoryModels.AccountDirectoryRequestTableFilterModel);
+
+	const requestTableFiltersResponse = await accountDirectoryAPI.getRequestTableFilters(accountDirectoryRequestTableFilterModel, context);
+
+	if (expectError) {
+		return requestTableFiltersResponse;
+	} else if (requestTableFiltersResponse.status !== httpResponseStatusCodes.OK) {
+		throw Error(`Failed to get request table filters. Status code: ${requestTableFiltersResponse.status}`);
+	}
+
+	return requestTableFiltersResponse.data;
+};
+
+const getRequestTableFiltersByRecordId = (accountId, context, { globalRecordId, recordId, activityStatus, expectError } = {}) => {
+	const accountDirectoryRequestTableFilterModel = new accountDirectoryModels.AccountDirectoryRequestTableFilterModel(
+		{
+			accountId,
+			globalRecordId,
+			recordId,
+			activityStatus
+		});
+
+	return getRequestTableFilters(accountDirectoryRequestTableFilterModel, context, { expectError });
+};
+
+const getRequestActivityCount = async (accountDirectoryRequestTableFilterModel, context, { expectError } = {}) => {
+	validateType(accountDirectoryRequestTableFilterModel, accountDirectoryModels.AccountDirectoryRequestTableFilterModel);
+
+	const activityCountResponse = await accountDirectoryAPI.getRequestActivityCount(accountDirectoryRequestTableFilterModel, context);
+
+	if (expectError) {
+		return activityCountResponse;
+	} else if (activityCountResponse.status !== httpResponseStatusCodes.OK) {
+		throw Error(`Failed to get request activity count. Status code: ${activityCountResponse.status}`);
+	}
+
+	return activityCountResponse.data;
+};
+
+const getRequestActivityCountByRecordId = (accountId, context, { globalRecordId, recordId, activityStatus, expectError } = {}) => {
+	const accountDirectoryRequestTableFilterModel = new accountDirectoryModels.AccountDirectoryRequestTableFilterModel(
+		{
+			accountId,
+			globalRecordId,
+			recordId,
+			activityStatus
+		});
 
-	return getRecordTableData(accountDirectoryRecordTableFilterModel, context);
+	return getRequestActivityCount(accountDirectoryRequestTableFilterModel, context, { expectError });
 };
 
 module.exports = {
 	RECORD_TABLE_SORT_BY,
-	getRecordTableByAccountId
+	activationStatuses,
+	getRecordTableByAccountId,
+	getRecordsCount,
+	getProjectLocations,
+	getRequestTableData,
+	getRequestTableByRecordId,
+	getRequestTableFilters,
+	getRequestTableFiltersByRecordId,
+	getRequestActivityCount,
+	getRequestActivityCountByRecordId
 };

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

@@ -7,7 +7,7 @@ class AccountDirectoryRecordTableFilterModel {
 		sortBy = null,
 		sortOrder = null,
 		rowsPerPage = null,
-		pageNumber = null
+		pageNum = null
 	} = {}) {
 		this.accountId = accountId;
 		this.searchTerm = searchTerm;
@@ -16,10 +16,25 @@ class AccountDirectoryRecordTableFilterModel {
 		this.sortBy = sortBy;
 		this.sortOrder = sortOrder;
 		this.rowsPerPage = rowsPerPage;
-		this.pageNumber = pageNumber;
+		this.pageNum = pageNum;
+	}
+}
+
+class AccountDirectoryRequestTableFilterModel {
+	constructor({
+		accountId,
+		globalRecordId,
+		recordId,
+		activityStatus
+	} = {}) {
+		this.accountId = accountId;
+		this.globalRecordId = globalRecordId;
+		this.recordId = recordId;
+		this.activityStatus = activityStatus;
 	}
 }
 
 module.exports = {
-	AccountDirectoryRecordTableFilterModel
+	AccountDirectoryRecordTableFilterModel,
+	AccountDirectoryRequestTableFilterModel
 };

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

@@ -1,4 +1,3 @@
-const env = require('../../../../env');
 const FormData = require('form-data');
 const fs = require('fs');
 const path = require('path');
@@ -9,7 +8,7 @@ const { validateType } = require('../../../../common/validations/typeValidations
 const httpResponseStatusCodes = require('../../../../common/httpResponseStatusCodes.json');
 const { CONTRACT, TEMP_DOCUMENTS } = require('../../../../common/consts/s3FileTypes');
 const { CreateAgreementByAuditorModel } = require('../models/createAgreementByAuditorModel');
-const { COI_FOLDER_PATH, DEFAULT_COI_FILENAME } = require('../../../../../../../src/utils/consts');
+const { COI_FOLDER_PATH, DEFAULT_COI_FILENAME } = require('../consts/consts');
 
 const createAgreement = (createAgreementByPMModel, context) => {
 	validateType(createAgreementByPMModel, CreateAgreementByPMModel);

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

@@ -4,5 +4,7 @@ const UPLOADER_TYPE = {
 };
 
 const DEFAULT_AGREEMENT_TEMPLATE = 'tpl_C3sgbpYx7LHyRNdtM7';
+const COI_FOLDER_PATH = 'packages/test-infra/src/resources/coi/';
+const DEFAULT_COI_FILENAME = 'coi.pdf';
 
-module.exports = { UPLOADER_TYPE, DEFAULT_AGREEMENT_TEMPLATE };
+module.exports = { UPLOADER_TYPE, DEFAULT_AGREEMENT_TEMPLATE, COI_FOLDER_PATH, DEFAULT_COI_FILENAME };

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

@@ -9,7 +9,8 @@ const Endpoints = {
 	submitCoi: `${backendUrl}/coi/merge`,
 	completeScan: contractorId => `${backendUrl}/saas/auditor/contractors/${contractorId}/coi/complete-scan`,
 	getCoiPresignedUrl: fileName => `${backendUrl}/saas/coi/${fileName}`,
-	getCoiHashes: recordId => `${backendUrl}/jcsc/record/${recordId}/coi/hashes`
+	getCoiHashes: recordId => `${backendUrl}/jcsc/record/${recordId}/coi/hashes`,
+	combineLastTwoCOIs: `${backendUrl}/saas/auditor/record/coi/merge-last-two`
 };
 
 const uploadToS3 = (contractorId, fileData) => {
@@ -37,4 +38,8 @@ const getCoiHashes = recordId => {
 	return internalRequests.getRequestHandler(Endpoints.getCoiHashes(recordId));
 };
 
-module.exports = { uploadToS3, submitCoi, completeScan, getCoiPreSignedUrl, getCoiHashes };
+const combineLastTwoCOIs = (combineLastTwoCOIsModel, context) => {
+	return requests.postRequestHandler(Endpoints.combineLastTwoCOIs, combineLastTwoCOIsModel, context);
+};
+
+module.exports = { uploadToS3, submitCoi, completeScan, getCoiPreSignedUrl, getCoiHashes, combineLastTwoCOIs };

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

@@ -1,6 +1,8 @@
 const coiApi = require('./coi.api');
 const { SubmitCoiModel } = require('../models/submit.coi.model');
+const { CombineLastTwoCOIsModel } = require('../models/Combine.last.two.cois.model');
 const { validateType } = require('../../../../common/validations/typeValidations');
+const httpResponseStatusCodes = require('../../../../common/httpResponseStatusCodes.json');
 
 const uploadToS3 = (contractorId, fileData) => {
 	return coiApi.uploadToS3(contractorId, fileData);
@@ -23,4 +25,15 @@ const getCoiHashes = recordId => {
 	return coiApi.getCoiHashes(recordId);
 };
 
-module.exports = { uploadToS3, submitCoi, getCoiPreSignedUrl, completeScan, getCoiHashes };
+const combineLastTwoCOIs = async (combineLastTwoCOIsModel, auditorContext) => {
+	validateType(combineLastTwoCOIsModel, CombineLastTwoCOIsModel);
+	const response = await coiApi.combineLastTwoCOIs(combineLastTwoCOIsModel, auditorContext);
+
+	if (response.status !== httpResponseStatusCodes.OK) {
+		throw new Error(`Failed to combine last two COIs for recordId ${combineLastTwoCOIsModel.contractorId}`);
+	}
+
+	return response;
+};
+
+module.exports = { uploadToS3, submitCoi, getCoiPreSignedUrl, completeScan, getCoiHashes, combineLastTwoCOIs };

package/src/saas/internal-api/coi/models/Combine.last.two.cois.model.js

@@ -0,0 +1,25 @@
+const { SubmitCoiModel } = require('../models/submit.coi.model');
+
+class CombineLastTwoCOIsModel extends SubmitCoiModel {
+	constructor({
+		recordId,
+		fileIds,
+		uploadedBy,
+		uploaderEmail,
+		recordDateModified,
+		isContractorExist,
+		isNewCoiOnTop = true
+	}) {
+		super({
+			recordId,
+			fileIds,
+			uploadedBy,
+			uploaderEmail,
+			recordDateModified,
+			isContractorExist
+		});
+		this.isNewCoiOnTop = isNewCoiOnTop;
+	}
+}
+
+module.exports = { CombineLastTwoCOIsModel };

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

@@ -2,6 +2,7 @@ const fs = require('fs');
 
 const services = require('../api/coi.service');
 const { SubmitCoiModel } = require('../models/submit.coi.model');
+const { CombineLastTwoCOIsModel } = require('../models/Combine.last.two.cois.model');
 const { getContractorById } = require('../../contractors/api/contractors.service');
 const { getIcsCookie } = require('../../auth/api/auth.service');
 
@@ -63,8 +64,32 @@ const uploadCoi = async (
 	return uploadedCoi;
 };
 
+const combineLastTwoCOIs = async ({
+	recordId,
+	fileIds,
+	uploadedBy,
+	uploaderEmail,
+	isContractorExist,
+	icsContext,
+	auditorContext
+}) => {
+	const recordResponse = await getContractorById(recordId, icsContext);
+	const recordDateModified = recordResponse.data.dateModified;
+
+	const combineLastTwoCOIsModel = new CombineLastTwoCOIsModel({
+		recordId,
+		fileIds,
+		uploadedBy,
+		uploaderEmail,
+		recordDateModified,
+		isContractorExist
+	});
+	return services.combineLastTwoCOIs(combineLastTwoCOIsModel, auditorContext);
+};
+
 module.exports = {
 	uploadCoi,
 	uploadFileToStorage,
-	submitCoiFilesUpload
+	submitCoiFilesUpload,
+	combineLastTwoCOIs
 };

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

@@ -5,6 +5,7 @@ const Endpoints = {
 	auditorContractorList: `${backendUrl}/saas/auditor/contractors`,
 	audit: `${backendUrl}/saas/auditor/contractors/submit/audits`,
 	enterAudit: contractorId => `${backendUrl}/saas/auditor/contractors/${contractorId}/master-audit`,
+	verifyAudit: contractorId => `${backendUrl}/saas/auditor/audit/${contractorId}/verify`,
 	getAuditRecordModelByRecordId: recordId => `${backendUrl}/saas/auditor/record/${recordId}/audit-record`,
 	getComplianceJsonByRecordId: recordId => `${backendUrl}/saas/contractors/${recordId}/compliance-json`,
 	requirementDetailsForAudit: contractorId => `${backendUrl}/saas/auditor/contractor/${contractorId}/requirement`,
@@ -15,7 +16,8 @@ const Endpoints = {
 	putAuditOnHold: `${backendUrl}/saas/auditor/put-on-hold`,
 	resumeAudit: onHoldId => `${backendUrl}/saas/auditor/on-hold/${onHoldId}/resume`,
 	getAuditMetadata: auditId => `${backendUrl}/saas/auditor/audit-metadata/${auditId}`,
-	updateComplianceAuditActionsDate: recordId => `${backendUrl}/saas/automation/record/${recordId}/update-audit-actions-date`
+	updateComplianceAuditActionsDate: recordId => `${backendUrl}/saas/automation/record/${recordId}/update-audit-actions-date`,
+	auditRawData: recordId => `${backendUrl}/saas/integration-tests/record/${recordId}/audit/raw`
 };
 
 const audit = async (contractorId, auditRequestModel, context) => {
@@ -46,6 +48,10 @@ const enterAudit = (contractorId, context) => {
 	return requests.getRequestHandler(Endpoints.enterAudit(contractorId), {}, context);
 };
 
+const verifyAuditBeforeEnter = (contractorId, context) => {
+	return requests.getRequestHandler(Endpoints.verifyAudit(contractorId), {}, context);
+};
+
 const getAuditRecordModel = (recordId, context) => {
 	return requests.getRequestHandler(Endpoints.getAuditRecordModelByRecordId(recordId), {}, context);
 };
@@ -84,6 +90,10 @@ const getComplianceJson = (recordId, context) => {
 	return requests.getRequestHandler(Endpoints.getComplianceJsonByRecordId(recordId), {}, context);
 };
 
+const getAuditRawData = (recordId, context) => {
+	return requests.getRequestHandler(Endpoints.auditRawData(recordId), {}, context);
+};
+
 module.exports = {
 	audit,
 	submitAudit,
@@ -99,5 +109,7 @@ module.exports = {
 	putAuditOnHold,
 	resumeAudit,
 	getAuditMetadata,
-	updateComplianceAuditActionsDate
+	updateComplianceAuditActionsDate,
+	getAuditRawData,
+	verifyAuditBeforeEnter
 };

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

@@ -35,8 +35,24 @@ const getAuditorContractorList = (auditListParametersModel, context) => {
 	return auditApi.getAuditorContractorList(auditListParametersModel, context);
 };
 
-const enterAudit = (contractorId, context) => {
-	return auditApi.enterAudit(contractorId, context);
+const getAuditRequestModelAfterEnterAudit = async (auditConfigForModelAfterEnterAudit, accountId, projectId, requirementId, recordId, context) => {
+	const metadata = await prepareMetadataForAudit(context, accountId, projectId, requirementId, recordId);
+	const auditEntities = await getAuditEntities(recordId, auditConfigForModelAfterEnterAudit, context);
+	const auditRequestModel = getAuditRequestModel(metadata, auditEntities);
+
+	return auditRequestModel;
+};
+
+const enterAudit = async (recordId, context, { auditConfigForModelAfterEnterAudit, accountId, projectId, requirementId } = {}) => {
+	const enterAuditResponse = await auditApi.enterAudit(recordId, context);
+
+	if (enterAuditResponse.status !== httpResponseStatusCodes.OK) {
+		throw Error(`Failed to enter audit\n$response - ${enterAuditResponse.status}\n${JSON.stringify(enterAuditResponse.data)}`);
+	}
+
+	return auditConfigForModelAfterEnterAudit ?
+		getAuditRequestModelAfterEnterAudit(auditConfigForModelAfterEnterAudit, accountId, projectId, requirementId, recordId, context) :
+		enterAuditResponse;
 };
 
 const getAuditRecordModel = (recordId, context) => {
@@ -231,6 +247,20 @@ const getCurrentAuditUniqueCoiId = async function(recordId, auditorContext) {
 	return uniqueCoiId;
 };
 
+const getAuditRawData = async function(recordId, context) {
+	const responseAudit = await auditApi.getAuditRawData(recordId, context);
+
+	if (responseAudit.status !== httpResponseStatusCodes.OK) {
+		throw Error(`Failed to get audit raw data by record id\n${responseAudit}`);
+	}
+
+	return responseAudit.data;
+};
+
+const getAttributeKey = attributeName => {
+	return auditUtil.getAttributeKey(attributeName);
+};
+
 module.exports = {
 	audit,
 	submitAudit,
@@ -253,5 +283,7 @@ module.exports = {
 	getAuditOnHoldData,
 	getLastAuditDateBeforeAgreementAudit,
 	updateComplianceAuditActionsDate,
-	getCurrentAuditUniqueCoiId
+	getCurrentAuditUniqueCoiId,
+	getAuditRawData,
+	getAttributeKey
 };

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

@@ -5,7 +5,8 @@ const Endpoints = {
 	waive: contractorId => `${backendUrl}/saas/contractors/${contractorId}/waiver`,
 	retract: contractorId => `${backendUrl}/saas/contractors/${contractorId}/waiver`,
 	overrideGap: `${backendUrl}/saas/record/override-gap`,
-	retractOverride: `${backendUrl}/saas/record/retract-override`
+	retractOverride: `${backendUrl}/saas/record/retract-override`,
+	getOverridesByRecordId: recordId => `${backendUrl}/saas/integration-tests/record/${recordId}/override`
 };
 
 const waive = async (contractorId, waiveRequestModel, context) => {
@@ -30,4 +31,8 @@ const retractOverride = (retractRequestModel, context) => {
 	return requests.postRequestHandler(Endpoints.retractOverride, retractRequestModel, context);
 };
 
-module.exports = { waive, retract, overrideGap, retractOverride };
+const getOverridesByRecordId = (recordId, context) => {
+	return requests.getRequestHandler(Endpoints.getOverridesByRecordId(recordId), {}, context);
+};
+
+module.exports = { waive, retract, overrideGap, retractOverride, getOverridesByRecordId };

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

@@ -29,7 +29,7 @@ const retractOverride = (retractRequestModel, context) => {
 	return overrideGapApi.retractOverride(retractRequestModel, context);
 };
 
-const getWaiveModel = (
+const getAllWaiveModels = (
 	record,
 	policyName,
 	attributeName,
@@ -39,20 +39,40 @@ const getWaiveModel = (
 		userId,
 		userRole
 	} = {}) => {
-	const auditId = getPolicyAuditIdFromRecord(record, policyName, auditUtil.getAttributeKey(attributeName));
+	const auditIds = getPolicyAuditIdsFromRecord(record, policyName, auditUtil.getAttributeKey(attributeName));
 	userId = userId || env.getSystemUserIdentity(credentials.superUser).id;
 	userRole = userRole || userTypes.ICS;
 
-	const waiveModel = new WaiveRequestModel({
-		contractorId: record.id,
-		auditId,
-		waiverReason,
-		remarks,
+	const waiverModels = [];
+	let i = 0;
+	while (i < auditIds.length) {
+		const auditId = auditIds[i];
+		const waiveModel = new WaiveRequestModel({
+			contractorId: record.id,
+			auditId,
+			waiverReason,
+			remarks,
+			userId,
+			userRole
+		});
+		waiverModels.push(waiveModel);
+		i++;
+	}
+
+	return waiverModels;
+};
+
+const getWaiveModel = (
+	record,
+	policyName,
+	attributeName,
+	waiverReason,
+	remarks,
+	{
 		userId,
 		userRole
-	});
-
-	return waiveModel;
+	} = {}) => {
+	return getAllWaiveModels(record, policyName, attributeName, waiverReason, remarks, { userId, userRole })[0];
 };
 
 const getWaiveModelByGap = (
@@ -71,7 +91,7 @@ const getWaiveModelByGap = (
 };
 
 const getRetractModel = (record, policyName, attributeName) => {
-	const auditId = getPolicyAuditIdFromRecord(record, policyName, auditUtil.getAttributeKey(attributeName));
+	const auditId = getPolicyAuditIdsFromRecord(record, policyName, auditUtil.getAttributeKey(attributeName))[0];
 	const userId = env.getSystemUserIdentity(credentials.superUser).id;
 	const userRole = userTypes.ICS;
 
@@ -85,7 +105,7 @@ const getRetractModel = (record, policyName, attributeName) => {
 	return retractModel;
 };
 
-const getPolicyAuditIdFromRecord = (record, policyName, attributeName) => {
+const getPolicyAuditIdsFromRecord = (record, policyName, attributeName) => {
 	const policy = record.reviewbyAuditor.find(contractorCoverage =>
 		contractorCoverage.insuranceName === policyName);
 
@@ -93,25 +113,35 @@ const getPolicyAuditIdFromRecord = (record, policyName, attributeName) => {
 		throw new Error(`Policy name: ${policyName} don't exist in record`);
 	}
 
-	const attribute = policy.errorList.find(error => error.limitname === attributeName);
+	const attributes = policy.errorList.filter(error => error.limitname === attributeName);
 
-	if (!attribute) {
+	if (!attributes.length) {
 		throw new Error(`Attribute name: ${attributeName} don't exist in record`);
 	}
 
-	return attribute.auditId;
+	const auditIds = attributes.map(a => a.auditId);
+
+	return auditIds;
 };
 
 // private method - please refer to waiveAll / acceptAll
 const overrideAll = async (record, reason, context, { note = 'OVERRIDDEN AUTOMATICALLY' } = {}) => {
-	const allWaivablePolicies = auditUtil.getAllWaivablePolicies(record, context);
+	let allWaivablePolicies = auditUtil.getAllWaivablePolicies(record, context);
+	// Remove duplicates, this can happen for example in case of multiple errors on Additional Insured, Certificate Holder or Additional Information
+	allWaivablePolicies = allWaivablePolicies.filter((value, index, self) =>
+		index === self.findIndex(t => (
+			t.policyName === value.policyName && t.attributeName === value.attributeName
+		))
+	);
 
 	for (const waivable of allWaivablePolicies) {
-		const waiveModel = getWaiveModel(record, waivable.policyName, waivable.attributeName, reason, note);
-		const waiveResponse = await overrideGap({ waiveRequestModel: waiveModel, context });
+		const waiveModels = getAllWaiveModels(record, waivable.policyName, waivable.attributeName, reason, note);
+		for (waiveModel of waiveModels) {
+			const waiveResponse = await overrideGap({ waiveRequestModel: waiveModel, context });
 
-		if (waiveResponse.status !== httpResponseStatusCodes.OK) {
-			throw Error(`Failed to waive ${waivable.policyName} - ${waivable.attributeName} for ${record.company}`);
+			if (waiveResponse.status !== httpResponseStatusCodes.OK) {
+				throw Error(`Failed to waive ${waivable.policyName} - ${waivable.attributeName} for ${record.company}`);
+			}
 		}
 	}
 };
@@ -128,6 +158,16 @@ const acceptAll = async (record, context, { note = 'ACCEPTED AUTOMATICALLY' } =
 	await overrideAll(record, WAIVER_REASONS.ACCEPT_NO_EXPOSURE, context, { note });
 };
 
+const getOverridesByRecordId = async function(recordId, context) {
+	const responseAudit = await overrideGapApi.getOverridesByRecordId(recordId, context);
+
+	if (responseAudit.status !== httpResponseStatusCodes.OK) {
+		throw Error(`Failed to get overrides by record id\n${responseAudit}`);
+	}
+
+	return responseAudit.data;
+};
+
 module.exports = {
 	waive,
 	waiveAll,
@@ -137,5 +177,6 @@ module.exports = {
 	getRetractModel,
 	getWaiveModelByGap,
 	overrideGap,
-	retractOverride
+	retractOverride,
+	getOverridesByRecordId
 };

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

@@ -47,7 +47,7 @@ const ATTRIBUTE_NAMES_MAP = {
 	isPolicyExist: 'coverageexists',
 	eachOccurrence: 'Each Occurrence',
 	expiryDate: 'expirydate',
-	policyNumber: 'policyNumber',
+	policyNumber: 'policynumber',
 	perOccurrence: 'PerOccur',
 	perPolicy: 'Per Policy',
 	perProject: 'Per Project',
@@ -83,6 +83,11 @@ const auditStatus = {
 	canceled: 'CANCELED'
 };
 
+const auditTypes = {
+	manual: 'MANUAL',
+	automatic: 'AUTOMATIC'
+};
+
 const auditOnHoldReason = {
 	ESCALATION_TO_PM: 'Escalation to PM',
 	ISSUE_WITH_REQUIREMENTS: 'Issue with Requirements',
@@ -100,5 +105,6 @@ module.exports = {
 	VALID_SCORES,
 	auditTriggerType,
 	auditStatus,
-	auditOnHoldReason
+	auditOnHoldReason,
+	auditTypes
 };

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

@@ -142,7 +142,22 @@ const parseAuditConfig = function(config) {
 
 			if (isArray(config[field])) {
 				selection.status = AUDIT_ENTITY_STATUSES[(config[field][0]).toUpperCase()];
-				selection.value = config[field][1]; // Ok to be undefined
+
+				const auditValue = config[field][1];
+
+				if (multipleErrorsEndorsementList.includes(field) && isArray(auditValue)) {
+					// in case of 'Other' with multiple errors in special policies (Additional Information, Certificate Holder, etc)
+					let i = 0;
+					while (i < auditValue.length) {
+						const copiedSelection = { ... selection };
+						copiedSelection.value = auditValue[i];
+						auditDataArr.push(copiedSelection);
+						i++;
+					}
+					continue;
+				} else {
+					selection.value = auditValue; // Ok to be undefined
+				}
 			} else {
 				selection.status = AUDIT_ENTITY_STATUSES[(config[field]).toUpperCase()] || AUDIT_ENTITY_STATUSES.YES;
 				selection.value = getValueBySelection(config[field]);
@@ -188,6 +203,14 @@ const certificateEndorsementsList = [
 	'Agreement'
 ];
 
+const multipleErrorsEndorsementList = [
+	'Certificate Holder',
+	'Additional Information',
+	'Additional Insured',
+	'Agreement',
+	'Other' //not endorsement
+];
+
 const specialAttributes = {
 	'Certificate issue date': 'certIssueDate',
 	'Cancellation Terms': 'cancellationTerms',

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

@@ -274,6 +274,16 @@ const linkDraftRequestToAccountRecord = async (requestToLink, targetAccountRecor
 	}
 };
 
+const changeRequirementsDirectly = async (recordId, newRequirementId, context) => {
+	const recordVerificationModel = await getRecordVerificationModel(recordId, context);
+	recordVerificationModel.requirementId = newRequirementId;
+	const changeRequirementRes = await changeRequirement(recordVerificationModel, context);
+
+	if (changeRequirementRes.status !== httpResponseStatusCodes.NO_CONTENT) {
+		throw Error(`Failed to change requirement for record: ${recordId}`);
+	}
+};
+
 module.exports = {
 	changeRequirement,
 	getContractorsByAccountId,
@@ -314,5 +324,6 @@ module.exports = {
 	getContractorDetailsModel,
 	getBasicDetailsById,
 	getRecordsFromInsuredName,
-	linkDraftRequestToAccountRecord
+	linkDraftRequestToAccountRecord,
+	changeRequirementsDirectly
 };

package/src/saas/internal-api/uploadFiles/api/upload.file.api.js

@@ -3,6 +3,7 @@ const { backendUrl } = require('../../../../env').getEnv();
 
 const Endpoints = {
 	getRelatedDocPreSignedUrl: `${backendUrl}/saas/pre-signed-url/upload/document`,
+	getCreatePolicyPreSignedUrl: `${backendUrl}/saas/pre-signed-url/upload/policy`,
 	uploadRelatedDoc: recordId => `${backendUrl}/saas/contractor/${recordId}/document`,
 	fileUpload: `${backendUrl}/file/finalize-upload`
 };
@@ -11,6 +12,10 @@ const getRelatedDocPreSignedUrl = (formData, context) => {
 	return requests.postRequestHandler(Endpoints.getRelatedDocPreSignedUrl, formData, context, formData.getHeaders());
 };
 
+const getCreatePolicyPreSignedUrl = (formData, context) => {
+	return requests.postRequestHandler(Endpoints.getCreatePolicyPreSignedUrl, formData, context, formData.getHeaders());
+};
+
 const uploadFileToS3 = (preSignedUrl, file) => {
 	return requests.putRequestHandler(preSignedUrl, file);
 };
@@ -25,6 +30,7 @@ const uploadFile = data => {
 
 module.exports = {
 	getRelatedDocPreSignedUrl,
+	getCreatePolicyPreSignedUrl,
 	uploadRelatedDoc,
 	uploadFileToS3,
 	uploadFile

package/src/saas/internal-api/uploadFiles/api/upload.file.service.js

@@ -18,6 +18,18 @@ const getRelatedDocPreSignedUrl = (recordId, context, { filePath }) => {
 	return uploadFileApi.getRelatedDocPreSignedUrl(formData, context);
 };
 
+const getCreatePolicyPreSignedUrl = async (requestId, context, { shouldExpectError } = {}) => {
+	const formData = new FormData();
+	formData.append('requestId', requestId);
+	const policyPreSignedUrlResponse = await uploadFileApi.getCreatePolicyPreSignedUrl(formData, context);
+
+	if (policyPreSignedUrlResponse.status !== httpResponseStatusCodes.OK && !shouldExpectError) {
+		throw new Error('Failed to get policy pre-signed url');
+	}
+
+	return policyPreSignedUrlResponse;
+};
+
 const uploadFileToS3 = async (preSignedUrl, filePath) => {
 	const uploadFileToS3Response = await uploadFileApi.uploadFileToS3(preSignedUrl, fs.readFileSync(filePath));
 
@@ -46,6 +58,7 @@ const uploadFile = (recordId, type, fileName) => {
 };
 
 module.exports = {
+	getCreatePolicyPreSignedUrl,
 	uploadRelatedDoc,
 	uploadFileToS3
 };

package/src/saas/openapi/coi/coi.service.js

@@ -1,5 +1,4 @@
 const fs = require('fs');
-const path = require('path');
 
 const coiApis = require('./coi.api');
 const httpResponseStatusCodes = require('../../../common/httpResponseStatusCodes.json');

package/src/saas/openapi/requirements/requirements.api.js

@@ -1,11 +1,15 @@
 const requests = require('../../../common/requests/apiKeyAuth/requests');
 const { openapiUrl } = require('../../../env').getEnv();
+const { isLocalhost } = require('../../../env');
+
+const recordsPathSegment = isLocalhost() ? 'contractors' : 'records';
 
 const Endpoints = {
 	copyRequirement: sourceRequirementId => `${openapiUrl}/requirement/${sourceRequirementId}/copy`,
 	getRequirementsByTabId: tabId => `${openapiUrl}/tabs/${tabId}/requirements`,
 	getRequirementsByProjectId: projectId => `${openapiUrl}/properties/${projectId}/requirements`,
-	getRequirementsList: `${openapiUrl}/requirement/all`
+	getRequirementsList: `${openapiUrl}/requirement/all`,
+	changeRequirements: (requestId, newReqId) => `${openapiUrl}/${recordsPathSegment}/${requestId}/requirement/${newReqId}`
 };
 
 const copyRequirement = (apiKey, sourceRequirementId, newRequirementOverrides) => {
@@ -24,9 +28,14 @@ const getRequirementsList = (apiKey, params) => {
 	return requests.getRequestHandler(Endpoints.getRequirementsList, apiKey, params);
 };
 
+const changeRequirements = (apiKey, requestId, newReqId) => {
+	return requests.putRequestHandler(Endpoints.changeRequirements(requestId, newReqId), apiKey);
+};
+
 module.exports = {
 	copyRequirement,
 	getRequirementsByTabId,
 	getRequirementsByProjectId,
-	getRequirementsList
+	getRequirementsList,
+	changeRequirements
 };

package/src/saas/openapi/requirements/requirements.service.js

@@ -1,4 +1,5 @@
 const requirementsApi = require('./requirements.api');
+const httpResponseStatusCodes = require('../../../common/httpResponseStatusCodes.json');
 
 const { validateType } = require('../../../common/validations/typeValidations');
 const CopyRequirementModel = require('./models/copy.requirement.model');
@@ -29,9 +30,20 @@ const getRequirementsList = (apiKey, params) => {
 	return requirementsApi.getRequirementsList(apiKey, params);
 };
 
+const changeRequirements = async (apiKey, requestId, newReqId) => {
+	const response = await requirementsApi.changeRequirements(apiKey, requestId, newReqId);
+
+	if (response.status !== httpResponseStatusCodes.OK) {
+		throw new Error(`Failed to change requirements for requestId ${requestId} and newReqId ${newReqId}`);
+	}
+
+	return response;
+};
+
 module.exports = {
 	copyRequirement,
 	getRequirementsByTabId,
 	getRequirementsByProjectId,
-	getRequirementsList
+	getRequirementsList,
+	changeRequirements
 };