@getjones/test-infra 2.10.2 → 2.10.3

package/package.json

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

package/src/factory/users/users.js

@@ -13,6 +13,8 @@ const roles = {
 	cm: 'Compliance Manager'
 };
 
+const generateFullName = role => `${role} User`;
+
 const inviteSaasUser = async (username, role, projectIds, context) => {
 	const userResponse = await users.services.getUserByEmail(username, context);
 
@@ -36,7 +38,7 @@ const signupSaasUser = async (username, role, context) => {
 		return;
 	}
 
-	const signupUserModel = await users.util.getSignupUserModel(username, role, role, defaultsPassword, context);
+	const signupUserModel = await users.util.getSignupUserModel(username, role, generateFullName(role), defaultsPassword, context);
 	const signupResponse = await users.services.signupUser(signupUserModel, context);
 
 	if (signupResponse.status !== httpResponseStatusCodes.OK) {

package/src/index.js

@@ -41,8 +41,6 @@ const getInternalAPI = () => {
 	const agreement = require('./saas/internal-api/agreement/index');
 	const uploadFile = require('./saas/internal-api/uploadFiles/index');
 
-	const emailCustomization = require('./saas/internal-api/emailCustomization');
-
 	const internalAPI = {
 		defaults,
 		auth,
@@ -65,7 +63,6 @@ const getInternalAPI = () => {
 		requestsTable,
 		threadScheduler,
 		dbEmails,
-		emailCustomization,
 		factory,
 		agreement,
 		uploadFile

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

@@ -5,7 +5,17 @@ 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`,
+	submitContract: `${backendUrl}/saas/contractor/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 +30,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,10 @@
+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 createAgreement = (createAgreementModel, context) => {
 	validateType(createAgreementModel, CreateAgreementModel);
@@ -11,7 +15,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 for to S3 for contractor ${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 contractor ${recordId}`);
+	}
+
+	return createResponse;
+};
 module.exports = {
 	createAgreement,
-	deleteAgreement
+	deleteAgreement,
+	uploadAgreement
 };

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

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

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

@@ -167,7 +167,7 @@ const putAuditOnHold = async function(auditId, onHoldReason, context) {
 	const onHoldResponse = await auditApi.putAuditOnHold(onHoldModel, context);
 
 	if (onHoldResponse.status !== httpResponseStatusCodes.OK) {
-		throw Error(`Failed to put audit on hold\n${onHoldResponse.data.message}`);
+		throw Error(`Failed to put audit on hold\n${onHoldResponse}`);
 	}
 
 	return onHoldResponse.data;
@@ -177,7 +177,7 @@ const resumeAudit = async function(onHoldId, context) {
 	const resumeAuditResponse = await auditApi.resumeAudit(onHoldId, context);
 
 	if (resumeAuditResponse.status !== httpResponseStatusCodes.OK) {
-		throw Error(`Failed to resume audit\n${resumeAuditResponse.data.message}`);
+		throw Error(`Failed to resume audit\n${resumeAuditResponse}`);
 	}
 
 	return resumeAuditResponse.data;

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

@@ -25,8 +25,7 @@ const Endpoints = {
 		`${backendUrl}/saas/requests/search/audited?&tabId=${tabId}&searchWord=${searchWord}`,
 	automationUpdateContractorUploadDate: contractorId => `${backendUrl}/saas/automation/contractor/${contractorId}/upload-date`,
 	assignRequirement: requestId => `${backendUrl}/saas/contractor/${requestId}/assign-requirement`,
-	linkedProjectsCount: recordId => `${backendUrl}/saas/record/count/${recordId}/linked-projects`,
-	verifyInviteLink: encryptedData => `${backendUrl}/vendor-app/verify-link?data=${encryptedData}`
+	linkedProjectsCount: recordId => `${backendUrl}/saas/record/count/${recordId}/linked-projects`
 };
 
 const createContractor = (createContractorModel, context) => {
@@ -134,10 +133,6 @@ const updateLastInviteActionDate = (recordId, offsetInDays, context) => {
 	return requests.putRequestHandler(url, {}, context);
 };
 
-const getInviteLinkStatus = (encryptedData, context) => {
-	return requests.getRequestHandler(Endpoints.verifyInviteLink(encryptedData), {}, context, {});
-};
-
 module.exports = {
 	createContractor,
 	changeRequirement,
@@ -161,6 +156,5 @@ module.exports = {
 	muteNotifications,
 	unmuteNotifications,
 	getLinkedProjectsCount,
-	updateLastInviteActionDate,
-	getInviteLinkStatus
+	updateLastInviteActionDate
 };

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

@@ -162,10 +162,6 @@ const restoreByRecordId = async (recordId, context) => {
 	return restoreResponse;
 };
 
-const getInviteLinkStatus = (encryptedData, context) => {
-	return contractorsAPI.getInviteLinkStatus(encryptedData, context);
-};
-
 module.exports = {
 	createContractor,
 	changeRequirement,
@@ -193,6 +189,5 @@ module.exports = {
 	getAssignRequirementModel,
 	getLinkedProjectsCount,
 	restoreByRecordId,
-	updateLastInviteActionDate,
-	getInviteLinkStatus
+	updateLastInviteActionDate
 };

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

@@ -1,9 +1,6 @@
 const DEFAULT_EMAIL_SENDER = 'hellogetjonestest@gmail.com';
 
-const tenantUserExtension = externalCompanyName => ` and ${externalCompanyName}`;
-
 const EMAIL_TYPES = {
-	INVITE: 'invite',
 	COMPLIANT: 'compliant',
 	NOT_COMPLIANT: 'notCompliant',
 	SEND_GAPS: 'sendGaps',
@@ -23,7 +20,6 @@ const EMAIL_TYPES = {
 };
 
 const EMAIL_SUBJECT = {
-	invite: 'Your Insurance Docs are needed for',
 	compliant: ({ recordCompanyName }) => `Compliant COI - ${recordCompanyName}`,
 	sendGaps: ({ requesterName }) => `New Insurance Docs Required for ${requesterName} - `, //For this email type, guest is the same as vendor
 	sendGapsForTenant: ({ requesterName }) => `New Insurance Docs Required for leased space at ${requesterName} - `,
@@ -50,4 +46,4 @@ const EMAIL_SUBJECT = {
 	thankYou: 'Thank you for submitting your COI'
 };
 
-module.exports = { DEFAULT_EMAIL_SENDER, EMAIL_TYPES, EMAIL_SUBJECT, tenantUserExtension };
+module.exports = { DEFAULT_EMAIL_SENDER, EMAIL_TYPES, EMAIL_SUBJECT };

package/src/saas/internal-api/dbEmails/utils/util.js

@@ -62,21 +62,10 @@ const getEmailTextInSubject = (recordCompanyName, emailType, isAfterUpdateRequir
 	return isAfterUpdateRequirements ? `Updated Requirements - ${subject}` : subject;
 };
 
-const getMailActionButtonUrlRegex = () => {
-	return /(https:\/\/[a-zA-Z0-9.].*[a-zA-Z.]+\/CheckCustomersInviteLinkJSON\?data=[^"]+)/g;
-};
-
-const getEncryptedDataFromLink = link => {
-	const encryptedData = link.split('data=').pop();
-	return encryptedData.slice(0, -2);
-};
-
 module.exports = {
 	recipientsMatchVerification,
 	regexVerification,
 	extractEmailFromNameAndEmailFormat,
 	logRetrievedEmailInfo,
-	getEmailTextInSubject,
-	getMailActionButtonUrlRegex,
-	getEncryptedDataFromLink
+	getEmailTextInSubject
 };

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

@@ -3,8 +3,7 @@ const updateModel = require('./models/update.requirement.model');
 const policyModel = require('./models/policy.model');
 const services = require('./api/requirements.service');
 const consts = require('./consts/consts');
-const utils = require('./utils/utils');
 
 const models = { create: createModel, update: updateModel, policy: policyModel };
 
-module.exports = { services, models, consts, utils };
+module.exports = { services, models, consts };

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

@@ -193,5 +193,6 @@ module.exports = {
 	sendForgetPasswordMail,
 	getOrCreateInnerSystemUser,
 	editUserProfile,
-	editUserSettings
+	editUserSettings,
+	getInnerSystemUserByEmail
 };

package/src/saas/internal-api/emailCustomization/api/email.customization.api.js

@@ -1,26 +0,0 @@
-const requests = require('../../../../common/requests/cookieAuth/requests');
-const { backendUrl } = require('../../../../env').getEnv();
-
-const Endpoints = {
-	getCustomizationsByAccountId: accountId => `${backendUrl}/saas/email-customizations?accountId=${accountId}`,
-	restoreDefaultById: id => `${backendUrl}/saas/email-customization/${id}/restore?version=DEFAULT`,
-	deletePermanentlyById: id => `${backendUrl}/saas/email-customization/${id}/permanently`
-};
-
-const getEmailCustomizationsByAccountId = (accountId, context) => {
-	return requests.getRequestHandler(Endpoints.getCustomizationsByAccountId(accountId), {}, context);
-};
-
-const restoreDefaultById = (id, context) => {
-	return requests.postRequestHandler(Endpoints.restoreDefaultById(id), {}, context);
-};
-
-const deleteEmailCustomizationPermanentlyById = (id, context) => {
-	return requests.deleteRequestHandler(Endpoints.deletePermanentlyById(id), context);
-};
-
-module.exports = {
-	getEmailCustomizationsByAccountId,
-	restoreDefaultById,
-	deleteEmailCustomizationPermanentlyById
-};

package/src/saas/internal-api/emailCustomization/api/email.customization.service.js

@@ -1,50 +0,0 @@
-const httpResponseStatusCodes = require('../../../../common/httpResponseStatusCodes.json');
-
-const emailCustomizationApi = require('./email.customization.api');
-
-const getEmailCustomizationsByAccountId = async (accountId, context) => {
-	const response = await emailCustomizationApi.getEmailCustomizationsByAccountId(accountId, context);
-
-	if (response.status !== httpResponseStatusCodes.OK) {
-		throw new Error(`Failed to get email customization by account id ${accountId}`);
-	}
-
-	return response.data;
-};
-
-const restoreDefaultById = async (id, context) => {
-	const response = await emailCustomizationApi.restoreDefaultById(id, context);
-
-	if (response.status !== httpResponseStatusCodes.OK) {
-		throw new Error(`Failed to delete email customization by id ${id}`);
-	}
-
-	return response;
-};
-
-const deleteEmailCustomizationPermanentlyById = async (id, context) => {
-	const response = await emailCustomizationApi.deleteEmailCustomizationPermanentlyById(id, context);
-
-	if (response.status !== httpResponseStatusCodes.OK) {
-		throw new Error(`Failed to delete email customization by id ${id}`);
-	}
-
-	return response;
-};
-
-const restoreAllEmailCustomizationsInAccount = async (accountId, context) => {
-	const customizationList = await getEmailCustomizationsByAccountId(accountId, context);
-
-	for (const customization of customizationList) {
-		if (customization.id) {
-			await restoreDefaultById(customization.id, context);
-		}
-	}
-};
-
-module.exports = {
-	getEmailCustomizationsByAccountId,
-	restoreDefaultById,
-	deleteEmailCustomizationPermanentlyById,
-	restoreAllEmailCustomizationsInAccount
-};

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

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