@getjones/test-infra 2.8.14 → 2.9.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@getjones/test-infra",
-  "version": "2.8.14",
+  "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/timeUtils.js

@@ -7,6 +7,7 @@ const formats = {
 	dayMonthYear: 'DD/MM/YYYY',
 	numericMonthDayYear: 'MM/DD/YYYY',
 	monthDayYear: 'MMM DD, YYYY',
+	monthDYear: 'MMM D, YYYY',
 	monthDayYear_noZeroPrefix: 'MMM D, YYYY',
 	dateTime: 'YYYY/MM/DD-hh:mm:ss',
 	fullMonthDayYear: 'MMMM DD, YYYY',
@@ -24,7 +25,9 @@ const peroids = {
 };
 
 const getOneYearAgoDate = format => moment().utc().subtract(1, peroids.years).format(format || formats.threadScheduler);
+const getTwoHundredDaysAgoDate = format => moment().utc().subtract(200, peroids.days).format(format || formats.threadScheduler);
 const getSixMonthAgoDate = format => moment().utc().subtract(6, peroids.months).format(format || formats.threadScheduler);
+const getFortyFiveDaysAgoDate = format => moment().utc().subtract(45, peroids.days).format(format || formats.threadScheduler);
 const getOneMonthAgoDate = format => moment().utc().subtract(1, peroids.months).format(format || formats.threadScheduler);
 const getFifteenDaysAgoDate = format => moment().utc().subtract(15, peroids.days).format(format || formats.threadScheduler);
 const getTenDaysAgoDate = format => moment().utc().subtract(10, peroids.days).format(format || formats.threadScheduler);
@@ -46,31 +49,6 @@ const getLogTimestamp = () => {
 	return moment().format(formats.logTimeStampFormat);
 };
 
-const getCurrentFormattedDate = () => {
-	return new Date().toISOString();
-};
-
-const getDateWithOffset = (date, offsetInDays) => {
-	date.setDate(date.getDate() + offsetInDays);
-	return date;
-};
-
-const getAuditDateFormat = date => {
-	const year = date.getUTCFullYear();
-	const month = date.getUTCMonth() + 1; //getMonth is zero-based
-	const day = date.getUTCDate();
-
-	return `${month}/${day}/${year}`;
-};
-
-const getYearMonthDayFormat = date => {
-	const year = date.getUTCFullYear();
-	const month = String(date.getUTCMonth() + 1).length === 1 ? `0${(date.getUTCMonth() + 1)}` : (date.getUTCMonth() + 1);
-	const day = String(date.getUTCDate()).length === 1 ? `0${date.getUTCDate()}` : date.getUTCDate();
-
-	return `${year}-${month}-${day}`;
-};
-
 const extractDateFromDateTime = date => {
 	let extractedDate = date;
 
@@ -137,10 +115,16 @@ const convertDateToLongInt = value => {
 	return Date.parse(value);
 };
 
+const convertDateStringFormatToISOString = dateStringFormat => {
+	return new Date(dateStringFormat).toISOString();
+};
+
 module.exports = {
 	formats,
 	getOneYearAgoDate,
+	getTwoHundredDaysAgoDate,
 	getSixMonthAgoDate,
+	getFortyFiveDaysAgoDate,
 	getOneMonthAgoDate,
 	getFifteenDaysAgoDate,
 	getTenDaysAgoDate,
@@ -159,10 +143,6 @@ module.exports = {
 	getInvitationDatesForNotResponsiveTenant,
 	getAutomaticRenewalsExpirationDates,
 	getLogTimestamp,
-	getCurrentFormattedDate,
-	getAuditDateFormat,
-	getDateWithOffset,
-	getYearMonthDayFormat,
 	getDayInMilliseconds,
 	extractDateFromDateTime,
 	getPreviousDateByDays,
@@ -171,5 +151,6 @@ module.exports = {
 	convertDateToNewFormat,
 	getOneWeekAgoDate,
 	getOneWeekAheadDate,
-	convertDateToLongInt
+	convertDateToLongInt,
+	convertDateStringFormatToISOString
 };

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

@@ -1,19 +1,26 @@
 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`,
-	preAudit: contractorId => `${backendUrl}/saas/auditor/contractors/${contractorId}/master-audit`,
 	audit: `${backendUrl}/saas/auditor/contractors/submit/audits`,
 	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`
+	wrongCoi: `${backendUrl}/saas/coi/wrong-coi`,
+	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 requests.getRequestHandler(Endpoints.preAudit(contractorId), {}, context);
+	await getContractorDetailsForAudit(contractorId, {}, context);
+	return submitAudit(auditRequestModel, context);
+};
+
+const submitAudit = async (auditRequestModel, context) => {
 	return requests.postRequestHandler(Endpoints.audit, auditRequestModel, context);
 };
 
@@ -37,17 +44,29 @@ const getRequirementDetailsForAudit = (contractorId, context) => {
 	return requests.getRequestHandler(Endpoints.requirementDetailsForAudit(contractorId), {}, context);
 };
 
+const getAuditByRecordId = (recordId, context, { isRecordDeleted } = {}) => {
+	return requests.getRequestHandler(Endpoints.getAudit(recordId), { isRecordDeleted }, context);
+};
+
 const wrongCoi = (recordId, context) => {
 	const params = { contractorId: recordId };
 	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,
 	revertCoi,
 	wrongCoi,
 	isReaudit,
 	getAuditorContractorList,
 	getContractorDetailsForAudit,
-	getRequirementDetailsForAudit
+	getRequirementDetailsForAudit,
+	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');
@@ -11,6 +11,11 @@ const audit = (auditRequestModel, context) => {
 	return auditApi.audit(auditRequestModel.auditData.contractorId, auditRequestModel, context);
 };
 
+const submitAudit = (auditRequestModel, context) => {
+	validateType(auditRequestModel, AuditRequestModel);
+	return auditApi.submitAudit(auditRequestModel, context);
+};
+
 const revertCoi = (contractorId, dateModified, context) => {
 	const dateModifiedObj = { dateModified };
 	return auditApi.revertCoi(contractorId, dateModifiedObj, context);
@@ -61,6 +66,10 @@ const getAuditMetadata = async (
 	);
 };
 
+const getAuditByRecordId = async (recordId, context, { isRecordDeleted } = {}) => {
+	return auditApi.getAuditByRecordId(recordId, context, { isRecordDeleted });
+};
+
 const getAuditEntities = async (recordId, auditData, auditorContext) => {
 	const requirementDetailsForAuditResponse = await getRequirementDetailsForAudit(recordId, auditorContext);
 	const requirement = requirementDetailsForAuditResponse.data;
@@ -135,8 +144,14 @@ const auditRecord = async function(
 	return auditResponse;
 };
 
+const updateComplianceAuditActionsDate = (recordId, customLastInviteActionDate, context) => {
+	validateDateString(customLastInviteActionDate, Date);
+	return auditApi.updateComplianceAuditActionsDate(recordId, customLastInviteActionDate, context);
+};
+
 module.exports = {
 	audit,
+	submitAudit,
 	revertCoi,
 	isReaudit,
 	wrongCoi,
@@ -145,6 +160,8 @@ module.exports = {
 	getRequirementDetailsForAudit,
 	getAuditEntities,
 	getAuditMetadata,
+	getAuditByRecordId,
 	getAuditRequestModel,
-	auditRecord
+	auditRecord,
+	updateComplianceAuditActionsDate
 };

package/src/saas/internal-api/compliance/api/overrideGap/override.gap.api.js

@@ -2,10 +2,24 @@ const requests = require('../../../../../common/requests/cookieAuth/requests');
 const { backendUrl } = require('../../../../../env').getEnv();
 
 const Endpoints = {
+	waive: contractorId => `${backendUrl}/saas/contractors/${contractorId}/waiver`,
+	retract: contractorId => `${backendUrl}/saas/contractors/${contractorId}/waiver`,
 	overrideGap: `${backendUrl}/saas/record/override-gap`,
 	retractOverride: `${backendUrl}/saas/record/retract-override`
 };
 
+const waive = async (contractorId, waiveRequestModel, context) => {
+	const status = waiveRequestModel.status;
+	delete waiveRequestModel.status;
+	return requests.postRequestHandler(Endpoints.waive(contractorId), waiveRequestModel, context, {}, { status });
+};
+
+const retract = async (contractorId, retractRequestModel, context) => {
+	const status = retractRequestModel.status;
+	delete retractRequestModel.status;
+	return requests.postRequestHandler(Endpoints.retract(contractorId), retractRequestModel, context, {}, { status });
+};
+
 const overrideGap = ({ waiveRequestModel, isTestingBackwardCompatibility = false, context }) => {
 	const headers = {};
 	const params = { isTestingBackwardCompatibility };
@@ -16,4 +30,4 @@ const retractOverride = (retractRequestModel, context) => {
 	return requests.postRequestHandler(Endpoints.retractOverride, retractRequestModel, context);
 };
 
-module.exports = { overrideGap, retractOverride };
+module.exports = { waive, retract, overrideGap, retractOverride };

package/src/saas/internal-api/compliance/api/overrideGap/override.gap.service.js

@@ -9,6 +9,16 @@ const httpResponseStatusCodes = require('../../../../../common/httpResponseStatu
 const { credentials } = env.getEnv();
 const userTypes = require('../../../../../common/consts/userTypes');
 
+const waive = (waiveRequestModel, context) => {
+	validateType(waiveRequestModel, WaiveRequestModel);
+	return overrideGapApi.waive(waiveRequestModel.contractorId, waiveRequestModel, context);
+};
+
+const retract = (retractRequestModel, context) => {
+	validateType(retractRequestModel, RetractRequestModel);
+	return overrideGapApi.retract(retractRequestModel.contractorId, retractRequestModel, context);
+};
+
 const overrideGap = ({ waiveRequestModel, isTestingBackwardCompatibility = false, context }) => {
 	validateType(waiveRequestModel, WaiveRequestModel);
 	return overrideGapApi.overrideGap({ waiveRequestModel, isTestingBackwardCompatibility, context });
@@ -119,8 +129,10 @@ const acceptAll = async (record, context, { note = 'ACCEPTED AUTOMATICALLY' } =
 };
 
 module.exports = {
+	waive,
 	waiveAll,
 	acceptAll,
+	retract,
 	getWaiveModel,
 	getRetractModel,
 	getWaiveModelByGap,

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,10 +1,11 @@
 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');
+const { waitFor } = require('../../../../common/utils/timeUtils');
 
 const createContractor = async (createContractorModel, context) => {
 	validateType(createContractorModel, CreateContractorModel);
@@ -53,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);
 };
@@ -117,8 +123,14 @@ const deleteAllRecordsInAccount = async (accountId, context, { activationStatus
 		const response = await deleteByContractorId(record.id, context);
 
 		if (response.status !== httpResponseStatusCodes.NO_CONTENT) {
-			console.error('Failed to delete record: ', record.company);
-			failed.push(response);
+			console.error(`Failed to delete record: ${record.company}, retrying...`);
+			waitFor(1000);
+			const try2response = await deleteByContractorId(record.id, context);
+
+			if (try2response.status !== httpResponseStatusCodes.NO_CONTENT) {
+				console.error(`Failed to delete record: ${record.company} second time.`);
+				failed.push(response);
+			}
 		}
 	}
 
@@ -177,5 +189,6 @@ module.exports = {
 	assignRequirement,
 	getAssignRequirementModel,
 	getLinkedProjectsCount,
-	restoreByRecordId
+	restoreByRecordId,
+	updateLastInviteActionDate
 };

package/src/saas/internal-api/dbEmails/api/db.emails.service.js

@@ -119,21 +119,22 @@ const getLastMessage = async (
 	return newestResult;
 };
 
-const waitForMail = async (emailModel, maxSecondToWait) => {
-	let isNotSend = true;
+const waitForMail = async (emailModel, { maxSecondToWait = 30 } = {}) => {
+	let isFound = false;
 	const oneSecondInMilliseconds = 1000;
 	let timeFromTheStart = 0;
 	const started = new Date();
-	let sendMails;
+	let foundMails;
 
-	while (isNotSend && timeFromTheStart < maxSecondToWait) {
-		({ data: sendMails } = await getAllMessages(emailModel));
-		isNotSend = sendMails.length === 0;
+	while (!isFound && timeFromTheStart < maxSecondToWait) {
+		({ data: foundMails } = await getAllMessages(emailModel));
+		isFound = foundMails.length > 0;
 		const now = new Date();
 		timeFromTheStart = (now - started) / oneSecondInMilliseconds;
+		await timeUtils.waitFor(3).seconds;
 	}
 
-	return sendMails;
+	return foundMails;
 };
 
 module.exports = {