@getjones/test-infra 4.4.14 → 4.4.16

package/package.json

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

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

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

package/src/factory/users/users.js

@@ -17,7 +17,7 @@ const roles = {
 const inviteSaasUser = async (username, role, projectIds, context, { hasCompleteAccessPermission } = {}) => {
 	const userResponse = await users.services.getUserByEmail(username, context);
 
-	if (userResponse.data && userResponse.data.subuserId) {
+	if (userResponse.data && userResponse.data.id) {
 		const { projectPermissions } = userResponse.data;
 		const projectPermissionsIds = projectPermissions.map(projectPermission => projectPermission.projectId);
 

package/src/saas/internal-api/policyFile/api/policy.file.api.js

@@ -4,7 +4,10 @@ const { backendUrl } = require('../../../../env').getEnv();
 const Endpoints = {
 	getPolicyFilesForVendorReport: requestId => `${backendUrl}/saas/request/${requestId}/policy-files`,
 	getPreSignedUrlByPolicyId: policyFileId => `${backendUrl}/saas/policy-file/${policyFileId}`,
-	getAuditPolicyFilesByAuditId: (recordId, auditId) => `${backendUrl}/saas/integration-tests/record/${recordId}/audit/${auditId}/policy-files`
+	getAuditPolicyFilesByAuditId: (recordId, auditId) => `${backendUrl}/saas/integration-tests/record/${recordId}/audit/${auditId}/policy-files`,
+	unpublishPolicyFile: `${backendUrl}/saas/policy-file/unpublish`,
+	publishPolicyFile: `${backendUrl}/saas/policy-file/publish`,
+	getPolicyFilesRequireAudit: recordId => `${backendUrl}/saas/integration-tests/record/${recordId}/policy-files-to-audit`
 };
 const getPolicyFilesForVendorReport = async (requestId, context) => {
 	return requests.getRequestHandler(Endpoints.getPolicyFilesForVendorReport(requestId), {}, context);
@@ -18,8 +21,23 @@ const getAuditPolicyFiles = async (recordId, auditId, context) => {
 	return requests.getRequestHandler(Endpoints.getAuditPolicyFilesByAuditId(recordId, auditId), {}, context);
 };
 
+const unpublishPolicyFile = async (unpublishPolicyFileModel, context) => {
+	return requests.putRequestHandler(Endpoints.unpublishPolicyFile, unpublishPolicyFileModel, context);
+};
+
+const publishPolicyFile = async (publishPolicyFileModel, context) => {
+	return requests.putRequestHandler(Endpoints.publishPolicyFile, publishPolicyFileModel, context);
+};
+
+const getPolicyFilesRequireAudit = async (recordId, context) => {
+	return requests.getRequestHandler(Endpoints.getPolicyFilesRequireAudit(recordId), {}, context);
+};
+
 module.exports = {
 	getPolicyFilesForVendorReport,
 	getPreSignedUrlByPolicyId,
-	getAuditPolicyFiles
+	getAuditPolicyFiles,
+	unpublishPolicyFile,
+	publishPolicyFile,
+	getPolicyFilesRequireAudit
 };

package/src/saas/internal-api/policyFile/api/policy.file.service.js

@@ -1,4 +1,6 @@
 const policyFileApi = require('./policy.file.api');
+const timeUtils = require('../../../../common/utils/timeUtils');
+const { PolicyFileToSetPublishFlagRequestBodyModel } = require('../models/set.publish.flag.to.policy.model');
 
 const httpResponseStatusCodes = require('../../../../common/httpResponseStatusCodes.json');
 
@@ -32,8 +34,84 @@ const getAuditPolicyFiles = async (recordId, auditId, context) => {
 	return getAuditPolicyFilesResponse;
 };
 
+const unpublishPolicyFile = async (unpublishPolicyFileModel, context, { shouldExpectError } = {}) => {
+	const unpublishResponse = await policyFileApi.unpublishPolicyFile(unpublishPolicyFileModel, context);
+
+	if (unpublishResponse.status !== httpResponseStatusCodes.NO_CONTENT && !shouldExpectError) {
+		throw new Error(`Failed to unpublish policy file - ${unpublishPolicyFileModel.policyFileId}`);
+	}
+
+	return unpublishResponse;
+};
+
+const publishPolicyFile = async (publishPolicyFileModel, context, { shouldExpectError } = {}) => {
+	const publishResponse = await policyFileApi.publishPolicyFile(publishPolicyFileModel, context);
+
+	if (publishResponse.status !== httpResponseStatusCodes.NO_CONTENT && !shouldExpectError) {
+		throw new Error(`Failed to unpublish policy file - ${publishPolicyFileModel.policyFileId}`);
+	}
+
+	return publishResponse;
+};
+
+const getSetPublishFlagToPolicyFileModel = async (requestId, policyFileId, context) => {
+	const { isPublished, dateModified } = await getPolicyDetailsForPublishModel(requestId, policyFileId, context);
+
+	return new PolicyFileToSetPublishFlagRequestBodyModel(policyFileId, isPublished, dateModified);
+};
+
+const getPolicyDetailsForPublishModel = async (requestId, policyFileId, context) => {
+	const getPoliciesResponse = await getPolicyFilesForVendorReport(requestId, context);
+
+	for (const policy of getPoliciesResponse.data) {
+		if (policy.policyFileId === policyFileId) {
+			return {
+				isPublished: policy.isPublished,
+				dateModified: policy.dateModified
+			};
+		}
+	}
+	throw new Error(`No match found for policy file id: ${policyFileId}`);
+};
+
+const getPolicyFilesIfExist = async (recordId, context) => {
+	let retries = 10;
+	let policiesToReviewResponse;
+	let policyFiles = [];
+
+	while (policyFiles.length === 0 && retries > 0) {
+		//Busy wait for it takes time to get policy file to review
+		await timeUtils.waitFor(0.5).seconds;
+
+		policiesToReviewResponse = await policyFileApi.getPolicyFilesRequireAudit(recordId, context);
+		policyFiles = policiesToReviewResponse.data;
+
+		retries--;
+	}
+
+	if (policyFiles.length === 0) {
+		throw new Error(`No policy files to review where found for record ${recordId}`);
+	}
+
+	return policiesToReviewResponse;
+};
+
+const getPolicyFilesRequireAudit = async (recordId, context) => {
+	const getPolicyFilesResponse = await getPolicyFilesIfExist(recordId, context);
+
+	if (getPolicyFilesResponse.status !== httpResponseStatusCodes.OK) {
+		throw new Error('Failed to get policy files that require audit');
+	}
+
+	return getPolicyFilesResponse;
+};
+
 module.exports = {
 	getPolicyFilesForVendorReport,
 	getPreSignedUrlByPolicyId,
-	getAuditPolicyFiles
+	getAuditPolicyFiles,
+	getSetPublishFlagToPolicyFileModel,
+	unpublishPolicyFile,
+	publishPolicyFile,
+	getPolicyFilesRequireAudit
 };

package/src/saas/internal-api/policyFile/models/set.publish.flag.to.policy.model.js

@@ -0,0 +1,13 @@
+class PolicyFileToSetPublishFlagRequestBodyModel {
+	constructor(
+		policyFileId,
+		isPublished,
+		policyFileDateModified
+	) {
+		this.policyFileId = policyFileId;
+		this.isPublished = isPublished;
+		this.policyFileDateModified = policyFileDateModified;
+	}
+}
+
+module.exports = { PolicyFileToSetPublishFlagRequestBodyModel };

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

@@ -7,6 +7,7 @@ const { RequestModel } = require('../models/edit.request.model');
 const { validateType } = require('../../../../common/validations/typeValidations');
 const httpResponseStatusCodes = require('../../../../common/httpResponseStatusCodes.json');
 const activationStatuses = require('../../../../common/consts/activationStatuses');
+const { HomepageRequestCriteriaModel } = require('../models/homepageRequestCriteriaModel');
 
 const createRequest = async (createRequestModel, context) => {
 	validateType(createRequestModel, CreateRequestModel);
@@ -179,9 +180,18 @@ const getInnerPageRequests = async (requestListCriteriaModel, context) => {
 	return response.data;
 };
 
-const getHomePageRequests = async (requestListCriteriaModel, context) => {
-	validateType(requestListCriteriaModel, RequestListCriteriaModel);
-	const response = await requestsAPI.getHomePageRequests(requestListCriteriaModel, context);
+const getHomePageRequests = async (context, { sortBy, sortOrder, pageNumber, attentionTab, shouldExceptError } = {}) => {
+	const homepageRequestCriteriaModel = new HomepageRequestCriteriaModel({ sortBy, sortOrder, attentionTab, pageNumber });
+	return getHomePageRequestsByModel(homepageRequestCriteriaModel, context, shouldExceptError);
+};
+
+const getHomePageRequestsByModel = async (homepageRequestCriteriaModel, context, shouldExceptError) => {
+	validateType(homepageRequestCriteriaModel, HomepageRequestCriteriaModel);
+	const response = await requestsAPI.getHomePageRequests(homepageRequestCriteriaModel, context);
+
+	if (shouldExceptError) {
+		return response;
+	}
 
 	if (response.status !== httpResponseStatusCodes.OK) {
 		throw Error(`Get requests home page has fail\n${response}`);
@@ -190,6 +200,16 @@ const getHomePageRequests = async (requestListCriteriaModel, context) => {
 	return response.data;
 };
 
+const getHomePageRequestsCount = async context => {
+	const response = await requestsAPI.getHomePageRequestsCount(context);
+
+	if (response.status !== httpResponseStatusCodes.OK) {
+		throw Error(`Get requests count home page has fail\n${response}`);
+	}
+
+	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);
@@ -265,6 +285,7 @@ module.exports = {
 	getRequestFromTabByRecordId,
 	getInnerPageRequests,
 	getHomePageRequests,
+	getHomePageRequestsCount,
 	getAllRequestsByName,
 	getRequestByName,
 	getDraftRequestList,

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

@@ -0,0 +1,19 @@
+const AttentionTab = require('../../../../common/consts/homepage/AttentionTab');
+
+class HomepageRequestCriteriaModel {
+	constructor({
+		sortBy,
+		sortOrder,
+		attentionTab = AttentionTab.COMPLAINCE_ISSUE,
+		pageNumber = 1
+	} = {}) {
+		this.sortBy = sortBy,
+		this.sortOrder = sortOrder,
+		this.attentionTab = attentionTab,
+		this.pageNo = pageNumber;
+	}
+}
+
+module.exports = {
+	HomepageRequestCriteriaModel
+};

package/src/saas/internal-api/users/api/tenantApp/tenant.app.service.js

@@ -54,7 +54,7 @@ const getTenantUserByEmail = async (projectId, email, context) => {
 const getOrCreateTenantUser = async (projectId, email, company, requestId, context, { fullName = 'Tenant User', password = credentials.strongPassword, toSignUp = true, expectError } = {}) => {
 	let tenantUser = await getTenantUserByEmail(projectId, email, context);
 
-	if (tenantUser && tenantUser.subuserId && tenantUser.isVerified) {
+	if (tenantUser && tenantUser.id && tenantUser.isVerified) {
 		return tenantUser;
 	}
 
@@ -90,10 +90,10 @@ const getOrCreateTenantUser = async (projectId, email, company, requestId, conte
 const removeAllTenantUsersFromProject = async (projectId, context) => {
 	const tenantsListInProjects = await getTenantUsersByProjectId(projectId, context);
 	for (const tenant of tenantsListInProjects) {
-		const deleteInviteResponse = await removeTenantUser(projectId, tenant.subuserId, context);
+		const deleteInviteResponse = await removeTenantUser(projectId, tenant.id, context);
 		expect(deleteInviteResponse.status, 'Failed to delete user invite').to.equal(httpResponseStatusCodes.OK);
 
-		const deleteUserResponse = await users.removeAllUserTraceFromDb(tenant.subuserId, context);
+		const deleteUserResponse = await users.removeAllUserTraceFromDb(tenant.id, context);
 		expect(deleteUserResponse.status, 'Failed to completely delete user from DB').to.equal(httpResponseStatusCodes.NO_CONTENT);
 	}
 };

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

@@ -24,11 +24,23 @@ const editUserRole = async (userId, data, context) => {
 	return userAPI.editUserRole(userId, data, context);
 };
 
-const editUserProjects = async (editUserModel, context) => {
+const editUserProjectsByModel = async (editUserModel, context) => {
 	validateType(editUserModel, EditUserModel);
 	return userAPI.editUserProjects([editUserModel], context);
 };
 
+const editUserProjects = async (userId, userEmail, role, projectsIds, context, { hasCompleteAccessPermission } = {}) => {
+	const editUserModel = new EditUserModel(userId, userEmail, role, projectsIds, hasCompleteAccessPermission);
+
+	const response = await editUserProjectsByModel(editUserModel, context);
+
+	if (response.status !== httpResponseStatusCodes.NO_CONTENT) {
+		throw new Error('Failed to edit user projects');
+	}
+
+	return response;
+};
+
 const getUsersByProjectId = async (projectId, context) => {
 	return userAPI.getUsersByProjectId(projectId, context);
 };
@@ -57,7 +69,7 @@ const getEnabledAndDisabledByEmail = async (email, context) => {
 	return response.data;
 };
 
-const getOrCreateUser = async (email, role, projectsIds, context, { fullName = role, password = credentials.strongPassword } = {}) => {
+const getOrCreateUser = async (email, role, projectsIds, context, { fullName = role, password = credentials.strongPassword, expectError, hasCompleteAccessPermission } = {}) => {
 	let userResponse = await getUserByEmail(email, context);
 
 	if (userResponse.data !== '' && userResponse.status === httpResponseStatusCodes.OK) {
@@ -66,16 +78,18 @@ const getOrCreateUser = async (email, role, projectsIds, context, { fullName = r
 
 		projectsIds = projectsIds.filter(projectId => !projectPermissionsIds.includes(projectId));
 
-		if (userResponse.data && userResponse.data.subuserId && userResponse.data.isVerified && !projectsIds.length) {
+		if (userResponse.data && userResponse.data.id && userResponse.data.isVerified && !projectsIds.length) {
 			return userResponse.data;
 		}
 	}
 
-	const inviteUserModel = new InviteUserModel(email, role, projectsIds);
+	const inviteUserModel = new InviteUserModel(email, role, projectsIds, hasCompleteAccessPermission);
 	const inviteResponse = await inviteUser([inviteUserModel], context);
 
-	if (inviteResponse.status !== httpResponseStatusCodes.NO_CONTENT) {
+	if (inviteResponse.status !== httpResponseStatusCodes.NO_CONTENT && !expectError) {
 		throw new Error(`Failed to invite user with email: ${email}\n${inviteResponse}`);
+	} else if (expectError) {
+		return inviteResponse;
 	}
 
 	userResponse = await getUserByEmail(email, context);
@@ -126,7 +140,7 @@ const removeAllUserTraceFromDb = (userId, context) => {
 
 const deleteUserByEmail = async (userEmail, context) => {
 	const { data: user } = await getUserByEmail(userEmail, context);
-	return user ? deleteUser(user.subuserId, context) : null;
+	return user ? deleteUser(user.id, context) : null;
 };
 
 const reinviteUser = (userId, context) => {
@@ -232,6 +246,7 @@ module.exports = {
 	removeAllUserTraceFromDb,
 	editUserRole,
 	editUserProjects,
+	editUserProjectsByModel,
 	reinviteUser,
 	editUserEmailNotificationsSettings,
 	sendForgetPasswordMail,

package/src/saas/internal-api/users/models/users.model.js

@@ -17,11 +17,12 @@ class SignupUserModel {
 }
 
 class EditUserModel {
-	constructor(subUserId, email, role, projects = []) {
+	constructor(subUserId, email, role, projects = [], hasCompleteAccessPermission) {
 		this.subUserId = subUserId;
 		this.email = email;
 		this.role = role;
 		this.projects = projects;
+		this.hasCompleteAccessPermission = hasCompleteAccessPermission;
 	}
 }