@getjones/test-infra 4.5.7 → 4.5.8

package/package.json

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

package/src/common/consts/accountSettings.js

@@ -11,8 +11,30 @@ module.exports = {
 		on: { hasPolicyVerification: true },
 		off: { hasPolicyVerification: false }
 	},
-	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',
 	DRAFT: 'draft',
-	MUTED: 'muted'
+	MUTED: 'muted',
+	NON_INTEGRATED: 'nonIntegrated'
 };

package/src/common/utils/complianceUtil.js

@@ -50,14 +50,14 @@ const prepareMetadataForAudit = async (
 	const isReauditResponse = await isReaudit(recordId, auditorContext);
 	metadata.isReaudit = isReauditResponse.data.isReaudit;
 
+	const enterAuditResponse = await auditApi.enterAudit(recordId, auditorContext); //moved up 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,

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

@@ -56,6 +56,5 @@ const attributesConvertor = {
 	'Coverage Auditing': 'isCoverageAudit',
 	'Account Requirements': 'isAccountRequirementsEnabled',
 	'Skip 50 miles autocomplete limitation': 'isWithoutAutocompleteDistanceLimitation',
-	'Policy Verification': 'hasPolicyVerification',
-	'Auditing AI Enabled': 'isAuditingAiEnabled'
+	'Policy Verification': 'hasPolicyVerification'
 };

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,10 +7,11 @@ 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) => {
 	validateType(auditRequestModel, AuditRequestModel);
@@ -35,24 +36,31 @@ const getAuditorContractorList = (auditListParametersModel, context) => {
 	return auditApi.getAuditorContractorList(auditListParametersModel, context);
 };
 
-const getAuditRequestModelAfterEnterAudit = async (auditConfigForModelAfterEnterAudit, accountId, projectId, requirementId, recordId, context) => {
+const getAuditRequestModelAfterEnterAudit = async (accountId, projectId, requirementId, recordId, auditConfig, context) => {
 	const metadata = await prepareMetadataForAudit(context, accountId, projectId, requirementId, recordId);
-	const auditEntities = await getAuditEntities(recordId, auditConfigForModelAfterEnterAudit, context);
+	const auditEntities = await getAuditEntities(recordId, auditConfig, context);
 	const auditRequestModel = getAuditRequestModel(metadata, auditEntities);
 
 	return auditRequestModel;
 };
 
-const enterAudit = async (recordId, context, { auditConfigForModelAfterEnterAudit, accountId, projectId, requirementId } = {}) => {
-	const enterAuditResponse = await auditApi.enterAudit(recordId, context);
+const enterAudit = async (recordId, context, { shouldGetAuditRequestModelAfterEnterAudit, auditConfig, accountId, projectId, requirementId } = {}) => {
+// const enterAudit = async (recordId, context, { auditConfigForModelAfterEnterAudit, accountId, projectId, requirementId } = {}) => {
+	if (shouldGetAuditRequestModelAfterEnterAudit) {
+		return getAuditRequestModelAfterEnterAudit(accountId, projectId, requirementId, recordId, auditConfig, context);
+	} else {
+		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)}`);
+		}
 
-	if (enterAuditResponse.status !== httpResponseStatusCodes.OK) {
-		throw Error(`Failed to enter audit\n$response - ${enterAuditResponse.status}\n${JSON.stringify(enterAuditResponse.data)}`);
+		return enterAuditResponse;
 	}
 
-	return auditConfigForModelAfterEnterAudit ?
-		getAuditRequestModelAfterEnterAudit(auditConfigForModelAfterEnterAudit, accountId, projectId, requirementId, recordId, context) :
-		enterAuditResponse;
+	// return auditConfig ?
+	// 	getAuditRequestModelAfterEnterAudit(auditConfig, accountId, projectId, requirementId, recordId, context) :
+	// 	enterAuditResponse;
 };
 
 const getAuditRecordModel = (recordId, context) => {
@@ -180,7 +188,8 @@ const auditRecord = async function(
 	const auditEntities = await getAuditEntities(recordId, auditApiConfig, auditorContext);
 	const auditRequestModel = getAuditRequestModel(auditMetadata, auditEntities);
 
-	const auditResponse = await audit(auditRequestModel, auditorContext);
+	const auditResponse = await submitAudit(auditRequestModel, auditorContext); // switched to this
+	// const auditResponse = await audit(auditRequestModel, auditorContext);
 	return auditResponse;
 };
 
@@ -272,7 +281,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
 };