@getjones/test-infra 4.4.0 → 4.4.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@getjones/test-infra",
-  "version": "4.4.0",
+  "version": "4.4.2",
   "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();
@@ -35,7 +39,7 @@ const editRequestAndRecordDetails = async function(request, recordConfig, contex
 	const editRequestResponse = await requests.services.editRequestAndRecordDetails(requestEditModel, context);
 
 	if (editRequestResponse.status !== httpResponseStatusCodes.OK) {
-		throw Error(`Failed to edit record ${recordCompany}\n${editRequestResponse.data.message}`);
+		throw Error(`Failed to edit record \n${editRequestResponse.data.message}`);
 	}
 };
 
@@ -115,6 +119,31 @@ const getHistoryEvents = async function(recordId, context) {
 	return recordHistory.data.map(item => item.itemTitle).reverse();
 };
 
+const getFirstHistoryEventId = async function(recordId, context) {
+	const recordHistory = await contractors.services.getRecordHistory(recordId, context);
+	expect(recordHistory.status, 'Expected record history response status to equal 200.').to.equal(httpResponseStatusCodes.OK);
+	return recordHistory.data[recordHistory.data.length - 1].itemId;
+};
+
+const getLatestHistoryEventId = async function(recordId, context) {
+	const recordHistory = await contractors.services.getRecordHistory(recordId, context);
+	expect(recordHistory.status, 'Expected record history response status to equal 200.').to.equal(httpResponseStatusCodes.OK);
+	return recordHistory.data[0].itemId;
+};
+
+const getLatestRecordHistoryEventIdByItemTitle = async function(recordId, itemTitle, context) {
+	const recordHistory = await contractors.services.getRecordHistory(recordId, context);
+	expect(recordHistory.status, 'Expected record history response status to equal 200.').to.equal(httpResponseStatusCodes.OK);
+
+	const latestHistoryByTitle = recordHistory.data.find(historyItem => historyItem.itemTitle === itemTitle);
+
+	if (!latestHistoryByTitle) {
+		throw new Error(`History event with title ${itemTitle} not found`);
+	}
+
+	return latestHistoryByTitle.itemId;
+};
+
 const waitForOcrStatus = async function(recordId, context, { expectedStatus = ocrStatuses.SUCCESS } = {}) {
 	let { data: recordOcrStatus } = await contractors.services.getRecordOcrStatus(recordId, context);
 	let maxRetries = 25;
@@ -156,8 +185,11 @@ module.exports = {
 	updateInviteDate,
 	updatePolicyExpiryDateForRecord,
 	getHistoryEvents,
+	getFirstHistoryEventId,
+	getLatestHistoryEventId,
 	updateLastInviteActionDate,
 	waitForOcrStatus,
 	generateSubscriptionModelFromMail,
-	deleteAllRequestsInProject
+	deleteAllRequestsInProject,
+	getLatestRecordHistoryEventIdByItemTitle
 };

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/common/utils/complianceUtil.js

@@ -56,11 +56,13 @@ const prepareMetadataForAudit = async (
 	const auditResponse = await auditApi.getAuditMetadata(recordDetails.auditId, auditorContext);
 	const { currentAudit } = auditResponse.data;
 
+	const enterAuditResponse = await auditApi.enterAudit(recordId, auditorContext);
+
 	metadata.certificateId = recordDetails.certificateDetails.certificateuploadId;
 	metadata.auditDates = {
 		contractorId: recordId,
 		contractorDateModified: recordDetails.dateModified,
-		dateStartedAudit: recordDetailsResponse.dateStartedAudit,
+		dateStartedAudit: enterAuditResponse.data.dateStartedAudit,
 		contractorOverrideDateModified: recordDetails.contractorOverrideDateModified,
 		contractCreateDate: recordDetails.contractCreateDate,
 		auditDateModified: currentAudit.dateModified

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,11 +14,10 @@ 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');
 
-const prepareRecord = async (recordCompany, recordEmail, status, tabId, requirementId, context, { expiryStatus, shouldSendNotificationToPM = false, recordConfig, glPolicyNumber } = {}) => {
+const prepareRecord = async (recordCompany, recordEmail, status, tabId, requirementId, context, { inviterEmail = credentials.superUser, expiryStatus, shouldSendNotificationToPM = false, recordConfig, glPolicyNumber } = {}) => {
 	validateInsuranceAndExpiryStatus(status, expiryStatus);
 
 	const requestData = await requests.services.getOrCreateRequest(
@@ -26,7 +25,7 @@ const prepareRecord = async (recordCompany, recordEmail, status, tabId, requirem
 		tabId,
 		requirementId,
 		{ // record
-			inviterEmail: credentials.superUser,
+			inviterEmail,
 			email: recordEmail,
 			companyName: recordCompany
 		}
@@ -90,8 +89,8 @@ const prepareCompliantRecord = (recordCompany, recordEmail, tabId, requirementId
 	return prepareRecord(recordCompany, recordEmail, complianceStatuses.compliant, tabId, requirementId, context, { recordConfig, expiryStatus, glPolicyNumber });
 };
 
-const prepareNotCompliantRecord = (recordCompany, recordEmail, tabId, requirementId, context, { shouldSendNotificationToPM = false, recordConfig, expiryStatus, glPolicyNumber } = {}) => {
-	return prepareRecord(recordCompany, recordEmail, complianceStatuses.notCompliant, tabId, requirementId, context, {	shouldSendNotificationToPM, recordConfig, expiryStatus, glPolicyNumber });
+const prepareNotCompliantRecord = (recordCompany, recordEmail, tabId, requirementId, context, { inviterEmail, shouldSendNotificationToPM = false, recordConfig, expiryStatus, glPolicyNumber } = {}) => {
+	return prepareRecord(recordCompany, recordEmail, complianceStatuses.notCompliant, tabId, requirementId, context, { inviterEmail, shouldSendNotificationToPM, recordConfig, expiryStatus, glPolicyNumber });
 };
 
 const prepareWaivedRecord = async (recordCompany, recordEmail, tabId, requirementId, context, { recordConfig, expiryStatus, glPolicyNumber } = {}) => {
@@ -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.api.js

@@ -6,7 +6,8 @@ const AGREEMENT_API_URL = `${backendUrl}/saas/contractor/agreement`;
 const Endpoints = {
 	create: AGREEMENT_API_URL,
 	createByAuditor: `${backendUrl}/UpdateSnippetService`,
-	getAgreementPreSignedUrl: `${backendUrl}/saas/pre-signed-url/upload/agreement`
+	getAgreementPreSignedUrl: `${backendUrl}/saas/pre-signed-url/upload/agreement`,
+	getAgreementLinkByRecordId: recordId => `${backendUrl}/saas/contractor/${recordId}/agreement`
 };
 
 const getAgreementPreSignedUrl = (formData, context) => {
@@ -25,9 +26,14 @@ const createAgreementByAuditor = (createAgreementModel, context) => {
 	return requests.postRequestHandler(Endpoints.createByAuditor, createAgreementModel, context);
 };
 
+const getAgreementLinkByRecordId = (recordId, context) => {
+	return requests.getRequestHandler(Endpoints.getAgreementLinkByRecordId(recordId), null, context);
+};
+
 module.exports = {
 	createAgreement,
 	createAgreementByAuditor,
 	uploadAgreementToS3,
-	getAgreementPreSignedUrl
+	getAgreementPreSignedUrl,
+	getAgreementLinkByRecordId
 };

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

@@ -102,8 +102,20 @@ const uploadAgreementByAuditor = async (
 
 	return createResponse;
 };
+
+const getAgreementLinkByRecordId = async (recordId, context) => {
+	const linkResponse = await agreementAPI.getAgreementLinkByRecordId(recordId, context);
+
+	if (linkResponse.status !== httpResponseStatusCodes.OK) {
+		throw new Error(`Failed to get agreement for record ${recordId}`);
+	}
+
+	return linkResponse.data;
+};
+
 module.exports = {
 	createAgreement,
 	uploadAgreementByPM,
-	uploadAgreementByAuditor
+	uploadAgreementByAuditor,
+	getAgreementLinkByRecordId
 };

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