@getjones/test-infra 2.10.4 → 2.10.5

package/package.json

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

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

@@ -5,16 +5,7 @@ const AGREEMENT_API_URL = `${backendUrl}/saas/contractor/agreement`;
 
 const Endpoints = {
 	create: 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);
+	delete: AGREEMENT_API_URL
 };
 
 const createAgreement = (createAgreementModel, context) => {
@@ -29,7 +20,5 @@ const deleteAgreement = (recordId, context) => {
 
 module.exports = {
 	createAgreement,
-	deleteAgreement,
-	uploadAgreementToS3,
-	getAgreementPreSignedUrl
+	deleteAgreement
 };

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

@@ -1,11 +1,6 @@
-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);
@@ -16,52 +11,7 @@ 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,
-	uploadAgreement
+	deleteAgreement
 };

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 || null;
+		this.contractorDateModified = contractorDateModified;
 		this.uploaderId = uploaderId;
 		this.signedContractName = signedContractName;
 		this.uploaderType = uploaderType;

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 { DOCUMENT } = require('../../../../common/consts/s3FileTypes');
-const { RELATED_DOC_TYPES } = consts;
+
+const { RELATED_DOC_TYPES, S3_FILE_TYPE } = consts;
 
 const getRelatedDocPreSignedUrl = (recordId, context, { filePath }) => {
 	const formData = new FormData();
 	const file = fs.createReadStream(filePath);
 	formData.append('recordId', recordId);
-	formData.append('fileType', DOCUMENT);
+	formData.append('fileType', S3_FILE_TYPE.DOCUMENT);
 	formData.append('file', file) ;
 
 	return uploadFileApi.getRelatedDocPreSignedUrl(formData, context);

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

@@ -7,6 +7,19 @@ 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
+	RELATED_DOC_TYPES,
+	S3_FILE_TYPE
 };

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

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

package/src/common/consts/s3FileTypes.js

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