@getjones/test-infra 4.5.7 → 4.5.9

package/package.json

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

package/src/common/consts/accountSettings.js

@@ -14,5 +14,31 @@ module.exports = {
 	isAuditingAiEnabled: {
 		on: { isAuditingAiEnabled: true },
 		off: { isAuditingAiEnabled: false }
+	},
+	integrations: {
+		vendorsAndTenantsON: {
+			integrations: {
+				isVendorIntegrationsEnabled: true,
+				isTenantIntegrationsEnabled: true
+			}
+		},
+		vendorsAndTenantsOFF: {
+			integrations: {
+				isVendorIntegrationsEnabled: false,
+				isTenantIntegrationsEnabled: false
+			}
+		},
+		vendorsON: {
+			integrations: {
+				isVendorIntegrationsEnabled: true,
+				isTenantIntegrationsEnabled: false
+			}
+		},
+		tenantsON: {
+			integrations: {
+				isVendorIntegrationsEnabled: false,
+				isTenantIntegrationsEnabled: true
+			}
+		}
 	}
 };

package/src/common/consts/homepage/AttentionTab.js

@@ -1,5 +1,6 @@
 module.exports = {
-	COMPLAINCE_ISSUE: 'complianceIssue',
+	COMPLIANCE_ISSUE: 'complianceIssue',
 	DRAFT: 'draft',
-	MUTED: 'muted'
+	MUTED: 'muted',
+	NON_INTEGRATED: 'nonIntegrated'
 };

package/src/common/consts/homepage/sortOptions.js

