@getjones/test-infra 4.5.10 → 4.5.12

package/package.json

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

package/src/factory/users/users.js

@@ -10,9 +10,9 @@ const { InviteUserModel } = users.models;
 const defaultsPassword = credentials.strongPassword;
 const { internalApiUserRoles: roles } = require('../../../src/common/consts/userRoles');
 
-const inviteSaasUser = async (username, role, projectIds, context, { hasCompleteAccessPermission } = {}) => {
+const inviteSaasUser = async (username, role, projectIds, context, { hasCompleteAccessPermission, disableSendMail } = {}) => {
 	const inviteUserModel = new InviteUserModel(username, role, projectIds, hasCompleteAccessPermission);
-	const inviteResponse = await users.services.inviteUser([inviteUserModel], context);
+	const inviteResponse = await users.services.inviteUser([inviteUserModel], context, { disableSendMail });
 
 	if (inviteResponse.status !== httpResponseStatusCodes.NO_CONTENT) {
 		throw new Error(`Failed to invite user with email: ${username}\n${inviteResponse}`);
@@ -35,8 +35,8 @@ const signupSaasUser = async (username, role, context) => {
 	}
 };
 
-const prepareUser = async (username, role, projectIds, context, { signup = true, hasCompleteAccessPermission } = {}) => {
-	await inviteSaasUser(username, role, projectIds, context, { hasCompleteAccessPermission });
+const prepareUser = async (username, role, projectIds, context, { signup = true, hasCompleteAccessPermission, disableSendMail } = {}) => {
+	await inviteSaasUser(username, role, projectIds, context, { hasCompleteAccessPermission, disableSendMail });
 
 	const icsContext = await auth.getIcsCookie();
 	signup && await signupSaasUser(username, role, icsContext); // Can not use other context than ics to use this function
@@ -50,16 +50,16 @@ const prepareUser = async (username, role, projectIds, context, { signup = true,
 	return userResponse.data;
 };
 
-const prepareComplianceManagerUser = (username, projectIds, context, { signup, hasCompleteAccessPermission } = {}) => {
-	return prepareUser(username, roles.cm, projectIds, context, { signup, hasCompleteAccessPermission });
+const prepareComplianceManagerUser = (username, projectIds, context, { signup, hasCompleteAccessPermission, disableSendMail } = {}) => {
+	return prepareUser(username, roles.cm, projectIds, context, { signup, hasCompleteAccessPermission, disableSendMail });
 };
 
-const prepareInviterUser = (username, projectIds, context, { signup, hasCompleteAccessPermission } = {}) => {
-	return prepareUser(username, roles.inviter, projectIds, context, { signup, hasCompleteAccessPermission });
+const prepareInviterUser = (username, projectIds, context, { signup, hasCompleteAccessPermission, disableSendMail } = {}) => {
+	return prepareUser(username, roles.inviter, projectIds, context, { signup, hasCompleteAccessPermission, disableSendMail });
 };
 
-const prepareReadOnlyUser = (username, projectIds, context, { signup, hasCompleteAccessPermission } = {}) => {
-	return prepareUser(username, roles.readOnly, projectIds, context, { signup, hasCompleteAccessPermission });
+const prepareReadOnlyUser = (username, projectIds, context, { signup, hasCompleteAccessPermission, disableSendMail } = {}) => {
+	return prepareUser(username, roles.readOnly, projectIds, context, { signup, hasCompleteAccessPermission, disableSendMail });
 };
 
 module.exports = {

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

@@ -17,7 +17,8 @@ const Endpoints = {
 	resumeAudit: onHoldId => `${backendUrl}/saas/auditor/on-hold/${onHoldId}/resume`,
 	getAuditMetadata: auditId => `${backendUrl}/saas/auditor/audit-metadata/${auditId}`,
 	updateComplianceAuditActionsDate: recordId => `${backendUrl}/saas/automation/record/${recordId}/update-audit-actions-date`,
-	auditRawData: recordId => `${backendUrl}/saas/integration-tests/record/${recordId}/audit/raw`
+	auditRawData: recordId => `${backendUrl}/saas/integration-tests/record/${recordId}/audit/raw`,
+	getAuditResultAttributeState: auditId => `${backendUrl}/saas/audit/automation/audit/${auditId}`
 };
 
 const submitAudit = async (auditRequestModel, context) => {
@@ -86,6 +87,10 @@ const getAuditRawData = (recordId, context) => {
 	return requests.getRequestHandler(Endpoints.auditRawData(recordId), {}, context);
 };
 
+const getAuditResultAttributeState = (auditId, context) => {
+	return requests.getRequestHandler(Endpoints.getAuditResultAttributeState(auditId), {}, context);
+};
+
 module.exports = {
 	submitAudit,
 	revertCoi,
@@ -102,5 +107,6 @@ module.exports = {
 	getAuditMetadata,
 	updateComplianceAuditActionsDate,
 	getAuditRawData,
-	verifyAuditBeforeEnter
+	verifyAuditBeforeEnter,
+	getAuditResultAttributeState
 };

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

@@ -7,6 +7,7 @@ const { cloneObject } = require('../../../../../common/utils/objectUtils');
 const complianceUtil = require('../../../../../common/utils/complianceUtil');
 const httpResponseStatusCodes = require('../../../../../common/httpResponseStatusCodes.json');
 
+// This method is used only for submitting audit after already entering audit
 const submitAudit = async (auditRequestModel, context, { expectError } = {}) => {
 	validateType(auditRequestModel, AuditRequestModel);
 
@@ -19,64 +20,6 @@ const submitAudit = async (auditRequestModel, context, { expectError } = {}) =>
 	return submitAuditResponse;
 };
 
-const revertCoi = (contractorId, dateModified, context) => {
-	const dateModifiedObj = { dateModified };
-	return auditApi.revertCoi(contractorId, dateModifiedObj, context);
-};
-
-const wrongCoi = (recordId, context) => {
-	return auditApi.wrongCoi(recordId, context);
-};
-
-const isReaudit = (contractorId, context) => {
-	return complianceUtil.isReaudit(contractorId, context);
-};
-
-const getAuditorContractorList = (auditListParametersModel, context) => {
-	validateType(auditListParametersModel, AuditListParametersModel);
-	return auditApi.getAuditorContractorList(auditListParametersModel, 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, { 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)}`);
-	}
-
-	if (shouldGetAuditRequestModelAfterEnterAudit) {
-		const dateStartedAudit = enterAuditResponse.data.dateStartedAudit;
-		return getAuditRequestModelAfterEnterAudit(accountId, projectId, requirementId, recordId, auditConfig, context, { shouldSendNotificationToPM, dateStartedAudit });
-	} else {
-		return enterAuditResponse;
-	}
-};
-
-const getAuditRecordModel = (recordId, context) => {
-	return auditApi.getAuditRecordModel(recordId, context);
-};
-
-const getRequirementDetailsForAudit = (contractorId, context) => {
-	return auditApi.getRequirementDetailsForAudit(contractorId, context);
-};
-const getAuditorContractorReviewByRecordId = async (recordId, context) => {
-	const response = await auditApi.getAuditorContractorReviewByRecordId(recordId, context);
-
-	if (response.status !== httpResponseStatusCodes.OK) {
-		throw Error(`Failed to get auditor review fields from recordId - ${recordId} error status ${response.status}`);
-	}
-
-	return response.data;
-};
-
 const prepareMetadataForAudit = async (
 	auditorContext,
 	accountId,
@@ -103,11 +46,15 @@ const prepareMetadataForAudit = async (
 	);
 };
 
-const getAuditByRecordId = async (recordId, context, { isRecordDeleted } = {}) => {
-	const responseAudit = await auditApi.getAuditByRecordId(recordId, context, { isRecordDeleted });
+const getRequirementDetailsForAudit = (contractorId, context) => {
+	return auditApi.getRequirementDetailsForAudit(contractorId, context);
+};
+
+const getAuditRawData = async function(recordId, context) {
+	const responseAudit = await auditApi.getAuditRawData(recordId, context);
 
 	if (responseAudit.status !== httpResponseStatusCodes.OK) {
-		throw Error(`Failed to get audits by record id\n${responseAudit}`);
+		throw Error(`Failed to get audit raw data by record id\n${responseAudit}`);
 	}
 
 	return responseAudit.data;
@@ -169,6 +116,32 @@ const getAuditRequestModel = (metaData, auditEntities) => {
 	return auditRequestModel;
 };
 
+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;
+};
+
+//This method is used only for entering audit and not for submitting the audit
+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)}`);
+	}
+
+	// Create model for future submission of audit
+	if (shouldGetAuditRequestModelAfterEnterAudit) {
+		const dateStartedAudit = enterAuditResponse.data.dateStartedAudit;
+		return getAuditRequestModelAfterEnterAudit(accountId, projectId, requirementId, recordId, auditConfig, context, { shouldSendNotificationToPM, dateStartedAudit });
+	}
+
+	return enterAuditResponse;
+};
+
+// The main method for encapsulating full audit flow
 const auditRecord = async function(
 	auditorContext,
 	accountId,
@@ -187,6 +160,44 @@ const auditRecord = async function(
 	return submitAudit(auditRequestModel, auditorContext, { expectError });
 };
 
+const getAuditByRecordId = async (recordId, context, { isRecordDeleted } = {}) => {
+	const responseAudit = await auditApi.getAuditByRecordId(recordId, context, { isRecordDeleted });
+
+	if (responseAudit.status !== httpResponseStatusCodes.OK) {
+		throw Error(`Failed to get audits by record id\n${responseAudit}`);
+	}
+
+	return responseAudit.data;
+};
+
+const revertCoi = (contractorId, dateModified, context) => {
+	const dateModifiedObj = { dateModified };
+	return auditApi.revertCoi(contractorId, dateModifiedObj, context);
+};
+
+const wrongCoi = (recordId, context) => {
+	return auditApi.wrongCoi(recordId, context);
+};
+
+const isReaudit = (contractorId, context) => {
+	return complianceUtil.isReaudit(contractorId, context);
+};
+
+const getAuditorContractorList = (auditListParametersModel, context) => {
+	validateType(auditListParametersModel, AuditListParametersModel);
+	return auditApi.getAuditorContractorList(auditListParametersModel, context);
+};
+
+const getAuditorContractorReviewByRecordId = async (recordId, context) => {
+	const response = await auditApi.getAuditorContractorReviewByRecordId(recordId, context);
+
+	if (response.status !== httpResponseStatusCodes.OK) {
+		throw Error(`Failed to get auditor review fields from recordId - ${recordId} error status ${response.status}`);
+	}
+
+	return response.data;
+};
+
 const getOnHoldModel = (auditId, onHoldReason) => {
 	return new AuditOnHoldModel(auditId, onHoldReason);
 };
@@ -249,6 +260,10 @@ const getComplianceJson = async function(recordId, context) {
 	return getComplianceJsonResponse.data;
 };
 
+const getAuditRecordModel = (recordId, context) => {
+	return auditApi.getAuditRecordModel(recordId, context);
+};
+
 const getCurrentAuditUniqueCoiId = async function(recordId, auditorContext) {
 	const recordDetailsResponse = await getAuditRecordModel(recordId, auditorContext);
 
@@ -260,18 +275,18 @@ const getCurrentAuditUniqueCoiId = async function(recordId, auditorContext) {
 	return uniqueCoiId;
 };
 
-const getAuditRawData = async function(recordId, context) {
-	const responseAudit = await auditApi.getAuditRawData(recordId, context);
+const getAttributeKey = attributeName => {
+	return auditUtil.getAttributeKey(attributeName);
+};
 
-	if (responseAudit.status !== httpResponseStatusCodes.OK) {
-		throw Error(`Failed to get audit raw data by record id\n${responseAudit}`);
-	}
+const getAuditResultAttributeState = async function(auditId, context) {
+	const attributeStateResponse = await auditApi.getAuditResultAttributeState(auditId, context);
 
-	return responseAudit.data;
-};
+	if (attributeStateResponse.status !== httpResponseStatusCodes.OK) {
+		throw Error(`Failed to get audit result attribute state\n${JSON.stringify(attributeStateResponse)}`);
+	}
 
-const getAttributeKey = attributeName => {
-	return auditUtil.getAttributeKey(attributeName);
+	return response.data;
 };
 
 module.exports = {
@@ -298,5 +313,6 @@ module.exports = {
 	getCurrentAuditUniqueCoiId,
 	getAuditRawData,
 	getAuditorContractorReviewByRecordId,
-	getAttributeKey
+	getAttributeKey,
+	getAuditResultAttributeState
 };

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

@@ -23,7 +23,7 @@ const EMAIL_TYPES = {
 };
 
 const EMAIL_SUBJECT = {
-	invite: 'Your Insurance Docs are needed for',
+	invite: 'Your Insurance Documents are needed for',
 	compliant: ({ requesterName, recordCompanyName }) => `Accepted Insurance for ${requesterName} - ${recordCompanyName}`,
 	sendGaps: ({ requesterName }) => `Corrected Insurance Docs Required for ${requesterName} - `, //For this email type, guest is the same as vendor
 	sendGapsForTenant: ({ requesterName }) => `Corrected Insurance Docs Required for leased space at ${requesterName} - `,
@@ -49,7 +49,8 @@ const EMAIL_SUBJECT = {
 	malwareCoiFound: 'COI upload failed to pass security scan',
 	thankYou: 'Thank you for submitting your documents',
 	teamNoteMention: ({ taggingUserFullName, recordCompanyName }) => `${taggingUserFullName} mentioned you in a team note for ${recordCompanyName}`,
-	reportSentSingleProject: ({ accountName, projectName }) => `Jones - Report for ${accountName}: ${projectName}`
+	reportSentSingleProject: ({ accountName, projectName }) => `Jones - Report for ${accountName}: ${projectName}`,
+	inviteUserToProject: ({ accountName }) => `${accountName} invited you to join their project`
 };
 
 module.exports = { DEFAULT_EMAIL_SENDER, EMAIL_TYPES, EMAIL_SUBJECT, tenantUserExtension };