@getjones/test-infra 5.2.14 → 5.2.15

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@getjones/test-infra",
-  "version": "5.2.14",
+  "version": "5.2.15",
   "description": "Providing internal and openapi interface",
   "main": "src/index.js",
   "files": [

package/src/saas/internal-api/coi/consts/{uploaderStatuses.js → coiUploaderTypes.js}

@@ -1,9 +1,9 @@
-const UPLOADER_STATUSES = {
-	PM: 'pmUploadedCOI',
-	ICS: 'ICSUploadedCOI',
-	AUDITOR: 'AuditorUploadedCOI',
-	VENDOR: 'vendorUploadedCOI',
-	BOT: 'botUploadedCOI'
-};
-
-module.exports = UPLOADER_STATUSES;
+const COI_UPLOADER_TYPES = {
+	PM: 'pmUploadedCOI',
+	ICS: 'ICSUploadedCOI',
+	AUDITOR: 'AuditorUploadedCOI',
+	VENDOR: 'vendorUploadedCOI',
+	BOT: 'botUploadedCOI'
+};
+
+module.exports = COI_UPLOADER_TYPES;

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

@@ -1,17 +1,17 @@
-const services = require('./api/coi.service');
-
-const models = {
-	submit: require('./models/submit.coi.model'),
-	submitBatch: require('./models/submit.coi.batch.model')
-};
-
-const utils = require('./utils/utils');
-
-const consts = {
-	UPLOADER_TYPES: require('./consts/uploaderTypes'),
-	UPLOADER_STATUSES: require('./consts/uploaderStatuses'),
-	HASHES: require('./consts/hashes'),
-	DUPLICATE_HANDLING: require('./consts/duplicateHandling')
-};
-
-module.exports = { services, models, utils, consts };
+const services = require('./api/coi.service');
+
+const models = {
+	submit: require('./models/submit.coi.model'),
+	submitBatch: require('./models/submit.coi.batch.model')
+};
+
+const utils = require('./utils/utils');
+
+const consts = {
+	UPLOADER_TYPES: require('./consts/uploaderTypes'),
+	COI_UPLOADER_TYPES: require('./consts/coiUploaderTypes'),
+	HASHES: require('./consts/hashes'),
+	DUPLICATE_HANDLING: require('./consts/duplicateHandling')
+};
+
+module.exports = { services, models, utils, consts };

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

@@ -1,185 +1,186 @@
-const fs = require('fs');
-
-const services = require('../api/coi.service');
-const fileScanService = require('../../fileScan/api/file.scan.service');
-const { SubmitCoiModel } = require('../models/submit.coi.model');
-const { SubmitCoiBatchModel } = require('../models/submit.coi.batch.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 UPLOADER_TYPES = require('../consts/uploaderTypes');
-
-// Stages the certificate into TEMPCOI/{recordId}/ without submitting it, no audit is created
-const uploadFileToStorage = async (recordId, filePath) => {
-	const fileData = fs.createReadStream(filePath);
-	const uploadResponse = await services.uploadToS3(recordId, fileData);
-
-	return uploadResponse.data.fileId;
-};
-
-const submitCoiFilesUpload = async ({
-	recordId,
-	fileIds,
-	uploadedBy,
-	uploaderContext,
-	uploaderEmail,
-	recordDateModified,
-	duplicateHandling
-}) => {
-	const isAnonymousUpload = !uploaderContext && uploadedBy !== UPLOADER_TYPES.ICS;
-	const sessionContext = uploaderContext || await getIcsCookie();
-
-	const submitCoiModel = new SubmitCoiModel({
-		recordId,
-		fileIds,
-		uploadedBy,
-		uploaderContext: sessionContext,
-		uploaderEmail,
-		recordDateModified,
-		duplicateHandling
-	});
-
-	if (isAnonymousUpload) {
-		return services.submitCoi(submitCoiModel);
-	}
-
-	return services.submitCoiByUserContext(submitCoiModel, sessionContext);
-};
-
-const uploadCoi = async (
-	recordId,
-	filePath,
-	uploadedBy,
-	uploaderEmail,
-	{
-		markAsScaned,
-		uploaderContext,
-		duplicateHandling
-	} = {}
-) => {
-	const icsContext = await getIcsCookie();
-	const recordResponse = await getContractorById(recordId, icsContext); // Auditors can't read the record, same as combineLastTwoCOIs
-	const recordDateModified = recordResponse.data.dateModified;
-	const fileId = await uploadFileToStorage(recordId, filePath);
-
-	const submitResponse = fileId && await submitCoiFilesUpload({
-		recordId,
-		fileIds: [fileId],
-		uploadedBy,
-		uploaderContext,
-		uploaderEmail,
-		recordDateModified,
-		duplicateHandling
-	});
-
-	const uploadedCoi = !!submitResponse.data.fileName && { id: fileId, name: submitResponse.data.fileName };
-
-	if (uploadedCoi.name && markAsScaned) {
-		await fileScanService.completeCoiScan(recordId, uploadedCoi.name, icsContext); // Only ICS may update the scan status
-	}
-
-	return uploadedCoi;
-};
-
-// Stages a certificate the way the UI does before an on-behalf upload: upload, then merge with
-// isContractorExist false. The merge writes the file flat to TEMPCOI/ and returns before any
-// certificate, audit or history write, so the COI is staged but not attached to the record.
-const stageMergedCertificate = async (recordId, filePath, context) => {
-	const fileId = await uploadFileToStorage(recordId, filePath);
-	const submitCoiModel = new SubmitCoiModel({ recordId, fileIds: [fileId], isContractorExist: false });
-	const submitResponse = await services.submitCoiByUserContext(submitCoiModel, context);
-
-	if (!submitResponse.data.fileName) {
-		throw Error(`Failed to stage an on-behalf certificate for record: ${recordId}`);
-	}
-
-	return submitResponse.data.fileName;
-};
-
-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 uploadCoiBatch = async (sourceRecordId, recordIds, filePaths, uploadedBy, uploaderEmail, {
-	uploaderContext,
-	duplicateHandling,
-	expectError
-} = {}) => {
-	if (!uploaderContext) {
-		uploaderContext = await getIcsCookie();
-	}
-
-	const fileIds = await Promise.all(
-		filePaths.map(filePath => uploadFileToStorage(sourceRecordId, filePath))
-	);
-
-	const records = await Promise.all(
-		recordIds.map(async recordId => {
-			const { data: record } = await getContractorById(recordId, uploaderContext);
-			return { contractorId: recordId, contractorDateModified: record.dateModified };
-		})
-	);
-
-	const submitCoiBatchModel = new SubmitCoiBatchModel({
-		fileIds,
-		sourceRecordId,
-		records,
-		uploadedBy,
-		uploaderEmail,
-		duplicateHandling
-	});
-
-	return services.submitCoiBatch(submitCoiBatchModel, uploaderContext, { expectError });
-};
-
-const combineLastTwoCOIs = async ({
-	recordId,
-	fileIds,
-	uploadedBy,
-	uploaderEmail,
-	isContractorExist,
-	icsContext,
-	auditorContext,
-	isNewCoiOnTop
-}) => {
-	const recordResponse = await getContractorById(recordId, icsContext);
-	const recordDateModified = recordResponse.data.dateModified;
-
-	const combineLastTwoCOIsModel = new CombineLastTwoCOIsModel({
-		recordId,
-		fileIds,
-		uploadedBy,
-		uploaderEmail,
-		recordDateModified,
-		isContractorExist,
-		isNewCoiOnTop
-	});
-	return services.combineLastTwoCOIs(combineLastTwoCOIsModel, auditorContext);
-};
-
-module.exports = {
-	uploadCoi,
-	uploadCoiBatch,
-	uploadFileToStorage,
-	submitCoiFilesUpload,
-	stageMergedCertificate,
-	waitForAntiVirusRecordCoiScanToFinish,
-	combineLastTwoCOIs
-};
+const fs = require('fs');
+
+const services = require('../api/coi.service');
+const fileScanService = require('../../fileScan/api/file.scan.service');
+const { SubmitCoiModel } = require('../models/submit.coi.model');
+const { SubmitCoiBatchModel } = require('../models/submit.coi.batch.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 UPLOADER_TYPES = require('../consts/uploaderTypes');
+
+// Stages the certificate into TEMPCOI/{recordId}/ without submitting it, no audit is created
+const uploadFileToStorage = async (recordId, filePath) => {
+	const fileData = fs.createReadStream(filePath);
+	const uploadResponse = await services.uploadToS3(recordId, fileData);
+
+	return uploadResponse.data.fileId;
+};
+
+const submitCoiFilesUpload = async ({
+	recordId,
+	fileIds,
+	uploadedBy,
+	uploaderContext,
+	uploaderEmail,
+	recordDateModified,
+	duplicateHandling
+}) => {
+	// ICS is the default uploader, so without a session it falls back to the ICS cookie; other types go out unauthenticated
+	const isUnauthenticatedUpload = !uploaderContext && uploadedBy !== UPLOADER_TYPES.ICS;
+
+	const submitCoiModel = new SubmitCoiModel({
+		recordId,
+		fileIds,
+		uploadedBy,
+		uploaderContext,
+		uploaderEmail,
+		recordDateModified,
+		duplicateHandling
+	});
+
+	if (isUnauthenticatedUpload) {
+		return services.submitCoi(submitCoiModel);
+	}
+
+	const sessionContext = uploaderContext || await getIcsCookie();
+	return services.submitCoiByUserContext(submitCoiModel, sessionContext);
+};
+
+const uploadCoi = async (
+	recordId,
+	filePath,
+	uploadedBy,
+	uploaderEmail,
+	{
+		markAsScaned,
+		uploaderContext,
+		duplicateHandling
+	} = {}
+) => {
+	const icsContext = await getIcsCookie();
+	const recordResponse = await getContractorById(recordId, icsContext); // Auditors can't read the record, same as combineLastTwoCOIs
+	const recordDateModified = recordResponse.data.dateModified;
+	const fileId = await uploadFileToStorage(recordId, filePath);
+
+	const submitResponse = fileId && await submitCoiFilesUpload({
+		recordId,
+		fileIds: [fileId],
+		uploadedBy,
+		uploaderContext,
+		uploaderEmail,
+		recordDateModified,
+		duplicateHandling
+	});
+
+	const uploadedCoi = !!submitResponse.data.fileName && { id: fileId, name: submitResponse.data.fileName };
+
+	if (uploadedCoi.name && markAsScaned) {
+		await fileScanService.completeCoiScan(recordId, uploadedCoi.name, icsContext); // Only ICS may update the scan status
+	}
+
+	return uploadedCoi;
+};
+
+// Stages a certificate the way the UI does before an on-behalf upload: upload, then merge with
+// isContractorExist false. The merge writes the file flat to TEMPCOI/ and returns before any
+// certificate, audit or history write, so the COI is staged but not attached to the record.
+const stageMergedCertificate = async (recordId, filePath, context) => {
+	const fileId = await uploadFileToStorage(recordId, filePath);
+	const submitCoiModel = new SubmitCoiModel({ recordId, fileIds: [fileId], isContractorExist: false });
+	const submitResponse = await services.submitCoiByUserContext(submitCoiModel, context);
+
+	if (!submitResponse.data.fileName) {
+		throw Error(`Failed to stage an on-behalf certificate for record: ${recordId}`);
+	}
+
+	return submitResponse.data.fileName;
+};
+
+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 uploadCoiBatch = async (sourceRecordId, recordIds, filePaths, uploadedBy, uploaderEmail, {
+	uploaderContext,
+	duplicateHandling,
+	expectError
+} = {}) => {
+	if (!uploaderContext) {
+		uploaderContext = await getIcsCookie();
+	}
+
+	const fileIds = await Promise.all(
+		filePaths.map(filePath => uploadFileToStorage(sourceRecordId, filePath))
+	);
+
+	const records = await Promise.all(
+		recordIds.map(async recordId => {
+			const { data: record } = await getContractorById(recordId, uploaderContext);
+			return { contractorId: recordId, contractorDateModified: record.dateModified };
+		})
+	);
+
+	const submitCoiBatchModel = new SubmitCoiBatchModel({
+		fileIds,
+		sourceRecordId,
+		records,
+		uploadedBy,
+		uploaderEmail,
+		duplicateHandling
+	});
+
+	return services.submitCoiBatch(submitCoiBatchModel, uploaderContext, { expectError });
+};
+
+const combineLastTwoCOIs = async ({
+	recordId,
+	fileIds,
+	uploadedBy,
+	uploaderEmail,
+	isContractorExist,
+	icsContext,
+	auditorContext,
+	isNewCoiOnTop
+}) => {
+	const recordResponse = await getContractorById(recordId, icsContext);
+	const recordDateModified = recordResponse.data.dateModified;
+
+	const combineLastTwoCOIsModel = new CombineLastTwoCOIsModel({
+		recordId,
+		fileIds,
+		uploadedBy,
+		uploaderEmail,
+		recordDateModified,
+		isContractorExist,
+		isNewCoiOnTop
+	});
+	return services.combineLastTwoCOIs(combineLastTwoCOIsModel, auditorContext);
+};
+
+module.exports = {
+	uploadCoi,
+	uploadCoiBatch,
+	uploadFileToStorage,
+	submitCoiFilesUpload,
+	stageMergedCertificate,
+	waitForAntiVirusRecordCoiScanToFinish,
+	combineLastTwoCOIs
+};