@getjones/test-infra 2.9.3 → 2.9.6

package/package.json

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

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

@@ -4,15 +4,14 @@ 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 offsetInDaysList = isTenant ?
-		timeUtils.getInviteActionOffsetInDaysForNotResponsiveTenant() :
-		timeUtils.getInviteActionOffsetInDaysForNotResponsiveVendor();
+	const dates = isTenant ?
+		timeUtils.getInvitationDatesForNotResponsiveTenant() :
+		timeUtils.getInvitationDatesForNotResponsiveVendor();
 
-	for (const offsetInDays of offsetInDaysList) {
-		await updateLastInviteActionDate(recordId, offsetInDays, context);
+	for (const date of dates) {
+		await updateInviteDate(recordId, date, context);
 	}
 };
 
@@ -33,34 +32,6 @@ 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, offsetInDays, 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, offsetInDays, 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, offsetInDays, 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();
 
@@ -97,6 +68,5 @@ module.exports = {
 	runOverAllRenewalDatesForRecord,
 	updateInviteDate,
 	updatePolicyExpiryDateForRecord,
-	getHistoryEvents,
-	updateLastInviteActionDate
+	getHistoryEvents
 };

package/src/common/utils/objectUtils.js

@@ -2,6 +2,26 @@ const cloneObject = object => {
 	return JSON.parse(JSON.stringify(object));
 };
 
+const isUIConfig = (config, attributesConvertor) => {
+	const convectorKeys = Object.keys(attributesConvertor);
+	const configKeys = Object.keys(config);
+
+	return convectorKeys.some(key => configKeys.includes(key));
+};
+
+const objectConvertor = (config, attributesConvertor) => {
+	const covertConfig = {};
+
+	for (const field in config) {
+		const attributes = attributesConvertor[field];
+		covertConfig[attributes] = JSON.parse(config[field]);
+	}
+
+	return covertConfig;
+};
+
 module.exports = {
-	cloneObject
+	cloneObject,
+	isUIConfig,
+	objectConvertor
 };

package/src/common/utils/timeUtils.js

@@ -24,14 +24,6 @@ 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);
@@ -94,10 +86,6 @@ const getInvitationDatesForNotResponsiveVendor = function() {
 	return [twoDaysAgoUtc, fiveDaysAgoUtc, eightDaysAgoUtc];
 };
 
