@getjones/test-infra 2.6.2 → 2.6.4

package/package.json

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

package/src/factory/records/records.js

@@ -1,5 +1,5 @@
 const requests = require('../../saas/internal-api/requests');
-const { credentials } = require('../../../../../src/env');
+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');

package/src/saas/internal-api/coi/consts/uploaderTypes.js

@@ -1,5 +1,7 @@
-const { ICS, PM, AUDITOR } = require('../../../../common/consts/userTypes');
-
-const UPLOADER_TYPES = { ICS, PM, AUDITOR };
+const UPLOADER_TYPES = {
+	ICS: 'ICS',
+	PM: 'PM',
+	AUDITOR: 'AUDITOR'
+};
 
 module.exports = UPLOADER_TYPES;

package/src/saas/internal-api/compliance/api/waive/waive.service.js

@@ -1,12 +1,6 @@
-const env = require('../../../../../env');
-
 const waiveApi = require('./waive.api');
 const { WaiveRequestModel, RetractRequestModel } = require('../../models/waive/waive.model');
 const { validateType } = require('../../../../../common/validations/typeValidations');
-const util = require('../../utils/util');
-
-const { credentials } = env.getEnv();
-const userTypes = require('../../../../../common/consts/userTypes');
 
 const waive = (waiveRequestModel, context) => {
 	validateType(waiveRequestModel, WaiveRequestModel);
@@ -18,63 +12,39 @@ const retract = (retractRequestModel, context) => {
 	return waiveApi.retract(retractRequestModel.contractorId, retractRequestModel, context);
 };
 
-const getWaiveModel = (
+const getWaiveModel = async (
 	record,
 	policyName,
 	attributeName,
 	waiverReason,
-	remarks,
-	{
-		userId,
-		userRole
-	} = {}) => {
-	const auditId = getPolicyAuditIdFromRecord(record, policyName, util.getAttributeKey(attributeName));
-	userId = userId || env.getSystemUserIdentity(credentials.superUser).id;
-	userRole = userRole || userTypes.ICS;
+	remarks
+) => {
+	const auditId = await getPolicyAuditIdFromRecord(record, policyName, attributeName);
 
 	const waiveModel = new WaiveRequestModel({
+		userId: record.userId,
 		contractorId: record.id,
 		auditId,
 		waiverReason,
-		remarks,
-		userId,
-		userRole
+		remarks
 	});
 
 	return waiveModel;
 };
 
-const getWaiveModelByGap = (
-	record,
-	policyName,
-	gap,
-	reason,
-	note,
-	{
-		userId,
-		userRole
-	} = {}) => {
-	const attributeName = util.getAttributeNameByGap(record, policyName, gap);
-
-	return getWaiveModel(record, policyName, attributeName, reason, note, { userId, userRole });
-};
-
-const getRetractModel = (record, policyName, attributeName) => {
-	const auditId = getPolicyAuditIdFromRecord(record, policyName, util.getAttributeKey(attributeName));
-	const userId = env.getSystemUserIdentity(credentials.superUser).id;
-	const userRole = userTypes.ICS;
+const getRetractModel = async (record, policyName, attributeName) => {
+	const auditId = await getPolicyAuditIdFromRecord(record, policyName, attributeName);
 
 	const retractModel = new RetractRequestModel({
+		userId: record.userId,
 		contractorId: record.id,
-		auditId,
-		userId,
-		userRole
+		auditId
 	});
 
 	return retractModel;
 };
 
-const getPolicyAuditIdFromRecord = (record, policyName, attributeName) => {
+const getPolicyAuditIdFromRecord = async (record, policyName, attributeName) => {
 	const policy = record.reviewbyAuditor.find(contractorCoverage =>
 		contractorCoverage.insuranceName === policyName);
 
@@ -91,10 +61,4 @@ const getPolicyAuditIdFromRecord = (record, policyName, attributeName) => {
 	return attribute.auditId;
 };
 
-module.exports = {
-	waive,
-	retract,
-	getWaiveModel,
-	getRetractModel,
-	getWaiveModelByGap
-};
+module.exports = { waive, retract, getWaiveModel, getRetractModel };

package/src/saas/internal-api/compliance/consts/audit.js

@@ -11,6 +11,14 @@ const AUDIT_ENTITY_STATUSES = {
 	CLAIMS: 'Claims'
 };
 
+const AUDIT_ATTRIBUTE_NAMES = {
+	CERTIFICATE_ISSUE_DATE: 'certIssueDate'
+};
+
+const AUDIT_POLICY_NAMES = {
+	GENERAL_LIABILITY: ''
+};
+
 const VALID_SCORES = ['A+', 'A'];
 
 const AUDITOR_ROLE = 'Auditor';
@@ -66,6 +74,8 @@ module.exports = {
 	ATTRIBUTE_NAMES_MAP,
 	COI_AUDIT_STATUSES,
 	AUDITOR_ROLE,
+	AUDIT_POLICY_NAMES,
+	AUDIT_ATTRIBUTE_NAMES,
 	AUDIT_ENTITY_STATUSES,
 	VALID_SCORES
 };

package/src/saas/internal-api/compliance/models/waive/waive.model.js

@@ -1,3 +1,5 @@
+const DEFAULT_USER_ROLE = 'ICS';
+
 const WAIVE_ACTIONS = {
 	WAIVE: 'ignored',
 	RETRACT: 'notIgnored'
@@ -10,29 +12,24 @@ const WAIVER_REASONS = {
 };
 
 function WaiveRequestModel({
+	userId,
 	contractorId,
 	auditId,
 	waiverReason,
-	remarks,
-	userId,
-	userRole
+	remarks = '',
+	userRole = DEFAULT_USER_ROLE
 }) {
 	this.auditorContractorId = auditId;
 	this.contractorId = contractorId;
+	this.userId = userId;
 	this.waiverReason = waiverReason;
-	this.remarks = remarks || '';
+	this.remarks = remarks;
 
-	this.userId = userId,
-	this.userRole = userRole,
+	this.userRole = userRole;
 	this.status = WAIVE_ACTIONS.WAIVE;
 }
 
-function RetractRequestModel({
-	contractorId,
-	auditId,
-	userId,
-	userRole
-}) {
+function RetractRequestModel({ userId, contractorId, auditId, userRole = DEFAULT_USER_ROLE }) {
 	this.auditorContractorId = auditId;
 	this.contractorId = contractorId;
 	this.userId = userId;

package/src/saas/internal-api/compliance/utils/util.js

@@ -2,8 +2,6 @@ const { AUDIT_ENTITY_STATUSES, DEFAULT_POLICY_ID, VALID_SCORES } = require('../c
 const { isObject, isArray } = require('../../../../common/utils/dataTypeUtils');
 const timeUtils = require('../../../../common/utils/timeUtils');
 const auditModels = require('../models/audit/audit.model');
-const waiveModels = require('../models/waive/waive.model');
-
 const { getEnv, getSystemUserIdentity } = require('../../../../env');
 const { credentials } = getEnv();
 
@@ -25,27 +23,6 @@ const getAttributeKey = attribute => {
 	return specialAttributes[attribute] || attribute;
 };
 
-const getWaiveReason = reason => {
-	return waiveReasons[reason] || reason;
-};
-
-const getAttributeNameByGap = function(record, policyName, gap) {
-	const policy = record.reviewbyAuditor.find(contractorCoverage =>
-		contractorCoverage.insuranceName === policyName);
-
-	if (!policy) {
-		throw new Error(`Policy name ${policyName} don't exist in record`);
-	}
-
-	const attribute = policy.errorList.find(error => error.errorHeadline === gap);
-
-	if (!attribute) {
-		throw new Error(`Gap ${gap} don't exist in record`);
-	}
-
-	return attribute.limitname;
-};
-
 const getPolicyId = (policyName, requirement) => {
 	if (!policyName || policyName === 'Certificate of Insurance') {
 		return DEFAULT_POLICY_ID;
@@ -91,7 +68,7 @@ const parseAuditConfig = function(config) {
 				}
 
 				if (isArray(attributes[attributeName])) {
-					selection.status = AUDIT_ENTITY_STATUSES[(attributes[attributeName][0]).toUpperCase()];
+					selection.status = AUDIT_ENTITY_STATUSES[ (attributes[attributeName][0]).toUpperCase() ];
 					selection.value = attributes[attributeName][1].replace('$', emptyValue);
 				} else {
 					// Special statuses switch
@@ -103,7 +80,7 @@ const parseAuditConfig = function(config) {
 							selection.status = AUDIT_ENTITY_STATUSES.YES;
 							break;
 						default:
-							selection.status = AUDIT_ENTITY_STATUSES[(attributes[attributeName]).toUpperCase()];
+							selection.status = AUDIT_ENTITY_STATUSES[ (attributes[attributeName]).toUpperCase() ];
 							break;
 					}
 
@@ -121,10 +98,10 @@ const parseAuditConfig = function(config) {
 			certificateEndorsmentsList.includes(field) && (selection.policyName = field);
 
 			if (isArray(config[field])) {
-				selection.status = AUDIT_ENTITY_STATUSES[(config[field][0]).toUpperCase()];
+				selection.status = AUDIT_ENTITY_STATUSES[ (config[field][0]).toUpperCase() ];
 				selection.value = config[field][1]; // Ok to be undefined
 			} else {
-				selection.status = AUDIT_ENTITY_STATUSES[(config[field]).toUpperCase()] || AUDIT_ENTITY_STATUSES.YES;
+				selection.status = AUDIT_ENTITY_STATUSES[ (config[field]).toUpperCase() ] || AUDIT_ENTITY_STATUSES.YES;
 				selection.value = getValueBySelection(config[field]);
 			}
 
@@ -159,10 +136,7 @@ module.exports = {
 	parseAuditConfig,
 	getPolicyId,
 	createAuditEntity,
-	getAuditorId,
-	getAttributeKey,
-	getAttributeNameByGap,
-	getWaiveReason
+	getAuditorId
 };
 
 const certificateEndorsmentsList = [
@@ -199,9 +173,3 @@ const specialAttributes = {
 		'Umbrella': 'UMoccur'
 	}
 };
-
-const waiveReasons = {
-	'No Exposure': waiveModels.WAIVER_REASONS.NO_EXPOSURE,
-	'Business Decision': waiveModels.WAIVER_REASONS.BUSINESS_DECISION,
-	'Executive Approval': waiveModels.WAIVER_REASONS.EXECUTIVE_APPROVAL
-};

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

@@ -20,7 +20,7 @@ const Endpoints = {
 	updateVendorExpiryDate: contractorId => `${backendUrl}/_saas/automation/contractor/${contractorId}/expiry-date`,
 	updateContractorInviteDate: contractorId => `${backendUrl}/_saas/automation/contractor/${contractorId}/invite-date`,
 	searchInAutocomplete: ({ tabId, searchWord }) =>
-		`${backendUrl}/saas/contractors/search/audited?&tabId=${tabId}&searchWord=${searchWord}`,
+		`${backendUrl}/saas/requests/search/audited?&tabId=${tabId}&searchWord=${searchWord}`,
 	automationUpdateContractorUploadDate: contractorId => `${backendUrl}/saas/automation/contractor/${contractorId}/upload-date`
 };
 

package/src/saas/internal-api/dashboardInnerPage/api/recordList.api.js

@@ -2,7 +2,7 @@ const requests = require('../../../../common/requests/cookieAuth/requests');
 const { backendUrl } = require('../../../../env').getEnv();
 
 const Endpoints = {
-	innerPageRecordsApi: `${backendUrl}/saas/analytics/dashboard/records`
+	innerPageRecordsApi: `${backendUrl}/saas/analytics/dashboard/requests`
 };
 
 const getSortedRecordsForDashboardInnerPage = (dashboardCriteriaModel, context) => {

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

@@ -2,14 +2,14 @@ const requests = require('../../../../common/requests/cookieAuth/requests');
 const { backendUrl } = require('../../../../env').getEnv();
 
 const Endpoints = {
-	create: `${backendUrl}/saas/contractors/invite`,
-	publicLinkInvite: `${backendUrl}/_saas/contractors/publicinvite`,
-	edit: contractorId => `${backendUrl}/saas/contractors/${contractorId}/update`,
+	create: `${backendUrl}/saas/requests/invite`,
+	publicLinkInvite: `${backendUrl}/_saas/requests/publicinvite`,
+	edit: contractorId => `${backendUrl}/saas/requests/${contractorId}/update`,
 	getById: requestId => `${backendUrl}/saas/request/${requestId}`,
 	getAccountRequests: accountId => `${backendUrl}/saas/requests/${accountId}`,
-	getByTabId: `${backendUrl}/saas/contractors`,
+	getByTabId: `${backendUrl}/saas/requests`,
 	requestsGlobalSearch: (projectId, searchWord) =>
-		`${backendUrl}/saas/contractors/search?&projectId=${projectId}&searchWord=${searchWord}`
+		`${backendUrl}/saas/requests/search?&projectId=${projectId}&searchWord=${searchWord}`
 };
 
 const createRequest = (createRequestModel, context) => {

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

@@ -27,8 +27,8 @@ const updateRequirement = (updateRequirementModel, tabId, context) => {
 	return requests.postRequestHandler(Endpoints.update, updateRequirementModel, context, {}, { tabId });
 };
 
-const updateRequirementWithNotification = (updateRequirementModel, context) => {
-	return requests.postRequestHandler(Endpoints.updateWithNotification, updateRequirementModel, context);
+const updateRequirementWithNotification = (updateRequirementModel, tabId, context) => {
+	return requests.postRequestHandler(Endpoints.updateWithNotification, updateRequirementModel, context, {}, { tabId });
 };
 
 const deleteByRequirementId = (requirementId, context) => {

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

@@ -53,9 +53,9 @@ const updateRequirement = (updateRequirementModel, tabId, context) => {
 	return requirementsAPI.updateRequirement(updateRequirementModel, tabId, context);
 };
 
-const updateRequirementWithNotification = (updateRequirementModel, context) => {
+const updateRequirementWithNotification = (updateRequirementModel, tabId, context) => {
 	validateType(updateRequirementModel, UpdateRequirementModel);
-	return requirementsAPI.updateRequirementWithNotification(updateRequirementModel, context);
+	return requirementsAPI.updateRequirementWithNotification(updateRequirementModel, tabId, context);
 };
 
 const deleteByRequirementId = (requirementId, context) => {

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

@@ -1,6 +1,6 @@
 const { validateType } = require('../../../../common/validations/typeValidations');
+const { REQUIREMENT_SHARING_LEVELS } = require('../consts/consts');
 const { PolicyModel } = require('./policy.model');
-const DEFAULT_REQUIREMENT_TYPE = 'REQUIREMENT';
 
 class UpdateRequirementModel {
 	constructor(id, accountId, projectId, tabId, name, policies, dateModified) {
@@ -10,7 +10,7 @@ class UpdateRequirementModel {
 		this.tabId = tabId;
 		this.name = name;
 		this.policies = policies;
-		this.requirementType = DEFAULT_REQUIREMENT_TYPE;
+		this.sharingLevel = REQUIREMENT_SHARING_LEVELS.TAB;
 		this.dateModified = dateModified;
 
 		validateType(policies, Array);

package/src/common/consts/userTypes.js

@@ -1,5 +0,0 @@
-module.exports = {
-	ICS: 'ICS',
-	PM: 'PM',
-	AUDITOR: 'AUDITOR'
-};