@getjones/test-infra 2.10.5 → 2.10.7

package/package.json

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

package/src/common/consts/s3FileTypes.js

@@ -0,0 +1,11 @@
+module.exports = {
+	DOCUMENT: 'DOCUMENT',
+	REPORTS: 'REPORTS',
+	SNIPPET: 'SNIPPET',
+	CONTRACT: 'CONTRACT',
+	TEMPCOI: 'TEMPCOI',
+	COI: 'COI',
+	ATTACHMENT: 'ATTACHMENT',
+	OCRDATA: 'OCRDATA',
+	VENDORREPORT: 'VENDORREPORT'
+};

package/src/saas/internal-api/accounts/api/core/accounts.core.service.js

@@ -1,7 +1,9 @@
+const { expect } = require('chai');
 const env = require('../../../../../env');
 const accountsAPI = require('./accounts.core.api');
 const CreateAccountModel = require('../../models/core/create.account.model');
 const { validateType } = require('../../../../../common/validations/typeValidations');
+const httpResponseStatusCodes = require('../../../../../../../../packages/test-infra/src/common/httpResponseStatusCodes.json');
 
 const { accountCreationSecret } = env.getEnv();
 
@@ -18,16 +20,19 @@ const createAccount = async (createAccountModel, context) => {
 
 const getAccount = async (accountName, context) => {
 	const response = await accountsAPI.getByName(accountName, context);
+	expect(response.status, 'Failed to get accounts by name').to.equal(httpResponseStatusCodes.OK);
 
-	if (!response.data || !response.data.length) {
+	const existingAccounts = response.data;
+
+	if (!existingAccounts || !existingAccounts.length) {
 		return null;
 	}
 
-	if (response.data.length > 1) {
+	if (existingAccounts.length > 1) {
 		throw new Error(`Got more than one account with the name: ${accountName}. IDs: ${existingAccounts.map(item => item.userId).join(', ')}`);
 	}
 
-	return response.data[0];
+	return existingAccounts[0];
 };
 
 const getOrCreateAccount = async (createAccountModel, context) => {

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

@@ -5,7 +5,16 @@ const AGREEMENT_API_URL = `${backendUrl}/saas/contractor/agreement`;
 
 const Endpoints = {
 	create: AGREEMENT_API_URL,
-	delete: AGREEMENT_API_URL
+	delete: AGREEMENT_API_URL,
+	getAgreementPreSignedUrl: `${backendUrl}/pre-signed-url/upload/agreement`
+};
+
+const getAgreementPreSignedUrl = (formData, context) => {
+	return requests.postRequestHandler(Endpoints.getAgreementPreSignedUrl, formData, context, formData.getHeaders());
+};
+
+const uploadAgreementToS3 = (preSignedUrl, file) => {
+	return requests.putRequestHandler(preSignedUrl, file);
 };
 
 const createAgreement = (createAgreementModel, context) => {
@@ -20,5 +29,7 @@ const deleteAgreement = (recordId, context) => {
 
 module.exports = {
 	createAgreement,
-	deleteAgreement
+	deleteAgreement,
+	uploadAgreementToS3,
+	getAgreementPreSignedUrl
 };

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

@@ -1,6 +1,11 @@
+const fs = require('fs');
+const FormData = require('form-data');
+
 const agreementAPI = require('./agreement.api');
 const { CreateAgreementModel } = require('../models/create.agreement.model');
 const { validateType } = require('../../../../common/validations/typeValidations');
+const httpResponseStatusCodes = require('../../../../common/httpResponseStatusCodes.json');
+const { CONTRACT } = require('../../../../common/consts/s3FileTypes');
 
 const createAgreement = (createAgreementModel, context) => {
 	validateType(createAgreementModel, CreateAgreementModel);
@@ -11,7 +16,52 @@ const deleteAgreement = (recordId, context) => {
 	return agreementAPI.deleteAgreement(recordId, context);
 };
 
+const getAgreementPreSignedUrl = (recordId, context, { filePath }) => {
+	const formData = new FormData();
+	const file = fs.createReadStream(filePath);
+	formData.append('recordId', recordId);
+	formData.append('fileType', CONTRACT);
+	formData.append('file', file);
+
+	return agreementAPI.getAgreementPreSignedUrl(formData, context);
+};
+
+const uploadAgreementToS3 = (preSignedUrl, file) => {
+	return agreementAPI.uploadAgreementToS3(preSignedUrl, file);
+};
+
+const uploadAgreement = async (
+	recordId,
+	filePath,
+	uploaderId,
+	context,
+	{ contractorDateModified } = {}
+) => {
+	const { data: { preSignedUrl, fileName: fullFilePath } } = await getAgreementPreSignedUrl(recordId, context, { filePath });
+
+	const uploadResults = await uploadAgreementToS3(preSignedUrl, filePath);
+
+	if (uploadResults.status !== httpResponseStatusCodes.OK) {
+		throw new Error(`Failed to upload agreement to S3 for record ${recordId}`);
+	}
+
+	const createAgreementModel = new CreateAgreementModel({
+		contractorId: recordId,
+		contractorDateModified,
+		uploaderId,
+		signedContractName: fullFilePath
+	});
+
+	const createResponse = await createAgreement(createAgreementModel, context);
+
+	if (createResponse.status !== httpResponseStatusCodes.OK) {
+		throw new Error(`Failed to upload agreement for record ${recordId}`);
+	}
+
+	return createResponse;
+};
 module.exports = {
 	createAgreement,
-	deleteAgreement
+	deleteAgreement,
+	uploadAgreement
 };

package/src/saas/internal-api/agreement/models/create.agreement.model.js

@@ -3,7 +3,7 @@ const { UPLOADER_TYPE } = require('../consts/consts');
 class CreateAgreementModel {
 	constructor({ contractorId, contractorDateModified, uploaderId, signedContractName, uploaderType = UPLOADER_TYPE.USER }) {
 		this.contractorId = contractorId;
-		this.contractorDateModified = contractorDateModified;
+		this.contractorDateModified = contractorDateModified || null;
 		this.uploaderId = uploaderId;
 		this.signedContractName = signedContractName;
 		this.uploaderType = uploaderType;

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

@@ -39,7 +39,8 @@ const POLICY_NAMES_MAP = {
 	agreement: 'Agreement',
 	certificateHolder: 'Certificate Holder',
 	additionalInformation: 'Additional Information',
-	additionalInsured: 'Additional Insured'
+	additionalInsured: 'Additional Insured',
+	businessInterruptionIncomeInsurance: 'Business Interruption / Income Insurance'
 };
 
 const ATTRIBUTE_NAMES_MAP = {
@@ -57,7 +58,10 @@ const ATTRIBUTE_NAMES_MAP = {
 	amRating: 'AMBestRating',
 	cancellationTerms: 'cancellationTerms',
 	coiAuthentication: 'COIauthentication',
-	signature: 'signature'
+	signature: 'signature',
+	indemnityPeriod: 'Indemnity Period',
+	actualLossSustained: 'Actual Loss Sustained',
+	extraExpense: 'Extra Expense'
 };
 
 const auditTriggerType = {

package/src/saas/internal-api/uploadFiles/api/upload.file.service.js

@@ -3,14 +3,14 @@ const fs = require('fs');
 const path = require('path');
 const FormData = require('form-data');
 const consts = require('../consts');
-
-const { RELATED_DOC_TYPES, S3_FILE_TYPE } = consts;
+const { DOCUMENT } = require('../../../../common/consts/s3FileTypes');
+const { RELATED_DOC_TYPES } = consts;
 
 const getRelatedDocPreSignedUrl = (recordId, context, { filePath }) => {
 	const formData = new FormData();
 	const file = fs.createReadStream(filePath);
 	formData.append('recordId', recordId);
-	formData.append('fileType', S3_FILE_TYPE.DOCUMENT);
+	formData.append('fileType', DOCUMENT);
 	formData.append('file', file) ;
 
 	return uploadFileApi.getRelatedDocPreSignedUrl(formData, context);

package/src/saas/internal-api/uploadFiles/consts.js

@@ -7,19 +7,6 @@ const RELATED_DOC_TYPES = {
 	OTHER: 'OTHER'
 };
 
-S3_FILE_TYPE = {
-	DOCUMENT: 'DOCUMENT',
-	REPORTS: 'REPORTS',
-	SNIPPET: 'SNIPPET',
-	CONTRACT: 'CONTRACT',
-	TEMPCOI: 'TEMPCOI',
-	COI: 'COI',
-	ATTACHMENT: 'ATTACHMENT',
-	OCRDATA: 'OCRDATA',
-	VENDORREPORT: 'VENDORREPORT'
-};
-
 module.exports = {
-	RELATED_DOC_TYPES,
-	S3_FILE_TYPE
+	RELATED_DOC_TYPES
 };

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

@@ -89,7 +89,7 @@ const removeAllUserTraceFromDb = (userId, context) => {
 
 const deleteUserByEmail = async (userEmail, context) => {
 	const { data: user } = await getUserByEmail(userEmail, context);
-	return deleteUser(user.subuserId, context);
+	return user ? deleteUser(user.subuserId, context) : null;
 };
 
 const reinviteUser = (userId, context) => {
@@ -193,5 +193,6 @@ module.exports = {
 	sendForgetPasswordMail,
 	getOrCreateInnerSystemUser,
 	editUserProfile,
-	editUserSettings
+	editUserSettings,
+	getInnerSystemUserByEmail
 };