@getjones/test-infra 2.8.12 → 2.8.14

package/package.json

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

package/src/saas/internal-api/compliance/api/overrideGap/override.gap.api.js

@@ -2,24 +2,10 @@ const requests = require('../../../../../common/requests/cookieAuth/requests');
 const { backendUrl } = require('../../../../../env').getEnv();
 
 const Endpoints = {
-	waive: contractorId => `${backendUrl}/saas/contractors/${contractorId}/waiver`,
-	retract: contractorId => `${backendUrl}/saas/contractors/${contractorId}/waiver`,
 	overrideGap: `${backendUrl}/saas/record/override-gap`,
 	retractOverride: `${backendUrl}/saas/record/retract-override`
 };
 
-const waive = async (contractorId, waiveRequestModel, context) => {
-	const status = waiveRequestModel.status;
-	delete waiveRequestModel.status;
-	return requests.postRequestHandler(Endpoints.waive(contractorId), waiveRequestModel, context, {}, { status });
-};
-
-const retract = async (contractorId, retractRequestModel, context) => {
-	const status = retractRequestModel.status;
-	delete retractRequestModel.status;
-	return requests.postRequestHandler(Endpoints.retract(contractorId), retractRequestModel, context, {}, { status });
-};
-
 const overrideGap = ({ waiveRequestModel, isTestingBackwardCompatibility = false, context }) => {
 	const headers = {};
 	const params = { isTestingBackwardCompatibility };
@@ -30,4 +16,4 @@ const retractOverride = (retractRequestModel, context) => {
 	return requests.postRequestHandler(Endpoints.retractOverride, retractRequestModel, context);
 };
 
-module.exports = { waive, retract, overrideGap, retractOverride };
+module.exports = { overrideGap, retractOverride };

package/src/saas/internal-api/compliance/api/overrideGap/override.gap.service.js

@@ -9,16 +9,6 @@ const httpResponseStatusCodes = require('../../../../../common/httpResponseStatu
 const { credentials } = env.getEnv();
 const userTypes = require('../../../../../common/consts/userTypes');
 
-const waive = (waiveRequestModel, context) => {
-	validateType(waiveRequestModel, WaiveRequestModel);
-	return overrideGapApi.waive(waiveRequestModel.contractorId, waiveRequestModel, context);
-};
-
-const retract = (retractRequestModel, context) => {
-	validateType(retractRequestModel, RetractRequestModel);
-	return overrideGapApi.retract(retractRequestModel.contractorId, retractRequestModel, context);
-};
-
 const overrideGap = ({ waiveRequestModel, isTestingBackwardCompatibility = false, context }) => {
 	validateType(waiveRequestModel, WaiveRequestModel);
 	return overrideGapApi.overrideGap({ waiveRequestModel, isTestingBackwardCompatibility, context });
@@ -129,10 +119,8 @@ const acceptAll = async (record, context, { note = 'ACCEPTED AUTOMATICALLY' } =
 };
 
 module.exports = {
-	waive,
 	waiveAll,
 	acceptAll,
-	retract,
 	getWaiveModel,
 	getRetractModel,
 	getWaiveModelByGap,

package/src/saas/internal-api/dbEmails/consts/consts.js

@@ -25,7 +25,8 @@ const EMAIL_SUBJECT = {
 	sendGapsForTenant: ({ requesterName }) => `New Insurance Docs Required for leased space at ${requesterName} - `,
 	notCompliant: ({ recordCompanyName, requesterName }) => `Please Review COI Gaps - ${recordCompanyName} (${requesterName})`,
 	wrongCoi: ({ recordCompanyName, requesterName }) => `Incorrect File Submission - COI Still Required for ${recordCompanyName} - ${requesterName}`,
-	sendGapsRecordFullName: ({ requesterName, recordFirstName, recordLastName }) => `New Insurance Docs Required for ${requesterName} - ${recordFirstName} ${recordLastName}`,
+	sendGapsVendorFullName: ({ requesterName, recordFirstName, recordLastName }) => `New Insurance Docs Required for ${requesterName} - ${recordFirstName} ${recordLastName}`,
+	sendGapsTenantFullName: ({ requesterName, recordFirstName, recordLastName }) => `New Insurance Docs Required for leased space at ${requesterName} - ${recordFirstName} ${recordLastName}`,
 	requestNewCoiExpired: ({ recordCompanyName }) => `${recordCompanyName}'s COI is`,
 	firstReminder: ({ requesterName }) => `We are still awaiting the Insurance Docs for ${requesterName}`,
 	secondReminder: ({ requesterName }) => `${requesterName} still needs`,

package/src/saas/internal-api/reports/consts/consts.js

@@ -36,7 +36,8 @@ const XlsxReportTypes = {
 	WAIVERS_REPORT: 'WaiversReport',
 	USER_MANAGEMENT_REPORT: 'UserManagementReport',
 	COVERAGE_GAPS_REPORT: 'CoverageGapsReport',
-	EXPIRING_RECORDS_REPORT: 'ExpiringRecordsReport'
+	EXPIRING_RECORDS_REPORT: 'ExpiringRecordsReport',
+	COMPLIANCE_STATUS_BY_POLICY_REPORT: 'ComplianceStatusByPolicy'
 };
 
 const ScheduledReportFrequency = {

package/src/saas/internal-api/reports/models/report.model.js

@@ -10,7 +10,7 @@ class ReportFilters {
 			isAllProjects,
 			isAllTabTypes,
 			isAllComplianceStatuses
-		}
+		} = {}
 	) {
 		this.projects = projects;
 		this.vendorTabTypes = contractorTypes;

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

@@ -117,6 +117,20 @@ const getInnerPageRequests = async (innerPageRequestCriteriaModel, context) => {
 	return response.data;
 };
 
+const getAllRequestsByName = async (recordName, accountId, context) => {
+	const { data: requestsInAccount } = await requestsAPI.getRequestsByAccountId(accountId, context);
+	const requests = requestsInAccount.filter(requests => requests.record.company === recordName);
+
+	return requests;
+};
+
+const getRequestByName = async (recordName, tabId, context) => {
+	const { data: requestsInTab } = await requestsAPI.getRequestsByTabId(tabId, context);
+	const request = requestsInTab.find(requests => requests.record.company === recordName);
+
+	return request;
+};
+
 module.exports = {
 	createRequest,
 	getAutocompleteAutoSelect,
@@ -131,5 +145,7 @@ module.exports = {
 	requestsGlobalSearch,
 	getTabTenantRequestsInProject,
 	getRequestFromTabByRecordId,
-	getInnerPageRequests
+	getInnerPageRequests,
+	getAllRequestsByName,
+	getRequestByName
 };

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

@@ -39,8 +39,15 @@ const getUserByEmail = async (email, context) => {
 const getOrCreateUser = async (email, role, projectsIds, context, { fullName = role, password = credentials.strongPassword } = {}) => {
 	let userResponse = await getUserByEmail(email, context);
 
-	if (userResponse.data && userResponse.data.subuserId && userResponse.data.isVerified) {
-		return userResponse.data;
+	if (userResponse.data !== '') {
+		const { projectPermissions } = userResponse.data;
+		const projectPermissionsIds = projectPermissions.map(projectPermission => projectPermission.projectId);
+
+		projectsIds = projectsIds.filter(projectId => !projectPermissionsIds.includes(projectId));
+
+		if (userResponse.data && userResponse.data.subuserId && userResponse.data.isVerified && !projectsIds.length) {
+			return userResponse.data;
+		}
 	}
 
 	const inviteUserModel = new InviteUserModel(email, role, projectsIds, context);