-const getInviteActionOffsetInDaysForNotResponsiveVendor = function() {
-	return [inviteActionDateOffset.twoDays, inviteActionDateOffset.fiveDays, inviteActionDateOffset.eightDays];
-};
-
 const getInvitationDatesForNotResponsiveTenant = function() {
 	const fiveDaysAgoUtc = getFiveDaysAgoDate();
 	const tenDaysAgoUtc = getTenDaysAgoDate();
@@ -106,10 +94,6 @@ const getInvitationDatesForNotResponsiveTenant = function() {
 	return [fiveDaysAgoUtc, tenDaysAgoUtc, fifteenDaysAgoUtc];
 };
 
-const getInviteActionOffsetInDaysForNotResponsiveTenant = function() {
-	return [inviteActionDateOffset.fiveDays, inviteActionDateOffset.tenDays, inviteActionDateOffset.fifteenDays];
-};
-
 const isDateAfterOther = (date, other) => {
 	return moment(date).isAfter(other);
 };
@@ -131,10 +115,6 @@ const convertDateToLongInt = value => {
 	return Date.parse(value);
 };
 
-const convertDateStringFormatToISOString = dateStringFormat => {
-	return new Date(dateStringFormat).toISOString();
-};
-
 module.exports = {
 	formats,
 	getOneYearAgoDate,
@@ -156,9 +136,7 @@ module.exports = {
 	getDateinTwentyNineDays,
 	getDateInTwoMonths,
 	getInvitationDatesForNotResponsiveVendor,
-	getInviteActionOffsetInDaysForNotResponsiveVendor,
 	getInvitationDatesForNotResponsiveTenant,
-	getInviteActionOffsetInDaysForNotResponsiveTenant,
 	getAutomaticRenewalsExpirationDates,
 	getLogTimestamp,
 	getDayInMilliseconds,
@@ -169,6 +147,5 @@ module.exports = {
 	convertDateToNewFormat,
 	getOneWeekAgoDate,
 	getOneWeekAheadDate,
-	convertDateToLongInt,
-	convertDateStringFormatToISOString
+	convertDateToLongInt
 };

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

@@ -1,8 +1,6 @@
 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`,
@@ -12,12 +10,11 @@ const Endpoints = {
 	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}`,
-	updateComplianceAuditActionsDate: recordId => `${backendUrl}/saas/automation/record/${recordId}/update-audit-actions-date`
+	getAudit: recordId => `${backendUrl}/saas/audit/${recordId}`
 };
 
 const audit = async (contractorId, auditRequestModel, context) => {
-	await enterAudit(contractorId, {}, context);
+	await enterAudit(contractorId, context);
 	return submitAudit(auditRequestModel, context);
 };
 
@@ -58,11 +55,6 @@ const wrongCoi = (recordId, context) => {
 	return requests.getRequestHandler(Endpoints.wrongCoi, params, context);
 };
 
-const updateComplianceAuditActionsDate = (recordId, dateOffset, context) => {
-	const url = `${Endpoints.updateComplianceAuditActionsDate(recordId)}?offsetInDays=${dateOffset}`;
-	return requests.putRequestHandler(url, {}, context);
-};
-
 module.exports = {
 	audit,
 	submitAudit,
@@ -73,6 +65,5 @@ module.exports = {
 	enterAudit,
 	getAuditRecordModel,
 	getRequirementDetailsForAudit,
-	getAuditByRecordId,
-	updateComplianceAuditActionsDate
+	getAuditByRecordId
 };

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, validateDateString } = require('../../../../../common/validations/typeValidations');
+const { validateType } = require('../../../../../common/validations/typeValidations');
 const auditUtil = require('../../utils/auditUtil');
 const dataTypeUtils = require('../../../../../common/utils/dataTypeUtils');
 const { cloneObject } = require('../../../../../common/utils/objectUtils');
@@ -150,10 +150,6 @@ const auditRecord = async function(
 	return auditResponse;
 };
 
-const updateComplianceAuditActionsDate = (recordId, dateOffset, context) => {
-	return auditApi.updateComplianceAuditActionsDate(recordId, dateOffset, context);
-};
-
 module.exports = {
 	audit,
 	submitAudit,
@@ -168,6 +164,5 @@ module.exports = {
 	getAuditMetadata,
 	getAuditByRecordId,
 	getAuditRequestModel,
-	auditRecord,
-	updateComplianceAuditActionsDate
+	auditRecord
 };

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

@@ -1,6 +1,5 @@
 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`,
@@ -20,7 +19,6 @@ 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/record/${recordId}/update-emails-date`,
 	searchInAutocomplete: ({ tabId, searchWord }) =>
 		`${backendUrl}/saas/requests/search/audited?&tabId=${tabId}&searchWord=${searchWord}`,
 	automationUpdateContractorUploadDate: contractorId => `${backendUrl}/saas/automation/contractor/${contractorId}/upload-date`,
@@ -128,11 +126,6 @@ const getLinkedProjectsCount = async (recordId, context) => {
 	return await requests.getRequestHandler(Endpoints.linkedProjectsCount(recordId), {}, context);
 };
 
-const updateLastInviteActionDate = (recordId, offsetInDays, context) => {
-	const url = `${Endpoints.updateLastInviteActionDate(recordId)}?offsetInDays=${offsetInDays}`;
-	return requests.putRequestHandler(url, {}, context);
-};
-
 module.exports = {
 	createContractor,
 	changeRequirement,
@@ -155,6 +148,5 @@ module.exports = {
 	resendInvitation,
 	muteNotifications,
 	unmuteNotifications,
-	getLinkedProjectsCount,
-	updateLastInviteActionDate
+	getLinkedProjectsCount
 };

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, validateDateString } = require('../../../../common/validations/typeValidations');
+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');
@@ -54,10 +54,6 @@ const updateInviteDate = (contractorId, inviteDate, context) => {
 	return contractorsAPI.updateInviteDate(contractorId, inviteDate, context);
 };
 
-const updateLastInviteActionDate = (recordId, dateOffset, context) => {
-	return contractorsAPI.updateLastInviteActionDate(recordId, dateOffset, context);
-};
-
 const getContractorsByTabId = (tabId, context, activityStatus = 'Active') => {
 	return contractorsAPI.getContractorsByTabId(tabId, context, activityStatus);
 };
@@ -188,6 +184,5 @@ module.exports = {
 	assignRequirement,
 	getAssignRequirementModel,
 	getLinkedProjectsCount,
-	restoreByRecordId,
-	updateLastInviteActionDate
+	restoreByRecordId
 };

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

@@ -5,6 +5,7 @@ const Endpoints = {
 	invite: `${backendUrl}/saas/project/team-member`,
 	editUserProjects: `${backendUrl}/saas/project/team-member`,
 	editUserRole: userId => `${backendUrl}/secured/users/${userId}/change-role`,
+	editUserProfile: `${backendUrl}/saas/user/update`,
 	getByProjectId: projectId =>
 		`${backendUrl}/saas/project/${projectId}/team-members`,
 	getByEmail: email => `${backendUrl}/saas/team-member/by-email/${email}`,
@@ -84,6 +85,9 @@ const sendForgetPasswordMail = userEmail => {
 	const body = { email: userEmail };
 	return requests.postRequestHandler(Endpoints.sendForgetPasswordMail, body);
 };
+const editUserProfile = (editUserProfileModel, context) => {
+	return requests.postRequestHandler(Endpoints.editUserProfile, editUserProfileModel, context);
+};
 
 module.exports = {
 	invite,
@@ -100,5 +104,6 @@ module.exports = {
 	editUserEmailNotificationsSettings,
 	sendForgetPasswordMail,
 	createInnerSystemUser,
-	getInnerSystemUsersPerRole
+	getInnerSystemUsersPerRole,
+	editUserProfile
 };

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

@@ -1,4 +1,4 @@
-const { InviteUserModel, SignupUserModel, EditUserModel } = require('../models/users.model');
+const { InviteUserModel, SignupUserModel, EditUserModel, EditUserProfileModel } = require('../models/users.model');
 const { validateType } = require('../../../../common/validations/typeValidations');
 const { getEnv } = require('../../../../env');
 const { credentials } = getEnv();
@@ -147,6 +147,33 @@ const sendForgetPasswordMail = userEmail => {
 	return userAPI.sendForgetPasswordMail(userEmail);
 };
 
+const editUserProfile = async (email, fullName, context) => {
+	const { data: user } = await getUserByEmail(email, context);
+
+	const editUserProfileModel = new EditUserProfileModel(user.id, email, user.role, fullName);
+
+	const response = await userAPI.editUserProfile(editUserProfileModel, context);
+
+	if (response.status !== httpResponseStatusCodes.OK) {
+		throw Error(`Failed to edit user id: [${user.id}] profile\n${response}`);
+	}
+
+	return getUserByEmail(email, context);
+};
+
+const editUserSettings = async (email, config, context) => {
+	const { data: user } = await getUserByEmail(email, context);
+	const settingModel = util.getSettingsModel(config);
+
+	const response = await userAPI.editUserEmailNotificationsSettings(user.id, settingModel, context);
+
+	if (response.status !== httpResponseStatusCodes.OK) {
+		throw Error(`Failed to edit user id: [${user.id}] settings\n${response}`);
+	}
+
+	return getUserByEmail(email, context);
+};
+
 module.exports = {
 	inviteUser,
 	signupUser,
@@ -162,5 +189,7 @@ module.exports = {
 	reinviteUser,
 	editUserEmailNotificationsSettings,
 	sendForgetPasswordMail,
-	getOrCreateInnerSystemUser
+	getOrCreateInnerSystemUser,
+	editUserProfile,
+	editUserSettings
 };

package/src/saas/internal-api/users/models/users.model.js

@@ -24,8 +24,18 @@ class EditUserModel {
 	}
 }
 
+class EditUserProfileModel {
+	constructor(subUserId, email, role, fullName) {
+		this.subUserId = subUserId;
+		this.email = email;
+		this.role = role;
+		this.fullName = fullName;
+	}
+}
+
 module.exports = {
 	InviteUserModel,
 	SignupUserModel,
-	EditUserModel
+	EditUserModel,
+	EditUserProfileModel
 };

package/src/saas/internal-api/users/utils/util.js

@@ -1,6 +1,15 @@
 const { SignupUserModel } = require('../models/users.model');
+const { NotificationSettingsModel } = require('../models/notification.settings.model');
 const usersApi = require('../api/users.api');
 const httpResponseStatusCodes = require('../../../../common/httpResponseStatusCodes.json');
+const objectUtils = require('../../../../common/utils/objectUtils');
+
+const attributesConvertor = {
+	'COI is not compliant.': 'auditNotCompliant',
+	'Policy is about to expire.': 'aboutToExpire',
+	'COI is compliant.': 'auditCompliant',
+	'Unresponsive contact.': 'missingCoi'
+};
 
 const getUserEncryptedData = async (email, role, context) => {
 	const response = await usersApi.getUserEncryptedData(email, role, context);
@@ -17,4 +26,14 @@ const getSignupUserModel = async (email, role, fullName, password, context) => {
 	return new SignupUserModel(fullName, role, password, userEncryptedData);
 };
 
-module.exports = { getSignupUserModel };
+const getSettingsModel = settings => {
+	const isUIConfig = objectUtils.isUIConfig(settings, attributesConvertor);
+
+	const settingConfig = isUIConfig ?
+		objectUtils.objectConvertor(settings, attributesConvertor) :
+		settings;
+
+	return new NotificationSettingsModel(settingConfig);
+};
+
+module.exports = { getSignupUserModel, getSettingsModel };