@@ -1,6 +1,11 @@
 const sortBy = {
 	companyName: 'company_name',
-	coi: 'coi'
+	coi: 'coi',
+	externalRecordId: 'external_record_id',
+	insuranceStatus: 'insurance_status',
+	expiryDate: 'min_policy_expiry',
+	projectName: 'project_name',
+	accountName: 'companyname'
 };
 
 const sortOrder = {

package/src/common/utils/complianceUtil.js

@@ -36,7 +36,8 @@ const prepareMetadataForAudit = async (
 	recordId,
 	{
 		isProjectOnboarding = false,
-		shouldSendNotificationToPM = false
+		shouldSendNotificationToPM = false,
+		dateStartedAudit
 	} = {}) => {
 	const metadata = {
 		accountId,
@@ -50,19 +51,20 @@ const prepareMetadataForAudit = async (
 	const isReauditResponse = await isReaudit(recordId, auditorContext);
 	metadata.isReaudit = isReauditResponse.data.isReaudit;
 
+	// const enterAuditResponse = await auditApi.enterAudit(recordId, auditorContext); //moved up here //remove from here
+
 	const recordDetailsResponse = await auditApi.getAuditRecordModel(recordId, auditorContext);
 	const recordDetails = recordDetailsResponse.data;
 
 	const auditResponse = await auditApi.getAuditMetadata(recordDetails.auditId, auditorContext);
 	const { currentAudit } = auditResponse.data;
 
-	const enterAuditResponse = await auditApi.enterAudit(recordId, auditorContext);
-
 	metadata.certificateId = recordDetails.certificateDetails.certificateuploadId;
 	metadata.auditDates = {
 		contractorId: recordId,
 		contractorDateModified: recordDetails.dateModified,
-		dateStartedAudit: enterAuditResponse.data.dateStartedAudit,
+		dateStartedAudit: dateStartedAudit,
+		// dateStartedAudit: enterAuditResponse.data.dateStartedAudit,
 		contractorOverrideDateModified: recordDetails.contractorOverrideDateModified,
 		contractCreateDate: recordDetails.contractCreateDate,
 		auditDateModified: currentAudit.dateModified

package/src/factory/records/records.js

@@ -232,6 +232,7 @@ const prepareRecordForAutocomplete = async (
 	}
 
 	const auditConfig = auditConfigs.getCompliantAuditConfig({ glPolicyNumber });
+
 	const auditResponse = await compliance.services.audit.auditRecord(
 		auditorContext,
 		accountId,

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

@@ -20,13 +20,13 @@ const Endpoints = {
 	auditRawData: recordId => `${backendUrl}/saas/integration-tests/record/${recordId}/audit/raw`
 };
 
-const audit = async (contractorId, auditRequestModel, context) => {
-	await enterAudit(contractorId, context);
-	const auditResponse = await getAuditMetadata(auditRequestModel.auditId, context);
-	const { currentAudit } = auditResponse.data;
-	auditRequestModel.auditDates.auditDateModified = currentAudit.dateModified;
-	return submitAudit(auditRequestModel, context);
-};
+// const audit = async (contractorId, auditRequestModel, context) => {
+// 	await enterAudit(contractorId, context);
+// 	const auditResponse = await getAuditMetadata(auditRequestModel.auditId, context);
+// 	const { currentAudit } = auditResponse.data;
+// 	auditRequestModel.auditDates.auditDateModified = currentAudit.dateModified;
+// 	return submitAudit(auditRequestModel, context);
+// };
 
 const submitAudit = async (auditRequestModel, context) => {
 	return requests.postRequestHandler(Endpoints.audit, auditRequestModel, context);
@@ -95,7 +95,7 @@ const getAuditRawData = (recordId, context) => {
 };
 
 module.exports = {
-	audit,
+	// audit,
 	submitAudit,
 	revertCoi,
 	wrongCoi,

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

@@ -7,14 +7,22 @@ const { cloneObject } = require('../../../../../common/utils/objectUtils');
 const complianceUtil = require('../../../../../common/utils/complianceUtil');
 const httpResponseStatusCodes = require('../../../../../common/httpResponseStatusCodes.json');
 
-const audit = (auditRequestModel, context) => {
-	validateType(auditRequestModel, AuditRequestModel);
-	return auditApi.audit(auditRequestModel.auditData.contractorId, auditRequestModel, context);
-};
+// const audit = (auditRequestModel, context) => {
+// 	validateType(auditRequestModel, AuditRequestModel);
+// // return auditApi.audit(auditRequestModel.auditData.contractorId, auditRequestModel, context);
+// 	return auditApi.submitAudit(auditRequestModel, context); //switched to this
+// };
 
-const submitAudit = (auditRequestModel, context) => {
+const submitAudit = async (auditRequestModel, context, { expectError } = {}) => {
 	validateType(auditRequestModel, AuditRequestModel);
-	return auditApi.submitAudit(auditRequestModel, context);
+
+	const submitAuditResponse = await auditApi.submitAudit(auditRequestModel, context);
+
+	if (submitAuditResponse.status !== httpResponseStatusCodes.NO_CONTENT && !expectError) {
+		throw new Error(`Failed to submit audit for record: ${auditRequestModel.auditDates.contractorId}. \n${submitAuditResponse.status}`);
+	}
+
+	return submitAuditResponse;
 };
 
 const revertCoi = (contractorId, dateModified, context) => {
@@ -35,24 +43,31 @@ const getAuditorContractorList = (auditListParametersModel, context) => {
 	return auditApi.getAuditorContractorList(auditListParametersModel, context);
 };
 
-const getAuditRequestModelAfterEnterAudit = async (auditConfigForModelAfterEnterAudit, accountId, projectId, requirementId, recordId, context) => {
-	const metadata = await prepareMetadataForAudit(context, accountId, projectId, requirementId, recordId);
-	const auditEntities = await getAuditEntities(recordId, auditConfigForModelAfterEnterAudit, context);
+const getAuditRequestModelAfterEnterAudit = async (accountId, projectId, requirementId, recordId, auditConfig, context, { shouldSendNotificationToPM, dateStartedAudit } = {}) => {
+	const metadata = await prepareMetadataForAudit(context, accountId, projectId, requirementId, recordId, { shouldSendNotificationToPM, dateStartedAudit });
+	const auditEntities = await getAuditEntities(recordId, auditConfig, context);
 	const auditRequestModel = getAuditRequestModel(metadata, auditEntities);
 
 	return auditRequestModel;
 };
 
-const enterAudit = async (recordId, context, { auditConfigForModelAfterEnterAudit, accountId, projectId, requirementId } = {}) => {
+const enterAudit = async (recordId, context, { shouldSendNotificationToPM, shouldGetAuditRequestModelAfterEnterAudit, accountId, projectId, requirementId, auditConfig } = {}) => {
 	const enterAuditResponse = await auditApi.enterAudit(recordId, context);
 
 	if (enterAuditResponse.status !== httpResponseStatusCodes.OK) {
 		throw Error(`Failed to enter audit\n$response - ${enterAuditResponse.status}\n${JSON.stringify(enterAuditResponse.data)}`);
 	}
 
-	return auditConfigForModelAfterEnterAudit ?
-		getAuditRequestModelAfterEnterAudit(auditConfigForModelAfterEnterAudit, accountId, projectId, requirementId, recordId, context) :
-		enterAuditResponse;
+	if (shouldGetAuditRequestModelAfterEnterAudit) {
+		const dateStartedAudit = enterAuditResponse.data.dateStartedAudit;
+		return getAuditRequestModelAfterEnterAudit(accountId, projectId, requirementId, recordId, auditConfig, context, { shouldSendNotificationToPM, dateStartedAudit });
+	} else {
+		return enterAuditResponse;
+	}
+
+	// return auditConfig ?
+	// 	getAuditRequestModelAfterEnterAudit(auditConfig, accountId, projectId, requirementId, recordId, context) :
+	// 	enterAuditResponse;
 };
 
 const getAuditRecordModel = (recordId, context) => {
@@ -80,7 +95,8 @@ const prepareMetadataForAudit = async (
 	recordId,
 	{
 		isProjectOnboarding,
-		shouldSendNotificationToPM
+		shouldSendNotificationToPM,
+		dateStartedAudit
 	} = {}
 ) => {
 	return complianceUtil.prepareMetadataForAudit(
@@ -91,7 +107,8 @@ const prepareMetadataForAudit = async (
 		recordId,
 		{
 			isProjectOnboarding,
-			shouldSendNotificationToPM
+			shouldSendNotificationToPM,
+			dateStartedAudit
 		}
 	);
 };
@@ -169,19 +186,31 @@ const auditRecord = async function(
 	requirementId,
 	recordId,
 	auditConfig,
-	{ shouldSendNotificationToPM = false } = {}
+	{ shouldSendNotificationToPM = false, expectError } = {}
 ) {
-	const auditMetadata = await prepareMetadataForAudit(auditorContext, accountId, projectId, requirementId, recordId, { shouldSendNotificationToPM });
+	// const dateStartedAudit = AuditRequestModel.auditDates.dateStartedAudit;
+	// const auditMetadata = await prepareMetadataForAudit(auditorContext, accountId, projectId, requirementId, recordId, { shouldSendNotificationToPM, dateStartedAudit });
 
-	const auditApiConfig = dataTypeUtils.isObject(auditConfig) ?
+	const apiAuditConfig = dataTypeUtils.isObject(auditConfig) ?
 		auditUtil.parseAuditConfig(cloneObject(auditConfig)) :
 		auditConfig;
 
-	const auditEntities = await getAuditEntities(recordId, auditApiConfig, auditorContext);
-	const auditRequestModel = getAuditRequestModel(auditMetadata, auditEntities);
+	//enter audit + extract enterAuditResponse.data.dateStartedAudit and send it to prepareMetadataForAudit
+	const auditRequestModel = await enterAudit(recordId, auditorContext, { shouldSendNotificationToPM, shouldGetAuditRequestModelAfterEnterAudit: true, auditConfig: apiAuditConfig, accountId, projectId, requirementId });
+
+	// const auditEntities = await getAuditEntities(recordId, apiAuditConfig, auditorContext);
+	// const auditRequestModel = getAuditRequestModel(auditMetadata, auditEntities);
+	// const auditResponse = await submitAudit(auditRequestModel, auditorContext); // switched to this
+	//call getAuditRequestModelAfterEnterAudit and not the model itself
+	return submitAudit(auditRequestModel, auditorContext, { expectError });
+	// return submitAudit(accountId, projectId, requirementId, recordId, apiAuditConfig, auditorContext, { shouldSendNotificationToPM, dateStartedAudit, expectError });
+
+	// const auditResponse = await audit(auditRequestModel, auditorContext);
+	// if (auditResponse.status !== httpResponseStatusCodes.NO_CONTENT && !expectError) {
+	// 	throw new Error(`Failed to submit audit for record: ${recordId}. \n${auditResponse.status}`); //see what comes back
+	// }
 
-	const auditResponse = await audit(auditRequestModel, auditorContext);
-	return auditResponse;
+	// return auditResponse;
 };
 
 const getOnHoldModel = (auditId, onHoldReason) => {
@@ -272,7 +301,7 @@ const getAttributeKey = attributeName => {
 };
 
 module.exports = {
-	audit,
+	// audit,
 	submitAudit,
 	revertCoi,
 	isReaudit,

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

@@ -21,7 +21,8 @@ const Endpoints = {
 	homePageRequestsCount: `${backendUrl}/saas/requests/homepage/count`,
 	draftFilterCounters: tabId => `${backendUrl}/saas/tab/${tabId}/requests/draft/filter/counter`,
 	activityStatusCounter: tabId => `${backendUrl}/saas/tab/${tabId}/requests/activity-status/count`,
-	requestsCounters: tabId => `${backendUrl}/saas/tab/${tabId}/requests/counters`
+	requestsCounters: tabId => `${backendUrl}/saas/tab/${tabId}/requests/counters`,
+	showIntegrations: `${backendUrl}/saas/requests/homepage/show-integrations`
 };
 
 const createRequest = (createRequestModel, context) => {
@@ -83,6 +84,10 @@ const getHomePageRequests = (requestListCriteriaModel, context) => {
 	return requests.postRequestHandler(Endpoints.homePageRequests, requestListCriteriaModel, context);
 };
 
+const isIntegrationsEnabled = context => {
+	return requests.getRequestHandler(Endpoints.showIntegrations, {}, context);
+};
+
 const getHomePageRequestsCount = context => {
 	return requests.getRequestHandler(Endpoints.homePageRequestsCount, {}, context);
 };
@@ -122,5 +127,6 @@ module.exports = {
 	getDraftRequestList,
 	getDraftFilterCountersByTabId,
 	getActivityStatusCounterByTabId,
-	getRequestsCountersByTabId
+	getRequestsCountersByTabId,
+	isIntegrationsEnabled
 };

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

@@ -270,6 +270,16 @@ const getRequestsCountersByTabId = async (tabId, context) => {
 	return response.data;
 };
 
+const isIntegrationsEnabled = async context => {
+	const response = await requestsAPI.isIntegrationsEnabled(context);
+
+	if (response.status !== httpResponseStatusCodes.OK) {
+		throw Error(`Failed to get the integrations enable status - ${response.status}`);
+	}
+
+	return response.data;
+};
+
 module.exports = {
 	createRequest,
 	getAutocompleteAutoSelect,
@@ -297,5 +307,6 @@ module.exports = {
 	getDraftRequestListByTabId,
 	getDraftFilterCountersByTabId,
 	getActivityStatusCounterByTabId,
-	getRequestsCountersByTabId
+	getRequestsCountersByTabId,
+	isIntegrationsEnabled
 };

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

@@ -4,7 +4,7 @@ class HomepageRequestCriteriaModel {
 	constructor({
 		sortBy,
 		sortOrder,
-		attentionTab = AttentionTab.COMPLAINCE_ISSUE,
+		attentionTab = AttentionTab.COMPLIANCE_ISSUE,
 		pageNumber = 1
 	} = {}) {
 		this.sortBy = sortBy,