@getjones/test-infra 5.2.11 → 5.2.12

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@getjones/test-infra",
-  "version": "5.2.11",
+  "version": "5.2.12",
   "description": "Providing internal and openapi interface",
   "main": "src/index.js",
   "files": [

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

@@ -20,6 +20,8 @@ const recordTypes = require('../../../common/consts/recordTypes');
 const policyNames = require('../../../defaults/index').polices;
 const { ExtractionRequestModel } = require('../../../saas/internal-api/requirements/models/extraction.request.model');
 const { TabExtractionRequestModel } = require('../../../saas/internal-api/requirements/models/tab.extraction.request.model');
+const { DEFAULT_LEASE_PATH } = require('../../../saas/internal-api/requirements/consts/consts');
+const { RELATED_DOC_TYPES } = require('../../../saas/internal-api/uploadFiles/consts');
 const { WAIVER_REASONS, EXPIRY_TYPES } = compliance.models.waive;
 
 const makeRecordNotResponsive = async function(recordId, context) {
@@ -392,18 +394,25 @@ const requestRequirementsExtraction = async (recordId, context, { leaseFilePath,
 };
 
 const requestTabRequirementsExtraction = async (tabId, context,
-	{ leaseFilePath, requirementName, notes, docType } = {}, { expectError, readContext = context } = {}) => {
+	{ leaseFilePath = DEFAULT_LEASE_PATH, requirementName, notes, docType = RELATED_DOC_TYPES.SERVICE_AGREEMENT } = {}, { expectError, readContext = context } = {}) => {
 	const stagedDocument = await uploadFile.services.stageDocumentToTempBucket(tabId, context, { filePath: leaseFilePath });
 	const tabExtractionRequestModel = new TabExtractionRequestModel({ ... stagedDocument, requirementName, docType, notes });
+	const existingLeases = expectError ? [] : await requirements.lease.services.getLeasesByTabId(tabId, readContext, { openOnly: false });
+	const existingLeaseIds = new Set(existingLeases.map(({ leaseId }) => leaseId));
 	const requestResponse = await requirements.lease.services.requestTabLeaseExtraction(tabId, tabExtractionRequestModel, context, { expectError });
 
 	if (expectError) {
 		return { requestResponse, stagedDocument };
 	}
 
-	const [lease] = await requirements.lease.services.getLeasesByTabId(tabId, readContext);
+	const openLeases = await requirements.lease.services.getLeasesByTabId(tabId, readContext);
+	const createdLease = openLeases.find(({ leaseId }) => !existingLeaseIds.has(leaseId));
 
-	return lease.leaseId;
+	if (!createdLease) {
+		throw Error(`No new tab-level lease found for tab: ${tabId}`);
+	}
+
+	return createdLease.leaseId;
 };
 
 const cancelOpenTabRequests = async (tabId, icsContext) => {

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

@@ -4,6 +4,18 @@ const { credentials } = getEnv();
 const httpResponseStatusCodes = require('../../../../common/httpResponseStatusCodes.json');
 
 const authApi = require('./auth.api');
+const timeUtils = require('../../../../common/utils/timeUtils');
+
+const RETRYABLE_LOGIN_STATUSES = [
+	httpResponseStatusCodes.BAD_GATEWAY,
+	httpResponseStatusCodes.SERVICE_UNAVAILABLE,
+	httpResponseStatusCodes.GATEWAY_TIMEOUT
+];
+const MAX_LOGIN_ATTEMPTS = 3;
+const LOGIN_RETRY_DELAY_SECONDS = 1;
+
+// Parallel callers for the same user share one login request
+const pendingLogins = new Map();
 
 const getAuthCookie = async (email, password) => {
 	const systemUser = getSystemUserIdentity(email);
@@ -12,9 +24,31 @@ const getAuthCookie = async (email, password) => {
 		return systemUser.cookie;
 	}
 
-	try {
+	if (!pendingLogins.has(email)) {
+		const login = loginAndCacheCookie(email, password).finally(() => pendingLogins.delete(email));
+		pendingLogins.set(email, login);
+	}
+
+	return pendingLogins.get(email);
+};
+
+const loginWithRetry = async (email, password) => {
+	for (let attempt = 1; ; attempt++) {
 		const response = await authApi.login(email, password);
 
+		if (!RETRYABLE_LOGIN_STATUSES.includes(response.status) || attempt === MAX_LOGIN_ATTEMPTS) {
+			return response;
+		}
+
+		console.warn(`Login for ${email} failed with status ${response.status}, retrying`);
+		await timeUtils.waitFor(LOGIN_RETRY_DELAY_SECONDS).seconds;
+	}
+};
+
+const loginAndCacheCookie = async (email, password) => {
+	try {
+		const response = await loginWithRetry(email, password);
+
 		if (response.status !== httpResponseStatusCodes.OK) {
 			throw Error(`Error: ${JSON.stringify(response.data)}`);
 		}

package/src/saas/internal-api/requirements/consts/consts.js

@@ -12,9 +12,11 @@ const leaseExtractionStatus = {
 	closedReqSet: 'CLOSED_REQ_SET'
 };
 
+const DEFAULT_LEASE_PATH = 'packages/test-infra/src/resources/lease/defaultLease.pdf';
+
 const LEASE_TRIGGER_TYPES = {
 	record: 'RECORD',
 	tab: 'TAB'
 };
 
-module.exports = { REQUIREMENT_SHARING_LEVELS, leaseExtractionStatus, LEASE_TRIGGER_TYPES };
+module.exports = { REQUIREMENT_SHARING_LEVELS, leaseExtractionStatus, LEASE_TRIGGER_TYPES, DEFAULT_LEASE_PATH };

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

@@ -1,11 +1,12 @@
 class NotificationSettingsModel {
-	constructor({ aboutToExpire = true, auditCompliant = true, auditNotCompliant = true, missingCoi = true, recordOverrideRequest = true, timedOverrideExpired = true } = {}) {
+	constructor({ aboutToExpire = true, auditCompliant = true, auditNotCompliant = true, missingCoi = true, recordOverrideRequest = true, timedOverrideExpired = true, weeklySummary = true } = {}) {
 		this.aboutToExpire = aboutToExpire;
 		this.auditCompliant = auditCompliant;
 		this.auditNotCompliant = auditNotCompliant;
 		this.missingCoi = missingCoi;
 		this.recordOverrideRequest = recordOverrideRequest;
 		this.timedOverrideExpired = timedOverrideExpired;
+		this.weeklySummary = weeklySummary;
 	}
 }
 

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

@@ -13,7 +13,8 @@ const attributesConvertor = {
 	'COI is compliant.': 'auditCompliant',
 	'Unresponsive contact.': 'missingCoi',
 	'Record Override Request': 'recordOverrideRequest',
-	'Timed override expired — record is not compliant.': 'timedOverrideExpired'
+	'Timed override expired — record is not compliant.': 'timedOverrideExpired',
+	'Weekly summary': 'weeklySummary'
 };
 
 const getUserEncryptedData = async (email, role, context) => {