@getjones/test-infra 3.0.0 → 3.0.1

package/.npmrc.bak

@@ -0,0 +1,2 @@
+@getjones:registry=https://registry.npmjs.org/
+//registry.npmjs.org/:_authToken=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

package/package.json

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

package/package.json.bak

@@ -0,0 +1,30 @@
+{
+  "name": "@getjones/test-infra",
+  "version": "3.0.0",
+  "description": "Providing internal and openapi interface",
+  "main": "src/index.js",
+  "scripts": {
+    "test": "mocha  \"./tests/**/*.test.js\" --slow 3000 --timeout 10000 --exit --inlineDiffs --bail",
+    "eslint-fix": "eslint \"./src/**/*.js\" --fix"
+  },
+  "author": "",
+  "license": "ISC",
+  "dependencies": {
+    "axios": "^0.21.1",
+    "axios-file": "^1.0.17",
+    "chai": "^4.3.4",
+    "dotenv": "^8.2.0",
+    "enum": "^3.0.4",
+    "form-data": "^4.0.0",
+    "mocha": "^8.3.2"
+  },
+  "devDependencies": {
+    "babel-eslint": "^10.0.3",
+    "eslint": "^6.8.0",
+    "eslint-plugin-import": "^2.19.1",
+    "mocha-spec-json-output-reporter": "^1.1.7"
+  },
+  "directories": {
+    "test": "tests"
+  }
+}

package/src/common/consts/activationStatuses.js

@@ -0,0 +1,6 @@
+module.exports = {
+	ACTIVE: 'Active',
+	ARCHIVED: 'Archived',
+	DRAFT: 'Draft',
+	DELETED: 'Deleted'
+};

package/src/common/consts/projectSettings.js

@@ -0,0 +1,6 @@
+module.exports = {
+	tenantSolution: {
+		on: { tenantSolution: true },
+		off: { tenantSolution: false }
+	}
+};

package/src/common/errorCodes.js

@@ -0,0 +1,3 @@
+module.exports = {
+	UNKNOWN: 'UNKNOWN'
+};

package/src/common/requests/internalAuth/requests.js

@@ -5,12 +5,12 @@ const { crossServiceCommunicationAuthKey } = env.getEnv();
 const defaultApiKey = crossServiceCommunicationAuthKey;
 
 const getRequestHandler = (url, params = {}, headers = {}) => {
-	enrichAuthKey(headers, defaultApiKey);
+	enrichAuthKey(headers);
 	return requestHandler.getRequestHandler(url, headers, params);
 };
 
 const postRequestHandler = (url, body, headers = {}, params = {}) => {
-	enrichAuthKey(headers, defaultApiKey);
+	enrichAuthKey(headers);
 	return requestHandler.postRequestHandler(url, body, headers, params);
 };
 
@@ -20,22 +20,22 @@ const putRequestHandler = (url, body, headers = {}, params = {}) => {
 };
 
 const putFileRequestHandler = (url, fileData, headers = {}) => {
-	enrichAuthKey(headers, defaultApiKey);
+	enrichAuthKey(headers);
 	return requestHandler.putFileRequestHandler(url, fileData, headers);
 };
 
 const patchRequestHandler = (url, body, headers = {}) => {
-	enrichAuthKey(headers, defaultApiKey);
+	enrichAuthKey(headers);
 	return requestHandler.patchRequestHandler(url, body, headers);
 };
 
 const deleteRequestHandler = (url, headers = {}, params = {}, data = {}) => {
-	enrichAuthKey(headers, defaultApiKey);
+	enrichAuthKey(headers);
 	return requestHandler.deleteRequestHandler(url, headers, params, data);
 };
 
