@getjones/test-infra 2.8.14 → 2.8.15

package/package.json

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

package/src/common/utils/complianceUtil.js

@@ -1,10 +1,9 @@
 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',
@@ -44,16 +43,16 @@ const getAuditMetadata = async (
 	const isReauditResponse = await isReaudit(recordId, auditorContext);
 	metadata.isReaudit = isReauditResponse.data.isReaudit;
 
-	const recordDetailsResponse = await auditApi.getContractorDetailsForAudit(recordId, auditorContext);
-	const { vendorDetails } = recordDetailsResponse.data;
+	const recordDetailsResponse = await auditApi.getAuditRecordModel(recordId, auditorContext);
+	const recordDetails = recordDetailsResponse.data;
 
-	metadata.certificateId = vendorDetails.certificateDetails.certificateuploadId;
+	metadata.certificateId = recordDetails.certificateDetails.certificateuploadId;
 	metadata.auditDates = {
 		contractorId: recordId,
-		contractorDateModified: vendorDetails.dateModified,
+		contractorDateModified: recordDetails.dateModified,
 		dateStartedAudit: recordDetailsResponse.dateStartedAudit,
-		contractorOverrideDateModified: vendorDetails.contractorOverrideDateModified,
-		contractCreateDate: vendorDetails.contractCreateDate
+		contractorOverrideDateModified: recordDetails.contractorOverrideDateModified,
+		contractCreateDate: recordDetails.contractCreateDate
 	};
 
 	metadata.auditorId = await getAuditorId();

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;
 
@@ -140,7 +118,9 @@ const convertDateToLongInt = value => {
 module.exports = {
 	formats,
 	getOneYearAgoDate,
+	getTwoHundredDaysAgoDate,
 	getSixMonthAgoDate,
+	getFortyFiveDaysAgoDate,
 	getOneMonthAgoDate,
 	getFifteenDaysAgoDate,
 	getTenDaysAgoDate,
@@ -159,10 +139,6 @@ module.exports = {
 	getInvitationDatesForNotResponsiveTenant,
 	getAutomaticRenewalsExpirationDates,
 	getLogTimestamp,
-	getCurrentFormattedDate,
-	getAuditDateFormat,
-	getDateWithOffset,
-	getYearMonthDayFormat,
 	getDayInMilliseconds,
 	extractDateFromDateTime,
 	getPreviousDateByDays,

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

@@ -3,17 +3,22 @@ const { backendUrl } = require('../../../../../env').getEnv();
 
 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`,
+	enterAudit: contractorId => `${backendUrl}/saas/auditor/contractors/${contractorId}/master-audit`,
+	getAuditRecordModelByRecordId: recordId => `${backendUrl}/saas/auditor/record/${recordId}/audit-record`,
 	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}`
 };
 
 const audit = async (contractorId, auditRequestModel, context) => {
-	await requests.getRequestHandler(Endpoints.preAudit(contractorId), {}, context);
+	await enterAudit(contractorId, {}, context);
+	return submitAudit(auditRequestModel, context);
+};
+
+const submitAudit = async (auditRequestModel, context) => {
 	return requests.postRequestHandler(Endpoints.audit, auditRequestModel, context);
 };
 
@@ -29,14 +34,22 @@ const getAuditorContractorList = (auditListParametersModel, context) => {
 	return requests.postRequestHandler(Endpoints.auditorContractorList, auditListParametersModel, context);
 };
 
-const getContractorDetailsForAudit = (contractorId, context) => {
-	return requests.getRequestHandler(Endpoints.contractorDetailsForAudit(contractorId), {}, context);
+const enterAudit = (contractorId, context) => {
+	return requests.getRequestHandler(Endpoints.enterAudit(contractorId), {}, context);
+};
+
+const getAuditRecordModel = (recordId, context) => {
+	return requests.getRequestHandler(Endpoints.getAuditRecordModelByRecordId(recordId), {}, context);
 };
 
 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);
@@ -44,10 +57,13 @@ const wrongCoi = (recordId, context) => {
 
 module.exports = {
 	audit,
+	submitAudit,
 	revertCoi,
 	wrongCoi,
 	isReaudit,
 	getAuditorContractorList,
-	getContractorDetailsForAudit,
-	getRequirementDetailsForAudit
+	enterAudit,
+	getAuditRecordModel,
+	getRequirementDetailsForAudit,
+	getAuditByRecordId
 };

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

@@ -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);
@@ -29,8 +34,12 @@ const getAuditorContractorList = (auditListParametersModel, context) => {
 	return auditApi.getAuditorContractorList(auditListParametersModel, context);
 };
 
-const getContractorDetailsForAudit = (contractorId, context) => {
-	return auditApi.getContractorDetailsForAudit(contractorId, context);
+const enterAudit = (contractorId, context) => {
+	return auditApi.enterAudit(contractorId, context);
+};
+
+const getAuditRecordModel = (recordId, context) => {
+	return auditApi.getAuditRecordModel(recordId, context);
 };
 
 const getRequirementDetailsForAudit = (contractorId, context) => {
@@ -61,6 +70,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;
@@ -137,14 +150,17 @@ const auditRecord = async function(
 
 module.exports = {
 	audit,
+	submitAudit,
 	revertCoi,
 	isReaudit,
 	wrongCoi,
 	getAuditorContractorList,
-	getContractorDetailsForAudit,
+	enterAudit,
 	getRequirementDetailsForAudit,
+	getAuditRecordModel,
 	getAuditEntities,
 	getAuditMetadata,
+	getAuditByRecordId,
 	getAuditRequestModel,
 	auditRecord
 };

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/compliance/consts/audit.js

@@ -60,6 +60,23 @@ 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,
@@ -67,5 +84,7 @@ module.exports = {
 	COI_AUDIT_STATUSES,
 	AUDITOR_ROLE,
 	AUDIT_ENTITY_STATUSES,
-	VALID_SCORES
+	VALID_SCORES,
+	auditTriggerType,
+	auditStatus
 };

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

@@ -5,6 +5,7 @@ const { validateType } = 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);
@@ -117,8 +118,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);
+			}
 		}
 	}
 

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 = {