@getjones/test-infra 4.5.0 → 4.5.2

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

@@ -1,301 +1,301 @@
-const requestsAPI = require('./requests.api');
-const { CreateRequestModel, ContractorInfo } = require('../models/create.request.model');
-const { DraftRequestCriteriaModel } = require('../models/draft.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');
-const activationStatuses = require('../../../../common/consts/activationStatuses');
-const { HomepageRequestCriteriaModel } = require('../models/homepageRequestCriteriaModel');
-
-const createRequest = async (createRequestModel, context) => {
-	validateType(createRequestModel, CreateRequestModel);
-	return requestsAPI.createRequest(createRequestModel, context);
-};
-
-const addRequestToRecord = async (recordId, tabId, context) => {
-	return requestsAPI.addRequestToRecord(recordId, tabId, context);
-};
-
-const inviteRequestViaPublicLink = async (createRequestModel, context) => {
-	validateType(createRequestModel, CreateRequestModel);
-	return requestsAPI.inviteRequestViaPublicLink(createRequestModel, context);
-};
-
-const editRequestAndRecordDetails = (editRequestModel, context) => {
-	validateType(editRequestModel, RequestModel);
-	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, shouldSucceed = true } = {}) => {
-	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
-		}
-	);
-
-	const activationResponse = await activateDraftRequest(draftRequestReportModel, context);
-
-	if (activationResponse.status !== httpResponseStatusCodes.NO_CONTENT && shouldSucceed) {
-		throw Error(`Failed to activate record: ${activationResponse.data}`);
-	}
-
-	return activationResponse;
-};
-
-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);
-
-	if (autoSelectedRequest.status != httpResponseStatusCodes.OK) {
-		throw Error('Failed to get the auto select request', autoSelectedRequest.data);
-	}
-
-	return autoSelectedRequest.data;
-};
-
-const getRequestsByTabId = (tabId, context, activityStatus = activationStatuses.ACTIVE, sortBy = null, filterByStatus = null, filterByExpiryStatus = null, filterByResponsivenessStatus = null) => {
-	return requestsAPI.getRequestsByTabId(tabId, context, activityStatus, sortBy, filterByStatus, filterByExpiryStatus, filterByResponsivenessStatus);
-};
-
-const getRequestById = (requestId, context) => {
-	return requestsAPI.getRequestById(requestId, context);
-};
-
-const getRequestsByAccountId = (accountId, context, activationStatus) => {
-	if (activationStatus) {
-		activationStatus = activationStatus.reduce((f, s) => `${f},${s}`);
-	}
-
-	const params = { activationStatus };
-
-	return requestsAPI.getRequestsByAccountId(accountId, context, params);
-};
-
-const getCreateRequestModel = (requirementId, contractor, { tabId, publicLink, requirementDateModified, isDraft, existingCoiFileName, fileName, policyOwnerRecordId } = {}) => {
-	const { recordType, email, companyName, additionalEmails } = contractor;
-	const contractorInfoModel = new ContractorInfo(recordType, email, companyName, additionalEmails, isDraft, { fileName });
-
-	return new CreateRequestModel(
-		requirementId,
-		contractor.inviterEmail,
-		contractorInfoModel,
-		{
-			tabId,
-			publicLink,
-			requirementDateModified,
-			existingCoiFileName,
-			policyOwnerRecordId
-		}
-	);
-};
-
-const getOrCreateRequest = async (context, tabId, requirementId, contractor, activationStatus, { requirementDateModified, existingCoiFileName, fileName, policyOwnerRecordId } = {}) => {
-	const { data: existingRequests } = await getRequestsByTabId(tabId, context, activationStatus);
-
-	const filteredRequests = Array.isArray(existingRequests) ? existingRequests.filter(({ record }) =>
-		record.company === contractor.companyName) : [];
-
-	if (filteredRequests.length) {
-		return filteredRequests[0];
-	}
-
-	const isDraft = activationStatus === 'Draft' ? true : false;
-
-	const createContractorModel = getCreateRequestModel(requirementId, contractor, { tabId, requirementDateModified, isDraft, existingCoiFileName, fileName, policyOwnerRecordId });
-	const createContractorResponse = await createRequest(createContractorModel, context);
-	return createContractorResponse.data;
-};
-
-const requestsGlobalSearch = (projectId, searchWord, context) => {
-	return requestsAPI.requestsGlobalSearch(projectId, searchWord, context);
-};
-
-const getTabTenantRequestsInProject = async (projectId, context) => {
-	const response = await requestsAPI.getTabTenantRequestsInProject(projectId, context);
-
-	if (response.status !== httpResponseStatusCodes.OK) {
-		throw Error(`Failed to get the tab tenants in project, status - ${response.status}`);
-	}
-
-	return response.data;
-};
-
-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 (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}`);
-	}
-
-	return response.data;
-};
-
-const getHomePageRequests = async (context, { sortBy, sortOrder, pageNumber, attentionTab, shouldExceptError } = {}) => {
-	const homepageRequestCriteriaModel = new HomepageRequestCriteriaModel({ sortBy, sortOrder, attentionTab, pageNumber });
-	return getHomePageRequestsByModel(homepageRequestCriteriaModel, context, shouldExceptError);
-};
-
-const getHomePageRequestsByModel = async (homepageRequestCriteriaModel, context, shouldExceptError) => {
-	validateType(homepageRequestCriteriaModel, HomepageRequestCriteriaModel);
-	const response = await requestsAPI.getHomePageRequests(homepageRequestCriteriaModel, context);
-
-	if (shouldExceptError) {
-		return response;
-	}
-
-	if (response.status !== httpResponseStatusCodes.OK) {
-		throw Error(`Get requests home page has fail\n${response}`);
-	}
-
-	return response.data;
-};
-
-const getHomePageRequestsCount = async context => {
-	const response = await requestsAPI.getHomePageRequestsCount(context);
-
-	if (response.status !== httpResponseStatusCodes.OK) {
-		throw Error(`Get requests count 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);
-
-	return requests;
-};
-
-const getRequestByName = async (recordName, tabId, context) => {
-	const { data: requestsInTab } = await requestsAPI.getRequestsByTabId(tabId, context);
-	const request = requestsInTab.find(requests => requests.record.company === recordName);
-
-	return request;
-};
-
-const getDraftRequestListByModel = async (draftRequestCriteriaModel, context) => {
-	validateType(draftRequestCriteriaModel, DraftRequestCriteriaModel);
-	const response = await requestsAPI.getDraftRequestList(draftRequestCriteriaModel, context);
-
-	if (response.status !== httpResponseStatusCodes.OK) {
-		throw Error(`Failed to get draft request list - ${response.status}`);
-	}
-
-	return response.data;
-};
-
-const getDraftRequestListByTabId = async (tabId, context, { draftCompletionStatusesFilter, sortBy } = {}) => {
-	const draftRequestCriteriaModel = new DraftRequestCriteriaModel(tabId, { draftCompletionStatusesFilter, sortBy });
-	return getDraftRequestListByModel(draftRequestCriteriaModel, context);
-};
-
-const getDraftFilterCountersByTabId = async (tabId, context) => {
-	const response = await requestsAPI.getDraftFilterCountersByTabId(tabId, context);
-
-	if (response.status !== httpResponseStatusCodes.OK) {
-		throw Error(`Failed to get the draft filter counters - ${response.status}`);
-	}
-
-	return response.data;
-};
-
-const getActivityStatusCounterByTabId = async (tabId, context) => {
-	const response = await requestsAPI.getActivityStatusCounterByTabId(tabId, context);
-
-	if (response.status !== httpResponseStatusCodes.OK) {
-		throw Error(`Failed to get the requests counter by activity status - ${response.status}`);
-	}
-
-	return response.data;
-};
-
-const getRequestsCountersByTabId = async (tabId, context) => {
-	const response = await requestsAPI.getRequestsCountersByTabId(tabId, context);
-
-	if (response.status !== httpResponseStatusCodes.OK) {
-		throw Error(`Failed to get requests counter - ${response.status}`);
-	}
-
-	return response.data;
-};
-
-module.exports = {
-	createRequest,
-	getAutocompleteAutoSelect,
-	addRequestToRecord,
-	inviteRequestViaPublicLink,
-	editRequestAndRecordDetails,
-	activateByRequest,
-	saveDraftRequest,
-	saveDraftByRequest,
-	activateDraftRequest,
-	getRequestsByTabId,
-	getRequestById,
-	getRequestsByAccountId,
-	getOrCreateRequest,
-	getCreateRequestModel,
-	requestsGlobalSearch,
-	getTabTenantRequestsInProject,
-	getRequestFromTabByRecordId,
-	getInnerPageRequests,
-	getHomePageRequests,
-	getHomePageRequestsCount,
-	getAllRequestsByName,
-	getRequestByName,
-	getDraftRequestListByModel,
-	getDraftRequestListByTabId,
-	getDraftFilterCountersByTabId,
-	getActivityStatusCounterByTabId,
-	getRequestsCountersByTabId
-};
+const requestsAPI = require('./requests.api');
+const { CreateRequestModel, ContractorInfo } = require('../models/create.request.model');
+const { DraftRequestCriteriaModel } = require('../models/draft.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');
+const activationStatuses = require('../../../../common/consts/activationStatuses');
+const { HomepageRequestCriteriaModel } = require('../models/homepageRequestCriteriaModel');
+
+const createRequest = async (createRequestModel, context) => {
+	validateType(createRequestModel, CreateRequestModel);
+	return requestsAPI.createRequest(createRequestModel, context);
+};
+
+const addRequestToRecord = async (recordId, tabId, context) => {
+	return requestsAPI.addRequestToRecord(recordId, tabId, context);
+};
+
+const inviteRequestViaPublicLink = async (createRequestModel, context) => {
+	validateType(createRequestModel, CreateRequestModel);
+	return requestsAPI.inviteRequestViaPublicLink(createRequestModel, context);
+};
+
+const editRequestAndRecordDetails = (editRequestModel, context) => {
+	validateType(editRequestModel, RequestModel);
+	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, shouldSucceed = true } = {}) => {
+	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
+		}
+	);
+
+	const activationResponse = await activateDraftRequest(draftRequestReportModel, context);
+
+	if (activationResponse.status !== httpResponseStatusCodes.NO_CONTENT && shouldSucceed) {
+		throw Error(`Failed to activate record: ${activationResponse.data}`);
+	}
+
+	return activationResponse;
+};
+
+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);
+
+	if (autoSelectedRequest.status != httpResponseStatusCodes.OK) {
+		throw Error('Failed to get the auto select request', autoSelectedRequest.data);
+	}
+
+	return autoSelectedRequest.data;
+};
+
+const getRequestsByTabId = (tabId, context, activityStatus = activationStatuses.ACTIVE, sortBy = null, filterByStatus = null, filterByExpiryStatus = null, filterByResponsivenessStatus = null) => {
+	return requestsAPI.getRequestsByTabId(tabId, context, activityStatus, sortBy, filterByStatus, filterByExpiryStatus, filterByResponsivenessStatus);
+};
+
+const getRequestById = (requestId, context) => {
+	return requestsAPI.getRequestById(requestId, context);
+};
+
+const getRequestsByAccountId = (accountId, context, activationStatus) => {
+	if (activationStatus) {
+		activationStatus = activationStatus.reduce((f, s) => `${f},${s}`);
+	}
+
+	const params = { activationStatus };
+
+	return requestsAPI.getRequestsByAccountId(accountId, context, params);
+};
+
+const getCreateRequestModel = (requirementId, contractor, { tabId, publicLink, requirementDateModified, isDraft, existingCoiFileName, fileName, policyOwnerRecordId } = {}) => {
+	const { recordType, email, companyName, additionalEmails } = contractor;
+	const contractorInfoModel = new ContractorInfo(recordType, email, companyName, additionalEmails, isDraft, { fileName });
+
+	return new CreateRequestModel(
+		requirementId,
+		contractor.inviterEmail,
+		contractorInfoModel,
+		{
+			tabId,
+			publicLink,
+			requirementDateModified,
+			existingCoiFileName,
+			policyOwnerRecordId
+		}
+	);
+};
+
+const getOrCreateRequest = async (context, tabId, requirementId, contractor, activationStatus, { requirementDateModified, existingCoiFileName, fileName, policyOwnerRecordId } = {}) => {
+	const { data: existingRequests } = await getRequestsByTabId(tabId, context, activationStatus);
+
+	const filteredRequests = Array.isArray(existingRequests) ? existingRequests.filter(({ record }) =>
+		record.company === contractor.companyName) : [];
+
+	if (filteredRequests.length) {
+		return filteredRequests[0];
+	}
+
+	const isDraft = activationStatus === 'Draft' ? true : false;
+
+	const createContractorModel = getCreateRequestModel(requirementId, contractor, { tabId, requirementDateModified, isDraft, existingCoiFileName, fileName, policyOwnerRecordId });
+	const createContractorResponse = await createRequest(createContractorModel, context);
+	return createContractorResponse.data;
+};
+
+const requestsGlobalSearch = (projectId, searchWord, context) => {
+	return requestsAPI.requestsGlobalSearch(projectId, searchWord, context);
+};
+
+const getTabTenantRequestsInProject = async (projectId, context) => {
+	const response = await requestsAPI.getTabTenantRequestsInProject(projectId, context);
+
+	if (response.status !== httpResponseStatusCodes.OK) {
+		throw Error(`Failed to get the tab tenants in project, status - ${response.status}`);
+	}
+
+	return response.data;
+};
+
+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 (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}`);
+	}
+
+	return response.data;
+};
+
+const getHomePageRequests = async (context, { sortBy, sortOrder, pageNumber, attentionTab, shouldExceptError } = {}) => {
+	const homepageRequestCriteriaModel = new HomepageRequestCriteriaModel({ sortBy, sortOrder, attentionTab, pageNumber });
+	return getHomePageRequestsByModel(homepageRequestCriteriaModel, context, shouldExceptError);
+};
+
+const getHomePageRequestsByModel = async (homepageRequestCriteriaModel, context, shouldExceptError) => {
+	validateType(homepageRequestCriteriaModel, HomepageRequestCriteriaModel);
+	const response = await requestsAPI.getHomePageRequests(homepageRequestCriteriaModel, context);
+
+	if (shouldExceptError) {
+		return response;
+	}
+
+	if (response.status !== httpResponseStatusCodes.OK) {
+		throw Error(`Get requests home page has fail\n${response}`);
+	}
+
+	return response.data;
+};
+
+const getHomePageRequestsCount = async context => {
+	const response = await requestsAPI.getHomePageRequestsCount(context);
+
+	if (response.status !== httpResponseStatusCodes.OK) {
+		throw Error(`Get requests count 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);
+
+	return requests;
+};
+
+const getRequestByName = async (recordName, tabId, context) => {
+	const { data: requestsInTab } = await requestsAPI.getRequestsByTabId(tabId, context);
+	const request = requestsInTab.find(requests => requests.record.company === recordName);
+
+	return request;
+};
+
+const getDraftRequestListByModel = async (draftRequestCriteriaModel, context) => {
+	validateType(draftRequestCriteriaModel, DraftRequestCriteriaModel);
+	const response = await requestsAPI.getDraftRequestList(draftRequestCriteriaModel, context);
+
+	if (response.status !== httpResponseStatusCodes.OK) {
+		throw Error(`Failed to get draft request list - ${response.status}`);
+	}
+
+	return response.data;
+};
+
+const getDraftRequestListByTabId = async (tabId, context, { draftCompletionStatusesFilter, sortBy } = {}) => {
+	const draftRequestCriteriaModel = new DraftRequestCriteriaModel(tabId, { draftCompletionStatusesFilter, sortBy });
+	return getDraftRequestListByModel(draftRequestCriteriaModel, context);
+};
+
+const getDraftFilterCountersByTabId = async (tabId, context) => {
+	const response = await requestsAPI.getDraftFilterCountersByTabId(tabId, context);
+
+	if (response.status !== httpResponseStatusCodes.OK) {
+		throw Error(`Failed to get the draft filter counters - ${response.status}`);
+	}
+
+	return response.data;
+};
+
+const getActivityStatusCounterByTabId = async (tabId, context) => {
+	const response = await requestsAPI.getActivityStatusCounterByTabId(tabId, context);
+
+	if (response.status !== httpResponseStatusCodes.OK) {
+		throw Error(`Failed to get the requests counter by activity status - ${response.status}`);
+	}
+
+	return response.data;
+};
+
+const getRequestsCountersByTabId = async (tabId, context) => {
+	const response = await requestsAPI.getRequestsCountersByTabId(tabId, context);
+
+	if (response.status !== httpResponseStatusCodes.OK) {
+		throw Error(`Failed to get requests counter - ${response.status}`);
+	}
+
+	return response.data;
+};
+
+module.exports = {
+	createRequest,
+	getAutocompleteAutoSelect,
+	addRequestToRecord,
+	inviteRequestViaPublicLink,
+	editRequestAndRecordDetails,
+	activateByRequest,
+	saveDraftRequest,
+	saveDraftByRequest,
+	activateDraftRequest,
+	getRequestsByTabId,
+	getRequestById,
+	getRequestsByAccountId,
+	getOrCreateRequest,
+	getCreateRequestModel,
+	requestsGlobalSearch,
+	getTabTenantRequestsInProject,
+	getRequestFromTabByRecordId,
+	getInnerPageRequests,
+	getHomePageRequests,
+	getHomePageRequestsCount,
+	getAllRequestsByName,
+	getRequestByName,
+	getDraftRequestListByModel,
+	getDraftRequestListByTabId,
+	getDraftFilterCountersByTabId,
+	getActivityStatusCounterByTabId,
+	getRequestsCountersByTabId
+};

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

