@getjones/test-infra 3.1.3 → 3.1.4

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

@@ -1,90 +1,90 @@
-const { getEnv, requiredValidation, getSystemUserIdentity, addUserIdentity } = require('../../../../env');
-const { credentials } = getEnv();
-
-const httpResponseStatusCodes = require('../../../../common/httpResponseStatusCodes.json');
-
-const authApi = require('./auth.api');
-
-const getAuthCookie = async (email, password) => {
-	const systemUser = getSystemUserIdentity(email);
-
-	if (systemUser) {
-		return systemUser.cookie;
-	}
-
-	try {
-		const response = await authApi.login(email, password);
-
-		if (response.status !== httpResponseStatusCodes.OK) {
-			throw Error(`Error: ${JSON.stringify(response.data)}`);
-		}
-
-		const authCookie = response.headers['set-cookie'].find(item => item.startsWith('JonesToken='));
-
-		addUserIdentity(email, authCookie, response.data.id);
-
-		return authCookie;
-	} catch (error) {
-		throw new Error(`Failed to login with email: ${email}\nError: ${error}`);
-	}
-};
-
-const verifyEmail = email => {
-	return authApi.verifyEmail(email);
-};
-
-const createOneTimeSession = email => {
-	return authApi.createOneTimeSession(email);
-};
-
-const getHubUserCookie = async (email, oneTimeCode) => {
-	try {
-		const response = await authApi.verifyUser(email, oneTimeCode);
-
-		if (response.status !== httpResponseStatusCodes.OK && response.status !== httpResponseStatusCodes.NO_CONTENT) {
-			throw Error(`Error: ${JSON.stringify(response.data)}`);
-		}
-
-		const authCookie = response.headers['set-cookie'].find(item => item.startsWith('JonesToken='));
-
-		return authCookie;
-	} catch (error) {
-		throw new Error(`Failed to login to vendor hub by email:${email}`, error);
-	}
-};
-
-const getIcsCookie = () => {
-	requiredValidation({
-		'credentials.superUser': credentials.superUser,
-		'credentials.superUserPassword': credentials.superUserPassword
-	});
-	return getAuthCookie(credentials.superUser, credentials.superUserPassword);
-};
-
-const getAuditorCookie = () => {
-	const { auditorUser, auditorPassword } = credentials;
-	requiredValidation({
-		'credentials.auditorUser': auditorUser,
-		'credentials.auditorPassword': auditorPassword
-	});
-	return getAuthCookie(auditorUser, auditorPassword);
-};
-
-const getOperatorCookie = () => {
-	const { operatorUser, operatorPassword } = credentials;
-	requiredValidation({
-		'credentials.operatorUser': operatorUser,
-		'credentials.operatorPassword': operatorPassword
-	});
-	return getAuthCookie(operatorUser, operatorPassword);
-};
-
-module.exports = {
-	getAuthCookie,
-	verifyEmail,
-	createOneTimeSession,
-	getHubUserCookie,
-	getIcsCookie,
-	getAuditorCookie,
-	getOperatorCookie
-};
+const { getEnv, requiredValidation, getSystemUserIdentity, addUserIdentity } = require('../../../../env');
+const { credentials } = getEnv();
+
+const httpResponseStatusCodes = require('../../../../common/httpResponseStatusCodes.json');
+
+const authApi = require('./auth.api');
+
+const getAuthCookie = async (email, password) => {
+	const systemUser = getSystemUserIdentity(email);
+
+	if (systemUser) {
+		return systemUser.cookie;
+	}
+
+	try {
+		const response = await authApi.login(email, password);
+
+		if (response.status !== httpResponseStatusCodes.OK) {
+			throw Error(`Error: ${JSON.stringify(response.data)}`);
+		}
+
+		const authCookie = response.headers['set-cookie'].find(item => item.startsWith('JonesToken='));
+
+		addUserIdentity(email, authCookie, response.data.id);
+
+		return authCookie;
+	} catch (error) {
+		throw new Error(`Failed to login with email: ${email}\nError: ${error}`);
+	}
+};
+
+const verifyEmail = email => {
+	return authApi.verifyEmail(email);
+};
+
+const createOneTimeSession = email => {
+	return authApi.createOneTimeSession(email);
+};
+
+const getHubUserCookie = async (email, oneTimeCode) => {
+	try {
+		const response = await authApi.verifyUser(email, oneTimeCode);
+
+		if (response.status !== httpResponseStatusCodes.OK && response.status !== httpResponseStatusCodes.NO_CONTENT) {
+			throw Error(`Error: ${JSON.stringify(response.data)}`);
+		}
+
+		const authCookie = response.headers['set-cookie'].find(item => item.startsWith('JonesToken='));
+
+		return authCookie;
+	} catch (error) {
+		throw new Error(`Failed to login to vendor hub by email:${email}`, error);
+	}
+};
+
+const getIcsCookie = () => {
+	requiredValidation({
+		'credentials.superUser': credentials.superUser,
+		'credentials.superUserPassword': credentials.superUserPassword
+	});
+	return getAuthCookie(credentials.superUser, credentials.superUserPassword);
+};
+
+const getAuditorCookie = () => {
+	const { auditorUser, auditorPassword } = credentials;
+	requiredValidation({
+		'credentials.auditorUser': auditorUser,
+		'credentials.auditorPassword': auditorPassword
+	});
+	return getAuthCookie(auditorUser, auditorPassword);
+};
+
+const getOperatorCookie = () => {
+	const { operatorUser, operatorPassword } = credentials;
+	requiredValidation({
+		'credentials.operatorUser': operatorUser,
+		'credentials.operatorPassword': operatorPassword
+	});
+	return getAuthCookie(operatorUser, operatorPassword);
+};
+
+module.exports = {
+	getAuthCookie,
+	verifyEmail,
+	createOneTimeSession,
+	getHubUserCookie,
+	getIcsCookie,
+	getAuditorCookie,
+	getOperatorCookie
+};

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

