@getjones/test-infra 4.4.1 → 4.4.2

package/package.json

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

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

@@ -39,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}`);
 	}
 };
 
@@ -119,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;
@@ -160,8 +185,11 @@ module.exports = {
 	updateInviteDate,
 	updatePolicyExpiryDateForRecord,
 	getHistoryEvents,
+	getFirstHistoryEventId,
+	getLatestHistoryEventId,
 	updateLastInviteActionDate,
 	waitForOcrStatus,
 	generateSubscriptionModelFromMail,
-	deleteAllRequestsInProject
+	deleteAllRequestsInProject,
+	getLatestRecordHistoryEventIdByItemTitle
 };

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/factory/records/records.js

@@ -17,7 +17,7 @@ const recordFlows = require('../../common/commonFlows/records/records');
 
 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(
@@ -25,7 +25,7 @@ const prepareRecord = async (recordCompany, recordEmail, status, tabId, requirem
 		tabId,
 		requirementId,
 		{ // record
-			inviterEmail: credentials.superUser,
+			inviterEmail,
 			email: recordEmail,
 			companyName: recordCompany
 		}
@@ -89,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 } = {}) => {

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

@@ -5,6 +5,7 @@ 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');
+const timeUtils = require('../../../../common/utils/timeUtils');
 
 const uploadFileToStorage = (recordId, filePath) => {
 	const fileData = fs.createReadStream(filePath);
@@ -64,6 +65,26 @@ const uploadCoi = async (
 	return uploadedCoi;
 };
 
+const waitForAntiVirusRecordCoiScanToFinish = async (recordId, context, { maxSecondToWait = 10 } = {}) => {
+	let isScanned = false;
+	const oneSecondInMilliseconds = 1000;
+	let timeFromTheStart = 0;
+	let coiLink;
+	const started = Date.now();
+
+	const { data: record } = await getContractorById(recordId, context);
+
+	while (!isScanned && timeFromTheStart < maxSecondToWait) {
+		({ data: coiLink } = await services.getCoiPreSignedUrl(record.certificatePdf));
+		isScanned = coiLink.isInProgress;
+		const now = Date.now();
+		timeFromTheStart = (now - started) / oneSecondInMilliseconds;
+		await timeUtils.waitFor(1).seconds;
+	}
+
+	return coiLink.coiPreSignedUrl;
+};
+
 const combineLastTwoCOIs = async ({
 	recordId,
 	fileIds,
@@ -91,5 +112,6 @@ module.exports = {
 	uploadCoi,
 	uploadFileToStorage,
 	submitCoiFilesUpload,
+	waitForAntiVirusRecordCoiScanToFinish,
 	combineLastTwoCOIs
 };

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

@@ -62,6 +62,15 @@ const getAuditRecordModel = (recordId, context) => {
 const getRequirementDetailsForAudit = (contractorId, context) => {
 	return auditApi.getRequirementDetailsForAudit(contractorId, context);
 };
+const getAuditorContractorReviewByRecordId = async (recordId, context) => {
+	const response = await auditApi.getAuditorContractorReviewByRecordId(recordId, context);
+
+	if (response.status !== httpResponseStatusCodes.OK) {
+		throw Error(`Failed to get auditor review fields from recordId - ${recordId} error status ${response.status}`);
+	}
+
+	return response.data;
+};
 
 const prepareMetadataForAudit = async (
 	auditorContext,
@@ -99,11 +108,12 @@ const getAuditByRecordId = async (recordId, context, { isRecordDeleted } = {}) =
 
 const getAuditEntities = async (recordId, auditData, auditorContext) => {
 	const requirementDetailsForAuditResponse = await getRequirementDetailsForAudit(recordId, auditorContext);
+	const previousAuditData = await getAuditRawData(recordId, auditorContext);
 	const requirement = requirementDetailsForAuditResponse.data;
 
 	const auditEntities = [];
 	auditData.forEach(auditEntity => auditEntities.push(
-		auditUtil.createAuditEntity(requirement, { ... auditEntity }))
+		auditUtil.createAuditEntity(requirement, previousAuditData, { ... auditEntity }))
 	);
 	return auditEntities;
 };
@@ -285,5 +295,6 @@ module.exports = {
 	updateComplianceAuditActionsDate,
 	getCurrentAuditUniqueCoiId,
 	getAuditRawData,
+	getAuditorContractorReviewByRecordId,
 	getAttributeKey
 };

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

@@ -42,11 +42,12 @@ class AuditRequestModel {
 }
 
 class AuditEntityModel {
-	constructor(policyId, attributeName, status, value) {
+	constructor(policyId, attributeName, status, value, auditorReviewId) {
 		this.contractorInsuranceId = policyId;
 		this.limitname = attributeName;
 		this.status = status;
 		this.value = value;
+		this.auditorReviewId = auditorReviewId;
 	}
 }
 

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

@@ -83,6 +83,13 @@ const getPolicyId = (policyName, requirement) => {
 	return policy.id;
 };
 
+const getAuditorReviewIdFromPreviousAudit = (policyId, attributeName, previousAuditData) => {
+	const reviewField = previousAuditData.
+		find(reviewField => reviewField.insuranceTypeId === policyId && reviewField.limitName === attributeName);
+
+	return reviewField?.auditorcontractorId;
+};
+
 const parseAuditConfig = function(config) {
 	const auditDataArr = [];
 	for (const field in config) {
@@ -145,7 +152,7 @@ const parseAuditConfig = function(config) {
 
 				const auditValue = config[field][1];
 
-				if (multipleErrorsEndorsementList.includes(field) && isArray(auditValue)) {
+				if (multipleErrorsEndorsementAndAttributesList.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) {
@@ -174,14 +181,16 @@ const parseAuditConfig = function(config) {
 };
 
 const createAuditEntity = (
-	requirement, {
+	requirement, previousAuditData, {
 		policyName = null,
 		attributeName = null,
 		value = emptyValue,
 		status = emptyValue
 	}) => {
 	const policyId = getPolicyId(policyName, requirement);
-	const auditEntityModel = new auditModels.AuditEntityModel(policyId, attributeName, status, value);
+	const auditorReviewId = getAuditorReviewIdFromPreviousAudit(policyId, attributeName, previousAuditData);
+	const auditEntityModel = new auditModels.AuditEntityModel(policyId, attributeName, status, value, auditorReviewId);
+
 	return auditEntityModel;
 };
 
@@ -203,12 +212,12 @@ const certificateEndorsementsList = [
 	'Agreement'
 ];
 
-const multipleErrorsEndorsementList = [
+const multipleErrorsEndorsementAndAttributesList = [
 	'Certificate Holder',
 	'Additional Information',
 	'Additional Insured',
 	'Agreement',
-	'Other' //not endorsement
+	'Other'
 ];
 
 const specialAttributes = {

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

@@ -7,6 +7,7 @@ const Endpoints = {
 	get: `${backendUrl}/saas/contractors`,
 	getContractorById: contractorId => `${backendUrl}/saas/contractor/${contractorId}`,
 	getRecordHistory: contractorId => `${backendUrl}/saas/record/${contractorId}/history`,
+	getRecordHistoryEventReport: recordHistoryId => `${backendUrl}/saas/record/compliance-history-report/${recordHistoryId}`,
 	getRecordOcrStatus: contractorId => `${backendUrl}/saas/contractor/${contractorId}/ocr/status`,
 	delete: contractorId => `${backendUrl}/saas/contractor/${contractorId}`,
 	archive: contractorId => `${backendUrl}/saas/contractor/${contractorId}/archive`,
@@ -48,6 +49,10 @@ const getRecordHistory = (contractorId, context) => {
 	return requests.getRequestHandler(Endpoints.getRecordHistory(contractorId), {}, context);
 };
 
+const getRecordHistoryEventReport = (recordHistoryId, context) => {
+	return requests.getRequestHandler(Endpoints.getRecordHistoryEventReport(recordHistoryId), {}, context);
+};
+
 const getComplianceReport = (encryptedData, context) => {
 	return requests.getRequestHandler(Endpoints.getComplianceReport(encryptedData), {}, context);
 };
@@ -170,6 +175,7 @@ module.exports = {
 	getContractorsByAccountId,
 	getContractorById,
 	getRecordHistory,
+	getRecordHistoryEventReport,
 	getRecordOcrStatus,
 	getComplianceReport,
 	deleteByContractorId,

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

@@ -27,6 +27,18 @@ const getRecordHistory = (contractorId, context) => {
 	return contractorsAPI.getRecordHistory(contractorId, context);
 };
 
+const getRecordHistoryEventReport = async (recordHistoryId, context, { expectError } = {}) => {
+	const historyEventReportResponse = await contractorsAPI.getRecordHistoryEventReport(recordHistoryId, context);
+
+	if (expectError) {
+		return historyEventReportResponse;
+	} else if (historyEventReportResponse.status !== httpResponseStatusCodes.OK) {
+		throw new Error(`Failed to get record history event report: ${historyEventReportResponse.statusText}`);
+	}
+
+	return historyEventReportResponse.data;
+};
+
 const getRecordOcrStatus = (recordId, context) => {
 	return contractorsAPI.getRecordOcrStatus(recordId, context);
 };
@@ -289,6 +301,7 @@ module.exports = {
 	getContractorsByAccountId,
 	getContractorById,
 	getRecordHistory,
+	getRecordHistoryEventReport,
 	getRecordOcrStatus,
 	getComplianceReport,
 	archiveRecord,