@getjones/test-infra 2.8.15 → 2.9.0

package/package.json

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

package/src/common/commonFlows/records/records.js

@@ -4,6 +4,7 @@ const threadScheduler = require('../../../saas/internal-api/thread-scheduler/run
 const timeUtils = require('../../utils/timeUtils');
 const httpResponseStatusCodes = require('../../../common/httpResponseStatusCodes.json');
 const contractors = require('../../../saas/internal-api/contractors');
+const compliance = require('../../../saas/internal-api/compliance');
 
 const makeRecordNotResponsive = async function(recordId, context, { isTenant } = {}) {
 	const dates = isTenant ?
@@ -11,7 +12,7 @@ const makeRecordNotResponsive = async function(recordId, context, { isTenant } =
 		timeUtils.getInvitationDatesForNotResponsiveVendor();
 
 	for (const date of dates) {
-		await updateInviteDate(recordId, date, context);
+		await updateLastInviteActionDate(recordId, date, context);
 	}
 };
 
@@ -32,6 +33,34 @@ const updateInviteDate = async function(recordId, inviteDate, context) {
 	await timeUtils.waitFor(2.5).seconds; // calls for the same records can override each other
 };
 
+const updateLastInviteActionDate = async function(recordId, customDate, context) {
+	await timeUtils.waitFor(1).seconds;
+	/*
+	To run the reminders mails successfully we must first update the compliance audit actions date,
+	Since the thread scheduler will trigger the logic of the reminders mails
+	only if last invite action date will be equal or after compliance audit actions date
+	*/
+	const updateComplianceAuditResponse = await compliance.services.audit.updateComplianceAuditActionsDate(recordId, customDate, context);
+
+	if (updateComplianceAuditResponse.status !== httpResponseStatusCodes.NO_CONTENT) {
+		throw new Error(`Compliance audit date could not be updated\n${updateComplianceAuditResponse}`);
+	}
+
+	const updateLastInviteActionResponse = await contractors.services.updateLastInviteActionDate(recordId, customDate, context);
+
+	if (updateLastInviteActionResponse.status !== httpResponseStatusCodes.NO_CONTENT) {
+		throw new Error(`Record invite date could not be updated\n${updateLastInviteActionResponse}`);
+	}
+
+	const threadSchedulerResponse = await threadScheduler.runForRecords([recordId]);
+
+	if (threadSchedulerResponse.status !== httpResponseStatusCodes.OK) {
+		throw new Error(`Thread scheduler has failed to run\n${threadSchedulerResponse}`);
+	}
+
+	await timeUtils.waitFor(2.5).seconds; // calls for the same records can override each other
+};
+
 const runOverAllRenewalDatesForRecord = async function(recordId, policyName) {
 	const dates = timeUtils.getAutomaticRenewalsExpirationDates();
 
@@ -68,5 +97,6 @@ module.exports = {
 	runOverAllRenewalDatesForRecord,
 	updateInviteDate,
 	updatePolicyExpiryDateForRecord,
-	getHistoryEvents
+	getHistoryEvents,
+	updateLastInviteActionDate
 };

package/src/common/utils/complianceUtil.js

@@ -1,9 +1,10 @@
 const { getEnv, getSystemUserIdentity } = require('../../env');
-const auditApi = require('../../saas/internal-api/compliance/api/audit/audit.api');
 const auditConfigs = require('../../defaults/configs/auditConfigs');
 
 const { credentials } = getEnv();
 
+const auditApi = require('../../saas/internal-api/compliance/api/audit/audit.api');
+
 const complianceStatuses = {
 	complaint: 'complaint',
 	notCompliant: 'notCompliant',
@@ -43,16 +44,16 @@ const getAuditMetadata = async (
 	const isReauditResponse = await isReaudit(recordId, auditorContext);
 	metadata.isReaudit = isReauditResponse.data.isReaudit;
 
-	const recordDetailsResponse = await auditApi.getAuditRecordModel(recordId, auditorContext);
-	const recordDetails = recordDetailsResponse.data;
+	const recordDetailsResponse = await auditApi.getContractorDetailsForAudit(recordId, auditorContext);
+	const { vendorDetails } = recordDetailsResponse.data;
 
-	metadata.certificateId = recordDetails.certificateDetails.certificateuploadId;
+	metadata.certificateId = vendorDetails.certificateDetails.certificateuploadId;
 	metadata.auditDates = {
 		contractorId: recordId,
-		contractorDateModified: recordDetails.dateModified,
+		contractorDateModified: vendorDetails.dateModified,
 		dateStartedAudit: recordDetailsResponse.dateStartedAudit,
-		contractorOverrideDateModified: recordDetails.contractorOverrideDateModified,
-		contractCreateDate: recordDetails.contractCreateDate
+		contractorOverrideDateModified: vendorDetails.contractorOverrideDateModified,
+		contractCreateDate: vendorDetails.contractCreateDate
 	};
 
 	metadata.auditorId = await getAuditorId();

package/src/common/utils/timeUtils.js

@@ -115,6 +115,10 @@ const convertDateToLongInt = value => {
 	return Date.parse(value);
 };
 
+const convertDateStringFormatToISOString = dateStringFormat => {
+	return new Date(dateStringFormat).toISOString();
+};
+
 module.exports = {
 	formats,
 	getOneYearAgoDate,
@@ -147,5 +151,6 @@ module.exports = {
 	convertDateToNewFormat,
 	getOneWeekAgoDate,
 	getOneWeekAheadDate,
-	convertDateToLongInt
+	convertDateToLongInt,
+	convertDateStringFormatToISOString
 };

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

@@ -1,20 +1,22 @@
 const requests = require('../../../../../common/requests/cookieAuth/requests');
 const { backendUrl } = require('../../../../../env').getEnv();
 
+const { convertDateStringFormatToISOString } = require('../../../../../common/utils/timeUtils');
+
 const Endpoints = {
 	auditorContractorList: `${backendUrl}/saas/auditor/contractors`,
 	audit: `${backendUrl}/saas/auditor/contractors/submit/audits`,
-	enterAudit: contractorId => `${backendUrl}/saas/auditor/contractors/${contractorId}/master-audit`,
-	getAuditRecordModelByRecordId: recordId => `${backendUrl}/saas/auditor/record/${recordId}/audit-record`,
+	contractorDetailsForAudit: contractorId => `${backendUrl}/saas/auditor/contractors/${contractorId}/master-audit`,
 	requirementDetailsForAudit: contractorId => `${backendUrl}/saas/auditor/contractor/${contractorId}/requirement`,
 	isReaudit: contractorId => `${backendUrl}/saas/auditor/contractors/${contractorId}/isreaudit`,
 	revertCoi: contractorId => `${backendUrl}/saas/auditor/contractors/${contractorId}/coi/revert`,
 	wrongCoi: `${backendUrl}/saas/coi/wrong-coi`,
-	getAudit: recordId => `${backendUrl}/saas/audit/${recordId}`
+	getAudit: recordId => `${backendUrl}/saas/audit/${recordId}`,
+	updateComplianceAuditActionsDate: recordId => `${backendUrl}/saas/automation/audit/record/${recordId}/compliance-audit-actions/date`
 };
 
 const audit = async (contractorId, auditRequestModel, context) => {
-	await enterAudit(contractorId, {}, context);
+	await getContractorDetailsForAudit(contractorId, {}, context);
 	return submitAudit(auditRequestModel, context);
 };
 
@@ -34,12 +36,8 @@ const getAuditorContractorList = (auditListParametersModel, context) => {
 	return requests.postRequestHandler(Endpoints.auditorContractorList, auditListParametersModel, context);
 };
 
-const enterAudit = (contractorId, context) => {
-	return requests.getRequestHandler(Endpoints.enterAudit(contractorId), {}, context);
-};
-
-const getAuditRecordModel = (recordId, context) => {
-	return requests.getRequestHandler(Endpoints.getAuditRecordModelByRecordId(recordId), {}, context);
+const getContractorDetailsForAudit = (contractorId, context) => {
+	return requests.getRequestHandler(Endpoints.contractorDetailsForAudit(contractorId), {}, context);
 };
 
 const getRequirementDetailsForAudit = (contractorId, context) => {
@@ -55,6 +53,11 @@ const wrongCoi = (recordId, context) => {
 	return requests.getRequestHandler(Endpoints.wrongCoi, params, context);
 };
 
+const updateComplianceAuditActionsDate = (recordId, customComplianceAuditActionsDate, context) => {
+	const url = `${Endpoints.updateComplianceAuditActionsDate(recordId)}?customComplianceAuditActionsDate=${convertDateStringFormatToISOString(customComplianceAuditActionsDate)}`;
+	return requests.putRequestHandler(url, {}, context);
+};
+
 module.exports = {
 	audit,
 	submitAudit,
@@ -62,8 +65,8 @@ module.exports = {
 	wrongCoi,
 	isReaudit,
 	getAuditorContractorList,
-	enterAudit,
-	getAuditRecordModel,
+	getContractorDetailsForAudit,
 	getRequirementDetailsForAudit,
-	getAuditByRecordId
+	getAuditByRecordId,
+	updateComplianceAuditActionsDate
 };

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

@@ -1,6 +1,6 @@
 const auditApi = require('./audit.api');
 const { AuditRequestModel, AuditListParametersModel, AuditDatesModel } = require('../../models/audit/audit.model');
-const { validateType } = require('../../../../../common/validations/typeValidations');
+const { validateType, validateDateString } = require('../../../../../common/validations/typeValidations');
 const auditUtil = require('../../utils/auditUtil');
 const dataTypeUtils = require('../../../../../common/utils/dataTypeUtils');
 const { cloneObject } = require('../../../../../common/utils/objectUtils');
@@ -34,12 +34,8 @@ const getAuditorContractorList = (auditListParametersModel, context) => {
 	return auditApi.getAuditorContractorList(auditListParametersModel, context);
 };
 
-const enterAudit = (contractorId, context) => {
-	return auditApi.enterAudit(contractorId, context);
-};
-
-const getAuditRecordModel = (recordId, context) => {
-	return auditApi.getAuditRecordModel(recordId, context);
+const getContractorDetailsForAudit = (contractorId, context) => {
+	return auditApi.getContractorDetailsForAudit(contractorId, context);
 };
 
 const getRequirementDetailsForAudit = (contractorId, context) => {
@@ -148,6 +144,11 @@ const auditRecord = async function(
 	return auditResponse;
 };
 
+const updateComplianceAuditActionsDate = (recordId, customLastInviteActionDate, context) => {
+	validateDateString(customLastInviteActionDate, Date);
+	return auditApi.updateComplianceAuditActionsDate(recordId, customLastInviteActionDate, context);
+};
+
 module.exports = {
 	audit,
 	submitAudit,
@@ -155,12 +156,12 @@ module.exports = {
 	isReaudit,
 	wrongCoi,
 	getAuditorContractorList,
-	enterAudit,
+	getContractorDetailsForAudit,
 	getRequirementDetailsForAudit,
-	getAuditRecordModel,
 	getAuditEntities,
 	getAuditMetadata,
 	getAuditByRecordId,
 	getAuditRequestModel,
-	auditRecord
+	auditRecord,
+	updateComplianceAuditActionsDate
 };

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

@@ -60,23 +60,6 @@ const ATTRIBUTE_NAMES_MAP = {
 	signature: 'signature'
 };
 
-const auditTriggerType = {
-	newAudit: 'NEW_AUDIT',
-	changeRequirements: 'CHANGE_REQUIREMENTS',
-	updateRequirements: 'UPDATE_REQUIREMENTS',
-	updateRequirementsWithNotifications: 'ENTITY_CHANGED',
-	gaps: 'GAPS',
-	renewal: 'RENEWAL'
-};
-
-const auditStatus = {
-	pending: 'PENDING',
-	inProgress: 'IN_PROGRESS',
-	onHold: 'ON_HOLD',
-	done: 'DONE',
-	canceled: 'CANCELED'
-};
-
 module.exports = {
 	DEFAULT_POLICY_ID,
 	POLICY_NAMES_MAP,
@@ -84,7 +67,5 @@ module.exports = {
 	COI_AUDIT_STATUSES,
 	AUDITOR_ROLE,
 	AUDIT_ENTITY_STATUSES,
-	VALID_SCORES,
-	auditTriggerType,
-	auditStatus
+	VALID_SCORES
 };

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

@@ -1,5 +1,6 @@
 const requests = require('../../../../common/requests/cookieAuth/requests');
 const { backendUrl } = require('../../../../env').getEnv();
+const { convertDateStringFormatToISOString } = require('../../../../common/utils/timeUtils');
 
 const Endpoints = {
 	create: `${backendUrl}/saas/contractors/invite`,
@@ -19,6 +20,7 @@ const Endpoints = {
 	changeRequirement: `${backendUrl}/saas/contractor/requirement`,
 	updateVendorExpiryDate: contractorId => `${backendUrl}/_saas/automation/contractor/${contractorId}/expiry-date`,
 	updateContractorInviteDate: contractorId => `${backendUrl}/_saas/automation/contractor/${contractorId}/invite-date`,
+	updateLastInviteActionDate: recordId => `${backendUrl}/saas/automation/invite/record/${recordId}/last-invite-action/date`,
 	searchInAutocomplete: ({ tabId, searchWord }) =>
 		`${backendUrl}/saas/requests/search/audited?&tabId=${tabId}&searchWord=${searchWord}`,
 	automationUpdateContractorUploadDate: contractorId => `${backendUrl}/saas/automation/contractor/${contractorId}/upload-date`,
@@ -126,6 +128,11 @@ const getLinkedProjectsCount = async (recordId, context) => {
 	return await requests.getRequestHandler(Endpoints.linkedProjectsCount(recordId), {}, context);
 };
 
+const updateLastInviteActionDate = (recordId, customLastInviteActionDate, context) => {
+	const url = `${Endpoints.updateLastInviteActionDate(recordId)}?customLastInviteActionDate=${convertDateStringFormatToISOString(customLastInviteActionDate)}`;
+	return requests.putRequestHandler(url, {}, context);
+};
+
 module.exports = {
 	createContractor,
 	changeRequirement,
@@ -148,5 +155,6 @@ module.exports = {
 	resendInvitation,
 	muteNotifications,
 	unmuteNotifications,
-	getLinkedProjectsCount
+	getLinkedProjectsCount,
+	updateLastInviteActionDate
 };

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

@@ -1,7 +1,7 @@
 const contractorsAPI = require('./contractors.api');
 const { CreateContractorModel } = require('../models/create.contractor.model');
 const { RequestModel } = require('../../requests/models/edit.request.model');
-const { validateType } = require('../../../../common/validations/typeValidations');
+const { validateType, validateDateString } = require('../../../../common/validations/typeValidations');
 const { RecordModifyDateVerificationModel } = require('../models/verification.contractor.model');
 const { AssignRequirementModel } = require('../models/assign.requirement.model');
 const httpResponseStatusCodes = require('../../../../common/httpResponseStatusCodes.json');
@@ -54,6 +54,11 @@ const updateInviteDate = (contractorId, inviteDate, context) => {
 	return contractorsAPI.updateInviteDate(contractorId, inviteDate, context);
 };
 
+const updateLastInviteActionDate = (recordId, customLastInviteActionDate, context) => {
+	validateDateString(customLastInviteActionDate, Date);
+	return contractorsAPI.updateLastInviteActionDate(recordId, customLastInviteActionDate, context);
+};
+
 const getContractorsByTabId = (tabId, context, activityStatus = 'Active') => {
 	return contractorsAPI.getContractorsByTabId(tabId, context, activityStatus);
 };
@@ -184,5 +189,6 @@ module.exports = {
 	assignRequirement,
 	getAssignRequirementModel,
 	getLinkedProjectsCount,
-	restoreByRecordId
+	restoreByRecordId,
+	updateLastInviteActionDate
 };