@getjones/test-infra 2.5.0 → 2.6.0

package/package.json

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

package/src/common/commonFlows/records/records.js

@@ -22,7 +22,7 @@ const updateInviteDate = async function(recordId, inviteDate, context) {
 		throw new Error('Record invite date could not be updated', updateResponse);
 	}
 
-	const threadSchedulerResponse = await threadScheduler.runThreadScheduler({ contractorIds: [recordId] });
+	const threadSchedulerResponse = await threadScheduler.runForRecords([recordId]);
 
 	if (threadSchedulerResponse.status !== httpResponseStatusCodes.OK) {
 		throw new Error('Thread scheduler has failed to run', threadSchedulerResponse);
@@ -46,7 +46,7 @@ const updatePolicyExpiryDateForRecord = async function(recordId, expiryDate, pol
 		throw new Error('Record expiry date could not be updated', updateResponse);
 	}
 
-	const threadSchedulerResponse = await threadScheduler.runThreadScheduler({ contractorIds: [recordId] });
+	const threadSchedulerResponse = await threadScheduler.runForRecords([recordId]);
 
 	if (threadSchedulerResponse.status !== httpResponseStatusCodes.OK) {
 		throw new Error('Thread scheduler has failed to run', threadSchedulerResponse);

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

@@ -41,7 +41,7 @@ const getOrCreateAccount = async (createAccountModel, context) => {
 	const response = await accountsAPI.create(createAccountModel, context);
 
 	if (!response.data) {
-		throw new Error(`Account by the name ${createAccountModel.companyName} did not crate`);
+		throw new Error(`Account by the name ${createAccountModel.companyName} was not created`);
 	}
 
 	return response.data;

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

@@ -19,7 +19,7 @@ const getRequirementsByTabId = (tabId, context) => {
 	return requests.getRequestHandler(Endpoints.getRequirementsByTabId, { tabId }, context);
 };
 
-const getRequirementById = (requirementId, context, isPermanentLink = false) => {
+const getRequirementById = (requirementId, context, { isPermanentLink } = {}) => {
 	return requests.getRequestHandler(Endpoints.getRequirementById(requirementId), { isPermanentLink }, context);
 };
 

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

@@ -14,11 +14,11 @@ const getRequirementsByTabId = (tabId, context) => {
 	return requirementsAPI.getRequirementsByTabId(tabId, context);
 };
 
-const getRequirementById = (requirementId, context, isPermanentLink = false) => {
-	return requirementsAPI.getRequirementById(requirementId, context, isPermanentLink);
+const getRequirementById = (requirementId, context, { isPermanentLink } = {}) => {
+	return requirementsAPI.getRequirementById(requirementId, context, { isPermanentLink });
 };
 
-const getRequirementByName = async (tabId, requirementName, context, isPermanentLink = false) => {
+const getRequirementByName = async (tabId, requirementName, context, { isPermanentLink } = {}) => {
 	const { data: requirementList } = await getRequirementsByTabId(tabId, context);
 
 	const requirement = requirementList.find(req => req.name === requirementName);
@@ -27,7 +27,7 @@ const getRequirementByName = async (tabId, requirementName, context, isPermanent
 		return null;
 	}
 
-	const requirementResponse = await getRequirementById(requirement.id, context, isPermanentLink);
+	const requirementResponse = await getRequirementById(requirement.id, context, { isPermanentLink });
 	return requirementResponse.data.requirement;
 };
 

package/src/saas/internal-api/thread-scheduler/runner.js

@@ -1,13 +1,39 @@
 const requests = require('../../internal-api/../../common/requests/cookieAuth/requests');
+const httpResponseStatusCodes = require('../../../common/httpResponseStatusCodes.json');
+const timeUtils = require('../../../common/utils/timeUtils');
+
 const { backendUrl, threadSchedulerSecret } = require('../../../env').getEnv();
 
 const Endpoints = {
 	run: `${backendUrl}/threadSchedular/${threadSchedulerSecret}`
 };
 
-const runThreadScheduler = ({ contractorIds = [], scheduledReportsIds = [] } = {}) => {
+const runThreadScheduler = async ({ contractorIds = [], scheduledReportsIds = [], retries = 10 } = {}) => {
 	const params = { contractorIdsList: contractorIds.toString(), scheduledReportsIds: scheduledReportsIds.toString() };
-	return requests.getRequestHandler(Endpoints.run, params);
+
+	let response;
+	while (!response || isOverloadError(response.status) && retries--) {
+		response = await requests.getRequestHandler(Endpoints.run, params);
+		await timeUtils.waitFor(1.5).seconds;
+	}
+
+	if (response.status !== httpResponseStatusCodes.OK) {
+		throw new Error('Thread scheduler has failed to run', response);
+	}
+
+	return response;
+};
+
+module.exports = {
+	runForRecords: function(contractorIds) {
+		return runThreadScheduler({ contractorIds });
+	},
+	runForReports: function(scheduledReportsIds) {
+		return runThreadScheduler({ scheduledReportsIds });
+	}
 };
 
-module.exports = { runThreadScheduler };
+function isOverloadError(errorCode) {
+	const overloadResponseErrors = [httpResponseStatusCodes.TOO_MANY_REQUESTS, httpResponseStatusCodes.CONFLICT];
+	return overloadResponseErrors.includes(errorCode);
+}