@@ -1,3 +1,3 @@
-const services = require('./api/auth.service');
-
-module.exports = { services };
+const services = require('./api/auth.service');
+
+module.exports = { services };

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

@@ -1,40 +1,40 @@
-const axiosFile = require('axios-file');
-const requests = require('../../../../common/requests/cookieAuth/requests');
-const internalRequests = require('../../../../common/requests/internalAuth/requests');
-
-const { backendUrl } = require('../../../../env').getEnv();
-
-const Endpoints = {
-	uploadToS3: `${backendUrl}/_saas/coi/upload`,
-	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`
-};
-
-const uploadToS3 = (contractorId, fileData) => {
-	return axiosFile({
-		url: Endpoints.uploadToS3,
-		method: 'post',
-		params: { contractorId },
-		data: { fileData }
-	});
-};
-
-const submitCoi = submitCoiModel => {
-	return requests.postRequestHandler(Endpoints.submitCoi, submitCoiModel);
-};
-
-const completeScan = (contractorId, pdfFileName, context) => {
-	return requests.postRequestHandler(Endpoints.completeScan(contractorId), { pdfFileName }, context);
-};
-
-const getCoiPreSignedUrl = (coiFileName, context) => {
-	return requests.getRequestHandler(Endpoints.getCoiPresignedUrl(coiFileName), {}, context);
-};
-
-const getCoiHashes = recordId => {
-	return internalRequests.getRequestHandler(Endpoints.getCoiHashes(recordId));
-};
-
-module.exports = { uploadToS3, submitCoi, completeScan, getCoiPreSignedUrl, getCoiHashes };
+const axiosFile = require('axios-file');
+const requests = require('../../../../common/requests/cookieAuth/requests');
+const internalRequests = require('../../../../common/requests/internalAuth/requests');
+
+const { backendUrl } = require('../../../../env').getEnv();
+
+const Endpoints = {
+	uploadToS3: `${backendUrl}/_saas/coi/upload`,
+	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`
+};
+
+const uploadToS3 = (contractorId, fileData) => {
+	return axiosFile({
+		url: Endpoints.uploadToS3,
+		method: 'post',
+		params: { contractorId },
+		data: { fileData }
+	});
+};
+
+const submitCoi = submitCoiModel => {
+	return requests.postRequestHandler(Endpoints.submitCoi, submitCoiModel);
+};
+
+const completeScan = (contractorId, pdfFileName, context) => {
+	return requests.postRequestHandler(Endpoints.completeScan(contractorId), { pdfFileName }, context);
+};
+
+const getCoiPreSignedUrl = (coiFileName, context) => {
+	return requests.getRequestHandler(Endpoints.getCoiPresignedUrl(coiFileName), {}, context);
+};
+
+const getCoiHashes = recordId => {
+	return internalRequests.getRequestHandler(Endpoints.getCoiHashes(recordId));
+};
+
+module.exports = { uploadToS3, submitCoi, completeScan, getCoiPreSignedUrl, getCoiHashes };

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