-const enrichAuthKey = (headers, apiKey) => {
-	headers['x-jcsc-auth'] = apiKey;
+const enrichAuthKey = headers => {
+	headers['x-jcsc-auth'] = defaultApiKey;
 };
 
 module.exports = {

package/src/factory/records/records.js

@@ -11,6 +11,7 @@ const requests = require('../../saas/internal-api/requests');
 
 const { complianceStatuses, getAuditConfigByStatus } = require('../../common/utils/complianceUtil');
 const httpResponseStatusCodes = require('../../common/httpResponseStatusCodes.json');
+const activationStatuses = require('../../common/consts/activationStatuses');
 const timeUtils = require('../../common/utils/timeUtils');
 
 const filePath = path.join(__dirname, '../../resources/coi/coi.pdf');
@@ -135,6 +136,40 @@ const prepareAwaitingNewCoiRecord = async (recordCompany, recordEmail, tabId, re
 const prepareUnderReviewRecord = (recordCompany, recordEmail, tabId, requirementId, context, { recordConfig } = {}) => {
 	return prepareRecord(recordCompany, recordEmail, complianceStatuses.underReview, tabId, requirementId, context, { recordConfig });
 };
+const prepareDraftRecord = async (recordCompany, tabId, context, { recordEmail, requirementId, uploadCoi } = {}) => {
+	const requestData = await requests.services.getOrCreateRequest(
+		context,
+		tabId,
+		requirementId,
+		{
+			inviterEmail: credentials.superUser,
+			email: recordEmail,
+			companyName: recordCompany
+		},
+		activationStatuses.DRAFT
+	);
+
+	if (!(requestData && requestData.id)) {
+		throw Error(`Failed to create record ${recordCompany}\n${requestData}`);
+	}
+
+	if (uploadCoi) {
+		const recordId = requestData.record.contractorId;
+
+		const coiUpload = await coi.utils.uploadCoi(
+			recordId,
+			filePath,
+			uploaderType = coi.consts.UPLOADER_TYPES.ICS,
+			uploaderEmail = credentials.superUser
+		);
+
+		if (!(coiUpload && coiUpload.name)) {
+			throw Error(`Failed to upload COI for record ${recordCompany}\n${coiUpload}`);
+		}
+	}
+
+	return requestData;
+};
 
 module.exports = {
 	prepareCompliantRecord,
@@ -143,5 +178,6 @@ module.exports = {
 	prepareWaivedRecord,
 	prepareAboutToExpiredRecord,
 	prepareAwaitingNewCoiRecord,
-	prepareUnderReviewRecord
+	prepareUnderReviewRecord,
+	prepareDraftRecord
 };

package/src/saas/internal-api/accounts/api/emailCustomization/accounts.email.customizations.api.js

@@ -0,0 +1,29 @@
+const requests = require('../../../../../common/requests/cookieAuth/requests');
+const internalRequests = require('../../../../../common/requests/internalAuth/requests');
+
+const { backendUrl } = require('../../../../../env').getEnv();
+
+const Endpoints = {
+	getCobranding: accountId => `${backendUrl}/saas/cobranding/fetch?accountId=${accountId}`,
+	deleteCobranding: accountId => `${backendUrl}/saas/cobranding/archive?accountId=${accountId}`,
+	publishCobranding: `${backendUrl}/saas/cobranding/publish`,
+	getAccountsByCobrandingEmail: email => `${backendUrl}/jcsc/account/from-email/${email}`
+};
+
+const getCobranding = (accountId, context) => {
+	return requests.getRequestHandler(Endpoints.getCobranding(accountId), {}, context);
+};
+
+const deleteCobranding = (accountId, context) => {
+	return requests.deleteRequestHandler(Endpoints.deleteCobranding(accountId), context);
+};
+
+const publishCobranding = (formData, context) => {
+	return requests.postRequestHandler(Endpoints.publishCobranding, formData, context, formData.getHeaders());
+};
+
+const getAccountsByCobrandingEmail = email => {
+	return internalRequests.getRequestHandler(Endpoints.getAccountsByCobrandingEmail(email), {});
+};
+
+module.exports = { getCobranding, deleteCobranding, publishCobranding, getAccountsByCobrandingEmail };

package/src/saas/internal-api/accounts/api/emailCustomization/accounts.email.customizations.service.js

@@ -0,0 +1,61 @@
+const FormData = require('form-data');
+
+const emailCustomizationsAPI = require('./accounts.email.customizations.api');
+const httpResponseStatusCodes = require('../../../../../common/httpResponseStatusCodes.json');
+
+const getCobranding = async (accountId, context) => {
+	const response = await emailCustomizationsAPI.getCobranding(accountId, context);
+
+	if (response.status !== httpResponseStatusCodes.OK) {
+		throw Error(`Failed to get cobranding by account id: ${accountId} - Response: ${response.status}`);
+	}
+
+	return response.data;
+};
+
+const deleteCobranding = async (accountId, context) => {
+	const response = await emailCustomizationsAPI.deleteCobranding(accountId, context);
+
+	if (response.status !== httpResponseStatusCodes.OK) {
+		throw Error(`Failed to delete cobranding by account id: ${accountId} - Response: ${response.status}`);
+	}
+
+	return response.data;
+};
+
+const publishCobranding = async (publishCobrandingModel, context) => {
+	const publishCobrandingStr = JSON.stringify(publishCobrandingModel);
+
+	const formData = new FormData();
+	// File names are passed as empty so the integration tests won't need to start handle files
+	// In this case the backend just take the file name from the cobrandingData object
+	// and doesn't check against S3. This will work as long as we won't check the content of the cobranded
+	// emails themselves as there there won't be images.
+	formData.append('file', '');
+	formData.append('coBrandingData', publishCobrandingStr) ;
+
+	const response = await emailCustomizationsAPI.publishCobranding(formData, context);
+
+	if (response.status !== httpResponseStatusCodes.OK) {
+		throw Error(`Failed to publish cobranding with from email: ${publishCobrandingModel.fromEmailAddress} - Response: ${response.status}`);
+	}
+
+	return response.data;
+};
+
+const getAccountsByCobrandingEmail = async email => {
+	const response = await emailCustomizationsAPI.getAccountsByCobrandingEmail(email);
+
+	if (response.status !== httpResponseStatusCodes.OK) {
+		throw Error(`Failed to get account ids by email: ${email} - Response: ${response.status}`);
+	}
+
+	return response.data;
+};
+
+module.exports = {
+	getCobranding,
+	deleteCobranding,
+	publishCobranding,
+	getAccountsByCobrandingEmail
+};

package/src/saas/internal-api/accounts/index.js

@@ -10,11 +10,13 @@ const consts = require('./consts/consts');
 const coreService = require('./api/core/accounts.core.service');
 const openApiServices = require('./api/openapi/accounts.openapi.service');
 const settingsServices = require('./api/settings/settings.service');
+const emailCustomizationService = require('./api/emailCustomization/accounts.email.customizations.service');
 
 const services = {
 	core: coreService,
 	openApi: openApiServices,
-	settings: settingsServices
+	settings: settingsServices,
+	emailCustomizations: emailCustomizationService
 };
 
 module.exports = { services, models, utils, consts };

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

@@ -1,5 +1,6 @@
 const axiosFile = require('axios-file');
 const requests = require('../../../../common/requests/cookieAuth/requests');
+const internalRequests = require('../../../../common/requests/internalAuth/requests');
 
 const { backendUrl } = require('../../../../env').getEnv();
 
@@ -7,7 +8,8 @@ const Endpoints = {
 	uploadToS3: `${backendUrl}/_saas/coi/upload`,
 	submitCoi: `${backendUrl}/coi/merge`,
 	completeScan: contractorId => `${backendUrl}/saas/auditor/contractors/${contractorId}/coi/complete-scan`,
-	getCoiPresignedUrl: fileName => `${backendUrl}/saas/coi/${fileName}`
+	getCoiPresignedUrl: fileName => `${backendUrl}/saas/coi/${fileName}`,
+	getCoiHashes: recordId => `${backendUrl}/jcsc/record/${recordId}/coi/hashes`
 };
 
 const uploadToS3 = (contractorId, fileData) => {
@@ -31,4 +33,8 @@ const getCoiPreSignedUrl = (coiFileName, context) => {
 	return requests.getRequestHandler(Endpoints.getCoiPresignedUrl(coiFileName), {}, context);
 };
 
-module.exports = { uploadToS3, submitCoi, getCoiPreSignedUrl, completeScan };
+const getCoiHashes = recordId => {
+	return internalRequests.getRequestHandler(Endpoints.getCoiHashes(recordId));
+};
+
+module.exports = { uploadToS3, submitCoi, completeScan, getCoiPreSignedUrl, getCoiHashes };

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

@@ -19,4 +19,8 @@ const getCoiPreSignedUrl = (coiFileName, context) => {
 	return coiApi.getCoiPreSignedUrl(coiFileName, context);
 };
 
-module.exports = { uploadToS3, submitCoi, getCoiPreSignedUrl, completeScan };
+const getCoiHashes = recordId => {
+	return coiApi.getCoiHashes(recordId);
+};
+
+module.exports = { uploadToS3, submitCoi, getCoiPreSignedUrl, completeScan, getCoiHashes };

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

@@ -6,7 +6,9 @@ const { AssignRequirementModel } = require('../models/assign.requirement.model')
 const { ContractorDetailsModel } = require('../models/edit.contractor.model');
 const httpResponseStatusCodes = require('../../../../common/httpResponseStatusCodes.json');
 const { waitFor } = require('../../../../common/utils/timeUtils');
+const activationStatuses = require('../../../../common/consts/activationStatuses');
 const utils = require('../utils');
+const requestService = require('../../requests/api/requests.service');
 
 const getContractorsByAccountId = async (accountId, context, activationStatus = null) => {
 	if (activationStatus) {
@@ -107,7 +109,7 @@ const deleteByContractorId = (contractorId, context) => {
 	return contractorsAPI.deleteByContractorId(contractorId, context);
 };
 
-const deleteAllRecordsInAccount = async (accountId, context, { activationStatus } = {}) => {
+const deleteAllRecordsInAccount = async (accountId, context, { activationStatus = [activationStatuses.ACTIVE, activationStatuses.ARCHIVED, activationStatuses.DRAFT] } = {}) => {
 	const { data: existingRecords } = await getContractorsByAccountId(accountId, context, activationStatus);
 
 	if (!existingRecords.length) {
@@ -135,11 +137,20 @@ const deleteAllRecordsInAccount = async (accountId, context, { activationStatus
 	}
 };
 
+const deleteAllActiveRecordsInAccount = async (accountId, context) => {
+	return deleteAllRecordsInAccount(accountId, context, { activationStatus: [activationStatuses.ACTIVE] });
+};
+
 const getRecordVerificationModel = async (recordId, context, { requirementId, requirementDateModified } = {}) => {
 	const { data: recordData } = await getContractorById(recordId, context);
 	return new RecordModifyDateVerificationModel(recordData.id, { contractorDateModified: recordData.dateModified, requirementId, requirementDateModified });
 };
 
+const getRecordVerificationModelForDraftRecord = (request, { requirementId, requirementDateModified } = {}) => {
+	const { record } = request;
+	return new RecordModifyDateVerificationModel(record.id, { contractorDateModified: record.dateModified, requirementId, requirementDateModified });
+};
+
 const getAssignRequirementModel = (requirementId, companyName, emailAddress) => {
 	return new AssignRequirementModel(requirementId, companyName, emailAddress);
 };
@@ -220,7 +231,9 @@ module.exports = {
 	unmuteNotifications,
 	deleteByContractorId,
 	deleteAllRecordsInAccount,
+	deleteAllActiveRecordsInAccount,
 	getRecordVerificationModel,
+	getRecordVerificationModelForDraftRecord,
 	assignRequirement,
 	getAssignRequirementModel,
 	getLinkedProjectsCount,

package/src/saas/internal-api/globalRecord/api/global.record.service.js

@@ -70,14 +70,14 @@ const splitToExistGlobalRecord = (recordId, glPolicyNumber, globalRecordId, cont
 	return globalRecordAPI.splitToExistGlobalRecord(requestData, context);
 };
 
-const getGlobalRecordByRecordId = async (recordId, context) => {
+const getGlobalRecordByRecordId = async (recordId, context, shouldSucceed = true) => {
 	const response = await globalRecordAPI.getGlobalRecordByRecordId(recordId, context);
 
-	if (response.status !== httpResponseStatusCodes.OK) {
+	if (response.status !== httpResponseStatusCodes.OK && shouldSucceed) {
 		throw Error(`Failed to get global record by recordId - ${recordId}\n${response.data}`);
 	}
 
-	return response.data;
+	return response;
 };
 
 const dismissGlobalChanges = (id, context) => {

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

@@ -6,6 +6,8 @@ const Endpoints = {
 	addRequestToRecord: (recordId, tabId) => `${backendUrl}/saas/${tabId}/request/${recordId}`,
 	publicLinkInvite: `${backendUrl}/_saas/requests/publicinvite`,
 	edit: contractorId => `${backendUrl}/saas/requests/${contractorId}/update`,
+	saveDraftRequest: `${backendUrl}/saas/requests/draft/save`,
+	activateDraftRequest: `${backendUrl}/saas/requests/draft/activate`,
 	getById: requestId => `${backendUrl}/saas/request/${requestId}`,
 	getAccountRequests: accountId => `${backendUrl}/saas/requests/${accountId}`,
 	getByTabId: `${backendUrl}/saas/requests`,
@@ -13,7 +15,8 @@ const Endpoints = {
 		`${backendUrl}/saas/requests/search?&projectId=${projectId}&searchWord=${searchWord}`,
 	getAutocompleteAutoSelect: `${backendUrl}/saas/request/auto/selection`,
 	getTabTenantRequestsInProject: projectId => `${backendUrl}/saas/project/${projectId}/tenants/companies`,
-	innerPageRequests: `${backendUrl}/saas/requests/chart-filter`
+	innerPageRequests: `${backendUrl}/saas/requests/chart-filter`,
+	homePageRequests: `${backendUrl}/saas/requests/actionable`
 };
 
 const createRequest = (createRequestModel, context) => {
@@ -34,6 +37,14 @@ const editRequestAndRecordDetails = (editRequestModel, context) => {
 	return requests.postRequestHandler(Endpoints.edit(contractorId), editRequestModel, context, {}, params);
 };
 
+const saveDraftRequest = (draftRequestReportModel, context) => {
+	return requests.postRequestHandler(Endpoints.saveDraftRequest, draftRequestReportModel, context);
+};
+
+const activateDraftRequest = (draftRequestReportModel, context) => {
+	return requests.postRequestHandler(Endpoints.activateDraftRequest, draftRequestReportModel, context);
+};
+
 const getRequestById = (requestId, context) => {
 	return requests.getRequestHandler(Endpoints.getById(requestId), {}, context);
 };
@@ -59,8 +70,12 @@ const getTabTenantRequestsInProject = (projectId, context) => {
 	return requests.getRequestHandler(Endpoints.getTabTenantRequestsInProject(projectId), {}, context);
 };
 
-const getInnerPageRequests = (innerPageRequestCriteriaModel, context) => {
-	return requests.postRequestHandler(Endpoints.innerPageRequests, innerPageRequestCriteriaModel, context);
+const getInnerPageRequests = (requestListCriteriaModel, context) => {
+	return requests.postRequestHandler(Endpoints.innerPageRequests, requestListCriteriaModel, context);
+};
+
+const getHomePageRequests = (requestListCriteriaModel, context) => {
+	return requests.postRequestHandler(Endpoints.homePageRequests, requestListCriteriaModel, context);
 };
 
 module.exports = {
@@ -68,11 +83,14 @@ module.exports = {
 	addRequestToRecord,
 	inviteRequestViaPublicLink,
 	editRequestAndRecordDetails,
+	saveDraftRequest,
+	activateDraftRequest,
 	getRequestById,
 	getRequestsByAccountId,
 	getRequestsByTabId,
 	requestsGlobalSearch,
 	getAutocompleteAutoSelect,
 	getTabTenantRequestsInProject,
-	getInnerPageRequests
+	getInnerPageRequests,
+	getHomePageRequests
 };

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

@@ -1,6 +1,7 @@
 const requestsAPI = require('./requests.api');
 const { CreateRequestModel, ContractorInfo } = require('../models/create.request.model');
-const { InnerPageRequestCriteriaModel } = require('../models/inner.page.request.criteria.model');
+const { RequestListCriteriaModel } = require('../models/requestListCriteriaModel');
+const { DraftRequestReportModel } = require('../models/draft.request.report.model');
 const { RequestModel } = require('../models/edit.request.model');
 const { validateType } = require('../../../../common/validations/typeValidations');
 const httpResponseStatusCodes = require('../../../../common/httpResponseStatusCodes.json');
@@ -24,6 +25,56 @@ const editRequestAndRecordDetails = (editRequestModel, context) => {
 	return requestsAPI.editRequestAndRecordDetails(editRequestModel, context);
 };
 
+const activateDraftRequest = (draftRequestReportModel, context) => {
+	validateType(draftRequestReportModel, DraftRequestReportModel);
+	return requestsAPI.activateDraftRequest(draftRequestReportModel, context);
+};
+
+const activateByRequest = async (request, context, { email, requirementId, additionalEmailList, dateModified, overrideDateModified } = {}) => {
+	const emailAddress = email || request.record.emailAddress;
+	const selectedRequirementsId = requirementId || request.record.requirementId;
+	const additionalEmails = additionalEmailList || request.record.additionalEmails;
+	const recordDateModified = dateModified || request.record.dateModified;
+
+	const draftRequestReportModel = new DraftRequestReportModel(
+		request.id,
+		{
+			emailAddress,
+			selectedRequirementsId,
+			additionalEmails,
+			recordDateModified,
+			overrideDateModified
+		}
+	);
+
+	return activateDraftRequest(draftRequestReportModel, context);
+};
+
+const saveDraftRequest = (draftRequestReportModel, context) => {
+	validateType(draftRequestReportModel, DraftRequestReportModel);
+	return requestsAPI.saveDraftRequest(draftRequestReportModel, context);
+};
+
+const saveDraftByRequest = async (request, context, { email, requirementId, additionalEmailList, dateModified, overrideDateModified } = {}) => {
+	const emailAddress = email || request.record.emailAddress;
+	const selectedRequirementsId = requirementId || request.record.requirementId;
+	const additionalEmails = additionalEmailList || request.record.additionalEmails;
+	const recordDateModified = dateModified || request.record.dateModified;
+
+	const draftRequestReportModel = new DraftRequestReportModel(
+		request.id,
+		{
+			emailAddress,
+			selectedRequirementsId,
+			additionalEmails,
+			recordDateModified,
+			overrideDateModified
+		}
+	);
+
+	return saveDraftRequest(draftRequestReportModel, context);
+};
+
 const getAutocompleteAutoSelect = async (params, context) => {
 	const { companyOrDba, tabId, requirementsId } = params;
 	const autoSelectedRequest = await requestsAPI.getAutocompleteAutoSelect({ companyOrDba, tabId, requirementsId }, context);
@@ -101,16 +152,16 @@ const getTabTenantRequestsInProject = async (projectId, context) => {
 	return response.data;
 };
 
-const getRequestFromTabByRecordId = async (recordId, tabId, context) => {
-	const { data: requestsInTab } = await requestsAPI.getRequestsByTabId(tabId, context);
+const getRequestFromTabByRecordId = async (recordId, tabId, context, activationStatus) => {
+	const { data: requestsInTab } = await requestsAPI.getRequestsByTabId(tabId, context, activationStatus);
 	const request = requestsInTab.find(({ record }) => record.contractorId === recordId);
 
 	return request;
 };
 
-const getInnerPageRequests = async (innerPageRequestCriteriaModel, context) => {
-	validateType(innerPageRequestCriteriaModel, InnerPageRequestCriteriaModel);
-	const response = await requestsAPI.getInnerPageRequests(innerPageRequestCriteriaModel, context);
+const getInnerPageRequests = async (requestListCriteriaModel, context) => {
+	validateType(requestListCriteriaModel, RequestListCriteriaModel);
+	const response = await requestsAPI.getInnerPageRequests(requestListCriteriaModel, context);
 
 	if (response.status !== httpResponseStatusCodes.OK) {
 		throw Error(`Get requests inner page has fail\n${response}`);
@@ -119,6 +170,17 @@ const getInnerPageRequests = async (innerPageRequestCriteriaModel, context) => {
 	return response.data;
 };
 
+const getHomePageRequests = async (requestListCriteriaModel, context) => {
+	validateType(requestListCriteriaModel, RequestListCriteriaModel);
+	const response = await requestsAPI.getHomePageRequests(requestListCriteriaModel, context);
+
+	if (response.status !== httpResponseStatusCodes.OK) {
+		throw Error(`Get requests home page has fail\n${response}`);
+	}
+
+	return response.data;
+};
+
 const getAllRequestsByName = async (recordName, accountId, context) => {
 	const { data: requestsInAccount } = await requestsAPI.getRequestsByAccountId(accountId, context);
 	const requests = requestsInAccount.filter(requests => requests.record.company === recordName);
@@ -139,6 +201,10 @@ module.exports = {
 	addRequestToRecord,
 	inviteRequestViaPublicLink,
 	editRequestAndRecordDetails,
+	activateByRequest,
+	saveDraftRequest,
+	saveDraftByRequest,
+	activateDraftRequest,
 	getRequestsByTabId,
 	getRequestById,
 	getRequestsByAccountId,
@@ -148,6 +214,7 @@ module.exports = {
 	getTabTenantRequestsInProject,
 	getRequestFromTabByRecordId,
 	getInnerPageRequests,
+	getHomePageRequests,
 	getAllRequestsByName,
 	getRequestByName
 };

package/src/saas/internal-api/requests/index.js

@@ -2,7 +2,8 @@ const services = require('./api/requests.service');
 
 const { TenantRequestModel, RequestModel, TabModel } = require('./models/edit.request.model');
 const { CreateRequestModel, ContractorInfo } = require('./models/create.request.model');
-const { InnerPageRequestCriteriaModel } = require('./models/inner.page.request.criteria.model');
+const { RequestListCriteriaModel } = require('./models/requestListCriteriaModel');
+const { DraftRequestReportModel } = require('./models/draft.request.report.model');
 
 const models = {
 	TenantRequestModel,
@@ -10,7 +11,8 @@ const models = {
 	TabModel,
 	CreateRequestModel,
 	ContractorInfo,
-	InnerPageRequestCriteriaModel
+	DraftRequestReportModel,
+	RequestListCriteriaModel
 };
 
 module.exports = { services, models };

package/src/saas/internal-api/requests/models/draft.request.report.model.js

@@ -0,0 +1,14 @@
+class DraftRequestReportModel {
+	constructor(requestId, { emailAddress, selectedRequirementsId, additionalEmails, recordDateModified, overrideDateModified } = {}) {
+		this.requestId = requestId;
+		this.emailAddress = emailAddress;
+		this.selectedRequirementsId = selectedRequirementsId;
+		this.additionalEmails = additionalEmails;
+		this.recordDateModified = recordDateModified;
+		this.overrideDateModified = overrideDateModified;
+	}
+}
+
+module.exports = {
+	DraftRequestReportModel
+};

package/src/saas/internal-api/requests/models/{inner.page.request.criteria.model.js → requestListCriteriaModel.js}

@@ -1,4 +1,4 @@
-class InnerPageRequestCriteriaModel {
+class RequestListCriteriaModel {
 	constructor({
 		projectIds = [],
 		recordTypes = [],
@@ -13,5 +13,5 @@ class InnerPageRequestCriteriaModel {
 }
 
 module.exports = {
-	InnerPageRequestCriteriaModel
+	RequestListCriteriaModel
 };

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

@@ -7,7 +7,8 @@ const Endpoints = {
 	getRequirementById: requirementId => `${backendUrl}/saas/requirement/${requirementId}`,
 	update: `${backendUrl}/saas/requirement/linked/edit`,
 	updateWithNotification: `${backendUrl}/saas/requirement/linked/edit/notify`,
-	delete: requirementId => `${backendUrl}/saas/requirement/${requirementId}`
+	delete: requirementId => `${backendUrl}/saas/requirement/${requirementId}`,
+	getLinkedRecordCount: requirementId => `${backendUrl}/saas/requirement/${requirementId}/contractor-count`
 };
 
 const createRequirement = (createRequirementModel, tabId, context) => {
@@ -23,6 +24,10 @@ const getRequirementById = (requirementId, context, { isPermanentLink } = {}) =>
 	return requests.getRequestHandler(Endpoints.getRequirementById(requirementId), { isPermanentLink }, context);
 };
 
+const getRequirementLinkedRecordCount = async (requirementId, context, { shouldCountDraft = true } = {}) => {
+	return requests.getRequestHandler(Endpoints.getLinkedRecordCount(requirementId), { shouldCountDraft }, context);
+};
+
 const updateRequirement = (updateRequirementModel, tabId, context) => {
 	return requests.postRequestHandler(Endpoints.update, updateRequirementModel, context, {}, { tabId });
 };
@@ -39,6 +44,7 @@ module.exports = {
 	createRequirement,
 	getRequirementsByTabId,
 	getRequirementById,
+	getRequirementLinkedRecordCount,
 	updateRequirement,
 	updateRequirementWithNotification,
 	deleteByRequirementId

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

@@ -124,6 +124,16 @@ const getRequirementDateModified = async (tabId, requirementName, context) => {
 	return requirementRes.dateModified;
 };
 
+const getRequirementLinkedRecordCount = async (requirementId, context, { shouldCountDraft } = {}) => {
+	const recordCount = await requirementsAPI.getRequirementLinkedRecordCount(requirementId, context, { shouldCountDraft });
+
+	if (recordCount.status !== httpResponseStatusCodes.OK) {
+		throw new Error(`Failed to retrieve linked record count for requirement - ${requirementId}\n${recordCount}`);
+	}
+
+	return recordCount;
+};
+
 module.exports = {
 	createRequirement,
 	getRequirementById,
@@ -138,5 +148,6 @@ module.exports = {
 	deleteAllRequirementsInTabs,
 	getCreateRequirementModel,
 	getUpdatedRequirementModel,
-	getRequirementDateModified
+	getRequirementDateModified,
+	getRequirementLinkedRecordCount
 };

package/src/saas/internal-api/users/api/tenantApp/tenant.app.service.js

@@ -41,7 +41,7 @@ const getTenantUserByEmail = async (projectId, email, context) => {
 	return tenant;
 };
 
-const getOrCreateTenantUser = async (projectId, email, company, requestId, context, { fullName = 'Tenant User', password = credentials.strongPassword, toSignUp = true } = {}) => {
+const getOrCreateTenantUser = async (projectId, email, company, requestId, context, { fullName = 'Tenant User', password = credentials.strongPassword, toSignUp = true, expectError } = {}) => {
 	let tenantUser = await getTenantUserByEmail(projectId, email, context);
 
 	if (tenantUser && tenantUser.subuserId && tenantUser.isVerified) {
@@ -52,7 +52,11 @@ const getOrCreateTenantUser = async (projectId, email, company, requestId, conte
 	const inviteResponse = await inviteTenantUser(projectId, inviteUserModel, context);
 
 	if (inviteResponse.status !== httpResponseStatusCodes.OK) {
-		throw new Error(`Failed to invite tenant user with email: ${email}\n${inviteResponse}`);
+		if (expectError) {
+			return inviteResponse;
+		} else {
+			throw new Error(`Failed to invite tenant user with email: ${email}\n${inviteResponse}`);
+		}
 	}
 
 	tenantUser = await getTenantUserByEmail(projectId, email, context);

package/src/saas/openapi/requests/requests.api.js

@@ -49,17 +49,17 @@ const updateRequest = (apiKey, id, updateRequestModel) => {
 
 const changeRequirement = (apiKey, requestId, requirementId) => {
 	const endpoint = Endpoints.changeRequirement(requestId, requirementId);
-	return requests.putRequestHandler(endpoint, apiKey);
+	return requests.putRequestHandler(endpoint, apiKey, {});
 };
 
 const archiveRequest = (apiKey, requestId) => {
 	const endpoint = Endpoints.archive(requestId);
-	return requests.putRequestHandler(endpoint, apiKey);
+	return requests.putRequestHandler(endpoint, apiKey, {});
 };
 
 const restoreRequest = (apiKey, requestId) => {
 	const endpoint = Endpoints.restore(requestId);
-	return requests.putRequestHandler(endpoint, apiKey);
+	return requests.putRequestHandler(endpoint, apiKey, {});
 };
 
 const deleteRequest = (apiKey, requestId) => {