@getjones/test-infra 2.6.4 → 2.6.5

package/package.json

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

package/src/factory/records/records.js

@@ -3,6 +3,7 @@ const { credentials } = require('../../../src/env');
 const coi = require('../../saas/internal-api/coi');
 const compliance = require('../../saas/internal-api/compliance');
 const auth = require('../../saas/internal-api/auth');
+const contractors = require('../../saas/internal-api/contractors');
 const auditConfigs = require('../../defaults/configs/auditConfigs');
 const httpResponseStatusCodes = require('../../common/httpResponseStatusCodes.json');
 const timeUtils = require('../../common/utils/timeUtils');
@@ -12,7 +13,8 @@ const complianceStatuses = {
 	complaint: 'complaint',
 	notCompliant: 'notCompliant',
 	expired: 'expired',
-	aboutToExpired: 'aboutToExpired'
+	aboutToExpired: 'aboutToExpired',
+	awaitingNewCoi: 'awaitingNewCoi'
 };
 
 const prepareRecord = async (recordCompany, recordEmail, status, tabId, requirementId, context) => {
@@ -50,6 +52,7 @@ const prepareRecord = async (recordCompany, recordEmail, status, tabId, requirem
 	let auditConfig;
 	switch (status) {
 		case complianceStatuses.notCompliant:
+		case complianceStatuses.awaitingNewCoi:
 			auditConfig = auditConfigs.getNotCompliantConfig();
 			break;
 		case complianceStatuses.expired:
@@ -79,6 +82,8 @@ const prepareRecord = async (recordCompany, recordEmail, status, tabId, requirem
 	if (auditResponse.status !== httpResponseStatusCodes.NO_CONTENT) {
 		throw Error(`Failed to audit record ${record.company}\n`, auditResponse);
 	}
+
+	return requestData.id;
 };
 
 const prepareCompliantRecord = (recordCompany, recordEmail, tabId, requirementId, context) => {
@@ -97,9 +102,23 @@ const prepareAboutToExpiredRecord = (recordCompany, recordEmail, tabId, requirem
 	return prepareRecord(recordCompany, recordEmail, complianceStatuses.aboutToExpired, tabId, requirementId, context);
 };
 
+const prepareAwaitingNewCoiRecord = async (recordCompany, recordEmail, tabId, requirementId, context) => {
+	const prepareRecordId = await prepareRecord(recordCompany, recordEmail, complianceStatuses.awaitingNewCoi, tabId, requirementId, context);
+
+	const recordVerificationModel = await contractors.services.getRecordVerificationModel(prepareRecordId, context);
+	const sendGapsResponse = await contractors.services.sendGaps(recordVerificationModel, context);
+
+	if (sendGapsResponse.status !== httpResponseStatusCodes.OK) {
+		throw Error(`Failed to send gaps to ${recordCompany}\n`, sendGapsResponse);
+	}
+
+	return prepareRecordId;
+};
+
 module.exports = {
 	prepareCompliantRecord,
 	prepareNotCompliantRecord,
 	prepareExpiredRecord,
-	prepareAboutToExpiredRecord
+	prepareAboutToExpiredRecord,
+	prepareAwaitingNewCoiRecord
 };

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

@@ -122,6 +122,11 @@ const deleteAllRecordsInAccount = async (accountId, context, { activationStatus
 	}
 };
 
+const getRecordVerificationModel = async (recordId, context) => {
+	const { data: recordData } = await getContractorById(recordId, context);
+	return new RecordModifyDateVerificationModel(recordData.id, { contractorDateModified: recordData.dateModified });
+};
+
 module.exports = {
 	createContractor,
 	changeRequirement,
@@ -143,5 +148,6 @@ module.exports = {
 	muteNotifications,
 	unmuteNotifications,
 	deleteByContractorId,
-	deleteAllRecordsInAccount
+	deleteAllRecordsInAccount,
+	getRecordVerificationModel
 };

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

@@ -26,7 +26,7 @@ const editRequestAndRecordDetails = (editRequestModel, context) => {
 	return requests.postRequestHandler(Endpoints.edit(contractorId), editRequestModel, context, {}, params);
 };
 
-const getReqeustById = (requestId, context) => {
+const getRequestById = (requestId, context) => {
 	return requests.getRequestHandler(Endpoints.getById(requestId), {}, context);
 };
 
@@ -47,7 +47,7 @@ module.exports = {
 	createRequest,
 	inviteRequestViaPublicLink,
 	editRequestAndRecordDetails,
-	getReqeustById,
+	getRequestById,
 	getRequestsByAccountId,
 	getRequestsByTabId,
 	requestsGlobalSearch

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

@@ -22,8 +22,8 @@ const getRequestsByTabId = (tabId, context, activityStatus = 'Active') => {
 	return requestsAPI.getRequestsByTabId(tabId, context, activityStatus);
 };
 
-const getReqeustById = (requestId, context) => {
-	return requestsAPI.getReqeustById(requestId, context);
+const getRequestById = (requestId, context) => {
+	return requestsAPI.getRequestById(requestId, context);
 };
 
 const getRequestsByAccountId = (accountId, context, activationStatus) => {
@@ -76,7 +76,7 @@ module.exports = {
 	inviteRequestViaPublicLink,
 	editRequestAndRecordDetails,
 	getRequestsByTabId,
-	getReqeustById,
+	getRequestById,
 	getRequestsByAccountId,
 	getOrCreateRequest,
 	getCreateRequestModel,

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

@@ -71,11 +71,12 @@ const getCreateRequirementModel = requirement => {
 	return requirementUtils.getCreateRequirementModel(requirement);
 };
 
-const getUpdatedRequirementModel = async (requirementId, requirementPolicies, requirementName, accountId, projectId, tabId, context) => {
-	const getRequirementData = await getRequirementByName(tabId, requirementName, context);
-	const dateModified = getRequirementData.dateModified;
+const getUpdatedRequirementModel = async (updatedRequirement, tabId, context) => {
+	const { name: requirementName } = updatedRequirement;
+	const existingRequirement = await getRequirementByName(tabId, requirementName, context);
+	updatedRequirement.dateModified = existingRequirement.dateModified;
 
-	return requirementUtils.getUpdateRequirementModel(requirementId, requirementPolicies, requirementName, accountId, projectId, tabId, dateModified);
+	return requirementUtils.getUpdateRequirementModel(updatedRequirement);
 };
 
 module.exports = {

package/src/saas/internal-api/requirements/models/update.requirement.model.js

@@ -3,15 +3,12 @@ const { REQUIREMENT_SHARING_LEVELS } = require('../consts/consts');
 const { PolicyModel } = require('./policy.model');
 
 class UpdateRequirementModel {
-	constructor(id, accountId, projectId, tabId, name, policies, dateModified) {
+	constructor({ id, name, policies, dateModified, sharingLevel = REQUIREMENT_SHARING_LEVELS.TAB }) {
 		this.id = id;
-		this.userId = accountId;
-		this.projectId = projectId;
-		this.tabId = tabId;
 		this.name = name;
 		this.policies = policies;
-		this.sharingLevel = REQUIREMENT_SHARING_LEVELS.TAB;
 		this.dateModified = dateModified;
+		this.sharingLevel = sharingLevel;
 
 		validateType(policies, Array);
 		policies && validateType(policies[0], PolicyModel);

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

@@ -3,7 +3,6 @@ const dataTypeUtils = require('../../../../common/utils/dataTypeUtils');
 const { UpdateRequirementModel } = require('../models/update.requirement.model');
 const { AttributeModel, PolicyModel, AttributeTypes } = require('../models/policy.model');
 const { CreateRequirementModel } = require('../models/create.requirement.model');
-const { REQUIREMENT_SHARING_LEVELS } = require('../consts/consts');
 
 const convertNumericValuesToNumberType = function(value) {
 	if (dataTypeUtils.isString(value) && value.startsWith('$')) {
@@ -88,11 +87,13 @@ const getCreateRequirementModel = function(requirement) {
 	return new CreateRequirementModel(name, policyModels, sharingLevel);
 };
 
-const getUpdateRequirementModel = function(requirementId, requirementPolicies, requirementName, accountId, projectId, tabId, dateModified) {
-	const policies = parseRequirementConfig(requirementPolicies);
-	const policyModels = policies.map(policy => getPolicyModel(policy));
+const getUpdateRequirementModel = function(updatedRequirement) {
+	const { id, policies, name, sharingLevel, dateModified } = updatedRequirement;
 
-	return new UpdateRequirementModel(requirementId, accountId, projectId, tabId, requirementName, policyModels, dateModified);
+	const parsedPolicies = parseRequirementConfig(policies);
+	const policyModels = parsedPolicies.map(policy => getPolicyModel(policy));
+
+	return new UpdateRequirementModel({ id, name, policies: policyModels, dateModified, sharingLevel });
 };
 
 module.exports = {