@@ -1,26 +1,26 @@
-const coiApi = require('./coi.api');
-const { SubmitCoiModel } = require('../models/submit.coi.model');
-const { validateType } = require('../../../../common/validations/typeValidations');
-
-const uploadToS3 = (contractorId, fileData) => {
-	return coiApi.uploadToS3(contractorId, fileData);
-};
-
-const submitCoi = submitCoiModel => {
-	validateType(submitCoiModel, SubmitCoiModel);
-	return coiApi.submitCoi(submitCoiModel);
-};
-
-const completeScan = (contractorId, pdfFileName, context) => {
-	return coiApi.completeScan(contractorId, pdfFileName, context);
-};
-
-const getCoiPreSignedUrl = (coiFileName, context) => {
-	return coiApi.getCoiPreSignedUrl(coiFileName, context);
-};
-
-const getCoiHashes = recordId => {
-	return coiApi.getCoiHashes(recordId);
-};
-
-module.exports = { uploadToS3, submitCoi, getCoiPreSignedUrl, completeScan, getCoiHashes };
+const coiApi = require('./coi.api');
+const { SubmitCoiModel } = require('../models/submit.coi.model');
+const { validateType } = require('../../../../common/validations/typeValidations');
+
+const uploadToS3 = (contractorId, fileData) => {
+	return coiApi.uploadToS3(contractorId, fileData);
+};
+
+const submitCoi = submitCoiModel => {
+	validateType(submitCoiModel, SubmitCoiModel);
+	return coiApi.submitCoi(submitCoiModel);
+};
+
+const completeScan = (contractorId, pdfFileName, context) => {
+	return coiApi.completeScan(contractorId, pdfFileName, context);
+};
+
+const getCoiPreSignedUrl = (coiFileName, context) => {
+	return coiApi.getCoiPreSignedUrl(coiFileName, context);
+};
+
+const getCoiHashes = recordId => {
+	return coiApi.getCoiHashes(recordId);
+};
+
+module.exports = { uploadToS3, submitCoi, getCoiPreSignedUrl, completeScan, getCoiHashes };

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

@@ -1,4 +1,4 @@
-const defaultCoiHashValue = '79c8e018c43de2d8f4c6b489dde08cc3e21abe30f3e5f3a26ee4a0bca1ca6226';
-const realCoiHashValue = '71de8e0b212168cb513c9f38af63f6b4f6186f950412b9e1e0ea84e1e54e47ce';
-
-module.exports = { defaultCoiHashValue, realCoiHashValue };
+const defaultCoiHashValue = '79c8e018c43de2d8f4c6b489dde08cc3e21abe30f3e5f3a26ee4a0bca1ca6226';
+const realCoiHashValue = '71de8e0b212168cb513c9f38af63f6b4f6186f950412b9e1e0ea84e1e54e47ce';
+
+module.exports = { defaultCoiHashValue, realCoiHashValue };

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