@@ -1,21 +1,21 @@
-const services = require('./api/requests.service');
-const utils = require('./utils');
-
-const { TenantRequestModel, RequestModel, TabModel } = require('./models/edit.request.model');
-const { CreateRequestModel, ContractorInfo } = require('./models/create.request.model');
-const { RequestListCriteriaModel } = require('./models/requestListCriteriaModel');
-const { DraftRequestReportModel } = require('./models/draft.request.report.model');
-const { DraftRequestCriteriaModel } = require('./models/draft.request.criteria.model');
-
-const models = {
-	TenantRequestModel,
-	RequestModel,
-	TabModel,
-	CreateRequestModel,
-	ContractorInfo,
-	DraftRequestReportModel,
-	DraftRequestCriteriaModel,
-	RequestListCriteriaModel
-};
-
-module.exports = { services, models, utils };
+const services = require('./api/requests.service');
+const utils = require('./utils');
+
+const { TenantRequestModel, RequestModel, TabModel } = require('./models/edit.request.model');
+const { CreateRequestModel, ContractorInfo } = require('./models/create.request.model');
+const { RequestListCriteriaModel } = require('./models/requestListCriteriaModel');
+const { DraftRequestReportModel } = require('./models/draft.request.report.model');
+const { DraftRequestCriteriaModel } = require('./models/draft.request.criteria.model');
+
+const models = {
+	TenantRequestModel,
+	RequestModel,
+	TabModel,
+	CreateRequestModel,
+	ContractorInfo,
+	DraftRequestReportModel,
+	DraftRequestCriteriaModel,
+	RequestListCriteriaModel
+};
+
+module.exports = { services, models, utils };