@getjones/test-infra 4.4.1 → 4.4.3

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

@@ -1,95 +1,117 @@
-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');
-
-const uploadFileToStorage = (recordId, filePath) => {
-	const fileData = fs.createReadStream(filePath);
-	return services.uploadToS3(recordId, fileData);
-};
-
-const submitCoiFilesUpload = ({
-	recordId,
-	fileIds,
-	uploadedBy,
-	uploaderEmail,
-	recordDateModified
-}) => {
-	const submitCoiModel = new SubmitCoiModel({
-		recordId,
-		fileIds,
-		uploadedBy,
-		uploaderEmail,
-		recordDateModified
-	});
-	return services.submitCoi(submitCoiModel);
-};
-
-const uploadCoi = async (
-	recordId,
-	filePath,
-	uploadedBy,
-	uploaderEmail,
-	{
-		markAsScaned, // Should be passed with context
-		context
-	} = {}
-) => {
-	if (!context) {
-		context = await getIcsCookie();
-	}
-
-	const recordResponse = await getContractorById(recordId, context);
-	const recordDateModified = recordResponse.data.dateModified;
-	const uploadResponse = await uploadFileToStorage(recordId, filePath);
-	const fileId = uploadResponse.data.fileId;
-
-	const submitResponse = fileId && await submitCoiFilesUpload({
-		recordId,
-		fileIds: [fileId],
-		uploadedBy,
-		uploaderEmail,
-		recordDateModified
-	});
-
-	const uploadedCoi = !!submitResponse.data.fileName && { id: fileId, name: submitResponse.data.fileName };
-
-	if (uploadedCoi.name && markAsScaned && context) {
-		await services.completeScan(recordId, uploadedCoi.name, context);
-	}
-
-	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,
-	combineLastTwoCOIs
-};
+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');
+const timeUtils = require('../../../../common/utils/timeUtils');
+
+const uploadFileToStorage = (recordId, filePath) => {
+	const fileData = fs.createReadStream(filePath);
+	return services.uploadToS3(recordId, fileData);
+};
+
+const submitCoiFilesUpload = ({
+	recordId,
+	fileIds,
+	uploadedBy,
+	uploaderEmail,
+	recordDateModified
+}) => {
+	const submitCoiModel = new SubmitCoiModel({
+		recordId,
+		fileIds,
+		uploadedBy,
+		uploaderEmail,
+		recordDateModified
+	});
+	return services.submitCoi(submitCoiModel);
+};
+
+const uploadCoi = async (
+	recordId,
+	filePath,
+	uploadedBy,
+	uploaderEmail,
+	{
+		markAsScaned, // Should be passed with context
+		context
+	} = {}
+) => {
+	if (!context) {
+		context = await getIcsCookie();
+	}
+
+	const recordResponse = await getContractorById(recordId, context);
+	const recordDateModified = recordResponse.data.dateModified;
+	const uploadResponse = await uploadFileToStorage(recordId, filePath);
+	const fileId = uploadResponse.data.fileId;
+
+	const submitResponse = fileId && await submitCoiFilesUpload({
+		recordId,
+		fileIds: [fileId],
+		uploadedBy,
+		uploaderEmail,
+		recordDateModified
+	});
+
+	const uploadedCoi = !!submitResponse.data.fileName && { id: fileId, name: submitResponse.data.fileName };
+
+	if (uploadedCoi.name && markAsScaned && context) {
+		await services.completeScan(recordId, uploadedCoi.name, context);
+	}
+
+	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,
+	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,
+	waitForAntiVirusRecordCoiScanToFinish,
+	combineLastTwoCOIs
+};

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