@@ -1,5 +1,5 @@
-const { ICS, PM, AUDITOR, VENDOR } = require('../../../../common/consts/userTypes');
-
-const UPLOADER_TYPES = { ICS, PM, AUDITOR, VENDOR };
-
-module.exports = UPLOADER_TYPES;
+const { ICS, PM, AUDITOR, VENDOR } = require('../../../../common/consts/userTypes');
+
+const UPLOADER_TYPES = { ICS, PM, AUDITOR, VENDOR };
+
+module.exports = UPLOADER_TYPES;

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

@@ -1,14 +1,14 @@
-const services = require('./api/coi.service');
-
-const models = {
-	submit: require('./models/submit.coi.model')
-};
-
-const utils = require('./utils/utils');
-
-const consts = {
-	UPLOADER_TYPES: require('./consts/uploaderTypes'),
-	HASHES: require('./consts/hashes')
-};
-
-module.exports = { services, models, utils, consts };
+const services = require('./api/coi.service');
+
+const models = {
+	submit: require('./models/submit.coi.model')
+};
+
+const utils = require('./utils/utils');
+
+const consts = {
+	UPLOADER_TYPES: require('./consts/uploaderTypes'),
+	HASHES: require('./consts/hashes')
+};
+
+module.exports = { services, models, utils, consts };

package/src/saas/internal-api/coi/models/submit.coi.model.js

@@ -1,9 +1,19 @@
-function SubmitCoiModel(contractorId, fileIds, uploadedBy, uploaderEmail, isContractorExist = true) {
-	this.contractorId = contractorId;
-	this.chosenIds = fileIds;
-	this.uploadedBy = uploadedBy;
-	this.uploaderEmail = uploaderEmail;
-	this.isContractorExist = isContractorExist;
-}
-
-module.exports = { SubmitCoiModel };
+class SubmitCoiModel {
+	constructor({
+		recordId: contractorId,
+		fileIds,
+		uploadedBy,
+		uploaderEmail,
+		recordDateModified,
+		isContractorExist = true
+	}) {
+		this.contractorId = contractorId;
+		this.chosenIds = fileIds;
+		this.uploadedBy = uploadedBy;
+		this.uploaderEmail = uploaderEmail;
+		this.isContractorExist = isContractorExist;
+		this.recordDateModified = recordDateModified;
+	}
+}
+
+module.exports = { SubmitCoiModel };

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

@@ -1,48 +1,70 @@
-const fs = require('fs');
-
-const services = require('../api/coi.service');
-const { SubmitCoiModel } = require('../models/submit.coi.model');
-
-const uploadFileToStorage = (recordId, filePath) => {
-	const fileData = fs.createReadStream(filePath);
-	return services.uploadToS3(recordId, fileData);
-};
-
-const submitCoiFilesUpload = (recordId, fileIds, uploaderType, uploaderEmail) => {
-	const submitCoiModel = new SubmitCoiModel(
-		recordId,
-		fileIds,
-		uploaderType,
-		uploaderEmail
-	);
-	return services.submitCoi(submitCoiModel);
-};
-
-const uploadCoi = async (
-	recordId,
-	filePath,
-	uploaderType,
-	uploaderEmail,
-	{
-		markAsScaned, // Should be passed with context
-		context
-	} = {}
-) => {
-	const uploadResponse = await uploadFileToStorage(recordId, filePath);
-	const fileId = uploadResponse.data.fileId;
-
-	const submitResponse = fileId && await submitCoiFilesUpload(recordId, [fileId], uploaderType, uploaderEmail);
-	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;
-};
-
-module.exports = {
-	uploadCoi,
-	uploadFileToStorage,
-	submitCoiFilesUpload
-};
+const fs = require('fs');
+
+const services = require('../api/coi.service');
+const { SubmitCoiModel } = require('../models/submit.coi.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;
+};
+
+module.exports = {
+	uploadCoi,
+	uploadFileToStorage,
+	submitCoiFilesUpload
+};