@getjones/test-infra 2.9.0 → 2.9.1

package/package.json

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

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

@@ -7,12 +7,12 @@ const contractors = require('../../../saas/internal-api/contractors');
 const compliance = require('../../../saas/internal-api/compliance');
 
 const makeRecordNotResponsive = async function(recordId, context, { isTenant } = {}) {
-	const dates = isTenant ?
-		timeUtils.getInvitationDatesForNotResponsiveTenant() :
-		timeUtils.getInvitationDatesForNotResponsiveVendor();
+	const datesOffset = isTenant ?
+		timeUtils.getInviteActionDatesOffsetForNotResponsiveTenant() :
+		timeUtils.getInviteActionDatesOffsetForNotResponsiveVendor();
 
-	for (const date of dates) {
-		await updateLastInviteActionDate(recordId, date, context);
+	for (const dateOffset of datesOffset) {
+		await updateLastInviteActionDate(recordId, dateOffset, context);
 	}
 };
 
@@ -33,20 +33,20 @@ 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) {
+const updateLastInviteActionDate = async function(recordId, dateOffset, 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);
+	const updateComplianceAuditResponse = await compliance.services.audit.updateComplianceAuditActionsDate(recordId, dateOffset, 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);
+	const updateLastInviteActionResponse = await contractors.services.updateLastInviteActionDate(recordId, dateOffset, context);
 
 	if (updateLastInviteActionResponse.status !== httpResponseStatusCodes.NO_CONTENT) {
 		throw new Error(`Record invite date could not be updated\n${updateLastInviteActionResponse}`);

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

@@ -24,6 +24,14 @@ const peroids = {
 	years: 'years'
 };
 
+const inviteActionDateOffset = {
+	twoDays: 2,
+	fiveDays: 5,
+	eightDays: 8,
+	tenDays: 10,
+	fifteenDays: 15
+};
+
 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);
@@ -86,6 +94,10 @@ const getInvitationDatesForNotResponsiveVendor = function() {
 	return [twoDaysAgoUtc, fiveDaysAgoUtc, eightDaysAgoUtc];
 };
 
+const getInviteActionDatesOffsetForNotResponsiveVendor = function() {
+	return [inviteActionDateOffset.twoDays, inviteActionDateOffset.fiveDays, inviteActionDateOffset.eightDays];
+};
+
 const getInvitationDatesForNotResponsiveTenant = function() {
 	const fiveDaysAgoUtc = getFiveDaysAgoDate();
 	const tenDaysAgoUtc = getTenDaysAgoDate();
@@ -94,6 +106,10 @@ const getInvitationDatesForNotResponsiveTenant = function() {
 	return [fiveDaysAgoUtc, tenDaysAgoUtc, fifteenDaysAgoUtc];
 };
 
+const getInviteActionDatesOffsetForNotResponsiveTenant = function() {
+	return [inviteActionDateOffset.fiveDays, inviteActionDateOffset.tenDays, inviteActionDateOffset.fifteenDays];
+};
+
 const isDateAfterOther = (date, other) => {
 	return moment(date).isAfter(other);
 };
@@ -140,7 +156,9 @@ module.exports = {
 	getDateinTwentyNineDays,
 	getDateInTwoMonths,
 	getInvitationDatesForNotResponsiveVendor,
+	getInviteActionDatesOffsetForNotResponsiveVendor,
 	getInvitationDatesForNotResponsiveTenant,
+	getInviteActionDatesOffsetForNotResponsiveTenant,
 	getAutomaticRenewalsExpirationDates,
 	getLogTimestamp,
 	getDayInMilliseconds,

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

@@ -6,7 +6,8 @@ const { convertDateStringFormatToISOString } = require('../../../../../common/ut
 const Endpoints = {
 	auditorContractorList: `${backendUrl}/saas/auditor/contractors`,
 	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`,
@@ -16,7 +17,7 @@ const Endpoints = {
 };
 
 const audit = async (contractorId, auditRequestModel, context) => {
-	await getContractorDetailsForAudit(contractorId, {}, context);
+	await enterAudit(contractorId, {}, context);
 	return submitAudit(auditRequestModel, context);
 };
 
@@ -36,8 +37,12 @@ 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) => {
@@ -53,8 +58,8 @@ const wrongCoi = (recordId, context) => {
 	return requests.getRequestHandler(Endpoints.wrongCoi, params, context);
 };
 
-const updateComplianceAuditActionsDate = (recordId, customComplianceAuditActionsDate, context) => {
-	const url = `${Endpoints.updateComplianceAuditActionsDate(recordId)}?customComplianceAuditActionsDate=${convertDateStringFormatToISOString(customComplianceAuditActionsDate)}`;
+const updateComplianceAuditActionsDate = (recordId, dateOffset, context) => {
+	const url = `${Endpoints.updateComplianceAuditActionsDate(recordId)}?complianceAuditActionsDateOffset=${dateOffset}`;
 	return requests.putRequestHandler(url, {}, context);
 };
 
@@ -65,7 +70,8 @@ module.exports = {
 	wrongCoi,
 	isReaudit,
 	getAuditorContractorList,
-	getContractorDetailsForAudit,
+	enterAudit,
+	getAuditRecordModel,
 	getRequirementDetailsForAudit,
 	getAuditByRecordId,
 	updateComplianceAuditActionsDate

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

@@ -34,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) => {
@@ -144,9 +148,8 @@ const auditRecord = async function(
 	return auditResponse;
 };
 
-const updateComplianceAuditActionsDate = (recordId, customLastInviteActionDate, context) => {
-	validateDateString(customLastInviteActionDate, Date);
-	return auditApi.updateComplianceAuditActionsDate(recordId, customLastInviteActionDate, context);
+const updateComplianceAuditActionsDate = (recordId, dateOffset, context) => {
+	return auditApi.updateComplianceAuditActionsDate(recordId, dateOffset, context);
 };
 
 module.exports = {
@@ -156,8 +159,9 @@ module.exports = {
 	isReaudit,
 	wrongCoi,
 	getAuditorContractorList,
-	getContractorDetailsForAudit,
+	enterAudit,
 	getRequirementDetailsForAudit,
+	getAuditRecordModel,
 	getAuditEntities,
 	getAuditMetadata,
 	getAuditByRecordId,

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

@@ -128,8 +128,8 @@ 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)}`;
+const updateLastInviteActionDate = (recordId, dateOffset, context) => {
+	const url = `${Endpoints.updateLastInviteActionDate(recordId)}?actionDateOffset=${dateOffset}`;
 	return requests.putRequestHandler(url, {}, context);
 };
 

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

@@ -54,9 +54,8 @@ 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 updateLastInviteActionDate = (recordId, dateOffset, context) => {
+	return contractorsAPI.updateLastInviteActionDate(recordId, dateOffset, context);
 };
 
 const getContractorsByTabId = (tabId, context, activityStatus = 'Active') => {