@@ -1,115 +1,115 @@
-const requests = require('../../../../../common/requests/cookieAuth/requests');
-const { backendUrl } = require('../../../../../env').getEnv();
-
-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`,
-	isReaudit: contractorId => `${backendUrl}/saas/auditor/contractors/${contractorId}/isreaudit`,
-	revertCoi: contractorId => `${backendUrl}/saas/auditor/contractors/${contractorId}/coi/revert`,
-	wrongCoi: `${backendUrl}/saas/coi/wrong-coi`,
-	getAudit: recordId => `${backendUrl}/saas/audit/${recordId}`,
-	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`,
-	auditRawData: recordId => `${backendUrl}/saas/integration-tests/record/${recordId}/audit/raw`
-};
-
-const audit = async (contractorId, auditRequestModel, context) => {
-	await enterAudit(contractorId, context);
-	const auditResponse = await getAuditMetadata(auditRequestModel.auditId, context);
-	const { currentAudit } = auditResponse.data;
-	auditRequestModel.auditDates.auditDateModified = currentAudit.dateModified;
-	return submitAudit(auditRequestModel, context);
-};
-
-const submitAudit = async (auditRequestModel, context) => {
-	return requests.postRequestHandler(Endpoints.audit, auditRequestModel, context);
-};
-
-const revertCoi = (contractorId, dateModified, context) => {
-	return requests.postRequestHandler(Endpoints.revertCoi(contractorId), dateModified, context);
-};
-
-const isReaudit = (contractorId, context) => {
-	return requests.getRequestHandler(Endpoints.isReaudit(contractorId), {}, context);
-};
-
-const getAuditorContractorList = (auditListParametersModel, context) => {
-	return requests.postRequestHandler(Endpoints.auditorContractorList, auditListParametersModel, context);
-};
-
-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);
-};
-
-const getRequirementDetailsForAudit = (contractorId, context) => {
-	return requests.getRequestHandler(Endpoints.requirementDetailsForAudit(contractorId), {}, context);
-};
-
-const getAuditByRecordId = (recordId, context, { isRecordDeleted } = {}) => {
-	return requests.getRequestHandler(Endpoints.getAudit(recordId), { isRecordDeleted }, context);
-};
-
-const wrongCoi = (recordId, context) => {
-	const params = { contractorId: recordId };
-	return requests.getRequestHandler(Endpoints.wrongCoi, params, context);
-};
-
-const putAuditOnHold = (onHoldModel, context) => {
-	return requests.postRequestHandler(Endpoints.putAuditOnHold, onHoldModel, context);
-};
-
-const resumeAudit = (onHoldId, context) => {
-	return requests.putRequestHandler(Endpoints.resumeAudit(onHoldId), {}, context);
-};
-
-const getAuditMetadata = (auditId, context) => {
-	return requests.getRequestHandler(Endpoints.getAuditMetadata(auditId), {}, context);
-};
-
-const updateComplianceAuditActionsDate = (recordId, dateOffset, context) => {
-	const url = `${Endpoints.updateComplianceAuditActionsDate(recordId)}?offsetInDays=${dateOffset}`;
-	return requests.putRequestHandler(url, {}, context);
-};
-
-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,
-	revertCoi,
-	wrongCoi,
-	isReaudit,
-	getAuditorContractorList,
-	enterAudit,
-	getAuditRecordModel,
-	getRequirementDetailsForAudit,
-	getComplianceJson,
-	getAuditByRecordId,
-	putAuditOnHold,
-	resumeAudit,
-	getAuditMetadata,
-	updateComplianceAuditActionsDate,
-	getAuditRawData,
-	verifyAuditBeforeEnter
-};
+const requests = require('../../../../../common/requests/cookieAuth/requests');
+const { backendUrl } = require('../../../../../env').getEnv();
+
+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`,
+	isReaudit: contractorId => `${backendUrl}/saas/auditor/contractors/${contractorId}/isreaudit`,
+	revertCoi: contractorId => `${backendUrl}/saas/auditor/contractors/${contractorId}/coi/revert`,
+	wrongCoi: `${backendUrl}/saas/coi/wrong-coi`,
+	getAudit: recordId => `${backendUrl}/saas/audit/${recordId}`,
+	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`,
+	auditRawData: recordId => `${backendUrl}/saas/integration-tests/record/${recordId}/audit/raw`
+};
+
+const audit = async (contractorId, auditRequestModel, context) => {
+	await enterAudit(contractorId, context);
+	const auditResponse = await getAuditMetadata(auditRequestModel.auditId, context);
+	const { currentAudit } = auditResponse.data;
+	auditRequestModel.auditDates.auditDateModified = currentAudit.dateModified;
+	return submitAudit(auditRequestModel, context);
+};
+
+const submitAudit = async (auditRequestModel, context) => {
+	return requests.postRequestHandler(Endpoints.audit, auditRequestModel, context);
+};
+
+const revertCoi = (contractorId, dateModified, context) => {
+	return requests.postRequestHandler(Endpoints.revertCoi(contractorId), dateModified, context);
+};
+
+const isReaudit = (contractorId, context) => {
+	return requests.getRequestHandler(Endpoints.isReaudit(contractorId), {}, context);
+};
+
+const getAuditorContractorList = (auditListParametersModel, context) => {
+	return requests.postRequestHandler(Endpoints.auditorContractorList, auditListParametersModel, context);
+};
+
+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);
+};
+
+const getRequirementDetailsForAudit = (contractorId, context) => {
+	return requests.getRequestHandler(Endpoints.requirementDetailsForAudit(contractorId), {}, context);
+};
+
+const getAuditByRecordId = (recordId, context, { isRecordDeleted } = {}) => {
+	return requests.getRequestHandler(Endpoints.getAudit(recordId), { isRecordDeleted }, context);
+};
+
+const wrongCoi = (recordId, context) => {
+	const params = { contractorId: recordId };
+	return requests.getRequestHandler(Endpoints.wrongCoi, params, context);
+};
+
+const putAuditOnHold = (onHoldModel, context) => {
+	return requests.postRequestHandler(Endpoints.putAuditOnHold, onHoldModel, context);
+};
+
+const resumeAudit = (onHoldId, context) => {
+	return requests.putRequestHandler(Endpoints.resumeAudit(onHoldId), {}, context);
+};
+
+const getAuditMetadata = (auditId, context) => {
+	return requests.getRequestHandler(Endpoints.getAuditMetadata(auditId), {}, context);
+};
+
+const updateComplianceAuditActionsDate = (recordId, dateOffset, context) => {
+	const url = `${Endpoints.updateComplianceAuditActionsDate(recordId)}?offsetInDays=${dateOffset}`;
+	return requests.putRequestHandler(url, {}, context);
+};
+
+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,
+	revertCoi,
+	wrongCoi,
+	isReaudit,
+	getAuditorContractorList,
+	enterAudit,
+	getAuditRecordModel,
+	getRequirementDetailsForAudit,
+	getComplianceJson,
+	getAuditByRecordId,
+	putAuditOnHold,
+	resumeAudit,
+	getAuditMetadata,
+	updateComplianceAuditActionsDate,
+	getAuditRawData,
+	verifyAuditBeforeEnter
+};