@getjones/test-infra 2.8.6 → 2.8.7

package/package.json

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

package/src/factory/records/records.js

@@ -121,8 +121,9 @@ const prepareWaivedRecord = async (recordCompany, recordEmail, tabId, requiremen
 const prepareAwaitingNewCoiRecord = async (recordCompany, recordEmail, tabId, requirementId, context) => {
 	const recordId = await prepareRecord(recordCompany, recordEmail, complianceStatuses.awaitingNewCoi, tabId, requirementId, context);
 
+	const { id: requestId } = await requests.services.getRequestFromTabByRecordId(recordId, tabId, context);
 	const recordVerificationModel = await contractors.services.getRecordVerificationModel(recordId, context);
-	const sendGapsResponse = await contractors.services.sendGaps(recordVerificationModel, context);
+	const sendGapsResponse = await contractors.services.sendGaps(requestId, recordVerificationModel, context);
 
 	if (sendGapsResponse.status !== httpResponseStatusCodes.OK) {
 		throw Error(`Failed to send gaps to ${recordCompany}\n${sendGapsResponse}`);

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

@@ -5,7 +5,7 @@ const agreementConsts = require('./consts/consts');
 const models = { create: createModel };
 
 const consts = {
-	audit: agreementConsts
+	agreement: agreementConsts
 };
 
 module.exports = { services, models, consts };

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

@@ -10,7 +10,7 @@ const Endpoints = {
 	archive: contractorId => `${backendUrl}/saas/contractor/${contractorId}/archive`,
 	restore: contractorId => `${backendUrl}/saas/contractor/${contractorId}/restore`,
 	edit: contractorId => `${backendUrl}/saas/contractors/${contractorId}/update`,
-	sendGaps: `${backendUrl}/saas/contractor/compliance/status`,
+	sendGaps: requestId => `${backendUrl}/saas/request/${requestId}/compliance/status`,
 	resendInvitation: requestId => `${backendUrl}/saas/contractor/${requestId}/reminders/reset`,
 	requestNewCoiAboutToExpire: requestId => `${backendUrl}/saas/coi/${requestId}/about-to-expire`,
 	requestNewCoiExpired: requestId => `${backendUrl}/saas/coi/${requestId}/expired`,
@@ -50,7 +50,7 @@ const archiveByContractorId = (contractorId, context) => {
 	return requests.deleteRequestHandler(Endpoints.archive(contractorId), context);
 };
 
-const restoreContractor = (recordVerificationModel, context) => {
+const restoreRecord = (recordVerificationModel, context) => {
 	return requests.postRequestHandler(Endpoints.restore(recordVerificationModel.contractorId), recordVerificationModel, context);
 };
 
@@ -76,8 +76,8 @@ const assignRequirement = (requestId, assignRequirementModel, context) => {
 	return requests.putRequestHandler(Endpoints.assignRequirement(requestId), assignRequirementModel, context);
 };
 
-const sendGaps = (recordModifyDateVerificationModel, context) => {
-	return requests.postRequestHandler(Endpoints.sendGaps, recordModifyDateVerificationModel, context);
+const sendGaps = (requestId, recordModifyDateVerificationModel, context) => {
+	return requests.postRequestHandler(Endpoints.sendGaps(requestId), recordModifyDateVerificationModel, context);
 };
 
 const requestNewCoiAboutToExpire = (requestId, recordModifyDateVerificationModel, context) => {
@@ -135,7 +135,7 @@ module.exports = {
 	getRecordHistory,
 	deleteByContractorId,
 	archiveByContractorId,
-	restoreContractor,
+	restoreRecord,
 	editContractor,
 	updateInviteDate,
 	updateExpiryDate,

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

@@ -31,9 +31,9 @@ const archiveByContractorId = (contractorId, context) => {
 	return contractorsAPI.archiveByContractorId(contractorId, context);
 };
 
-const restoreContractor = (recordVerificationModel, context) => {
+const restoreRecord = (recordVerificationModel, context) => {
 	validateType(recordVerificationModel, RecordModifyDateVerificationModel);
-	return contractorsAPI.restoreContractor(recordVerificationModel, context);
+	return contractorsAPI.restoreRecord(recordVerificationModel, context);
 };
 
 const editContractor = (editRequestModel, context) => {
@@ -71,9 +71,9 @@ const changeRequirement = (recordModifyDateVerificationModel, context) => {
 	return contractorsAPI.changeRequirement(recordModifyDateVerificationModel, context);
 };
 
-const sendGaps = (recordModifyDateVerificationModel, context) => {
+const sendGaps = (requestId, recordModifyDateVerificationModel, context) => {
 	validateType(recordModifyDateVerificationModel, RecordModifyDateVerificationModel);
-	return contractorsAPI.sendGaps(recordModifyDateVerificationModel, context);
+	return contractorsAPI.sendGaps(requestId, recordModifyDateVerificationModel, context);
 };
 
 const requestNewCoiAboutToExpire = (requestId, recordModifyDateVerificationModel, context) => {
@@ -140,6 +140,17 @@ const getLinkedProjectsCount = (recordId, context) => {
 	return contractorsAPI.getLinkedProjectsCount(recordId, context);
 };
 
+const restoreByRecordId = async (recordId, context) => {
+	const recordModifyModel = await getRecordVerificationModel(recordId, context);
+	const restoreResponse = await restoreRecord(recordModifyModel, context);
+
+	if (restoreResponse.status !== httpResponseStatusCodes.OK) {
+		throw new Error(`Failed to restore record "${recordId}"\n${restoreResponse.statusText}`);
+	}
+
+	return restoreResponse;
+};
+
 module.exports = {
 	createContractor,
 	changeRequirement,
@@ -147,7 +158,7 @@ module.exports = {
 	getContractorById,
 	getRecordHistory,
 	archiveByContractorId,
-	restoreContractor,
+	restoreRecord,
 	editContractor,
 	updateInviteDate,
 	updateExpiryDate,
@@ -165,5 +176,6 @@ module.exports = {
 	getRecordVerificationModel,
 	assignRequirement,
 	getAssignRequirementModel,
-	getLinkedProjectsCount
+	getLinkedProjectsCount,
+	restoreByRecordId
 };