@getjones/test-infra 2.6.5 → 2.6.7

package/package.json

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

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

@@ -19,13 +19,13 @@ const updateInviteDate = async function(recordId, inviteDate, context) {
 	const updateResponse = await contractors.services.updateInviteDate(recordId, inviteDate, context);
 
 	if (updateResponse.status !== httpResponseStatusCodes.NO_CONTENT) {
-		throw new Error('Record invite date could not be updated', updateResponse);
+		throw new Error(`Record invite date could not be updated\n${updateResponse}`);
 	}
 
 	const threadSchedulerResponse = await threadScheduler.runForRecords([recordId]);
 
 	if (threadSchedulerResponse.status !== httpResponseStatusCodes.OK) {
-		throw new Error('Thread scheduler has failed to run', threadSchedulerResponse);
+		throw new Error(`Thread scheduler has failed to run\n${threadSchedulerResponse}`);
 	}
 
 	await timeUtils.waitFor(2.5).seconds; // calls for the same records can override each other
@@ -43,13 +43,13 @@ const updatePolicyExpiryDateForRecord = async function(recordId, expiryDate, pol
 	const updateResponse = await contractors.services.updateExpiryDate(recordId, expiryDate, policyName);
 
 	if (updateResponse.status !== httpResponseStatusCodes.NO_CONTENT) {
-		throw new Error('Record expiry date could not be updated', updateResponse);
+		throw new Error(`Record expiry date could not be updated\n${updateResponse}`);
 	}
 
 	const threadSchedulerResponse = await threadScheduler.runForRecords([recordId]);
 
 	if (threadSchedulerResponse.status !== httpResponseStatusCodes.OK) {
-		throw new Error('Thread scheduler has failed to run', threadSchedulerResponse);
+		throw new Error(`Thread scheduler has failed to run\n${threadSchedulerResponse}`);
 	}
 
 	await timeUtils.waitFor(2.5).seconds; // calls for the same records can override each other

package/src/common/consts/recordTypes.js

@@ -0,0 +1,5 @@
+module.exports = {
+	VENDORS: 'Vendors',
+	TENANTS: 'Tenants',
+	GUESTS: 'Guests'
+};

package/src/common/consts/userTypes.js

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

package/src/common/requests/apiKeyAuth/requests.js

@@ -15,6 +15,11 @@ const putRequestHandler = (url, apiKey, body, headers = {}, params = {}) => {
 	return requestHandler.putRequestHandler(url, body, headers, params);
 };
 
+const putFileRequestHandler = (url, apiKey, fileData, headers = {}) => {
+	enrichApiKey(headers, apiKey);
+	return requestHandler.putFileRequestHandler(url, fileData, headers);
+};
+
 const patchRequestHandler = (url, apiKey, body, headers = {}) => {
 	enrichApiKey(headers, apiKey);
 	return requestHandler.patchRequestHandler(url, body, headers);
@@ -33,6 +38,7 @@ module.exports = {
 	getRequestHandler,
 	postRequestHandler,
 	putRequestHandler,
+	putFileRequestHandler,
 	patchRequestHandler,
 	deleteRequestHandler
 };

package/src/common/requests/requestHandlers.js

@@ -1,4 +1,6 @@
 const axios = require('axios');
+const axiosFile = require('axios-file');
+
 const errorValidation = require('../validations/errorValidation');
 
 const getRequestHandler = async (url, headers = {}, params = {}) => {
@@ -31,6 +33,21 @@ const putRequestHandler = async (url, body, headers = {}, params = {}) => {
 	}
 };
 
+const putFileRequestHandler = async (url, fileData, headers = {}) => {
+	try {
+		const response = await axiosFile({
+			url,
+			method: 'put',
+			headers,
+			data: { file: fileData }
+		});
+		return response;
+	} catch (error) {
+		errorValidation.validateClientErrorResponseStatus(error);
+		return error.response;
+	}
+};
+
 const patchRequestHandler = async (url, body, headers = {}) => {
 	try {
 		const response = await axios.patch(url, body, { headers });
@@ -55,6 +72,7 @@ module.exports = {
 	getRequestHandler,
 	postRequestHandler,
 	putRequestHandler,
+	putFileRequestHandler,
 	patchRequestHandler,
 	deleteRequestHandler
 };

package/src/common/utils/timeUtils.js

@@ -12,7 +12,8 @@ const formats = {
 	fullMonthDayYear: 'MMMM DD, YYYY',
 	threadScheduler: '', // Passing empty string resolves moment.js format to ISO8601 standard like 2020-04-12T09:49:59Z;
 	monthDayYear12hTime: 'MMM D, YYYY h:mm A',
-	amPmTime: 'h:mm A'
+	amPmTime: 'h:mm A',
+	yearMonthDay: 'YYYY-MM-DD'
 };
 
 const peroids = {
@@ -34,6 +35,7 @@ const getThirtyFiveDaysAgoDate = format => moment().utc().subtract(35, peroids.d
 const getCurrentDate = format => moment().utc().format(format || formats.threadScheduler);
 const getDateInOneDay = format => moment().utc().add(1, peroids.days).format(format || formats.threadScheduler);
 const getDateinSixDays = format => moment().utc().add(6, peroids.days).format(format || formats.threadScheduler);
+const getDateInTwoMonths = format => moment().utc().add(2, peroids.months).format(format || formats.dayMonthYear);
 const getDateinThirteenDays = format => moment().utc().add(13, peroids.days).format(format || formats.threadScheduler);
 const getDateinTwentyNineDays = format => moment().utc().add(29, peroids.days).format(format || formats.threadScheduler);
 const getOneWeekAgoDate = () => moment().utc().subtract(7, peroids.days).format(formats.dayMonthYear);
@@ -68,10 +70,6 @@ const getYearMonthDayFormat = date => {
 	return `${year}-${month}-${day}`;
 };
 
-const dateToIsoFormat = date => {
-	return new Date(date).toISOString();
-};
-
 const extractDateFromDateTime = date => {
 	let extractedDate = date;
 
@@ -134,6 +132,10 @@ const convertDateToNewFormat = (value, currentFormat, newFormat = formats.dayMon
 	return moment(value, currentFormat).format(newFormat);
 };
 
+const convertDateToLongInt = value => {
+	return Date.parse(value);
+};
+
 module.exports = {
 	formats,
 	getOneYearAgoDate,
@@ -151,6 +153,7 @@ module.exports = {
 	getDateinSixDays,
 	getDateinThirteenDays,
 	getDateinTwentyNineDays,
+	getDateInTwoMonths,
 	getInvitationDatesForNotResponsiveVendor,
 	getInvitationDatesForNotResponsiveTenant,
 	getAutomaticRenewalsExpirationDates,
@@ -159,7 +162,6 @@ module.exports = {
 	getAuditDateFormat,
 	getDateWithOffset,
 	getYearMonthDayFormat,
-	dateToIsoFormat,
 	getDayInMilliseconds,
 	extractDateFromDateTime,
 	getPreviousDateByDays,
@@ -167,5 +169,6 @@ module.exports = {
 	isDateAfterOther,
 	convertDateToNewFormat,
 	getOneWeekAgoDate,
-	getOneWeekAheadDate
+	getOneWeekAheadDate,
+	convertDateToLongInt
 };

package/src/defaults/configs/auditConfigs.js

@@ -81,5 +81,9 @@ module.exports = {
 	getCompliantAuditConfig,
 	getNotCompliantConfig,
 	getAboutExpiredConfig,
-	getExpiredConfig
+	getExpiredConfig,
+	policySelections,
+	defaultPolicyDate: DEFAULT_POLICY_DATE,
+	defaultAMScore: DEFAULT_AM_SCORE,
+	defaultPolicyNumber: DEFAULT_POLICY_NUMBER
 };

package/src/defaults/configs/polices.js

@@ -38,7 +38,8 @@ const attributeNames = {
 	perOccurrence: 'Per Occur',
 	cancellationTerms: 'Cancellation Terms',
 	coiAuthentication: 'COI authentication',
-	signature: 'Signature'
+	signature: 'Signature',
+	occur: 'Occur'
 };
 
 module.exports = {

package/src/defaults/configs/requirement.js

@@ -4,6 +4,7 @@ const { cloneObject } = require('../../common/utils/objectUtils');
 const { eachOccurrence } = attributeNames;
 const { generalLiability } = policyNames;
 
+const { REQUIREMENT_SHARING_LEVELS } = require('../../saas/internal-api/requirements/consts/consts');
 const DEFAULT_REQUIREMENT_NAME = 'Integration Requirement';
 const DEFAULT_COVERAGE_VALUE = 1000000;
 
@@ -15,15 +16,17 @@ const getDefaultRequirementPolices = () => {
 	});
 };
 
-const defaultRequirementConfig = () => {
+const defaultRequirementConfig = ({ name = DEFAULT_REQUIREMENT_NAME, sharingLevel = REQUIREMENT_SHARING_LEVELS.TAB } = {}) => {
 	return {
-		name: DEFAULT_REQUIREMENT_NAME,
-		policies: getDefaultRequirementPolices()
+		name,
+		policies: getDefaultRequirementPolices(),
+		sharingLevel
 	};
 };
 
 module.exports = {
 	name: DEFAULT_REQUIREMENT_NAME,
+	value: DEFAULT_COVERAGE_VALUE,
 	getDefaultRequirementPolices,
 	defaultRequirementConfig
 };

package/src/factory/records/records.js

@@ -1,14 +1,20 @@
-const requests = require('../../saas/internal-api/requests');
-const { credentials } = require('../../../src/env');
+const path = require('path');
+
+const { getEnv } = require('../../env');
+const { credentials } = getEnv();
+
+const auth = require('../../saas/internal-api/auth');
 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 requests = require('../../saas/internal-api/requests');
+
 const auditConfigs = require('../../defaults/configs/auditConfigs');
 const httpResponseStatusCodes = require('../../common/httpResponseStatusCodes.json');
 const timeUtils = require('../../common/utils/timeUtils');
 
-const filePath = 'src/resources/coi/coi.pdf';
+const filePath = path.join(__dirname, '../../resources/coi/coi.pdf');
+
 const complianceStatuses = {
 	complaint: 'complaint',
 	notCompliant: 'notCompliant',
@@ -22,7 +28,7 @@ const prepareRecord = async (recordCompany, recordEmail, status, tabId, requirem
 		context,
 		tabId,
 		requirementId,
-		{
+		{ // record
 			inviterEmail: credentials.superUser,
 			email: recordEmail,
 			companyName: recordCompany
@@ -30,21 +36,22 @@ const prepareRecord = async (recordCompany, recordEmail, status, tabId, requirem
 	);
 
 	if (!(requestData && requestData.id)) {
-		throw Error(`Failed to create record ${record.company}\n`, requestData);
+		throw Error(`Failed to create record ${recordCompany}\n${requestData}`);
 	}
 
 	const accountId = requestData.record.userId;
 	const projectId = requestData.projectInfo.projectId;
+	const recordId = requestData.record.contractorId;
 
 	const coiUpload = await coi.utils.uploadCoi(
-		requestData.id,
+		recordId,
 		filePath,
 		uploaderType = coi.consts.UPLOADER_TYPES.ICS,
 		uploaderEmail = credentials.superUser
 	);
 
 	if (!(coiUpload && coiUpload.name)) {
-		throw Error(`Failed to upload COI for record ${record.company}\n`, coiUpload);
+		throw Error(`Failed to upload COI for record ${recordCompany}\n${coiUpload}`);
 	}
 
 	const auditorContext = await auth.services.getAuditorCookie();
@@ -73,17 +80,17 @@ const prepareRecord = async (recordCompany, recordEmail, status, tabId, requirem
 			auditorContext,
 			accountId,
 			projectId,
-			record.requirementId,
-			requestData.id,
+			requirementId,
+			recordId,
 			auditConfig
 		);
 	} while (auditResponse.status !== httpResponseStatusCodes.NO_CONTENT && retries--);
 
 	if (auditResponse.status !== httpResponseStatusCodes.NO_CONTENT) {
-		throw Error(`Failed to audit record ${record.company}\n`, auditResponse);
+		throw Error(`Failed to audit record ${record.company}\n${auditResponse}`);
 	}
 
-	return requestData.id;
+	return recordId;
 };
 
 const prepareCompliantRecord = (recordCompany, recordEmail, tabId, requirementId, context) => {
@@ -102,23 +109,33 @@ const prepareAboutToExpiredRecord = (recordCompany, recordEmail, tabId, requirem
 	return prepareRecord(recordCompany, recordEmail, complianceStatuses.aboutToExpired, tabId, requirementId, context);
 };
 
+const prepareWaivedRecord = async (recordCompany, recordEmail, tabId, requirementId, context) => {
+	const recordId = await prepareRecord(recordCompany, recordEmail, complianceStatuses.notCompliant, tabId, requirementId, context);
+
+	const record = await contractors.services.getContractorById(recordId, context);
+	await compliance.services.waive.waiveAll(record, context);
+
+	return recordId;
+};
+
 const prepareAwaitingNewCoiRecord = async (recordCompany, recordEmail, tabId, requirementId, context) => {
-	const prepareRecordId = await prepareRecord(recordCompany, recordEmail, complianceStatuses.awaitingNewCoi, tabId, requirementId, context);
+	const recordId = await prepareRecord(recordCompany, recordEmail, complianceStatuses.awaitingNewCoi, tabId, requirementId, context);
 
-	const recordVerificationModel = await contractors.services.getRecordVerificationModel(prepareRecordId, context);
+	const recordVerificationModel = await contractors.services.getRecordVerificationModel(recordId, context);
 	const sendGapsResponse = await contractors.services.sendGaps(recordVerificationModel, context);
 
 	if (sendGapsResponse.status !== httpResponseStatusCodes.OK) {
-		throw Error(`Failed to send gaps to ${recordCompany}\n`, sendGapsResponse);
+		throw Error(`Failed to send gaps to ${recordCompany}\n${sendGapsResponse}`);
 	}
 
-	return prepareRecordId;
+	return recordId;
 };
 
 module.exports = {
 	prepareCompliantRecord,
 	prepareNotCompliantRecord,
 	prepareExpiredRecord,
+	prepareWaivedRecord,
 	prepareAboutToExpiredRecord,
 	prepareAwaitingNewCoiRecord
 };

package/src/index.js

@@ -26,7 +26,7 @@ const getInternalAPI = () => {
 
 	const reports = require('./saas/internal-api/reports');
 	const charts = require('./saas/internal-api/homepageCharts');
-	const dashboardInnerPage = require('./saas/internal-api/dashboardInnerPage');
+	const dashboard = require('./saas/internal-api/dashboard');
 
 	const globalRecord = require('./saas/internal-api/globalRecord');
 	const vendorProfile = require('./saas/internal-api/vendorProfile');
@@ -49,7 +49,7 @@ const getInternalAPI = () => {
 		reports,
 		users,
 		charts,
-		dashboardInnerPage,
+		dashboard,
 		globalRecord,
 		vendorProfile,
 		serviceArea,
@@ -63,11 +63,12 @@ const getInternalAPI = () => {
 
 const getOpenAPI = () => {
 	const accounts = require('./saas/openapi/accounts/accounts.service');
-	const tabs = require('./saas/openapi/tabs/tabs.service');
-	const requests = require('./saas/openapi/requests');
 	const projects = require('./saas/openapi/projects/projects.service');
+	const tabs = require('./saas/openapi/tabs/tabs.service');
 	const requirements = require('./saas/openapi/requirements');
-	const openAPI = { accounts, tabs, requests, projects, requirements };
+	const requests = require('./saas/openapi/requests');
+	const coi = require('./saas/openapi/coi/coi.service');
+	const openAPI = { accounts, projects, tabs, requirements, requests, coi };
 	return openAPI;
 };
 

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} was not created`);
+		throw new Error(`Account by the name ${createAccountModel.companyName} was not created\n${response}`);
 	}
 
 	return response.data;

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

@@ -12,8 +12,7 @@ const updateAccountSettings = (updateAccountSettingsModel, context) => {
 };
 
 const restoreAccountSettings = (accountId, context) => {
-	const [isHighPriority, hasAnalyticsDashboard, isExcludedFromNetwork, isOcrEnabled, isCoverageAudit, isAccountRequirementsEnabled] = [false, false, false, false, false, false];
-	const updateAccountSettingsModel = new UpdateAccountSettingsModel(accountId, isHighPriority, hasAnalyticsDashboard, isExcludedFromNetwork, isOcrEnabled, isCoverageAudit, isAccountRequirementsEnabled);
+	const updateAccountSettingsModel = new UpdateAccountSettingsModel(accountId);
 	return accountsAPI.updateAccountSettings(updateAccountSettingsModel, context);
 };
 

package/src/saas/internal-api/accounts/models/settings/update.settings.model.js

@@ -1,13 +1,15 @@
 class UpdateAccountSettingsModel {
 	constructor(
 		accountId,
-		isHighPriority,
-		hasAnalyticsDashboard,
-		isEmailOnWelcomePageVA,
-		isExcludedFromNetwork,
-		isOcrEnabled,
-		isCoverageAudit,
-		isAccountRequirementsEnabled
+		{
+			isHighPriority = false,
+			hasAnalyticsDashboard = false,
+			isEmailOnWelcomePageVA = false,
+			isExcludedFromNetwork = false,
+			isOcrEnabled = false,
+			isCoverageAudit = false,
+			isAccountRequirementsEnabled = false
+		} = {}
 	) {
 		this.accountId = accountId;
 		this.isHighPriority = isHighPriority;

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

@@ -1,4 +1,6 @@
 const { getEnv, requiredValidation, getSystemUserIdentity, addUserIdentity } = require('../../../../env');
+const httpResponseStatusCodes = require('../../../../common/httpResponseStatusCodes.json');
+
 const { credentials } = getEnv();
 const authApi = require('./auth.api');
 
@@ -11,13 +13,18 @@ const getAuthCookie = async (email, password) => {
 
 	try {
 		const response = await authApi.login(email, password);
+
+		if (response.status !== httpResponseStatusCodes.OK) {
+			throw Error(`Error: ${JSON.stringify(response.data)}`);
+		}
+
 		const authCookie = response.headers['set-cookie'].find(item => item.startsWith('JonesToken='));
 
 		addUserIdentity(email, authCookie, response.data.id);
 
 		return authCookie;
 	} catch (error) {
-		throw new Error(`Failed to login to email:${email}`, error);
+		throw new Error(`Failed to login with email: ${email}\nError: ${error}`);
 	}
 };
 

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

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

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

@@ -1,6 +1,13 @@
+const env = require('../../../../../env');
+
 const waiveApi = require('./waive.api');
-const { WaiveRequestModel, RetractRequestModel } = require('../../models/waive/waive.model');
+const { WaiveRequestModel, RetractRequestModel, WAIVER_REASONS } = require('../../models/waive/waive.model');
 const { validateType } = require('../../../../../common/validations/typeValidations');
+const util = require('../../utils/util');
+const httpResponseStatusCodes = require('../../../../../common/httpResponseStatusCodes.json');
+
+const { credentials } = env.getEnv();
+const userTypes = require('../../../../../common/consts/userTypes');
 
 const waive = (waiveRequestModel, context) => {
 	validateType(waiveRequestModel, WaiveRequestModel);
@@ -12,39 +19,63 @@ const retract = (retractRequestModel, context) => {
 	return waiveApi.retract(retractRequestModel.contractorId, retractRequestModel, context);
 };
 
-const getWaiveModel = async (
+const getWaiveModel = (
 	record,
 	policyName,
 	attributeName,
 	waiverReason,
-	remarks
-) => {
-	const auditId = await getPolicyAuditIdFromRecord(record, policyName, attributeName);
+	remarks,
+	{
+		userId,
+		userRole
+	} = {}) => {
+	const auditId = getPolicyAuditIdFromRecord(record, policyName, util.getAttributeKey(attributeName));
+	userId = userId || env.getSystemUserIdentity(credentials.superUser).id;
+	userRole = userRole || userTypes.ICS;
 
 	const waiveModel = new WaiveRequestModel({
-		userId: record.userId,
 		contractorId: record.id,
 		auditId,
 		waiverReason,
-		remarks
+		remarks,
+		userId,
+		userRole
 	});
 
 	return waiveModel;
 };
 
-const getRetractModel = async (record, policyName, attributeName) => {
-	const auditId = await getPolicyAuditIdFromRecord(record, policyName, attributeName);
+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 retractModel = new RetractRequestModel({
-		userId: record.userId,
 		contractorId: record.id,
-		auditId
+		auditId,
+		userId,
+		userRole
 	});
 
 	return retractModel;
 };
 
-const getPolicyAuditIdFromRecord = async (record, policyName, attributeName) => {
+const getPolicyAuditIdFromRecord = (record, policyName, attributeName) => {
 	const policy = record.reviewbyAuditor.find(contractorCoverage =>
 		contractorCoverage.insuranceName === policyName);
 
@@ -61,4 +92,24 @@ const getPolicyAuditIdFromRecord = async (record, policyName, attributeName) =>
 	return attribute.auditId;
 };
 
-module.exports = { waive, retract, getWaiveModel, getRetractModel };
+const waiveAll = async (record, context, { reason = WAIVER_REASONS.BUSINESS_DECISION, note = 'WAIVED AUTOMATICALLY' } = {}) => {
+	const allWaivablePolicies = util.getAllWaivablePolicies(record, context);
+
+	for (const waivable of allWaivablePolicies) {
+		const waiveModel = getWaiveModel(record, waivable.policyName, waivable.attributeName, reason, note);
+		const waiveResponse = await waive(waiveModel, context);
+
+		if (waiveResponse.status !== httpResponseStatusCodes.OK) {
+			throw Error(`Failed to waive ${waivable.policyName} - ${waivable.attributeName} for ${record.company}`);
+		}
+	}
+};
+
+module.exports = {
+	waive,
+	waiveAll,
+	retract,
+	getWaiveModel,
+	getRetractModel,
+	getWaiveModelByGap
+};

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

@@ -11,14 +11,6 @@ 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';
@@ -74,8 +66,6 @@ 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,5 +1,3 @@
-const DEFAULT_USER_ROLE = 'ICS';
-
 const WAIVE_ACTIONS = {
 	WAIVE: 'ignored',
 	RETRACT: 'notIgnored'
@@ -12,24 +10,29 @@ const WAIVER_REASONS = {
 };
 
 function WaiveRequestModel({
-	userId,
 	contractorId,
 	auditId,
 	waiverReason,
-	remarks = '',
-	userRole = DEFAULT_USER_ROLE
+	remarks,
+	userId,
+	userRole
 }) {
 	this.auditorContractorId = auditId;
 	this.contractorId = contractorId;
-	this.userId = userId;
 	this.waiverReason = waiverReason;
-	this.remarks = remarks;
+	this.remarks = remarks || '';
 
-	this.userRole = userRole;
+	this.userId = userId,
+	this.userRole = userRole,
 	this.status = WAIVE_ACTIONS.WAIVE;
 }
 
-function RetractRequestModel({ userId, contractorId, auditId, userRole = DEFAULT_USER_ROLE }) {
+function RetractRequestModel({
+	contractorId,
+	auditId,
+	userId,
+	userRole
+}) {
 	this.auditorContractorId = auditId;
 	this.contractorId = contractorId;
 	this.userId = userId;