@getjones/test-infra 2.12.3 → 2.12.5

package/package.json

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

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

@@ -1,11 +1,11 @@
-const fs = require('fs');
 const FormData = require('form-data');
-
+const path = require('path');
+const uploadFileApi = require('../../../internal-api/uploadFiles/api/upload.file.api');
 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 { CONTRACT, TEMP_DOCUMENTS } = require('../../../../common/consts/s3FileTypes');
 
 const createAgreement = (createAgreementModel, context) => {
 	validateType(createAgreementModel, CreateAgreementModel);
@@ -18,18 +18,32 @@ const deleteAgreement = (recordId, context) => {
 
 const getAgreementPreSignedUrl = (recordId, context, { filePath }) => {
 	const formData = new FormData();
-	const file = fs.createReadStream(filePath);
+	const fileName = path.basename(filePath);
 	formData.append('recordId', recordId);
-	formData.append('fileType', CONTRACT);
-	formData.append('file', file);
+	formData.append('fileType', TEMP_DOCUMENTS);
+	formData.append('fileName', fileName) ;
 
 	return agreementAPI.getAgreementPreSignedUrl(formData, context);
 };
 
-const uploadAgreementToS3 = (preSignedUrl, file) => {
+const uploadAgreementToTempBucket = (preSignedUrl, file) => {
 	return agreementAPI.uploadAgreementToS3(preSignedUrl, file);
 };
 
+const uploadAgreementToS3 = (fileName, recordId) => {
+	const formData = new FormData();
+	formData.append('fileName', fileName) ;
+	formData.append('fileType', CONTRACT);
+	formData.append('recordId', recordId);
+	return uploadFileApi.uploadFile(formData);
+};
+
+const validateResponse = (response, recordId) => {
+	if (response.status !== httpResponseStatusCodes.OK) {
+		throw new Error(`Failed to upload agreement to S3 for record ${recordId}`);
+	}
+};
+
 const uploadAgreement = async (
 	recordId,
 	filePath,
@@ -39,11 +53,11 @@ const uploadAgreement = async (
 ) => {
 	const { data: { preSignedUrl, fileName: fullFilePath } } = await getAgreementPreSignedUrl(recordId, context, { filePath });
 
-	const uploadResults = await uploadAgreementToS3(preSignedUrl, filePath);
+	const uploadResults = await uploadAgreementToTempBucket(preSignedUrl, filePath);
+	validateResponse(uploadResults, recordId);
 
-	if (uploadResults.status !== httpResponseStatusCodes.OK) {
-		throw new Error(`Failed to upload agreement to S3 for record ${recordId}`);
-	}
+	const response = await uploadAgreementToS3(fullFilePath, recordId);
+	validateResponse(response, recordId);
 
 	const createAgreementModel = new CreateAgreementModel({
 		contractorId: recordId,