@getjones/test-infra 2.11.0 → 2.11.2

package/package.json

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

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

@@ -3,7 +3,7 @@ const env = require('../../../../../env');
 const accountsAPI = require('./accounts.core.api');
 const CreateAccountModel = require('../../models/core/create.account.model');
 const { validateType } = require('../../../../../common/validations/typeValidations');
-const httpResponseStatusCodes = require('../../../../../../../../packages/test-infra/src/common/httpResponseStatusCodes.json');
+const httpResponseStatusCodes = require('../../../../../common/httpResponseStatusCodes.json');
 
 const { accountCreationSecret } = env.getEnv();
 

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

@@ -49,8 +49,8 @@ const deleteByContractorId = (contractorId, context) => {
 	return requests.deleteRequestHandler(Endpoints.delete(contractorId), context);
 };
 
-const archiveByContractorId = (contractorId, context) => {
-	return requests.deleteRequestHandler(Endpoints.archive(contractorId), context);
+const archiveRecord = (recordVerificationModel, context) => {
+	return requests.deleteRequestHandler(Endpoints.archive(recordVerificationModel.contractorId), context, {}, {}, recordVerificationModel);
 };
 
 const restoreRecord = (recordVerificationModel, context) => {
@@ -146,7 +146,7 @@ module.exports = {
 	getContractorById,
 	getRecordHistory,
 	deleteByContractorId,
-	archiveByContractorId,
+	archiveRecord,
 	restoreRecord,
 	editContractor,
 	updateInviteDate,

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

@@ -28,8 +28,9 @@ const getRecordHistory = (contractorId, context) => {
 	return contractorsAPI.getRecordHistory(contractorId, context);
 };
 
-const archiveByContractorId = (contractorId, context) => {
-	return contractorsAPI.archiveByContractorId(contractorId, context);
+const archiveRecord = (recordVerificationModel, context) => {
+	validateType(recordVerificationModel, RecordModifyDateVerificationModel);
+	return contractorsAPI.archiveRecord(recordVerificationModel, context);
 };
 
 const restoreRecord = (recordVerificationModel, context) => {
@@ -172,7 +173,7 @@ module.exports = {
 	getContractorsByAccountId,
 	getContractorById,
 	getRecordHistory,
-	archiveByContractorId,
+	archiveRecord,
 	restoreRecord,
 	editContractor,
 	updateInviteDate,

package/src/saas/internal-api/requirements/consts/attributeTypes.json

@@ -2,5 +2,6 @@
 	"endorsment": "ENDORSMENT",
 	"limit": "LIMIT",
 	"boolean": "BOOLEAN",
-	"multiple": "MULTIPLE"
+	"multiple": "MULTIPLE",
+	"numeric": "NUMERIC"
 }

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

@@ -4,19 +4,30 @@ const { UpdateRequirementModel } = require('../models/update.requirement.model')
 const { AttributeModel, PolicyModel, AttributeTypes } = require('../models/policy.model');
 const { CreateRequirementModel } = require('../models/create.requirement.model');
 
-const convertNumericValuesToNumberType = function(value) {
+const customAttributes = {
+	Including: 'multiple',
+	indemnityPeriod: 'Indemnity Period'
+};
+
+const convertNumericValuesToNumberType = function(value, attributeName) {
 	if (dataTypeUtils.isString(value) && value.startsWith('$')) {
 		return Number(value.replace(/[$,]/g, ''));
 	}
 
+	if (attributeName === customAttributes.indemnityPeriod) {
+		return Number(value);
+	}
+
 	return value;
 };
 
-const preparePolicyAttributesTypes = function(value) {
-	const attributesValue = convertNumericValuesToNumberType(value);
+const preparePolicyAttributesTypes = function(value, attributeName) {
+	const attributesValue = convertNumericValuesToNumberType(value, attributeName);
 
 	if (dataTypeUtils.isNumber(attributesValue)) {
-		return AttributeTypes.get(attributeTypes.limit);
+		return attributeName === customAttributes.indemnityPeriod ?
+			AttributeTypes.get(attributeTypes.numeric) :
+			AttributeTypes.get(attributeTypes.limit);
 	}
 
 	if (dataTypeUtils.isBoolean(attributesValue)) {
@@ -46,12 +57,14 @@ const parseRequirementConfig = function(config) {
 
 		if (dataTypeUtils.isObject(config[policy])) {
 			for (const attribute in config[policy]) {
+				const attributeName = customAttributes[attribute] || attribute;
+
 				attributes.push({
-					name: attribute,
-					type: preparePolicyAttributesTypes(config[policy][attribute]),
-					values: attribute === 'Including' ?
+					name: attributeName,
+					type: preparePolicyAttributesTypes(config[policy][attribute], attributeName),
+					values: attributeName === customAttributes.Including ?
 						config[policy][attribute].split(', ') :
-						[convertNumericValuesToNumberType(config[policy][attribute])]
+						[convertNumericValuesToNumberType(config[policy][attribute], attributeName)]
 				});
 			};
 		} else {