From 1d1f2e5c28f8f533787e3c8647126dad6d6776d2 Mon Sep 17 00:00:00 2001 From: Dominic Belcher Date: Wed, 20 Nov 2024 11:48:52 +0000 Subject: [PATCH] WIP use module alias everywhere --- .../agreements/agreements.controller.js | 12 +++++----- .../agreements/agreements.controller.test.js | 22 +++++++++---------- .../agreements/agreements.service.js | 6 ++--- .../agreements/agreements.service.test.js | 6 ++--- ...e-transactions-no-autosearch.controller.js | 6 ++--- ...nsactions-no-autosearch.controller.test.js | 16 +++++++------- .../download-transactions.controller.js | 10 ++++----- .../get.controller.js | 16 +++++++------- .../get.controller.test.js | 22 +++++++++---------- .../all-service-transactions/populateModel.js | 10 ++++----- .../populateModel.test.js | 16 +++++++------- .../api-keys/get-create.controller.js | 2 +- .../api-keys/get-index.controller.it.test.js | 2 +- .../api-keys/get-index.controller.js | 4 ++-- .../get-revoked.controller.it.test.js | 2 +- .../api-keys/get-revoked.controller.js | 4 ++-- .../api-keys/post-create.controller.js | 4 ++-- .../api-keys/post-revoke.controller.js | 8 +++---- .../api-keys/post-update.controller.js | 8 +++---- .../toggle-billing-address.controller.js | 10 ++++----- .../create-service.controller.js | 10 ++++----- .../create-service/get.controller.test.js | 2 +- .../create-service/post.controller.test.js | 10 ++++----- .../select-organisation-type.controller.js | 8 +++---- .../select-organisation-type.test.js | 4 ++-- app/controllers/credentials.controller.js | 14 ++++++------ .../credentials.controller.test.js | 4 ++-- .../credentials/worldpay.controller.js | 12 +++++----- .../credentials/worldpay.controller.test.js | 8 +++---- .../dashboard-activity.controller.js | 20 ++++++++--------- .../dashboard-activity.controller.test.js | 14 ++++++------ .../get-apple-pay.controller.js | 2 +- .../get-google-pay.controller.js | 2 +- .../post-apple-pay.controller.js | 6 ++--- .../post-google-pay.controller.js | 12 +++++----- .../post-google-pay.controller.test.js | 14 ++++++------ .../edit-service-name.controller.js | 10 ++++----- .../edit-service-name/get.controller.test.js | 6 ++--- .../edit-service-name/post.controller.test.js | 8 +++---- .../email-notifications.controller.js | 14 ++++++------ .../feedback/get-index.controller.js | 2 +- .../feedback/post-index.controller.js | 6 ++--- .../forgotten-password.controller.js | 8 +++---- app/controllers/healthcheck.controller.js | 2 +- app/controllers/invite-user.controller.js | 12 +++++----- .../invite-validation.controller.js | 8 +++---- .../invite-validation.controller.test.js | 8 +++---- .../login/after-otp-login.controller.js | 4 ++-- app/controllers/login/logout.controller.js | 4 ++-- app/controllers/login/otp-login.controller.js | 4 ++-- .../login/post-login.controller.js | 4 ++-- .../login/send-again-post.controller.js | 8 +++---- ...-direct-login-after-register.controller.js | 4 ++-- .../make-a-demo-payment/edit.controller.js | 12 +++++----- .../go-to-payment.controller.js | 12 +++++----- .../go-to-transactions.controller.js | 8 +++---- .../make-a-demo-payment/index.controller.js | 2 +- .../mock-card-details.controller.js | 6 ++--- .../my-services/get-index.controller.js | 10 ++++----- .../my-services/post-index.controller.js | 6 ++--- .../organisation-details.controller.js | 6 ++--- .../payment-links/get-amount.controller.js | 2 +- .../payment-links/get-delete.controller.js | 10 ++++----- .../payment-links/get-disable.controller.js | 8 +++---- .../get-edit-amount.controller.js | 8 +++---- .../get-edit-information.controller.js | 8 +++---- .../get-edit-reference.controller.js | 8 +++---- .../payment-links/get-edit.controller.js | 8 +++---- .../get-information.controller.js | 4 ++-- .../payment-links/get-manage.controller.js | 8 +++---- .../payment-links/get-reference.controller.js | 2 +- .../payment-links/get-review.controller.js | 6 ++--- .../payment-links/get-start.controller.js | 4 ++-- .../get-start.controller.test.js | 4 ++-- .../get-update-reporting-column.controller.js | 4 ++-- .../get-web-address.controller.js | 2 +- .../payment-links/post-amount.controller.js | 8 +++---- .../post-edit-amount.controller.js | 8 +++---- .../post-edit-information.controller.js | 6 ++--- .../post-edit-reference.controller.js | 6 ++--- .../payment-links/post-edit.controller.js | 8 +++---- .../post-information.controller.js | 8 +++---- .../post-reference.controller.js | 6 ++--- .../payment-links/post-review.controller.js | 14 ++++++------ ...post-update-reporting-column.controller.js | 6 ++--- .../post-web-address.controller.js | 6 ++--- .../payment-types/get-index.controller.js | 4 ++-- .../payment-types/post-index.controller.js | 6 ++--- .../payouts/payout-list.controller.js | 8 +++---- .../payouts/payouts.service.it.test.js | 2 +- app/controllers/payouts/payouts.service.js | 4 ++-- .../payouts/payouts.service.test.js | 6 ++--- .../user-services-names.controller.test.js | 4 ++-- .../policy/aws-s3-policy-bucket.js | 2 +- app/controllers/policy/policy.controller.js | 4 ++-- app/controllers/privacy/privacy.controller.js | 2 +- .../privacy/privacy.controller.test.js | 2 +- .../registration/registration.controller.js | 20 ++++++++--------- .../registration.controller.test.js | 8 +++---- .../get.controller.js | 6 ++--- .../post.controller.js | 12 +++++----- .../agreement/get.controller.js | 8 +++---- .../agreement/post.controller.js | 14 ++++++------ .../get.controller.js | 8 +++---- .../post.controller.js | 8 +++---- .../get.controller.js | 8 +++---- .../get.controller.test.js | 6 ++--- .../go-live-stage-to-next-page-path.js | 4 ++-- .../go-live-stage-to-next-page-path.test.js | 2 +- .../index/get.controller.js | 4 ++-- .../index/post.controller.js | 2 +- .../organisation-address/get.controller.js | 10 ++++----- .../get.controller.test.js | 8 +++---- .../post.controller.test.js | 8 +++---- .../organisation-name/get.controller.js | 8 +++---- .../organisation-name/post.controller.test.js | 2 +- app/controllers/root/index.controller.js | 2 +- .../service-roles-update.controller.js | 12 +++++----- .../service-switch.controller.it.test.js | 6 ++--- app/controllers/service-users.controller.js | 16 +++++++------- ...ault-billing-address-country.controller.js | 8 +++---- ...billing-address-country.controller.test.js | 8 +++---- .../settings/get.settings.controller.js | 4 ++-- .../email-notifications.controller.js | 10 ++++----- .../email-notifications.controller.test.js | 8 +++---- .../payment-confirmation-emails.controller.js | 10 ++++----- ...ent-confirmation-emails.controller.test.js | 8 +++---- .../refund-emails/refund-emails.controller.js | 10 ++++----- .../refund-emails.controller.test.js | 8 +++---- .../custom-paragraph.controller.test.js | 4 ++-- .../templates/templates.controller.js | 6 ++--- .../templates/templates.controller.test.js | 6 ++--- app/controllers/static.controller.js | 2 +- .../add-psp-account-details/get.controller.js | 8 +++---- .../get.controller.test.js | 2 +- .../bank-details/bank-details-validations.js | 2 +- .../bank-details/get.controller.js | 4 ++-- .../bank-details/post.controller.js | 16 +++++++------- .../bank-details/post.controller.test.js | 6 ++--- .../check-org-details/get.controller.js | 4 ++-- .../check-org-details/get.controller.test.js | 10 ++++----- .../check-org-details/post.controller.js | 12 +++++----- .../check-org-details/post.controller.test.js | 14 ++++++------ .../company-number-validations.js | 2 +- .../company-number/get.controller.js | 4 ++-- .../company-number/post.controller.js | 14 ++++++------ .../company-number/post.controller.test.js | 6 ++--- .../stripe-setup/director/get.controller.js | 4 ++-- .../stripe-setup/director/post.controller.js | 18 +++++++-------- .../director/post.controller.test.js | 12 +++++----- .../get.controller.js | 4 ++-- .../post.controller.js | 14 ++++++------ .../post.controller.test.js | 6 ++--- .../responsible-person/get.controller.js | 4 ++-- .../responsible-person/post.controller.js | 20 ++++++++--------- .../post.controller.test.js | 12 +++++----- ...ipe-setup-dashboard-redirect.controller.js | 6 ++--- ...etup-dashboard-redirect.controller.test.js | 8 +++---- .../stripe-setup/stripe-setup.util.js | 10 ++++----- .../stripe-setup/stripe-setup.util.test.js | 6 ++--- .../stripe-setup/vat-number/get.controller.js | 4 ++-- .../vat-number/post.controller.js | 14 ++++++------ .../vat-number/post.controller.test.js | 6 ++--- .../vat-number/vat-number-validations.js | 2 +- .../vat-number/vat-number-validations.test.js | 2 +- .../stripeTermsAndConditions.controller.js | 2 +- .../subscribe-service.controller.js | 12 +++++----- .../subscribe-service.controller.test.js | 12 +++++----- .../organisation-url/get.controller.js | 4 ++-- .../switch-psp/switch-psp.controller.js | 12 +++++----- .../switch-psp/switch-psp.controller.test.js | 8 +++---- .../switch-psp/switch-tasks.service.js | 2 +- .../switch-psp/switch-tasks.service.test.js | 4 ++-- .../verify-psp-integration.controller.js | 16 +++++++------- .../verify-psp-integration.controller.test.js | 10 ++++----- .../test-with-your-users/create.controller.js | 2 +- .../disable.controller.js | 8 +++---- .../test-with-your-users/index.controller.js | 2 +- .../test-with-your-users/links.controller.js | 6 ++--- .../test-with-your-users/submit.controller.js | 18 +++++++-------- ...toggleMotoMaskCardNumber.get.controller.js | 2 +- ...oggleMotoMaskCardNumber.post.controller.js | 6 ++--- .../maskSecurityCode.get.controller.js | 2 +- .../maskSecurityCode.post.controller.js | 6 ++--- .../transaction-detail-redirect.controller.js | 10 ++++----- .../transaction-detail.controller.js | 6 ++--- .../transaction-details.controller.it.test.js | 4 ++-- .../transaction-download.controller.js | 8 +++---- .../transaction-list.controller.it.test.js | 22 +++++++++---------- .../transaction-list.controller.js | 14 ++++++------ .../transaction-list.controller.test.js | 18 +++++++-------- .../transaction-refund.controller.it.test.js | 2 +- .../transaction-refund.controller.js | 6 ++--- .../user/degateway/get.controller.js | 10 ++++----- .../user/degateway/post.controller.js | 8 +++---- .../user/phone-number/get.controller.js | 4 ++-- .../user/phone-number/post.controller.js | 10 ++++----- .../get-configure.controller.js | 8 +++---- .../two-factor-auth/get-index.controller.js | 4 ++-- .../get-phone-number.controller.js | 2 +- .../two-factor-auth/get-resend.controller.js | 2 +- .../post-configure.controller.js | 12 +++++----- .../post-configure.controller.test.js | 10 ++++----- .../two-factor-auth/post-index.controller.js | 6 ++--- .../post-index.controller.test.js | 8 +++---- .../post-phone-number.controller.js | 10 ++++----- .../post-phone-number.controller.test.js | 10 ++++----- .../two-factor-auth/post-resend.controller.js | 10 ++++----- .../post-resend.controller.test.js | 10 ++++----- .../webhooks/webhooks-forms.test.js | 2 +- .../webhooks/webhooks.controller.js | 8 +++---- app/controllers/webhooks/webhooks.service.js | 4 ++-- .../webhooks/webhooks.service.test.js | 4 ++-- .../your-psp/get-flex.controller.js | 6 ++--- .../your-psp/get-flex.controller.test.js | 2 +- app/controllers/your-psp/get.controller.js | 4 ++-- .../your-psp/get.controller.test.js | 2 +- .../your-psp/post-flex.controller.js | 14 ++++++------ .../your-psp/post-flex.controller.test.js | 6 ++--- .../your-psp/worldpay-3ds-flex-validations.js | 2 +- .../your-psp/your-psp-tasks.service.test.js | 4 ++-- app/middleware/error-handler.js | 6 ++--- app/middleware/error-handler.test.js | 12 +++++----- ...-service-and-gateway-account.middleware.js | 8 +++---- ...ice-and-gateway-account.middleware.test.js | 10 ++++----- app/middleware/invite-cookie-is-present.js | 6 ++--- app/middleware/logging-middleware.js | 2 +- app/middleware/permission.test.js | 8 +++---- .../restrict-to-switching-account.test.js | 2 +- ...lified-account-strategy.middleware.test.js | 6 ++--- .../restrict-to-stripe-account-context.js | 2 +- app/middleware/user-is-authorised.test.js | 8 +++---- app/models/DisputeTransaction.class.js | 6 ++--- app/models/DisputeTransaction.class.test.js | 2 +- app/models/TransactionEvent.class.js | 6 ++--- app/models/User.class.js | 4 ++-- app/models/User.class.test.js | 2 +- app/services/auth.service.js | 12 +++++----- app/services/auth.service.test.js | 8 +++---- app/services/clients/adminusers.client.js | 4 ++-- app/services/clients/base/config.js | 2 +- app/services/clients/base/config.test.js | 2 +- app/services/clients/base/request-logger.js | 2 +- app/services/clients/connector.client.js | 6 ++--- app/services/clients/ledger.client.js | 2 +- app/services/clients/ledger.client.test.js | 2 +- app/services/clients/products.client.js | 6 ++--- app/services/clients/stream.client.js | 2 +- app/services/email.service.js | 2 +- app/services/service.create-service.test.js | 2 +- app/services/service.service.js | 10 ++++----- app/services/service.service.test.js | 8 +++---- app/services/session-validator.test.js | 2 +- app/services/stripe-details.service.js | 2 +- app/services/transaction.service.js | 10 ++++----- app/utils/credentials.test.js | 2 +- app/utils/dates.test.js | 2 +- app/utils/filters.js | 4 ++-- app/utils/logger.js | 2 +- app/utils/nav-builder.test.js | 2 +- app/utils/payment-links.js | 2 +- app/utils/permissions.js | 2 +- app/utils/permissions.test.js | 18 +++++++-------- .../format/arrange-users-by-role.js | 2 +- .../format/arrange-users-by-role.test.js | 4 ++-- .../settings/service-settings.js | 2 +- app/utils/transaction-view.js | 8 +++---- app/utils/transaction-view.test.js | 2 +- app/utils/verify-psp-integration.test.js | 2 +- 269 files changed, 936 insertions(+), 936 deletions(-) diff --git a/app/controllers/agreements/agreements.controller.js b/app/controllers/agreements/agreements.controller.js index 54bc03ab4e..2fbb85798d 100644 --- a/app/controllers/agreements/agreements.controller.js +++ b/app/controllers/agreements/agreements.controller.js @@ -1,13 +1,13 @@ const url = require('url') const agreementsService = require('./agreements.service') -const transactionService = require('../../services/transaction.service') -const { buildPaymentList } = require('../../utils/transaction-view') -const formatFutureStrategyAccountPathsFor = require('../../utils/format-future-strategy-account-paths-for') -const paths = require('../../paths') +const transactionService = require('@services/transaction.service') +const { buildPaymentList } = require('@utils/transaction-view') +const formatFutureStrategyAccountPathsFor = require('@utils/format-future-strategy-account-paths-for') +const paths = require('@root/paths') -const { response } = require('../../utils/response') -const { NotFoundError } = require('../../errors') +const { response } = require('@utils/response') +const { NotFoundError } = require('@root/errors') const { RESTClientError } = require('@govuk-pay/pay-js-commons/lib/utils/axios-base-client/errors') const LIMIT_NUMBER_OF_TRANSACTIONS_TO_SHOW = 5 diff --git a/app/controllers/agreements/agreements.controller.test.js b/app/controllers/agreements/agreements.controller.test.js index 7fa0b195ed..fce096bf1e 100644 --- a/app/controllers/agreements/agreements.controller.test.js +++ b/app/controllers/agreements/agreements.controller.test.js @@ -4,16 +4,16 @@ const sinon = require('sinon') const proxyquire = require('proxyquire') const { expect } = require('chai') -const serviceFixtures = require('../../../test/fixtures/service.fixtures') -const gatewayAccountFixtures = require('../../../test/fixtures/gateway-account.fixtures') -const agreementFixtures = require('../../../test/fixtures/agreement.fixtures') -const transactionFixtures = require('../../../test/fixtures/ledger-transaction.fixtures') -const Service = require('../../models/Service.class') -const { NotFoundError } = require('../../errors') +const serviceFixtures = require('@test/fixtures/service.fixtures') +const gatewayAccountFixtures = require('@test/fixtures/gateway-account.fixtures') +const agreementFixtures = require('@test/fixtures/agreement.fixtures') +const transactionFixtures = require('@test/fixtures/ledger-transaction.fixtures') +const Service = require('@models/Service.class') +const { NotFoundError } = require('@root/errors') const { RESTClientError } = require('@govuk-pay/pay-js-commons/lib/utils/axios-base-client/errors') -const { buildPaymentList } = require('../../utils/transaction-view') -const User = require('../../models/User.class') -const userFixtures = require('../../../test/fixtures/user.fixtures') +const { buildPaymentList } = require('@utils/transaction-view') +const User = require('@models/User.class') +const userFixtures = require('@test/fixtures/user.fixtures') const agreementsServiceSpy = { agreements: sinon.spy(() => Promise.resolve(agreements)), @@ -259,7 +259,7 @@ function getControllerWithMocks ( transactionsServiceSpy) { return proxyquire('./agreements.controller', { './agreements.service': agreementsServiceSpy, - '../../utils/response': responseSpy, - '../../services/transaction.service': transactionsServiceSpy + '@utils/response': responseSpy, + '@services/transaction.service': transactionsServiceSpy }) } diff --git a/app/controllers/agreements/agreements.service.js b/app/controllers/agreements/agreements.service.js index ef4ee584fd..63537f68c0 100644 --- a/app/controllers/agreements/agreements.service.js +++ b/app/controllers/agreements/agreements.service.js @@ -1,6 +1,6 @@ -const Ledger = require('../../services/clients/ledger.client') -const { ConnectorClient } = require('../../services/clients/connector.client') -const Paginator = require('../../utils/paginator') +const Ledger = require('@services/clients/ledger.client') +const { ConnectorClient } = require('@services/clients/connector.client') +const Paginator = require('@utils/paginator') const { CONNECTOR_URL } = process.env const connectorClient = new ConnectorClient(CONNECTOR_URL) diff --git a/app/controllers/agreements/agreements.service.test.js b/app/controllers/agreements/agreements.service.test.js index 684a8e959d..faa106dc7a 100644 --- a/app/controllers/agreements/agreements.service.test.js +++ b/app/controllers/agreements/agreements.service.test.js @@ -3,7 +3,7 @@ const sinon = require('sinon') const proxyquire = require('proxyquire') -const agreementsFixture = require('../../../test/fixtures/agreement.fixtures') +const agreementsFixture = require('@test/fixtures/agreement.fixtures') describe('agreements service', () => { describe('list agreements', () => { @@ -90,7 +90,7 @@ describe('agreements service', () => { function getAgreementsService (ledgerClientStub = {}, connectorClientStub = {}) { return proxyquire('./agreements.service.js', { - './../../services/clients/ledger.client': ledgerClientStub, - './../../services/clients/connector.client': connectorClientStub + '@services/clients/ledger.client': ledgerClientStub, + '@services/clients/connector.client': connectorClientStub }) } diff --git a/app/controllers/all-service-transactions/all-service-transactions-no-autosearch.controller.js b/app/controllers/all-service-transactions/all-service-transactions-no-autosearch.controller.js index 46ab687c2d..40dcb7af46 100644 --- a/app/controllers/all-service-transactions/all-service-transactions-no-autosearch.controller.js +++ b/app/controllers/all-service-transactions/all-service-transactions-no-autosearch.controller.js @@ -1,9 +1,9 @@ 'use strict' -const { response } = require('../../utils/response') +const { response } = require('@utils/response') const { populateModel } = require('./populateModel') -const { getFilters } = require('../../utils/filters') -const permissions = require('../../utils/permissions') +const { getFilters } = require('@utils/filters') +const permissions = require('@utils/permissions') module.exports = async function getTransactionsForAllServicesNoSearch (req, res, next) { const filters = getFilters(req) diff --git a/app/controllers/all-service-transactions/all-service-transactions-no-autosearch.controller.test.js b/app/controllers/all-service-transactions/all-service-transactions-no-autosearch.controller.test.js index d6b6c6fab3..38f23c7512 100644 --- a/app/controllers/all-service-transactions/all-service-transactions-no-autosearch.controller.test.js +++ b/app/controllers/all-service-transactions/all-service-transactions-no-autosearch.controller.test.js @@ -1,10 +1,10 @@ const sinon = require('sinon') const proxyquire = require('proxyquire') -const User = require('../../models/User.class') -const userFixtures = require('../../../test/fixtures/user.fixtures') -const gatewayAccountFixture = require('../../../test/fixtures/gateway-account.fixtures') -const Service = require('../../models/Service.class') -const serviceFixtures = require('../../../test/fixtures/service.fixtures') +const User = require('@models/User.class') +const userFixtures = require('@test/fixtures/user.fixtures') +const gatewayAccountFixture = require('@test/fixtures/gateway-account.fixtures') +const Service = require('@models/Service.class') +const serviceFixtures = require('@test/fixtures/service.fixtures') describe('All service transactions no autosearch - GET', () => { let req, res, next @@ -60,16 +60,16 @@ describe('All service transactions no autosearch - GET', () => { function getController () { return proxyquire('./all-service-transactions-no-autosearch.controller', { - '../../utils/permissions': { + '@utils/permissions': { getGatewayAccountsFor: sinon.spy(() => Promise.resolve(userPermittedAccountsSummary)) }, './populateModel': { populateModel: modelMock }, - '../../utils/response': { + '@utils/response': { response: responseMock }, - '../../utils/filters.js': { + '@utils/filters': { getFilters: filterMock } }) diff --git a/app/controllers/all-service-transactions/download-transactions.controller.js b/app/controllers/all-service-transactions/download-transactions.controller.js index 6d8d71b0ca..55c981eca5 100644 --- a/app/controllers/all-service-transactions/download-transactions.controller.js +++ b/app/controllers/all-service-transactions/download-transactions.controller.js @@ -1,10 +1,10 @@ 'use strict' -const date = require('../../utils/dates') -const transactionService = require('../../services/transaction.service') -const Stream = require('../../services/clients/stream.client') -const permissions = require('../../utils/permissions') -const { NoServicesWithPermissionError } = require('../../errors') +const date = require('@utils/dates') +const transactionService = require('@services/transaction.service') +const Stream = require('@services/clients/stream.client') +const permissions = require('@utils/permissions') +const { NoServicesWithPermissionError } = require('@root/errors') module.exports = async function dowmloadTransactions (req, res, next) { const filters = req.query diff --git a/app/controllers/all-service-transactions/get.controller.js b/app/controllers/all-service-transactions/get.controller.js index 98fc1cde9e..62849b39e6 100644 --- a/app/controllers/all-service-transactions/get.controller.js +++ b/app/controllers/all-service-transactions/get.controller.js @@ -2,14 +2,14 @@ const url = require('url') -const { response } = require('../../utils/response') -const transactionService = require('../../services/transaction.service') -const permissions = require('../../utils/permissions') -const { getFilters } = require('../../utils/filters.js') -const paths = require('../../paths') - -const logger = require('../../utils/logger')(__filename) -const { NoServicesWithPermissionError } = require('../../errors') +const { response } = require('@utils/response') +const transactionService = require('@services/transaction.service') +const permissions = require('@utils/permissions') +const { getFilters } = require('@utils/filters.js') +const paths = require('@root/paths') + +const logger = require('@utils/logger')(__filename) +const { NoServicesWithPermissionError } = require('@root/errors') const { populateModel } = require('./populateModel.js') module.exports = async function getTransactionsForAllServices (req, res, next) { diff --git a/app/controllers/all-service-transactions/get.controller.test.js b/app/controllers/all-service-transactions/get.controller.test.js index 629b601201..1b8916544f 100644 --- a/app/controllers/all-service-transactions/get.controller.test.js +++ b/app/controllers/all-service-transactions/get.controller.test.js @@ -1,11 +1,11 @@ const sinon = require('sinon') const proxyquire = require('proxyquire') -const User = require('../../models/User.class') -const userFixtures = require('../../../test/fixtures/user.fixtures') -const gatewayAccountFixture = require('../../../test/fixtures/gateway-account.fixtures') -const Service = require('../../models/Service.class') -const serviceFixtures = require('../../../test/fixtures/service.fixtures') -const ledgerTransactionFixture = require('../../../test/fixtures/ledger-transaction.fixtures') +const User = require('@models/User.class') +const userFixtures = require('@test/fixtures/user.fixtures') +const gatewayAccountFixture = require('@test/fixtures/gateway-account.fixtures') +const Service = require('@models/Service.class') +const serviceFixtures = require('@test/fixtures/service.fixtures') +const ledgerTransactionFixture = require('@test/fixtures/ledger-transaction.fixtures') describe('All service transactions - GET', () => { let req, res, next @@ -62,23 +62,23 @@ describe('All service transactions - GET', () => { function getController () { return proxyquire('./get.controller', { - '../../utils/permissions': { + '@utils/permissions': { getGatewayAccountsFor: sinon.spy(() => Promise.resolve(userPermittedAccountsSummary)) }, - '../../services/transaction.service': { + '@services/transaction.service': { search: sinon.spy(() => Promise.resolve(transactionSearchResponse)) }, './populateModel': { populateModel: modelMock }, - '../../utils/response': { + '@utils/response': { response: responseMock }, - '../../paths': { + '@root/paths': { allServiceTransactions: { download: 'download-path' }, formattedPathFor: () => 'formatted-path' }, - '../../utils/filters.js': { + '@utils/filters.js': { getFilters: filterMock } }) diff --git a/app/controllers/all-service-transactions/populateModel.js b/app/controllers/all-service-transactions/populateModel.js index f510917f9b..d369cdd343 100644 --- a/app/controllers/all-service-transactions/populateModel.js +++ b/app/controllers/all-service-transactions/populateModel.js @@ -1,9 +1,9 @@ -const { buildPaymentList } = require('../../utils/transaction-view') -const paths = require('../../paths') -const { describeFilters } = require('../../utils/filters') -const states = require('../../utils/states') +const { buildPaymentList } = require('@utils/transaction-view') +const paths = require('@root/paths') +const { describeFilters } = require('@utils/filters') +const states = require('@utils/states') const _ = require('lodash') -const { ConnectorClient } = require('../../services/clients/connector.client') +const { ConnectorClient } = require('@services/clients/connector.client') const client = new ConnectorClient(process.env.CONNECTOR_URL) async function populateModel (req, searchResultOutput, filters, downloadRoute, filterLiveAccounts, userPermittedAccountsSummary) { diff --git a/app/controllers/all-service-transactions/populateModel.test.js b/app/controllers/all-service-transactions/populateModel.test.js index c35e1771e4..d57fac804e 100644 --- a/app/controllers/all-service-transactions/populateModel.test.js +++ b/app/controllers/all-service-transactions/populateModel.test.js @@ -1,11 +1,11 @@ const sinon = require('sinon') const proxyquire = require('proxyquire') -const User = require('../../models/User.class') -const userFixtures = require('../../../test/fixtures/user.fixtures') -const gatewayAccountFixture = require('../../../test/fixtures/gateway-account.fixtures') -const Service = require('../../models/Service.class') -const serviceFixtures = require('../../../test/fixtures/service.fixtures') -const { getFilters } = require('../../utils/filters.js') +const User = require('@models/User.class') +const userFixtures = require('@test/fixtures/user.fixtures') +const gatewayAccountFixture = require('@test/fixtures/gateway-account.fixtures') +const Service = require('@models/Service.class') +const serviceFixtures = require('@test/fixtures/service.fixtures') +const { getFilters } = require('@utils/filters.js') const { expect } = require('chai') describe('Populate Model', () => { @@ -98,10 +98,10 @@ describe('Populate Model', () => { function populateModel () { return proxyquire('./populateModel', { - '../../services/clients/connector.client.js': { + '@services/clients/connector.client': { ConnectorClient: class {async getAllCardTypes () { return {} }} }, - '../../utils/states': { + '@utils/states': { allDisplayStateSelectorObjects: allDisplayStateSelectorObjectsMock } }).populateModel diff --git a/app/controllers/api-keys/get-create.controller.js b/app/controllers/api-keys/get-create.controller.js index 4d26c49bac..d9cc634ffb 100644 --- a/app/controllers/api-keys/get-create.controller.js +++ b/app/controllers/api-keys/get-create.controller.js @@ -1,6 +1,6 @@ 'use strict' -const { response } = require('../../utils/response.js') +const { response } = require('@utils/response.js') module.exports = function showCreateApiKey (req, res) { const accountId = req.account.gateway_account_id diff --git a/app/controllers/api-keys/get-index.controller.it.test.js b/app/controllers/api-keys/get-index.controller.it.test.js index 96701b9ddc..c30a4c13a8 100644 --- a/app/controllers/api-keys/get-index.controller.it.test.js +++ b/app/controllers/api-keys/get-index.controller.it.test.js @@ -3,7 +3,7 @@ const nock = require('nock') const sinon = require('sinon') -const gatewayAccountFixtures = require('../../../test/fixtures/gateway-account.fixtures') +const gatewayAccountFixtures = require('@test/fixtures/gateway-account.fixtures') const controller = require('./get-index.controller') const { PUBLIC_AUTH_URL } = process.env diff --git a/app/controllers/api-keys/get-index.controller.js b/app/controllers/api-keys/get-index.controller.js index 0e8d9e16ad..60768782f0 100644 --- a/app/controllers/api-keys/get-index.controller.js +++ b/app/controllers/api-keys/get-index.controller.js @@ -1,7 +1,7 @@ 'use strict' -const { response } = require('../../utils/response.js') -const publicAuthClient = require('../../services/clients/public-auth.client') +const { response } = require('@utils/response.js') +const publicAuthClient = require('@services/clients/public-auth.client') module.exports = async function listActiveApiKeys (req, res, next) { const accountId = req.account.gateway_account_id diff --git a/app/controllers/api-keys/get-revoked.controller.it.test.js b/app/controllers/api-keys/get-revoked.controller.it.test.js index 0c73f13e46..d777a4c6b1 100644 --- a/app/controllers/api-keys/get-revoked.controller.it.test.js +++ b/app/controllers/api-keys/get-revoked.controller.it.test.js @@ -3,7 +3,7 @@ const nock = require('nock') const sinon = require('sinon') -const gatewayAccountFixtures = require('../../../test/fixtures/gateway-account.fixtures') +const gatewayAccountFixtures = require('@test/fixtures/gateway-account.fixtures') const controller = require('./get-revoked.controller') const { PUBLIC_AUTH_URL } = process.env diff --git a/app/controllers/api-keys/get-revoked.controller.js b/app/controllers/api-keys/get-revoked.controller.js index 6f5804d794..651614c862 100644 --- a/app/controllers/api-keys/get-revoked.controller.js +++ b/app/controllers/api-keys/get-revoked.controller.js @@ -1,7 +1,7 @@ 'use strict' -const { response } = require('../../utils/response.js') -const publicAuthClient = require('../../services/clients/public-auth.client') +const { response } = require('@utils/response.js') +const publicAuthClient = require('@services/clients/public-auth.client') module.exports = async function listRevokedApiKeys (req, res, next) { const accountId = req.account.gateway_account_id diff --git a/app/controllers/api-keys/post-create.controller.js b/app/controllers/api-keys/post-create.controller.js index 2abedea289..c3ab15383b 100644 --- a/app/controllers/api-keys/post-create.controller.js +++ b/app/controllers/api-keys/post-create.controller.js @@ -1,7 +1,7 @@ 'use strict' -const { response } = require('../../utils/response.js') -const publicAuthClient = require('../../services/clients/public-auth.client') +const { response } = require('@utils/response.js') +const publicAuthClient = require('@services/clients/public-auth.client') module.exports = async function createApiKey (req, res, next) { const accountId = req.account.gateway_account_id diff --git a/app/controllers/api-keys/post-revoke.controller.js b/app/controllers/api-keys/post-revoke.controller.js index 0042aacc12..4b7e6c6392 100644 --- a/app/controllers/api-keys/post-revoke.controller.js +++ b/app/controllers/api-keys/post-revoke.controller.js @@ -1,9 +1,9 @@ 'use strict' -const paths = require('../../paths') -const publicAuthClient = require('../../services/clients/public-auth.client') -const logger = require('../../utils/logger')(__filename) -const formatAccountPathsFor = require('../../utils/format-account-paths-for') +const paths = require('@root/paths') +const publicAuthClient = require('@services/clients/public-auth.client') +const logger = require('@utils/logger')(__filename) +const formatAccountPathsFor = require('@utils/format-account-paths-for') module.exports = async function revokeApiKey (req, res) { const apiKeysPath = formatAccountPathsFor(paths.account.apiKeys.index, req.account.external_id) diff --git a/app/controllers/api-keys/post-update.controller.js b/app/controllers/api-keys/post-update.controller.js index 160d281fbb..f127c8e41c 100644 --- a/app/controllers/api-keys/post-update.controller.js +++ b/app/controllers/api-keys/post-update.controller.js @@ -1,9 +1,9 @@ 'use strict' -const paths = require('../../paths') -const publicAuthClient = require('../../services/clients/public-auth.client') -const logger = require('../../utils/logger')(__filename) -const formatAccountPathsFor = require('../../utils/format-account-paths-for') +const paths = require('@root/paths') +const publicAuthClient = require('@services/clients/public-auth.client') +const logger = require('@utils/logger')(__filename) +const formatAccountPathsFor = require('@utils/format-account-paths-for') module.exports = async function updateApiKey (req, res) { const apiKeysPath = formatAccountPathsFor(paths.account.apiKeys.index, req.account.external_id) diff --git a/app/controllers/billing-address/toggle-billing-address.controller.js b/app/controllers/billing-address/toggle-billing-address.controller.js index f97534648b..4c34da7df2 100644 --- a/app/controllers/billing-address/toggle-billing-address.controller.js +++ b/app/controllers/billing-address/toggle-billing-address.controller.js @@ -2,11 +2,11 @@ const lodash = require('lodash') -const logger = require('../../utils/logger')(__filename) -const { response } = require('../../utils/response') -const paths = require('../../paths') -const formatAccountPathsFor = require('../../utils/format-account-paths-for') -const serviceService = require('../../services/service.service') +const logger = require('@utils/logger')(__filename) +const { response } = require('@utils/response') +const paths = require('@root/paths') +const formatAccountPathsFor = require('@utils/format-account-paths-for') +const serviceService = require('@services/service.service') function getIndex (req, res) { const model = { diff --git a/app/controllers/create-service/create-service.controller.js b/app/controllers/create-service/create-service.controller.js index 06fa24af5f..dfae27a4d6 100644 --- a/app/controllers/create-service/create-service.controller.js +++ b/app/controllers/create-service/create-service.controller.js @@ -2,11 +2,11 @@ const _ = require('lodash') -const { response } = require('../../utils/response') -const paths = require('../../paths') -const serviceService = require('../../services/service.service') -const userService = require('../../services/user.service') -const formatAccountPathsFor = require('../../utils/format-account-paths-for') +const { response } = require('@utils/response') +const paths = require('@root/paths') +const serviceService = require('@services/service.service') +const userService = require('@services/user.service') +const formatAccountPathsFor = require('@utils/format-account-paths-for') function get (req, res) { const createServiceState = _.get(req, 'session.pageData.createService', {}) diff --git a/app/controllers/create-service/get.controller.test.js b/app/controllers/create-service/get.controller.test.js index 0dda19e2f9..c6ad6f43f9 100644 --- a/app/controllers/create-service/get.controller.test.js +++ b/app/controllers/create-service/get.controller.test.js @@ -8,7 +8,7 @@ let req, res const getController = function (mockResponses) { return proxyquire('./create-service.controller', { - '../../utils/response': mockResponses + '@utils/response': mockResponses }) } diff --git a/app/controllers/create-service/post.controller.test.js b/app/controllers/create-service/post.controller.test.js index 593110280d..b7871c25c7 100644 --- a/app/controllers/create-service/post.controller.test.js +++ b/app/controllers/create-service/post.controller.test.js @@ -3,8 +3,8 @@ const proxyquire = require('proxyquire') const sinon = require('sinon') const { expect } = require('chai') -const formatAccountPathsFor = require('../../utils/format-account-paths-for') -const paths = require('../../paths') +const formatAccountPathsFor = require('@utils/format-account-paths-for') +const paths = require('@root/paths') const mockResponses = {} const mockServiceService = {} const mockUserService = {} @@ -16,9 +16,9 @@ let req, res, next const getController = function (mockResponses, mockServiceService, mockUserService) { return proxyquire('./create-service.controller', { - '../../utils/response': mockResponses, - '../../services/service.service': mockServiceService, - '../../services/user.service': mockUserService + '@utils/response': mockResponses, + '@services/service.service': mockServiceService, + '@services/user.service': mockUserService }) } diff --git a/app/controllers/create-service/select-organisation-type/select-organisation-type.controller.js b/app/controllers/create-service/select-organisation-type/select-organisation-type.controller.js index 7545cb5e33..4d74b36039 100644 --- a/app/controllers/create-service/select-organisation-type/select-organisation-type.controller.js +++ b/app/controllers/create-service/select-organisation-type/select-organisation-type.controller.js @@ -1,12 +1,12 @@ const _ = require('lodash') -const paths = require('../../../paths') -const { response } = require('../../../utils/response') +const paths = require('@root/paths') +const { response } = require('@utils/response') const { validateMandatoryField, SERVICE_NAME_MAX_LENGTH, validateOptionalField -} = require('../../../utils/validation/server-side-form-validations') -const logger = require('../../../utils/logger')(__filename) +} = require('@utils/validation/server-side-form-validations') +const logger = require('@utils/logger')(__filename) function get (req, res) { const createServiceState = _.get(req, 'session.pageData.createService', {}) diff --git a/app/controllers/create-service/select-organisation-type/select-organisation-type.test.js b/app/controllers/create-service/select-organisation-type/select-organisation-type.test.js index bb0170b865..ddb8ca16be 100644 --- a/app/controllers/create-service/select-organisation-type/select-organisation-type.test.js +++ b/app/controllers/create-service/select-organisation-type/select-organisation-type.test.js @@ -3,12 +3,12 @@ const proxyquire = require('proxyquire') const sinon = require('sinon') const { expect } = require('chai') -const paths = require('../../../paths') +const paths = require('@root/paths') const mockResponse = {} const controller = function (mockResponses) { return proxyquire('./select-organisation-type.controller', { - '../../../utils/response': mockResponses + '@utils/response': mockResponses }) } diff --git a/app/controllers/credentials.controller.js b/app/controllers/credentials.controller.js index fefff9690a..562a194e17 100644 --- a/app/controllers/credentials.controller.js +++ b/app/controllers/credentials.controller.js @@ -1,12 +1,12 @@ const _ = require('lodash') -const paths = require('../paths') -const formatAccountPathsFor = require('../utils/format-account-paths-for') -const { response } = require('../utils/response') -const { getCredentialByExternalId } = require('../utils/credentials') -const { ConnectorClient } = require('../services/clients/connector.client') +const paths = require('@root/paths') +const formatAccountPathsFor = require('@utils/format-account-paths-for') +const { response } = require('@utils/response') +const { getCredentialByExternalId } = require('@utils/credentials') +const { ConnectorClient } = require('@services/clients/connector.client') const { CONNECTOR_URL } = process.env -const { isPasswordLessThanTenChars } = require('../utils/validation/field-validation-checks') -const { NotFoundError } = require('../errors') +const { isPasswordLessThanTenChars } = require('@utils/validation/field-validation-checks') +const { NotFoundError } = require('@root/errors') const connectorClient = new ConnectorClient(CONNECTOR_URL) diff --git a/app/controllers/credentials.controller.test.js b/app/controllers/credentials.controller.test.js index d0b3f5a735..a192a62fc3 100644 --- a/app/controllers/credentials.controller.test.js +++ b/app/controllers/credentials.controller.test.js @@ -1,6 +1,6 @@ const proxyquire = require('proxyquire') const sinon = require('sinon') -const gatewayAccountFixture = require('../../test/fixtures/gateway-account.fixtures') +const gatewayAccountFixture = require('@test/fixtures/gateway-account.fixtures') const patchAccountSpy = sinon.spy(() => Promise.resolve()) const postNotificationCredentialsSpy = sinon.spy(() => Promise.resolve()) const connectorClientMock = { @@ -9,7 +9,7 @@ const connectorClientMock = { this.postAccountNotificationCredentials = postNotificationCredentialsSpy } } -const credentialsController = proxyquire('./credentials.controller', { '../services/clients/connector.client': connectorClientMock }) +const credentialsController = proxyquire('./credentials.controller', { '@services/clients/connector.client': connectorClientMock }) // @TODO(sfount) there should be a common pattern of helpers for quickly unit // testing controllers with values that work out of the box diff --git a/app/controllers/credentials/worldpay.controller.js b/app/controllers/credentials/worldpay.controller.js index abde48b879..ab434c7cd5 100644 --- a/app/controllers/credentials/worldpay.controller.js +++ b/app/controllers/credentials/worldpay.controller.js @@ -1,9 +1,9 @@ -const paths = require('../../paths') -const logger = require('../../utils/logger')(__filename) -const { response } = require('../../utils/response') -const formatAccountPathsFor = require('../../utils/format-account-paths-for') -const { isSwitchingCredentialsRoute, getCredentialByExternalId, worldpayMerchantDetailOperations, getWorldpayMerchantDetailOperationByKey } = require('../../utils/credentials') -const { ConnectorClient } = require('../../services/clients/connector.client') +const paths = require('@root/paths') +const logger = require('@utils/logger')(__filename) +const { response } = require('@utils/response') +const formatAccountPathsFor = require('@utils/format-account-paths-for') +const { isSwitchingCredentialsRoute, getCredentialByExternalId, worldpayMerchantDetailOperations, getWorldpayMerchantDetailOperationByKey } = require('@utils/credentials') +const { ConnectorClient } = require('@services/clients/connector.client') const { CredentialsForm, isNotEmpty, formatErrorsForSummaryList } = require('./credentials-form') const { CONNECTOR_URL, SKIP_PSP_CREDENTIAL_CHECKS } = process.env diff --git a/app/controllers/credentials/worldpay.controller.test.js b/app/controllers/credentials/worldpay.controller.test.js index cd598e02d6..d452288500 100644 --- a/app/controllers/credentials/worldpay.controller.test.js +++ b/app/controllers/credentials/worldpay.controller.test.js @@ -1,9 +1,9 @@ const proxyquire = require('proxyquire') const sinon = require('sinon') -const gatewayAccountFixtures = require('../../../test/fixtures/gateway-account.fixtures') -const userFixtures = require('../../../test/fixtures/user.fixtures') -const User = require('../../models/User.class') +const gatewayAccountFixtures = require('@test/fixtures/gateway-account.fixtures') +const userFixtures = require('@test/fixtures/user.fixtures') +const User = require('@models/User.class') const checkCredentialsMock = sinon.spy(() => Promise.resolve({ result: 'valid' })) const updateCredentialsMock = sinon.spy(() => Promise.resolve()) @@ -67,7 +67,7 @@ describe('Worldpay credentials controller', () => { function getControllerWithMocks () { return proxyquire('./worldpay.controller', { - '../../services/clients/connector.client': { + '@services/clients/connector.client': { ConnectorClient: function () { this.postCheckWorldpayCredentials = checkCredentialsMock this.patchAccountGatewayAccountCredentials = updateCredentialsMock diff --git a/app/controllers/dashboard/dashboard-activity.controller.js b/app/controllers/dashboard/dashboard-activity.controller.js index 062ab96112..d1698bd83c 100644 --- a/app/controllers/dashboard/dashboard-activity.controller.js +++ b/app/controllers/dashboard/dashboard-activity.controller.js @@ -3,14 +3,14 @@ const _ = require('lodash') const moment = require('moment-timezone') -const logger = require('../../utils/logger')(__filename) -const response = require('../../utils/response').response -const { getCurrentCredential, getSwitchingCredential } = require('../../utils/credentials') -const LedgerClient = require('../../services/clients/ledger.client') -const ProductsClient = require('../../services/clients/products.client.js') -const { ConnectorClient } = require('../../services/clients/connector.client.js') +const logger = require('@utils/logger')(__filename) +const response = require('@utils/response').response +const { getCurrentCredential, getSwitchingCredential } = require('@utils/credentials') +const LedgerClient = require('@services/clients/ledger.client') +const ProductsClient = require('@services/clients/products.client.js') +const { ConnectorClient } = require('@services/clients/connector.client.js') const connector = new ConnectorClient(process.env.CONNECTOR_URL) -const { retrieveAccountDetails } = require('../../services/clients/stripe/stripe.client') +const { retrieveAccountDetails } = require('@services/clients/stripe/stripe.client') const { datetime } = require('@govuk-pay/pay-js-commons').nunjucksFilters const { @@ -24,9 +24,9 @@ const { TERMS_AGREED_GOV_BANKING_WORLDPAY, LIVE, DENIED -} = require('../../models/go-live-stage') -const pspTestAccountStage = require('../../models/psp-test-account-stage') -const serviceService = require('../../services/service.service') +} = require('@models/go-live-stage') +const pspTestAccountStage = require('@models/psp-test-account-stage') +const serviceService = require('@services/service.service') const links = { demoPayment: 0, diff --git a/app/controllers/dashboard/dashboard-activity.controller.test.js b/app/controllers/dashboard/dashboard-activity.controller.test.js index 5e93e49095..664061d97d 100644 --- a/app/controllers/dashboard/dashboard-activity.controller.test.js +++ b/app/controllers/dashboard/dashboard-activity.controller.test.js @@ -1,14 +1,14 @@ 'use strict' const sinon = require('sinon') -const User = require('../../models/User.class') -const { validUser } = require('../../../test/fixtures/user.fixtures') -const { validGatewayAccountResponse } = require('../../../test/fixtures/gateway-account.fixtures') -const { ConnectorClient } = require('../../services/clients/connector.client') -const StripeClient = require('../../services/clients/stripe/stripe.client.js') +const User = require('@models/User.class') +const { validUser } = require('@test/fixtures/user.fixtures') +const { validGatewayAccountResponse } = require('@test/fixtures/gateway-account.fixtures') +const { ConnectorClient } = require('@services/clients/connector.client') +const StripeClient = require('@services/clients/stripe/stripe.client.js') const { expect } = require('chai') const proxyquire = require('proxyquire') -const gatewayAccountFixtures = require('../../../test/fixtures/gateway-account.fixtures') +const gatewayAccountFixtures = require('@test/fixtures/gateway-account.fixtures') describe('Controller: Dashboard activity', () => { const externalServiceId = 'service-external-id' @@ -97,7 +97,7 @@ describe('Controller: Dashboard activity', () => { function getControllerWithMocks (gatewayAccounts) { return proxyquire('./dashboard-activity.controller', { - '../../services/service.service': { + '@services/service.service': { getGatewayAccounts: sinon.spy(() => Promise.resolve(gatewayAccounts)) } }) diff --git a/app/controllers/digital-wallet/get-apple-pay.controller.js b/app/controllers/digital-wallet/get-apple-pay.controller.js index 539c83b754..3996cf22df 100644 --- a/app/controllers/digital-wallet/get-apple-pay.controller.js +++ b/app/controllers/digital-wallet/get-apple-pay.controller.js @@ -1,6 +1,6 @@ 'use strict' -const { response } = require('../../utils/response') +const { response } = require('@utils/response') module.exports = (req, res) => { return response(req, res, 'digital-wallet/apple-pay', {}) diff --git a/app/controllers/digital-wallet/get-google-pay.controller.js b/app/controllers/digital-wallet/get-google-pay.controller.js index ef7afa616d..c760ed2719 100644 --- a/app/controllers/digital-wallet/get-google-pay.controller.js +++ b/app/controllers/digital-wallet/get-google-pay.controller.js @@ -1,6 +1,6 @@ 'use strict' -const { response } = require('../../utils/response') +const { response } = require('@utils/response') module.exports = function showGooglePaySettings (req, res) { return response(req, res, 'digital-wallet/google-pay', { diff --git a/app/controllers/digital-wallet/post-apple-pay.controller.js b/app/controllers/digital-wallet/post-apple-pay.controller.js index ac8fbd655e..577aaef92f 100644 --- a/app/controllers/digital-wallet/post-apple-pay.controller.js +++ b/app/controllers/digital-wallet/post-apple-pay.controller.js @@ -1,8 +1,8 @@ 'use strict' -const paths = require('../../paths') -const formatAccountPathsFor = require('../../utils/format-account-paths-for') -const { ConnectorClient } = require('../../services/clients/connector.client') +const paths = require('@root/paths') +const formatAccountPathsFor = require('@utils/format-account-paths-for') +const { ConnectorClient } = require('@services/clients/connector.client') const connector = new ConnectorClient(process.env.CONNECTOR_URL) module.exports = async (req, res, next) => { diff --git a/app/controllers/digital-wallet/post-google-pay.controller.js b/app/controllers/digital-wallet/post-google-pay.controller.js index 1c9eea33df..60cf1416e6 100644 --- a/app/controllers/digital-wallet/post-google-pay.controller.js +++ b/app/controllers/digital-wallet/post-google-pay.controller.js @@ -1,12 +1,12 @@ 'use strict' -const paths = require('../../paths') -const formatAccountPathsFor = require('../../utils/format-account-paths-for') -const logger = require('../../utils/logger')(__filename) -const { ConnectorClient } = require('../../services/clients/connector.client') -const { getCurrentCredential } = require('../../utils/credentials') +const paths = require('@root/paths') +const formatAccountPathsFor = require('@utils/format-account-paths-for') +const logger = require('@utils/logger')(__filename) +const { ConnectorClient } = require('@services/clients/connector.client') +const { getCurrentCredential } = require('@utils/credentials') const connector = new ConnectorClient(process.env.CONNECTOR_URL) -const { response } = require('../../utils/response') +const { response } = require('@utils/response') module.exports = async function updateGooglePaySettings (req, res, next) { const gatewayAccountId = req.account.gateway_account_id diff --git a/app/controllers/digital-wallet/post-google-pay.controller.test.js b/app/controllers/digital-wallet/post-google-pay.controller.test.js index 7e317c0ec4..fc723f83b9 100644 --- a/app/controllers/digital-wallet/post-google-pay.controller.test.js +++ b/app/controllers/digital-wallet/post-google-pay.controller.test.js @@ -3,11 +3,11 @@ const sinon = require('sinon') const proxyquire = require('proxyquire') -const { validGatewayAccount } = require('../../../test/fixtures/gateway-account.fixtures') -const { validUserResponse } = require('../../../test/fixtures/user.fixtures') -const formatAccountPathsFor = require('../../utils/format-account-paths-for') -const paths = require('../../paths') -const User = require('../../models/User.class') +const { validGatewayAccount } = require('@test/fixtures/gateway-account.fixtures') +const { validUserResponse } = require('@test/fixtures/user.fixtures') +const formatAccountPathsFor = require('@utils/format-account-paths-for') +const paths = require('@root/paths') +const User = require('@models/User.class') const { RESTClientError } = require('@govuk-pay/pay-js-commons/lib/utils/axios-base-client/errors') const gatewayAccountCredentialId = 12 @@ -164,10 +164,10 @@ describe('Google Pay settings POST controller', () => { function getControllerWithMocks (patchGooglePayGatewayMerchantIdMock, toggleGooglePayMock) { return proxyquire('./post-google-pay.controller.js', { - '../../utils/response': { + '@utils/response': { response: responseMock }, - '../../services/clients/connector.client': { + '@services/clients/connector.client': { ConnectorClient: function () { this.patchGooglePayGatewayMerchantId = patchGooglePayGatewayMerchantIdMock this.toggleGooglePay = toggleGooglePayMock diff --git a/app/controllers/edit-service-name/edit-service-name.controller.js b/app/controllers/edit-service-name/edit-service-name.controller.js index 77729959f4..338dd4811b 100644 --- a/app/controllers/edit-service-name/edit-service-name.controller.js +++ b/app/controllers/edit-service-name/edit-service-name.controller.js @@ -2,15 +2,15 @@ const lodash = require('lodash') -const responses = require('../../utils/response') -const paths = require('../../paths') -const formatServicePathsFor = require('../../utils/format-service-paths-for') -const serviceService = require('../../services/service.service') +const responses = require('@utils/response') +const paths = require('@root/paths') +const formatServicePathsFor = require('@utils/format-service-paths-for') +const serviceService = require('@services/service.service') const { validateMandatoryField, validateOptionalField, SERVICE_NAME_MAX_LENGTH -} = require('../../utils/validation/server-side-form-validations') +} = require('@utils/validation/server-side-form-validations') function getServiceName (req, res) { let pageData = lodash.get(req, 'session.pageData.editServiceName') diff --git a/app/controllers/edit-service-name/get.controller.test.js b/app/controllers/edit-service-name/get.controller.test.js index 2d0893e55b..94f5aca1a9 100644 --- a/app/controllers/edit-service-name/get.controller.test.js +++ b/app/controllers/edit-service-name/get.controller.test.js @@ -3,11 +3,11 @@ const proxyquire = require('proxyquire') const sinon = require('sinon') const { expect } = require('chai') -const Service = require('../../models/Service.class') -const random = require('../../utils/random') +const Service = require('@models/Service.class') +const random = require('@utils/random') const mockResponses = {} const editServiceNameCtrl = proxyquire('./edit-service-name.controller', { - '../../utils/response': mockResponses + '@utils/response': mockResponses }) let req, res diff --git a/app/controllers/edit-service-name/post.controller.test.js b/app/controllers/edit-service-name/post.controller.test.js index f2d604e43c..9ff96dc6a7 100644 --- a/app/controllers/edit-service-name/post.controller.test.js +++ b/app/controllers/edit-service-name/post.controller.test.js @@ -3,13 +3,13 @@ const proxyquire = require('proxyquire') const sinon = require('sinon') const { expect } = require('chai') -const Service = require('../../models/Service.class') -const random = require('../../utils/random') +const Service = require('@models/Service.class') +const random = require('@utils/random') const mockResponses = {} const mockServiceService = {} const editServiceNameCtrl = proxyquire('./edit-service-name.controller', { - '../../utils/response': mockResponses, - '../../services/service.service': mockServiceService + '@utils/response': mockResponses, + '@services/service.service': mockServiceService }) let req, res, next diff --git a/app/controllers/email-notifications/email-notifications.controller.js b/app/controllers/email-notifications/email-notifications.controller.js index 3666310c5a..11ef9713c8 100644 --- a/app/controllers/email-notifications/email-notifications.controller.js +++ b/app/controllers/email-notifications/email-notifications.controller.js @@ -1,12 +1,12 @@ 'use strict' -const logger = require('../../utils/logger')(__filename) -const response = require('../../utils/response.js').response -const emailService = require('../../services/email.service.js') -const paths = require('../../paths.js') -const formatAccountPathsFor = require('../../utils/format-account-paths-for') -const humaniseEmailMode = require('../../utils/humanise-email-mode') -const { validateOptionalField } = require('../../utils/validation/server-side-form-validations') +const logger = require('@utils/logger')(__filename) +const response = require('@utils/response.js').response +const emailService = require('@services/email.service.js') +const paths = require('@root/paths.js') +const formatAccountPathsFor = require('@utils/format-account-paths-for') +const humaniseEmailMode = require('@utils/humanise-email-mode') +const { validateOptionalField } = require('@utils/validation/server-side-form-validations') const CUSTOM_PARAGRAPH_MAX_LENGTH = 5000 diff --git a/app/controllers/feedback/get-index.controller.js b/app/controllers/feedback/get-index.controller.js index 1a81be5095..da1899a332 100644 --- a/app/controllers/feedback/get-index.controller.js +++ b/app/controllers/feedback/get-index.controller.js @@ -2,7 +2,7 @@ const lodash = require('lodash') -const { response } = require('../../utils/response.js') +const { response } = require('@utils/response.js') module.exports = (req, res) => { const pageData = { diff --git a/app/controllers/feedback/post-index.controller.js b/app/controllers/feedback/post-index.controller.js index 26ea61391c..78f351741a 100644 --- a/app/controllers/feedback/post-index.controller.js +++ b/app/controllers/feedback/post-index.controller.js @@ -1,9 +1,9 @@ 'use strict' const lodash = require('lodash') -const logger = require('../../utils/logger')(__filename) -const paths = require('../../paths') -const zendeskClient = require('../../services/clients/zendesk.client') +const logger = require('@utils/logger')(__filename) +const paths = require('@root/paths') +const zendeskClient = require('@services/clients/zendesk.client') module.exports = async function postZendeskFeedback (req, res) { const message = `Feedback rating: ${req.body['feedback-rating']} diff --git a/app/controllers/forgotten-password.controller.js b/app/controllers/forgotten-password.controller.js index 0ede702cb3..1fbab4652f 100644 --- a/app/controllers/forgotten-password.controller.js +++ b/app/controllers/forgotten-password.controller.js @@ -1,12 +1,12 @@ 'use strict' -const paths = require('../paths.js') -const userService = require('../services/user.service.js') -const logger = require('../utils/logger')(__filename) +const paths = require('@root/paths.js') +const userService = require('@services/user.service.js') +const logger = require('@utils/logger')(__filename) const { validateEmail, validatePassword -} = require('../utils/validation/server-side-form-validations') +} = require('@utils/validation/server-side-form-validations') const emailGet = function emailGet (req, res) { res.render('forgotten-password/index') diff --git a/app/controllers/healthcheck.controller.js b/app/controllers/healthcheck.controller.js index faf5976878..3bef309a98 100644 --- a/app/controllers/healthcheck.controller.js +++ b/app/controllers/healthcheck.controller.js @@ -1,4 +1,4 @@ -const responseHandler = require('../utils/response.js') +const responseHandler = require('@utils/response.js') module.exports.healthcheck = function (req, res) { const data = { ping: { healthy: true } } diff --git a/app/controllers/invite-user.controller.js b/app/controllers/invite-user.controller.js index 4f6ff2ccdb..2682dc799f 100644 --- a/app/controllers/invite-user.controller.js +++ b/app/controllers/invite-user.controller.js @@ -1,11 +1,11 @@ const lodash = require('lodash') -const { response } = require('../utils/response.js') -const userService = require('../services/user.service.js') -const paths = require('../paths.js') -const rolesModule = require('../utils/roles') -const { isValidEmail } = require('../utils/email-tools.js') +const { response } = require('@utils/response.js') +const userService = require('@services/user.service.js') +const paths = require('@root/paths.js') +const rolesModule = require('@utils/roles') +const { isValidEmail } = require('@utils/email-tools.js') -const formatServicePathsFor = require('../utils/format-service-paths-for') +const formatServicePathsFor = require('@utils/format-service-paths-for') const messages = { emailAlreadyInUse: 'Email already in use', diff --git a/app/controllers/invite-validation.controller.js b/app/controllers/invite-validation.controller.js index 7cf742feab..5394f53164 100644 --- a/app/controllers/invite-validation.controller.js +++ b/app/controllers/invite-validation.controller.js @@ -1,9 +1,9 @@ 'use strict' -const adminusersClient = require('../services/clients/adminusers.client')() -const paths = require('../paths') -const { INVITE_SESSION_COOKIE_NAME } = require('../utils/constants') -const { ExpiredInviteError, NotFoundError } = require('../errors') +const adminusersClient = require('@services/clients/adminusers.client')() +const paths = require('@root/paths') +const { INVITE_SESSION_COOKIE_NAME } = require('@utils/constants') +const { ExpiredInviteError, NotFoundError } = require('@root/errors') /** * Intermediate endpoint which captures the invite code and validate. diff --git a/app/controllers/invite-validation.controller.test.js b/app/controllers/invite-validation.controller.test.js index 93e6548bcf..02e5ac50e9 100644 --- a/app/controllers/invite-validation.controller.test.js +++ b/app/controllers/invite-validation.controller.test.js @@ -2,10 +2,10 @@ const proxyquire = require('proxyquire') const sinon = require('sinon') -const { NotFoundError, ExpiredInviteError } = require('../errors') +const { NotFoundError, ExpiredInviteError } = require('@root/errors') const { RESTClientError } = require('@govuk-pay/pay-js-commons/lib/utils/axios-base-client/errors') -const paths = require('../paths') -const inviteFixtures = require('../../test/fixtures/invite.fixtures') +const paths = require('@root/paths') +const inviteFixtures = require('@test/fixtures/invite.fixtures') describe('Invite validation controller', function () { let req, res, next @@ -123,6 +123,6 @@ describe('Invite validation controller', function () { function getControllerWithMockedAdminusersClient (mockedAdminusersClient) { return proxyquire('./invite-validation.controller.js', { - '../services/clients/adminusers.client': () => mockedAdminusersClient + '@services/clients/adminusers.client': () => mockedAdminusersClient }) } diff --git a/app/controllers/login/after-otp-login.controller.js b/app/controllers/login/after-otp-login.controller.js index efdd5dbe47..748609cb59 100644 --- a/app/controllers/login/after-otp-login.controller.js +++ b/app/controllers/login/after-otp-login.controller.js @@ -1,7 +1,7 @@ 'use strict' -const logger = require('../../utils/logger')(__filename) -const { setSessionVersion } = require('../../services/auth.service') +const logger = require('@utils/logger')(__filename) +const { setSessionVersion } = require('@services/auth.service') module.exports = (req, res) => { req.session.secondFactor = 'totp' diff --git a/app/controllers/login/logout.controller.js b/app/controllers/login/logout.controller.js index a522ce6708..a7334ffc45 100644 --- a/app/controllers/login/logout.controller.js +++ b/app/controllers/login/logout.controller.js @@ -1,7 +1,7 @@ 'use strict' -const logger = require('../../utils/logger')(__filename) -const userService = require('../../services/user.service') +const logger = require('@utils/logger')(__filename) +const userService = require('@services/user.service') const router = require('../../routes') module.exports = (req, res) => { diff --git a/app/controllers/login/otp-login.controller.js b/app/controllers/login/otp-login.controller.js index 7e0f3b58be..f00ac8e23d 100644 --- a/app/controllers/login/otp-login.controller.js +++ b/app/controllers/login/otp-login.controller.js @@ -1,7 +1,7 @@ 'use strict' -const userService = require('../../services/user.service') -const secondFactorMethod = require('../../models/second-factor-method') +const userService = require('@services/user.service') +const secondFactorMethod = require('@models/second-factor-method') module.exports = async function showOtpLogin (req, res, next) { const pageData = { secondFactorMethod } diff --git a/app/controllers/login/post-login.controller.js b/app/controllers/login/post-login.controller.js index 780833c8c1..a5ac7db2ec 100644 --- a/app/controllers/login/post-login.controller.js +++ b/app/controllers/login/post-login.controller.js @@ -2,8 +2,8 @@ const _ = require('lodash') -const logger = require('../../utils/logger')(__filename) -const paths = require('../../paths') +const logger = require('@utils/logger')(__filename) +const paths = require('@root/paths') /** * Reset the login counter for the user, and clean diff --git a/app/controllers/login/send-again-post.controller.js b/app/controllers/login/send-again-post.controller.js index 3954d756cf..25fc8fbff5 100644 --- a/app/controllers/login/send-again-post.controller.js +++ b/app/controllers/login/send-again-post.controller.js @@ -1,9 +1,9 @@ 'use strict' -const userService = require('../../services/user.service') -const paths = require('../../paths') -const { renderErrorView } = require('../../utils/response') -const secondFactorMethod = require('../../models/second-factor-method') +const userService = require('@services/user.service') +const paths = require('@root/paths') +const { renderErrorView } = require('@utils/response') +const secondFactorMethod = require('@models/second-factor-method') module.exports = async function resendOtp (req, res, next) { if (req.user.secondFactor === secondFactorMethod.SMS) { diff --git a/app/controllers/login/setup-direct-login-after-register.controller.js b/app/controllers/login/setup-direct-login-after-register.controller.js index 4818f927e3..68bf769d89 100644 --- a/app/controllers/login/setup-direct-login-after-register.controller.js +++ b/app/controllers/login/setup-direct-login-after-register.controller.js @@ -1,7 +1,7 @@ 'use strict' -const { INVITE_SESSION_COOKIE_NAME } = require('../../utils/constants') -const logger = require('../../utils/logger')(__filename) +const { INVITE_SESSION_COOKIE_NAME } = require('@utils/constants') +const logger = require('@utils/logger')(__filename) module.exports = (req, res, userExternalId) => { if (!userExternalId) { diff --git a/app/controllers/make-a-demo-payment/edit.controller.js b/app/controllers/make-a-demo-payment/edit.controller.js index be59617397..d0079283f4 100644 --- a/app/controllers/make-a-demo-payment/edit.controller.js +++ b/app/controllers/make-a-demo-payment/edit.controller.js @@ -2,12 +2,12 @@ const lodash = require('lodash') -const { response } = require('../../utils/response.js') -const { index } = require('../../paths').account.prototyping.demoPayment -const { validateMandatoryField } = require('../../utils/validation/server-side-form-validations') -const formatAccountPathsFor = require('../../utils/format-account-paths-for') -const { isCurrency, isAboveMaxAmount } = require('../../utils/validation/field-validation-checks') -const { safeConvertPoundsStringToPence } = require('../../utils/currency-formatter') +const { response } = require('@utils/response.js') +const { index } = require('@root/paths').account.prototyping.demoPayment +const { validateMandatoryField } = require('@utils/validation/server-side-form-validations') +const formatAccountPathsFor = require('@utils/format-account-paths-for') +const { isCurrency, isAboveMaxAmount } = require('@utils/validation/field-validation-checks') +const { safeConvertPoundsStringToPence } = require('@utils/currency-formatter') const DESCRIPTION_MAX_LENGTH = 255 diff --git a/app/controllers/make-a-demo-payment/go-to-payment.controller.js b/app/controllers/make-a-demo-payment/go-to-payment.controller.js index 37cb732ae5..75ea152022 100644 --- a/app/controllers/make-a-demo-payment/go-to-payment.controller.js +++ b/app/controllers/make-a-demo-payment/go-to-payment.controller.js @@ -2,12 +2,12 @@ const lodash = require('lodash') -const logger = require('../../utils/logger')(__filename) -const paths = require('../../paths') -const productsClient = require('../../services/clients/products.client.js') -const productTypes = require('../../utils/product-types') -const publicAuthClient = require('../../services/clients/public-auth.client') -const formatAccountPathsFor = require('../../utils/format-account-paths-for') +const logger = require('@utils/logger')(__filename) +const paths = require('@root/paths') +const productsClient = require('@services/clients/products.client.js') +const productTypes = require('@utils/product-types') +const publicAuthClient = require('@services/clients/public-auth.client') +const formatAccountPathsFor = require('@utils/format-account-paths-for') module.exports = async function makeDemoPayment (req, res) { const gatewayAccountId = req.account.gateway_account_id diff --git a/app/controllers/make-a-demo-payment/go-to-transactions.controller.js b/app/controllers/make-a-demo-payment/go-to-transactions.controller.js index db67b1eb28..9df7f8f7e9 100644 --- a/app/controllers/make-a-demo-payment/go-to-transactions.controller.js +++ b/app/controllers/make-a-demo-payment/go-to-transactions.controller.js @@ -1,10 +1,10 @@ 'use strict' -const logger = require('../../utils/logger')(__filename) -const productsClient = require('../../services/clients/products.client.js') -const { ConnectorClient } = require('../../services/clients/connector.client') +const logger = require('@utils/logger')(__filename) +const productsClient = require('@services/clients/products.client.js') +const { ConnectorClient } = require('@services/clients/connector.client') const connector = new ConnectorClient(process.env.CONNECTOR_URL) -const formatAccountPathsFor = require('../../utils/format-account-paths-for') +const formatAccountPathsFor = require('@utils/format-account-paths-for') const router = require('../../routes') module.exports = async function goToTransactions (req, res, next) { diff --git a/app/controllers/make-a-demo-payment/index.controller.js b/app/controllers/make-a-demo-payment/index.controller.js index ef25c50b07..54a91396e8 100644 --- a/app/controllers/make-a-demo-payment/index.controller.js +++ b/app/controllers/make-a-demo-payment/index.controller.js @@ -2,7 +2,7 @@ const lodash = require('lodash') -const { response } = require('../../utils/response.js') +const { response } = require('@utils/response.js') const DEFAULTS = { paymentDescription: 'An example payment description', diff --git a/app/controllers/make-a-demo-payment/mock-card-details.controller.js b/app/controllers/make-a-demo-payment/mock-card-details.controller.js index 9d2821caad..cf8936dc79 100644 --- a/app/controllers/make-a-demo-payment/mock-card-details.controller.js +++ b/app/controllers/make-a-demo-payment/mock-card-details.controller.js @@ -2,9 +2,9 @@ const lodash = require('lodash') -const { response } = require('../../utils/response.js') -const paths = require('../../paths') -const formatAccountPathsFor = require('../../utils/format-account-paths-for') +const { response } = require('@utils/response.js') +const paths = require('@root/paths') +const formatAccountPathsFor = require('@utils/format-account-paths-for') module.exports = (req, res) => { const { paymentAmount, paymentDescription } = lodash.get(req, 'session.pageData.makeADemoPayment', {}) diff --git a/app/controllers/my-services/get-index.controller.js b/app/controllers/my-services/get-index.controller.js index 47e82b7801..aea5af0dc1 100644 --- a/app/controllers/my-services/get-index.controller.js +++ b/app/controllers/my-services/get-index.controller.js @@ -2,11 +2,11 @@ const lodash = require('lodash') -const { response } = require('../../utils/response') -const serviceService = require('../../services/service.service') -const { filterGatewayAccountIds } = require('../../utils/permissions') -const getHeldPermissions = require('../../utils/get-held-permissions') -const { DEFAULT_SERVICE_NAME } = require('../../utils/constants') +const { response } = require('@utils/response') +const serviceService = require('@services/service.service') +const { filterGatewayAccountIds } = require('@utils/permissions') +const getHeldPermissions = require('@utils/get-held-permissions') +const { DEFAULT_SERVICE_NAME } = require('@utils/constants') function hasStripeAccount (gatewayAccounts) { return gatewayAccounts.some(gatewayAccount => diff --git a/app/controllers/my-services/post-index.controller.js b/app/controllers/my-services/post-index.controller.js index 29b44590b2..d02dfec9d0 100644 --- a/app/controllers/my-services/post-index.controller.js +++ b/app/controllers/my-services/post-index.controller.js @@ -1,8 +1,8 @@ const _ = require('lodash') -const logger = require('../../utils/logger')(__filename) -const paths = require('../../paths') -const formatAccountPathsFor = require('../../utils/format-account-paths-for') +const logger = require('@utils/logger')(__filename) +const paths = require('@root/paths') +const formatAccountPathsFor = require('@utils/format-account-paths-for') const validAccountId = (accountId, user) => { const gatewayAccountIds = _.flattenDeep(_.concat(user.serviceRoles.map(serviceRole => serviceRole.service.gatewayAccountIds))) diff --git a/app/controllers/organisation-details.controller.js b/app/controllers/organisation-details.controller.js index a0e950aa3e..71ebdad5fe 100644 --- a/app/controllers/organisation-details.controller.js +++ b/app/controllers/organisation-details.controller.js @@ -2,9 +2,9 @@ const lodash = require('lodash') -const paths = require('../paths') -const formatServicePathsFor = require('../utils/format-service-paths-for') -const { response } = require('../utils/response') +const paths = require('@root/paths') +const formatServicePathsFor = require('@utils/format-service-paths-for') +const { response } = require('@utils/response') function showOrganisationDetails (req, res) { const externalServiceId = req.service.externalId diff --git a/app/controllers/payment-links/get-amount.controller.js b/app/controllers/payment-links/get-amount.controller.js index 025a55e641..05ab95956f 100644 --- a/app/controllers/payment-links/get-amount.controller.js +++ b/app/controllers/payment-links/get-amount.controller.js @@ -2,7 +2,7 @@ const lodash = require('lodash') -const { response } = require('../../utils/response.js') +const { response } = require('@utils/response.js') module.exports = function showAmountPage (req, res, next) { const sessionData = lodash.get(req, 'session.pageData.createPaymentLink') diff --git a/app/controllers/payment-links/get-delete.controller.js b/app/controllers/payment-links/get-delete.controller.js index d6479c5b1e..5bba9555ea 100644 --- a/app/controllers/payment-links/get-delete.controller.js +++ b/app/controllers/payment-links/get-delete.controller.js @@ -1,10 +1,10 @@ 'use strict' -const logger = require('../../utils/logger')(__filename) -const paths = require('../../paths') -const formatAccountPathsFor = require('../../utils/format-account-paths-for') -const productsClient = require('../../services/clients/products.client.js') -const publicAuthClient = require('../../services/clients/public-auth.client.js') +const logger = require('@utils/logger')(__filename) +const paths = require('@root/paths') +const formatAccountPathsFor = require('@utils/format-account-paths-for') +const productsClient = require('@services/clients/products.client.js') +const publicAuthClient = require('@services/clients/public-auth.client.js') module.exports = async (req, res) => { const gatewayAccountId = req.account.gateway_account_id diff --git a/app/controllers/payment-links/get-disable.controller.js b/app/controllers/payment-links/get-disable.controller.js index de99f5c000..2981d5d4ed 100644 --- a/app/controllers/payment-links/get-disable.controller.js +++ b/app/controllers/payment-links/get-disable.controller.js @@ -1,9 +1,9 @@ 'use strict' -const logger = require('../../utils/logger')(__filename) -const paths = require('../../paths') -const formatAccountPathsFor = require('../../utils/format-account-paths-for') -const productsClient = require('../../services/clients/products.client.js') +const logger = require('@utils/logger')(__filename) +const paths = require('@root/paths') +const formatAccountPathsFor = require('@utils/format-account-paths-for') +const productsClient = require('@services/clients/products.client.js') module.exports = async (req, res) => { const gatewayAccountId = req.account.gateway_account_id diff --git a/app/controllers/payment-links/get-edit-amount.controller.js b/app/controllers/payment-links/get-edit-amount.controller.js index 410d80def3..2176d94c01 100644 --- a/app/controllers/payment-links/get-edit-amount.controller.js +++ b/app/controllers/payment-links/get-edit-amount.controller.js @@ -2,10 +2,10 @@ const lodash = require('lodash') -const { response } = require('../../utils/response.js') -const paths = require('../../paths') -const formatAccountPathsFor = require('../../utils/format-account-paths-for') -const supportedLanguage = require('../../models/supported-language') +const { response } = require('@utils/response.js') +const paths = require('@root/paths') +const formatAccountPathsFor = require('@utils/format-account-paths-for') +const supportedLanguage = require('@models/supported-language') module.exports = function showEditAmountPage (req, res) { const { productExternalId } = req.params diff --git a/app/controllers/payment-links/get-edit-information.controller.js b/app/controllers/payment-links/get-edit-information.controller.js index 6bcf9dde4e..4339aac332 100644 --- a/app/controllers/payment-links/get-edit-information.controller.js +++ b/app/controllers/payment-links/get-edit-information.controller.js @@ -2,10 +2,10 @@ const lodash = require('lodash') -const { response } = require('../../utils/response.js') -const paths = require('../../paths') -const formatAccountPathsFor = require('../../utils/format-account-paths-for') -const supportedLanguage = require('../../models/supported-language') +const { response } = require('@utils/response.js') +const paths = require('@root/paths') +const formatAccountPathsFor = require('@utils/format-account-paths-for') +const supportedLanguage = require('@models/supported-language') module.exports = function showEditInformationPage (req, res, next) { const { productExternalId } = req.params diff --git a/app/controllers/payment-links/get-edit-reference.controller.js b/app/controllers/payment-links/get-edit-reference.controller.js index b422cdd5e5..baabfb538f 100644 --- a/app/controllers/payment-links/get-edit-reference.controller.js +++ b/app/controllers/payment-links/get-edit-reference.controller.js @@ -2,10 +2,10 @@ const lodash = require('lodash') -const { response } = require('../../utils/response.js') -const paths = require('../../paths') -const formatAccountPathsFor = require('../../utils/format-account-paths-for') -const supportedLanguage = require('../../models/supported-language') +const { response } = require('@utils/response.js') +const paths = require('@root/paths') +const formatAccountPathsFor = require('@utils/format-account-paths-for') +const supportedLanguage = require('@models/supported-language') module.exports = function showEditReferencePage (req, res, next) { const { productExternalId } = req.params diff --git a/app/controllers/payment-links/get-edit.controller.js b/app/controllers/payment-links/get-edit.controller.js index 8d8b5a54b3..ba2b69abad 100644 --- a/app/controllers/payment-links/get-edit.controller.js +++ b/app/controllers/payment-links/get-edit.controller.js @@ -2,10 +2,10 @@ const lodash = require('lodash') -const { response } = require('../../utils/response.js') -const paths = require('../../paths') -const productsClient = require('../../services/clients/products.client.js') -const formatAccountPathsFor = require('../../utils/format-account-paths-for') +const { response } = require('@utils/response.js') +const paths = require('@root/paths') +const productsClient = require('@services/clients/products.client.js') +const formatAccountPathsFor = require('@utils/format-account-paths-for') module.exports = async function showEditPaymentLink (req, res, next) { const { productExternalId } = req.params diff --git a/app/controllers/payment-links/get-information.controller.js b/app/controllers/payment-links/get-information.controller.js index 82cc559907..7ff8385d41 100644 --- a/app/controllers/payment-links/get-information.controller.js +++ b/app/controllers/payment-links/get-information.controller.js @@ -2,8 +2,8 @@ const lodash = require('lodash') -const { response } = require('../../utils/response') -const supportedLanguage = require('../../models/supported-language') +const { response } = require('@utils/response') +const supportedLanguage = require('@models/supported-language') module.exports = function showInformationPage (req, res) { // initialise session for create payment link journey if it doesn't exist diff --git a/app/controllers/payment-links/get-manage.controller.js b/app/controllers/payment-links/get-manage.controller.js index a7a2dfff44..aaf6aed001 100644 --- a/app/controllers/payment-links/get-manage.controller.js +++ b/app/controllers/payment-links/get-manage.controller.js @@ -2,10 +2,10 @@ const lodash = require('lodash') -const { response } = require('../../utils/response') -const productsClient = require('../../services/clients/products.client') -const supportedLanguage = require('../../models/supported-language') -const paths = require('../../paths') +const { response } = require('@utils/response') +const productsClient = require('@services/clients/products.client') +const supportedLanguage = require('@models/supported-language') +const paths = require('@root/paths') module.exports = async (req, res, next) => { const externalServiceId = req.service && req.service.externalId diff --git a/app/controllers/payment-links/get-reference.controller.js b/app/controllers/payment-links/get-reference.controller.js index 483eb7954d..374d2b67c7 100644 --- a/app/controllers/payment-links/get-reference.controller.js +++ b/app/controllers/payment-links/get-reference.controller.js @@ -2,7 +2,7 @@ const lodash = require('lodash') -const { response } = require('../../utils/response.js') +const { response } = require('@utils/response.js') module.exports = function showReferencePage (req, res, next) { const sessionData = lodash.get(req, 'session.pageData.createPaymentLink') diff --git a/app/controllers/payment-links/get-review.controller.js b/app/controllers/payment-links/get-review.controller.js index 8456b9d44d..62416e4d31 100644 --- a/app/controllers/payment-links/get-review.controller.js +++ b/app/controllers/payment-links/get-review.controller.js @@ -2,10 +2,10 @@ const lodash = require('lodash') -const paths = require('../../paths') -const formatAccountPathsFor = require('../../utils/format-account-paths-for') +const paths = require('@root/paths') +const formatAccountPathsFor = require('@utils/format-account-paths-for') -const { response } = require('../../utils/response.js') +const { response } = require('@utils/response.js') module.exports = (req, res) => { const pageData = lodash.get(req, 'session.pageData.createPaymentLink', {}) diff --git a/app/controllers/payment-links/get-start.controller.js b/app/controllers/payment-links/get-start.controller.js index daefa23072..b2b0ef04b3 100644 --- a/app/controllers/payment-links/get-start.controller.js +++ b/app/controllers/payment-links/get-start.controller.js @@ -2,8 +2,8 @@ const lodash = require('lodash') -const { response } = require('../../utils/response.js') -const { getCurrentCredential } = require('../../utils/credentials') +const { response } = require('@utils/response') +const { getCurrentCredential } = require('@utils/credentials') module.exports = (req, res) => { lodash.set(req, 'session.pageData.createPaymentLink', {}) diff --git a/app/controllers/payment-links/get-start.controller.test.js b/app/controllers/payment-links/get-start.controller.test.js index 9e7a3c7b2c..19684f59ea 100644 --- a/app/controllers/payment-links/get-start.controller.test.js +++ b/app/controllers/payment-links/get-start.controller.test.js @@ -4,13 +4,13 @@ const proxyquire = require('proxyquire') const sinon = require('sinon') const { expect } = require('chai') -const gatewayAccountFixtures = require('../../../test/fixtures/gateway-account.fixtures') +const gatewayAccountFixtures = require('@test/fixtures/gateway-account.fixtures') const mockResponses = {} const getController = function (mockResponses) { return proxyquire('./get-start.controller', { - '../../utils/response': mockResponses + '@utils/response': mockResponses }) } diff --git a/app/controllers/payment-links/get-update-reporting-column.controller.js b/app/controllers/payment-links/get-update-reporting-column.controller.js index 5dacb415eb..42d3fe5226 100644 --- a/app/controllers/payment-links/get-update-reporting-column.controller.js +++ b/app/controllers/payment-links/get-update-reporting-column.controller.js @@ -1,9 +1,9 @@ 'use strict' const MetadataForm = require('./metadata/metadata-form') -const { getPaymentLinksContext } = require('../../utils/payment-links') +const { getPaymentLinksContext } = require('@utils/payment-links') -const { response } = require('../../utils/response.js') +const { response } = require('@utils/response.js') function showAddMetadataPage (req, res) { const paymentLinksContext = getPaymentLinksContext(req) diff --git a/app/controllers/payment-links/get-web-address.controller.js b/app/controllers/payment-links/get-web-address.controller.js index 931f084099..9a95d18f4a 100644 --- a/app/controllers/payment-links/get-web-address.controller.js +++ b/app/controllers/payment-links/get-web-address.controller.js @@ -2,7 +2,7 @@ const lodash = require('lodash') -const { response } = require('../../utils/response.js') +const { response } = require('@utils/response.js') module.exports = function showWebAddressPage (req, res, next) { const friendlyURL = process.env.PRODUCTS_FRIENDLY_BASE_URI diff --git a/app/controllers/payment-links/post-amount.controller.js b/app/controllers/payment-links/post-amount.controller.js index 0d03b6dca3..a8e23111f9 100644 --- a/app/controllers/payment-links/post-amount.controller.js +++ b/app/controllers/payment-links/post-amount.controller.js @@ -2,10 +2,10 @@ const lodash = require('lodash') -const paths = require('../../paths') -const formatAccountPathsFor = require('../../utils/format-account-paths-for') -const { safeConvertPoundsStringToPence } = require('../../utils/currency-formatter') -const { validateOptionalField } = require('../../utils/validation/server-side-form-validations') +const paths = require('@root/paths') +const formatAccountPathsFor = require('@utils/format-account-paths-for') +const { safeConvertPoundsStringToPence } = require('@utils/currency-formatter') +const { validateOptionalField } = require('@utils/validation/server-side-form-validations') const HINT_MAX_LENGTH = 255 diff --git a/app/controllers/payment-links/post-edit-amount.controller.js b/app/controllers/payment-links/post-edit-amount.controller.js index bc00803556..f824a0afdc 100644 --- a/app/controllers/payment-links/post-edit-amount.controller.js +++ b/app/controllers/payment-links/post-edit-amount.controller.js @@ -2,10 +2,10 @@ const lodash = require('lodash') -const paths = require('../../paths') -const formatAccountPathsFor = require('../../utils/format-account-paths-for') -const { safeConvertPoundsStringToPence } = require('../../utils/currency-formatter') -const { validateOptionalField } = require('../../utils/validation/server-side-form-validations') +const paths = require('@root/paths') +const formatAccountPathsFor = require('@utils/format-account-paths-for') +const { safeConvertPoundsStringToPence } = require('@utils/currency-formatter') +const { validateOptionalField } = require('@utils/validation/server-side-form-validations') const HINT_MAX_LENGTH = 255 diff --git a/app/controllers/payment-links/post-edit-information.controller.js b/app/controllers/payment-links/post-edit-information.controller.js index 0b59643b5b..9e86851045 100644 --- a/app/controllers/payment-links/post-edit-information.controller.js +++ b/app/controllers/payment-links/post-edit-information.controller.js @@ -2,9 +2,9 @@ const lodash = require('lodash') -const paths = require('../../paths') -const formatAccountPathsFor = require('../../utils/format-account-paths-for') -const { validateMandatoryField, validateNaxsiSafe } = require('../../utils/validation/server-side-form-validations') +const paths = require('@root/paths') +const formatAccountPathsFor = require('@utils/format-account-paths-for') +const { validateMandatoryField, validateNaxsiSafe } = require('@utils/validation/server-side-form-validations') const TITLE_MAX_LENGTH = 255 diff --git a/app/controllers/payment-links/post-edit-reference.controller.js b/app/controllers/payment-links/post-edit-reference.controller.js index 31e550a551..9249c43a73 100644 --- a/app/controllers/payment-links/post-edit-reference.controller.js +++ b/app/controllers/payment-links/post-edit-reference.controller.js @@ -2,9 +2,9 @@ const lodash = require('lodash') -const paths = require('../../paths') -const formatAccountPathsFor = require('../../utils/format-account-paths-for') -const { validateOptionalField } = require('../../utils/validation/server-side-form-validations') +const paths = require('@root/paths') +const formatAccountPathsFor = require('@utils/format-account-paths-for') +const { validateOptionalField } = require('@utils/validation/server-side-form-validations') const LABEL_MAX_LENGTH = 50 const HINT_MAX_LENGTH = 255 diff --git a/app/controllers/payment-links/post-edit.controller.js b/app/controllers/payment-links/post-edit.controller.js index 93b6484358..1ac4c015ff 100644 --- a/app/controllers/payment-links/post-edit.controller.js +++ b/app/controllers/payment-links/post-edit.controller.js @@ -2,10 +2,10 @@ const lodash = require('lodash') -const paths = require('../../paths') -const formatAccountPathsFor = require('../../utils/format-account-paths-for') -const productsClient = require('../../services/clients/products.client.js') -const logger = require('../../utils/logger')(__filename) +const paths = require('@root/paths') +const formatAccountPathsFor = require('@utils/format-account-paths-for') +const productsClient = require('@services/clients/products.client.js') +const logger = require('@utils/logger')(__filename) module.exports = async function updatePaymentLink (req, res, next) { const { productExternalId } = req.params diff --git a/app/controllers/payment-links/post-information.controller.js b/app/controllers/payment-links/post-information.controller.js index 5c0e65b4e3..27144c2bd9 100644 --- a/app/controllers/payment-links/post-information.controller.js +++ b/app/controllers/payment-links/post-information.controller.js @@ -3,11 +3,11 @@ const lodash = require('lodash') const { slugify, removeIndefiniteArticles } = require('@govuk-pay/pay-js-commons').nunjucksFilters -const paths = require('../../paths') +const paths = require('@root/paths') -const formatAccountPathsFor = require('../../utils/format-account-paths-for') -const productsClient = require('../../services/clients/products.client.js') -const { validateMandatoryField, validateNaxsiSafe } = require('../../utils/validation/server-side-form-validations') +const formatAccountPathsFor = require('@utils/format-account-paths-for') +const productsClient = require('@services/clients/products.client.js') +const { validateMandatoryField, validateNaxsiSafe } = require('@utils/validation/server-side-form-validations') const TITLE_MAX_LENGTH = 255 diff --git a/app/controllers/payment-links/post-reference.controller.js b/app/controllers/payment-links/post-reference.controller.js index 34ed610ce4..509af7a556 100644 --- a/app/controllers/payment-links/post-reference.controller.js +++ b/app/controllers/payment-links/post-reference.controller.js @@ -1,10 +1,10 @@ 'use strict' const lodash = require('lodash') -const paths = require('../../paths') +const paths = require('@root/paths') -const formatAccountPathsFor = require('../../utils/format-account-paths-for') -const { validateOptionalField } = require('../../utils/validation/server-side-form-validations') +const formatAccountPathsFor = require('@utils/format-account-paths-for') +const { validateOptionalField } = require('@utils/validation/server-side-form-validations') const LABEL_MAX_LENGTH = 50 const HINT_MAX_LENGTH = 255 diff --git a/app/controllers/payment-links/post-review.controller.js b/app/controllers/payment-links/post-review.controller.js index 2ba9a8e3ce..04cd0da21a 100644 --- a/app/controllers/payment-links/post-review.controller.js +++ b/app/controllers/payment-links/post-review.controller.js @@ -1,14 +1,14 @@ 'use strict' const lodash = require('lodash') -const logger = require('../../utils/logger')(__filename) -const paths = require('../../paths') +const logger = require('@utils/logger')(__filename) +const paths = require('@root/paths') -const formatAccountPathsFor = require('../../utils/format-account-paths-for') -const productsClient = require('../../services/clients/products.client.js') -const productTypes = require('../../utils/product-types') -const publicAuthClient = require('../../services/clients/public-auth.client') -const supportedLanguage = require('../../models/supported-language') +const formatAccountPathsFor = require('@utils/format-account-paths-for') +const productsClient = require('@services/clients/products.client.js') +const productTypes = require('@utils/product-types') +const publicAuthClient = require('@services/clients/public-auth.client') +const supportedLanguage = require('@models/supported-language') module.exports = async function createPaymentLink (req, res) { const gatewayAccountId = req.account.gateway_account_id diff --git a/app/controllers/payment-links/post-update-reporting-column.controller.js b/app/controllers/payment-links/post-update-reporting-column.controller.js index e0686b78f9..a20988c3f9 100644 --- a/app/controllers/payment-links/post-update-reporting-column.controller.js +++ b/app/controllers/payment-links/post-update-reporting-column.controller.js @@ -1,10 +1,10 @@ 'use strict' -const logger = require('../../utils/logger')(__filename) +const logger = require('@utils/logger')(__filename) const MetadataForm = require('./metadata/metadata-form') -const { getPaymentLinksContext, metadata } = require('../../utils/payment-links') +const { getPaymentLinksContext, metadata } = require('@utils/payment-links') -const { response } = require('../../utils/response.js') +const { response } = require('@utils/response.js') function addMetadata (req, res, next) { try { diff --git a/app/controllers/payment-links/post-web-address.controller.js b/app/controllers/payment-links/post-web-address.controller.js index 78c5c9054b..9a1220c01a 100644 --- a/app/controllers/payment-links/post-web-address.controller.js +++ b/app/controllers/payment-links/post-web-address.controller.js @@ -2,11 +2,11 @@ const lodash = require('lodash') -const paths = require('../../paths') -const productsClient = require('../../services/clients/products.client.js') +const paths = require('@root/paths') +const productsClient = require('@services/clients/products.client.js') const { slugify, removeIndefiniteArticles } = require('@govuk-pay/pay-js-commons').nunjucksFilters -const formatAccountPathsFor = require('../../utils/format-account-paths-for') +const formatAccountPathsFor = require('@utils/format-account-paths-for') const makeNiceURL = string => { return slugify(removeIndefiniteArticles(string)) diff --git a/app/controllers/payment-types/get-index.controller.js b/app/controllers/payment-types/get-index.controller.js index c322aae38f..0ff3733cbf 100644 --- a/app/controllers/payment-types/get-index.controller.js +++ b/app/controllers/payment-types/get-index.controller.js @@ -1,7 +1,7 @@ 'use strict' -const { response } = require('../../utils/response') -const { ConnectorClient } = require('../../services/clients/connector.client') +const { response } = require('@utils/response') +const { ConnectorClient } = require('@services/clients/connector.client') const connector = new ConnectorClient(process.env.CONNECTOR_URL) function formatLabel (card) { diff --git a/app/controllers/payment-types/post-index.controller.js b/app/controllers/payment-types/post-index.controller.js index d223a189c2..b8747f3473 100644 --- a/app/controllers/payment-types/post-index.controller.js +++ b/app/controllers/payment-types/post-index.controller.js @@ -1,8 +1,8 @@ 'use strict' -const paths = require('../../paths') -const formatAccountPathsFor = require('../../utils/format-account-paths-for') -const { ConnectorClient } = require('../../services/clients/connector.client') +const paths = require('@root/paths') +const formatAccountPathsFor = require('@utils/format-account-paths-for') +const { ConnectorClient } = require('@services/clients/connector.client') const connector = new ConnectorClient(process.env.CONNECTOR_URL) module.exports = async function updateCardTypes (req, res, next) { diff --git a/app/controllers/payouts/payout-list.controller.js b/app/controllers/payouts/payout-list.controller.js index 8a073ebddd..cb68090881 100644 --- a/app/controllers/payouts/payout-list.controller.js +++ b/app/controllers/payouts/payout-list.controller.js @@ -1,9 +1,9 @@ const moment = require('moment') -const logger = require('../../utils/logger')(__filename) -const { response } = require('../../utils/response.js') -const permissions = require('../../utils/permissions') +const logger = require('@utils/logger')(__filename) +const { response } = require('@utils/response.js') +const permissions = require('@utils/permissions') const payoutService = require('./payouts.service') -const { NoServicesWithPermissionError } = require('../../errors') +const { NoServicesWithPermissionError } = require('@root/errors') const listAllServicesPayouts = async function listAllServicesPayouts (req, res, next) { const { page } = req.query diff --git a/app/controllers/payouts/payouts.service.it.test.js b/app/controllers/payouts/payouts.service.it.test.js index 78baede550..4c6525710b 100644 --- a/app/controllers/payouts/payouts.service.it.test.js +++ b/app/controllers/payouts/payouts.service.it.test.js @@ -4,7 +4,7 @@ const nock = require('nock') const { expect } = chai const payoutService = require('./payouts.service') -const fixtures = require('../../../test/fixtures/payout.fixtures') +const fixtures = require('@test/fixtures/payout.fixtures') const gatewayAccountId = '100' const ledgerMock = nock(process.env.LEDGER_URL) diff --git a/app/controllers/payouts/payouts.service.js b/app/controllers/payouts/payouts.service.js index 0d03e65679..e2b1d31dec 100644 --- a/app/controllers/payouts/payouts.service.js +++ b/app/controllers/payouts/payouts.service.js @@ -1,7 +1,7 @@ const moment = require('moment') -const Ledger = require('../../services/clients/ledger.client') -const Paginator = require('../../utils/paginator') +const Ledger = require('@services/clients/ledger.client') +const Paginator = require('@utils/paginator') const { indexServiceNamesByGatewayAccountId } = require('./user-services-names.controller') diff --git a/app/controllers/payouts/payouts.service.test.js b/app/controllers/payouts/payouts.service.test.js index f4f6fe4d45..4b6d86c6ec 100644 --- a/app/controllers/payouts/payouts.service.test.js +++ b/app/controllers/payouts/payouts.service.test.js @@ -1,9 +1,9 @@ const chai = require('chai') const { expect } = chai const { groupPayoutsByDate } = require('./payouts.service') -const User = require('../../models/User.class') -const payoutFixtures = require('../../../test/fixtures/payout.fixtures') -const userFixtures = require('../../../test/fixtures/user.fixtures') +const User = require('@models/User.class') +const payoutFixtures = require('@test/fixtures/payout.fixtures') +const userFixtures = require('@test/fixtures/user.fixtures') describe('payout service data transforms', () => { describe('grouping payouts by date', () => { diff --git a/app/controllers/payouts/user-services-names.controller.test.js b/app/controllers/payouts/user-services-names.controller.test.js index 154884fb21..4d1cd29759 100644 --- a/app/controllers/payouts/user-services-names.controller.test.js +++ b/app/controllers/payouts/user-services-names.controller.test.js @@ -1,8 +1,8 @@ const chai = require('chai') const { expect } = chai const { indexServiceNamesByGatewayAccountId } = require('./user-services-names.controller') -const User = require('../../models/User.class') -const fixtures = require('../../../test/fixtures/user.fixtures') +const User = require('@models/User.class') +const fixtures = require('@test/fixtures/user.fixtures') describe('user services to gateway account id map utility', () => { it('indexes gateway accounts to service names given a valid user object', () => { diff --git a/app/controllers/policy/aws-s3-policy-bucket.js b/app/controllers/policy/aws-s3-policy-bucket.js index 510bc19c5a..bc32aaf3d0 100644 --- a/app/controllers/policy/aws-s3-policy-bucket.js +++ b/app/controllers/policy/aws-s3-policy-bucket.js @@ -1,7 +1,7 @@ 'use strict' const AWS = require('aws-sdk') -const logger = require('../../utils/logger')(__filename) +const logger = require('@utils/logger')(__filename) // AWS S3 SDK is configured based on the production environment of the service const s3 = new AWS.S3() diff --git a/app/controllers/policy/policy.controller.js b/app/controllers/policy/policy.controller.js index 6a304ba6a0..3e8bc4aed4 100644 --- a/app/controllers/policy/policy.controller.js +++ b/app/controllers/policy/policy.controller.js @@ -1,7 +1,7 @@ 'use strict' -const logger = require('../../utils/logger')(__filename) -const { response } = require('../../utils/response') +const logger = require('@utils/logger')(__filename) +const { response } = require('@utils/response') const supportedPolicyDocuments = require('./supported-policy-documents') const policyBucket = require('./aws-s3-policy-bucket') diff --git a/app/controllers/privacy/privacy.controller.js b/app/controllers/privacy/privacy.controller.js index 74aa44a13e..c31a3ca8c3 100644 --- a/app/controllers/privacy/privacy.controller.js +++ b/app/controllers/privacy/privacy.controller.js @@ -1,6 +1,6 @@ 'use strict' -const sessionValidator = require('./../../services/session-validator') +const sessionValidator = require('@services/session-validator') function getPage (req, res) { const loggedIn = sessionValidator.validate(req.user, req.session) diff --git a/app/controllers/privacy/privacy.controller.test.js b/app/controllers/privacy/privacy.controller.test.js index 5cebd42849..a15ee94ef0 100644 --- a/app/controllers/privacy/privacy.controller.test.js +++ b/app/controllers/privacy/privacy.controller.test.js @@ -55,6 +55,6 @@ describe('Privacy controller', () => { const getControllerWithMock = function getController (sessionValidatorMock) { return proxyquire('./privacy.controller', { - './../../services/session-validator': sessionValidatorMock + '@services/session-validator': sessionValidatorMock }) } diff --git a/app/controllers/registration/registration.controller.js b/app/controllers/registration/registration.controller.js index 18cf520b59..0b00475341 100644 --- a/app/controllers/registration/registration.controller.js +++ b/app/controllers/registration/registration.controller.js @@ -3,22 +3,22 @@ const qrcode = require('qrcode') const lodash = require('lodash') -const logger = require('../../utils/logger')(__filename) -const { ExpiredInviteError } = require('../../errors') +const logger = require('@utils/logger')(__filename) +const { ExpiredInviteError } = require('@root/errors') const { RESTClientError } = require('@govuk-pay/pay-js-commons/lib/utils/axios-base-client/errors') -const adminusersClient = require('../../services/clients/adminusers.client')() -const paths = require('../../paths') +const adminusersClient = require('@services/clients/adminusers.client')() +const paths = require('@root/paths') const { validateEmail, validatePassword, validateOtp, validatePhoneNumber -} = require('../../utils/validation/server-side-form-validations') -const { isEmpty } = require('../../utils/validation/field-validation-checks') -const { sanitiseSecurityCode } = require('../../utils/security-code-utils') -const { validationErrors } = require('../../utils/validation/field-validation-checks') -const { INVITE_SESSION_COOKIE_NAME } = require('../../utils/constants') -const { APP, SMS } = require('../../models/second-factor-method') +} = require('@utils/validation/server-side-form-validations') +const { isEmpty } = require('@utils/validation/field-validation-checks') +const { sanitiseSecurityCode } = require('@utils/security-code-utils') +const { validationErrors } = require('@utils/validation/field-validation-checks') +const { INVITE_SESSION_COOKIE_NAME } = require('@utils/constants') +const { APP, SMS } = require('@models/second-factor-method') const { USER_EXTERNAL_ID } = require('@govuk-pay/pay-js-commons/lib/logging/keys') const EMAIL_INPUT_FIELD_NAME = 'email' diff --git a/app/controllers/registration/registration.controller.test.js b/app/controllers/registration/registration.controller.test.js index b9940d32e2..94109e7a12 100644 --- a/app/controllers/registration/registration.controller.test.js +++ b/app/controllers/registration/registration.controller.test.js @@ -2,12 +2,12 @@ const proxyquire = require('proxyquire') const sinon = require('sinon') const { expect } = require('chai') -const inviteFixtures = require('../../../test/fixtures/invite.fixtures') -const { ExpiredInviteError } = require('../../errors') +const inviteFixtures = require('@test/fixtures/invite.fixtures') +const { ExpiredInviteError } = require('@root/errors') const { RESTClientError } = require('@govuk-pay/pay-js-commons/lib/utils/axios-base-client/errors') const { paths } = require('../../routes') const registrationController = require('./registration.controller') -const { APP, SMS } = require('../../models/second-factor-method') +const { APP, SMS } = require('@models/second-factor-method') const lodash = require('lodash') const inviteCode = 'a-code' @@ -1009,7 +1009,7 @@ describe('Registration', () => { function getControllerWithMockedAdminusersClient (mockedAdminusersClient) { return proxyquire('./registration.controller.js', { - '../../services/clients/adminusers.client': () => mockedAdminusersClient, + '@services/clients/adminusers.client': () => mockedAdminusersClient, qrcode: { toDataURL: qrToDataURLSpy } }) } diff --git a/app/controllers/request-psp-test-account/get.controller.js b/app/controllers/request-psp-test-account/get.controller.js index 0311adc6ec..8deda0b6f8 100644 --- a/app/controllers/request-psp-test-account/get.controller.js +++ b/app/controllers/request-psp-test-account/get.controller.js @@ -1,8 +1,8 @@ 'use strict' -const { response } = require('../../utils/response') -const { NOT_STARTED, CREATED, REQUEST_SUBMITTED } = require('../../models/psp-test-account-stage') -const goLiveStage = require('../../models/go-live-stage') +const { response } = require('@utils/response') +const { NOT_STARTED, CREATED, REQUEST_SUBMITTED } = require('@models/psp-test-account-stage') +const goLiveStage = require('@models/go-live-stage') module.exports = function getRequestPspTestAccount (req, res, next) { const service = req.service diff --git a/app/controllers/request-psp-test-account/post.controller.js b/app/controllers/request-psp-test-account/post.controller.js index a44743e8f0..eeb0887961 100644 --- a/app/controllers/request-psp-test-account/post.controller.js +++ b/app/controllers/request-psp-test-account/post.controller.js @@ -1,11 +1,11 @@ 'use strict' -const { response } = require('../../utils/response') -const getAdminUsersClient = require('../../services/clients/adminusers.client') -const publicAuthClient = require('../../services/clients/public-auth.client') -const { ConnectorClient } = require('../../services/clients/connector.client') -const logger = require('../../utils/logger')(__filename) -const { CREATED, NOT_STARTED, REQUEST_SUBMITTED } = require('../../models/psp-test-account-stage') +const { response } = require('@utils/response') +const getAdminUsersClient = require('@services/clients/adminusers.client') +const publicAuthClient = require('@services/clients/public-auth.client') +const { ConnectorClient } = require('@services/clients/connector.client') +const logger = require('@utils/logger')(__filename) +const { CREATED, NOT_STARTED, REQUEST_SUBMITTED } = require('@models/psp-test-account-stage') const adminUsersClient = getAdminUsersClient() const { CONNECTOR_URL } = process.env const connectorClient = new ConnectorClient(CONNECTOR_URL) diff --git a/app/controllers/request-to-go-live/agreement/get.controller.js b/app/controllers/request-to-go-live/agreement/get.controller.js index c24c1b5bcd..9d881d8f2b 100644 --- a/app/controllers/request-to-go-live/agreement/get.controller.js +++ b/app/controllers/request-to-go-live/agreement/get.controller.js @@ -2,10 +2,10 @@ const lodash = require('lodash') -const goLiveStage = require('../../../models/go-live-stage') -const paths = require('../../../paths') -const { response } = require('../../../utils/response') -const formatServicePathsFor = require('../../../utils/format-service-paths-for') +const goLiveStage = require('@models/go-live-stage') +const paths = require('@root/paths') +const { response } = require('@utils/response') +const formatServicePathsFor = require('@utils/format-service-paths-for') const { CHOSEN_PSP_STRIPE, GOV_BANKING_MOTO_OPTION_COMPLETED } = goLiveStage const chosenOptions = [CHOSEN_PSP_STRIPE, GOV_BANKING_MOTO_OPTION_COMPLETED] diff --git a/app/controllers/request-to-go-live/agreement/post.controller.js b/app/controllers/request-to-go-live/agreement/post.controller.js index 5b28ab63bd..80c5675c68 100644 --- a/app/controllers/request-to-go-live/agreement/post.controller.js +++ b/app/controllers/request-to-go-live/agreement/post.controller.js @@ -2,15 +2,15 @@ const lodash = require('lodash') -const logger = require('../../../utils/logger')(__filename) -const goLiveStage = require('../../../models/go-live-stage') -const { updateCurrentGoLiveStage } = require('../../../services/service.service') -const { addGovUkAgreementEmailAddress, addStripeAgreementIpAddress } = require('../../../services/service.service') +const logger = require('@utils/logger')(__filename) +const goLiveStage = require('@models/go-live-stage') +const { updateCurrentGoLiveStage } = require('@services/service.service') +const { addGovUkAgreementEmailAddress, addStripeAgreementIpAddress } = require('@services/service.service') const goLiveStageToNextPagePath = require('../go-live-stage-to-next-page-path') const { isIPv4, isIPv6 } = require('net') -const zendeskClient = require('../../../services/clients/zendesk.client') -const formatServicePathsFor = require('../../../utils/format-service-paths-for') -const { response } = require('../../../utils/response') +const zendeskClient = require('@services/clients/zendesk.client') +const formatServicePathsFor = require('@utils/format-service-paths-for') +const { response } = require('@utils/response') const stages = { CHOSEN_PSP_STRIPE: goLiveStage.TERMS_AGREED_STRIPE, diff --git a/app/controllers/request-to-go-live/choose-how-to-process-payments/get.controller.js b/app/controllers/request-to-go-live/choose-how-to-process-payments/get.controller.js index f5dde3cab8..30fdf2a52d 100644 --- a/app/controllers/request-to-go-live/choose-how-to-process-payments/get.controller.js +++ b/app/controllers/request-to-go-live/choose-how-to-process-payments/get.controller.js @@ -1,9 +1,9 @@ 'use strict' -const goLiveStage = require('../../../models/go-live-stage') -const paths = require('../../../paths') -const response = require('../../../utils/response') -const formatServicePathsFor = require('../../../utils/format-service-paths-for') +const goLiveStage = require('@models/go-live-stage') +const paths = require('@root/paths') +const response = require('@utils/response') +const formatServicePathsFor = require('@utils/format-service-paths-for') module.exports = (req, res) => { // redirect on wrong stage diff --git a/app/controllers/request-to-go-live/choose-how-to-process-payments/post.controller.js b/app/controllers/request-to-go-live/choose-how-to-process-payments/post.controller.js index d68dd7a745..dead08b1d6 100644 --- a/app/controllers/request-to-go-live/choose-how-to-process-payments/post.controller.js +++ b/app/controllers/request-to-go-live/choose-how-to-process-payments/post.controller.js @@ -3,10 +3,10 @@ const lodash = require('lodash') const goLiveStageToNextPagePath = require('../go-live-stage-to-next-page-path') -const { updateCurrentGoLiveStage } = require('../../../services/service.service') -const goLiveStage = require('../../../models/go-live-stage') -const formatServicePathsFor = require('../../../utils/format-service-paths-for') -const response = require('../../../utils/response') +const { updateCurrentGoLiveStage } = require('@services/service.service') +const goLiveStage = require('@models/go-live-stage') +const formatServicePathsFor = require('@utils/format-service-paths-for') +const response = require('@utils/response') const PSP = 'choose-how-to-process-payments-mode' const stages = { diff --git a/app/controllers/request-to-go-live/choose-takes-payments-over-phone/get.controller.js b/app/controllers/request-to-go-live/choose-takes-payments-over-phone/get.controller.js index e1991595a9..c075491ce1 100644 --- a/app/controllers/request-to-go-live/choose-takes-payments-over-phone/get.controller.js +++ b/app/controllers/request-to-go-live/choose-takes-payments-over-phone/get.controller.js @@ -1,9 +1,9 @@ 'use strict' -const goLiveStage = require('../../../models/go-live-stage') -const paths = require('../../../paths') -const response = require('../../../utils/response') -const formatServicePathsFor = require('../../../utils/format-service-paths-for') +const goLiveStage = require('@models/go-live-stage') +const paths = require('@root/paths') +const response = require('@utils/response') +const formatServicePathsFor = require('@utils/format-service-paths-for') module.exports = (req, res) => { // redirect on wrong stage diff --git a/app/controllers/request-to-go-live/choose-takes-payments-over-phone/get.controller.test.js b/app/controllers/request-to-go-live/choose-takes-payments-over-phone/get.controller.test.js index 5ac4d505d4..5e2d576e93 100644 --- a/app/controllers/request-to-go-live/choose-takes-payments-over-phone/get.controller.test.js +++ b/app/controllers/request-to-go-live/choose-takes-payments-over-phone/get.controller.test.js @@ -6,10 +6,10 @@ const { NOT_STARTED, ENTERED_ORGANISATION_NAME, ENTERED_ORGANISATION_ADDRESS, CHOSEN_PSP_STRIPE, CHOSEN_PSP_GOV_BANKING_WORLDPAY, TERMS_AGREED_STRIPE, TERMS_AGREED_GOV_BANKING_WORLDPAY, LIVE, DENIED, GOV_BANKING_MOTO_OPTION_COMPLETED -} = require('../../../models/go-live-stage') +} = require('@models/go-live-stage') -const User = require('../../../models/User.class') -const userFixtures = require('../../../../test/fixtures/user.fixtures') +const User = require('@models/User.class') +const userFixtures = require('@test/fixtures/user.fixtures') describe('Request to go live - choose takes payments over phone - GET controller', () => { let req, res, next diff --git a/app/controllers/request-to-go-live/go-live-stage-to-next-page-path.js b/app/controllers/request-to-go-live/go-live-stage-to-next-page-path.js index 056398c193..782348cc97 100644 --- a/app/controllers/request-to-go-live/go-live-stage-to-next-page-path.js +++ b/app/controllers/request-to-go-live/go-live-stage-to-next-page-path.js @@ -1,7 +1,7 @@ 'use strict' -const goLiveStage = require('../../models/go-live-stage') -const { requestToGoLive } = require('../../paths').service +const goLiveStage = require('@models/go-live-stage') +const { requestToGoLive } = require('@root/paths').service const goLiveStageToNextPagePathMap = {} goLiveStageToNextPagePathMap[goLiveStage.NOT_STARTED] = requestToGoLive.organisationName diff --git a/app/controllers/request-to-go-live/go-live-stage-to-next-page-path.test.js b/app/controllers/request-to-go-live/go-live-stage-to-next-page-path.test.js index 96c3c74265..1d8da3c001 100644 --- a/app/controllers/request-to-go-live/go-live-stage-to-next-page-path.test.js +++ b/app/controllers/request-to-go-live/go-live-stage-to-next-page-path.test.js @@ -3,7 +3,7 @@ const chai = require('chai') const goLiveStageToNextPagePath = require('./go-live-stage-to-next-page-path') -const goLiveStage = require('../../models/go-live-stage') +const goLiveStage = require('@models/go-live-stage') // Constants const expect = chai.expect diff --git a/app/controllers/request-to-go-live/index/get.controller.js b/app/controllers/request-to-go-live/index/get.controller.js index a0df800a04..75fa444851 100644 --- a/app/controllers/request-to-go-live/index/get.controller.js +++ b/app/controllers/request-to-go-live/index/get.controller.js @@ -2,8 +2,8 @@ const lodash = require('lodash') -const goLiveStage = require('../../../models/go-live-stage') -const response = require('../../../utils/response') +const goLiveStage = require('@models/go-live-stage') +const response = require('@utils/response') const { NOT_STARTED, diff --git a/app/controllers/request-to-go-live/index/post.controller.js b/app/controllers/request-to-go-live/index/post.controller.js index f37d4e9f60..de850e20fa 100644 --- a/app/controllers/request-to-go-live/index/post.controller.js +++ b/app/controllers/request-to-go-live/index/post.controller.js @@ -1,7 +1,7 @@ 'use strict' const goLiveStageToNextPagePath = require('../go-live-stage-to-next-page-path') -const formatServicePathsFor = require('../../../utils/format-service-paths-for') +const formatServicePathsFor = require('@utils/format-service-paths-for') module.exports = (req, res) => { res.redirect( diff --git a/app/controllers/request-to-go-live/organisation-address/get.controller.js b/app/controllers/request-to-go-live/organisation-address/get.controller.js index e47aace6da..4c8ce10fda 100644 --- a/app/controllers/request-to-go-live/organisation-address/get.controller.js +++ b/app/controllers/request-to-go-live/organisation-address/get.controller.js @@ -2,13 +2,13 @@ const lodash = require('lodash') -const goLiveStage = require('../../../models/go-live-stage') -const paths = require('../../../paths') -const { response } = require('../../../utils/response') +const goLiveStage = require('@models/go-live-stage') +const paths = require('@root/paths') +const { response } = require('@utils/response') const { countries } = require('@govuk-pay/pay-js-commons').utils -const formatServicePathsFor = require('../../../utils/format-service-paths-for') +const formatServicePathsFor = require('@utils/format-service-paths-for') const { getAlreadySubmittedErrorPageData } = require('../../stripe-setup/stripe-setup.util') -const { isSwitchingCredentialsRoute, isEnableStripeOnboardingTaskListRoute, getCurrentCredential } = require('../../../utils/credentials') +const { isSwitchingCredentialsRoute, isEnableStripeOnboardingTaskListRoute, getCurrentCredential } = require('@utils/credentials') module.exports = function getOrganisationAddress (req, res) { const isRequestToGoLive = Object.values(paths.service.requestToGoLive).includes(req.route && req.route.path) diff --git a/app/controllers/request-to-go-live/organisation-address/get.controller.test.js b/app/controllers/request-to-go-live/organisation-address/get.controller.test.js index eeec781fd6..9f45304e8e 100644 --- a/app/controllers/request-to-go-live/organisation-address/get.controller.test.js +++ b/app/controllers/request-to-go-live/organisation-address/get.controller.test.js @@ -4,15 +4,15 @@ const proxyquire = require('proxyquire') const sinon = require('sinon') const { expect } = require('chai') -const goLiveStage = require('../../../models/go-live-stage') -const Service = require('../../../models/Service.class') -const serviceFixtures = require('../../../../test/fixtures/service.fixtures') +const goLiveStage = require('@models/go-live-stage') +const Service = require('@models/Service.class') +const serviceFixtures = require('@test/fixtures/service.fixtures') const mockResponse = sinon.spy() const getController = function getController () { return proxyquire('./get.controller', { - '../../../utils/response': { + '@utils/response': { response: mockResponse } }) diff --git a/app/controllers/request-to-go-live/organisation-address/post.controller.test.js b/app/controllers/request-to-go-live/organisation-address/post.controller.test.js index f389469926..514578f7a0 100644 --- a/app/controllers/request-to-go-live/organisation-address/post.controller.test.js +++ b/app/controllers/request-to-go-live/organisation-address/post.controller.test.js @@ -4,10 +4,10 @@ const proxyquire = require('proxyquire') const sinon = require('sinon') const { expect } = require('chai') -const goLiveStage = require('../../../models/go-live-stage') -const Service = require('../../../models/Service.class') -const serviceFixtures = require('../../../../test/fixtures/service.fixtures') -const gatewayAccountFixture = require('../../../../test/fixtures/gateway-account.fixtures') +const goLiveStage = require('@models/go-live-stage') +const Service = require('@models/Service.class') +const serviceFixtures = require('@test/fixtures/service.fixtures') +const gatewayAccountFixture = require('@test/fixtures/gateway-account.fixtures') const mockResponse = sinon.spy() diff --git a/app/controllers/request-to-go-live/organisation-name/get.controller.js b/app/controllers/request-to-go-live/organisation-name/get.controller.js index 51d1ae07db..bb677c3f2b 100644 --- a/app/controllers/request-to-go-live/organisation-name/get.controller.js +++ b/app/controllers/request-to-go-live/organisation-name/get.controller.js @@ -2,10 +2,10 @@ const lodash = require('lodash') -const goLiveStage = require('../../../models/go-live-stage') -const paths = require('../../../paths') -const response = require('../../../utils/response') -const formatServicePathsFor = require('../../../utils/format-service-paths-for') +const goLiveStage = require('@models/go-live-stage') +const paths = require('@root/paths') +const response = require('@utils/response') +const formatServicePathsFor = require('@utils/format-service-paths-for') module.exports = (req, res) => { // redirect on wrong stage diff --git a/app/controllers/request-to-go-live/organisation-name/post.controller.test.js b/app/controllers/request-to-go-live/organisation-name/post.controller.test.js index 89aa37578d..738ad62317 100644 --- a/app/controllers/request-to-go-live/organisation-name/post.controller.test.js +++ b/app/controllers/request-to-go-live/organisation-name/post.controller.test.js @@ -6,7 +6,7 @@ const { expect } = require('chai') const getController = function getContsroller (mockServiceService) { return proxyquire('./post.controller', { - '../../../services/service.service': { + '@services/service.service': { updateCurrentGoLiveStage: Promise.resolve(), updateService: Promise.resolve() } diff --git a/app/controllers/root/index.controller.js b/app/controllers/root/index.controller.js index 75488d81e7..b136d96544 100644 --- a/app/controllers/root/index.controller.js +++ b/app/controllers/root/index.controller.js @@ -1,6 +1,6 @@ 'use strict' -const paths = require('../../paths') +const paths = require('@root/paths') function get (req, res) { res.redirect(paths.serviceSwitcher.index) diff --git a/app/controllers/service-roles-update.controller.js b/app/controllers/service-roles-update.controller.js index 2132580ee5..c65cf3ae57 100644 --- a/app/controllers/service-roles-update.controller.js +++ b/app/controllers/service-roles-update.controller.js @@ -1,14 +1,14 @@ const _ = require('lodash') -const paths = require('../paths') -const logger = require('../utils/logger')(__filename) +const paths = require('@root/paths') +const logger = require('@utils/logger')(__filename) -const rolesModule = require('../utils/roles') +const rolesModule = require('@utils/roles') const roles = rolesModule.roles const getRole = rolesModule.getRoleByExtId -const userService = require('../services/user.service.js') +const userService = require('@services/user.service.js') -const { renderErrorView, response } = require('../utils/response') +const { renderErrorView, response } = require('@utils/response') const hasSameService = (admin, user, externalServiceId) => { return admin.hasService(externalServiceId) && user.hasService(externalServiceId) @@ -19,7 +19,7 @@ const serviceIdMismatchView = (req, res, adminUserExternalId, targetServiceExter return renderErrorView(req, res, 'Unable to update permissions for this user') } -const formatServicePathsFor = require('../utils/format-service-paths-for') +const formatServicePathsFor = require('@utils/format-service-paths-for') async function index (req, res, next) { const externalUserId = req.params.externalUserId diff --git a/app/controllers/service-switch.controller.it.test.js b/app/controllers/service-switch.controller.it.test.js index 9829f5043e..ea38b1aacc 100644 --- a/app/controllers/service-switch.controller.it.test.js +++ b/app/controllers/service-switch.controller.it.test.js @@ -8,9 +8,9 @@ const chaiAsPromised = require('chai-as-promised') const { expect } = require('chai') const myServicesController = require('./my-services') -const User = require('../models/User.class') -const userFixtures = require('../../test/fixtures/user.fixtures') -const gatewayAccountFixtures = require('../../test/fixtures/gateway-account.fixtures') +const User = require('@models/User.class') +const userFixtures = require('@test/fixtures/user.fixtures') +const gatewayAccountFixtures = require('@test/fixtures/gateway-account.fixtures') chai.use(chaiAsPromised) diff --git a/app/controllers/service-users.controller.js b/app/controllers/service-users.controller.js index 1bc01eaba7..1fe77dda96 100644 --- a/app/controllers/service-users.controller.js +++ b/app/controllers/service-users.controller.js @@ -1,13 +1,13 @@ const _ = require('lodash') -const { renderErrorView, response } = require('../utils/response.js') -const userService = require('../services/user.service.js') -const paths = require('../paths.js') -const roles = require('../utils/roles').roles -const secondFactorMethod = require('../models/second-factor-method') -const logger = require('../utils/logger.js')(__filename) -const { SHOW_DEGATEWAY_SETTINGS } = require('../utils/constants') -const formatServicePathsFor = require('../utils/format-service-paths-for') +const { renderErrorView, response } = require('@utils/response.js') +const userService = require('@services/user.service.js') +const paths = require('@root/paths.js') +const roles = require('@utils/roles').roles +const secondFactorMethod = require('@models/second-factor-method') +const logger = require('@utils/logger.js')(__filename) +const { SHOW_DEGATEWAY_SETTINGS } = require('@utils/constants') +const formatServicePathsFor = require('@utils/format-service-paths-for') const mapByRoles = function (users, externalServiceId, currentUser) { const userRolesMap = {} diff --git a/app/controllers/settings/default-billing-address-country.controller.js b/app/controllers/settings/default-billing-address-country.controller.js index a3102e34eb..51478205de 100644 --- a/app/controllers/settings/default-billing-address-country.controller.js +++ b/app/controllers/settings/default-billing-address-country.controller.js @@ -1,9 +1,9 @@ 'use strict' -const paths = require('../../paths') -const { response } = require('../../utils/response') -const formatAccountPathsFor = require('../../utils/format-account-paths-for') -const getAdminUsersClient = require('../../services/clients/adminusers.client') +const paths = require('@root/paths') +const { response } = require('@utils/response') +const formatAccountPathsFor = require('@utils/format-account-paths-for') +const getAdminUsersClient = require('@services/clients/adminusers.client') const adminUsersClient = getAdminUsersClient() const GB_COUNTRY_CODE = 'GB' diff --git a/app/controllers/settings/default-billing-address-country.controller.test.js b/app/controllers/settings/default-billing-address-country.controller.test.js index 39c8f4c217..8706f4a69b 100644 --- a/app/controllers/settings/default-billing-address-country.controller.test.js +++ b/app/controllers/settings/default-billing-address-country.controller.test.js @@ -1,9 +1,9 @@ const proxyquire = require('proxyquire') const sinon = require('sinon') -const Service = require('../../models/Service.class') -const serviceFixtures = require('../../../test/fixtures/service.fixtures') -const gatewayAccountFixtures = require('../../../test/fixtures/gateway-account.fixtures') +const Service = require('@models/Service.class') +const serviceFixtures = require('@test/fixtures/service.fixtures') +const gatewayAccountFixtures = require('@test/fixtures/gateway-account.fixtures') const updateDefaultBillingAddressCountrySpy = sinon.spy() const adminuUsersClientStub = () => { @@ -13,7 +13,7 @@ const adminuUsersClientStub = () => { } const controller = proxyquire('./default-billing-address-country.controller', { - '../../services/clients/adminusers.client': adminuUsersClientStub + '@services/clients/adminusers.client': adminuUsersClientStub } ) diff --git a/app/controllers/settings/get.settings.controller.js b/app/controllers/settings/get.settings.controller.js index 7171956118..7b15ec89d5 100644 --- a/app/controllers/settings/get.settings.controller.js +++ b/app/controllers/settings/get.settings.controller.js @@ -1,7 +1,7 @@ 'use strict' -const { response } = require('../../utils/response') -const humaniseEmailMode = require('../../utils/humanise-email-mode') +const { response } = require('@utils/response') +const humaniseEmailMode = require('@utils/humanise-email-mode') module.exports = (req, res) => { const pageData = { diff --git a/app/controllers/simplified-account/settings/email-notifications/email-notifications.controller.js b/app/controllers/simplified-account/settings/email-notifications/email-notifications.controller.js index afa7b1811d..10cf141e77 100644 --- a/app/controllers/simplified-account/settings/email-notifications/email-notifications.controller.js +++ b/app/controllers/simplified-account/settings/email-notifications/email-notifications.controller.js @@ -1,8 +1,8 @@ -const { response } = require('../../../../utils/response') -const formatSimplifiedAccountPathsFor = require('../../../../utils/simplified-account/format/format-simplified-account-paths-for') -const paths = require('../../../../paths') -const { setEmailCollectionModeByServiceIdAndAccountType } = require('../../../../services/email.service') -const logger = require('../../../../utils/logger')(__filename) +const { response } = require('@utils/response') +const formatSimplifiedAccountPathsFor = require('@utils/simplified-account/format/format-simplified-account-paths-for') +const paths = require('@root/paths') +const { setEmailCollectionModeByServiceIdAndAccountType } = require('@services/email.service') +const logger = require('@utils/logger')(__filename) function getEmailNotificationsSettingsPage (req, res) { const service = req.service diff --git a/app/controllers/simplified-account/settings/email-notifications/email-notifications.controller.test.js b/app/controllers/simplified-account/settings/email-notifications/email-notifications.controller.test.js index 82bf691e86..dd54de6827 100644 --- a/app/controllers/simplified-account/settings/email-notifications/email-notifications.controller.test.js +++ b/app/controllers/simplified-account/settings/email-notifications/email-notifications.controller.test.js @@ -1,8 +1,8 @@ const { expect } = require('chai') const proxyquire = require('proxyquire') const sinon = require('sinon') -const User = require('../../../../models/User.class') -const paths = require('../../../../paths') +const User = require('@models/User.class') +const paths = require('@root/paths') const ACCOUNT_TYPE = 'test' const SERVICE_ID = 'service-id-123abc' @@ -11,8 +11,8 @@ let req, res, responseStub, emailNotificationsController, setEmailCollectionMode const getController = (stubs = {}) => { return proxyquire('./email-notifications.controller', { - '../../../../utils/response': { response: stubs.response }, - '../../../../services/email.service': { setEmailCollectionModeByServiceIdAndAccountType: stubs.setEmailCollectionModeByServiceIdAndAccountType } + '@utils/response': { response: stubs.response }, + '@services/email.service': { setEmailCollectionModeByServiceIdAndAccountType: stubs.setEmailCollectionModeByServiceIdAndAccountType } }) } diff --git a/app/controllers/simplified-account/settings/email-notifications/payment-confirmation-emails/payment-confirmation-emails.controller.js b/app/controllers/simplified-account/settings/email-notifications/payment-confirmation-emails/payment-confirmation-emails.controller.js index 2c273e98e4..00f0e62e54 100644 --- a/app/controllers/simplified-account/settings/email-notifications/payment-confirmation-emails/payment-confirmation-emails.controller.js +++ b/app/controllers/simplified-account/settings/email-notifications/payment-confirmation-emails/payment-confirmation-emails.controller.js @@ -1,8 +1,8 @@ -const { response } = require('../../../../../utils/response') -const formatSimplifiedAccountPathsFor = require('../../../../../utils/simplified-account/format/format-simplified-account-paths-for') -const paths = require('../../../../../paths') -const { setConfirmationEnabledByServiceIdAndAccountType } = require('../../../../../services/email.service') -const logger = require('../../../../../utils/logger')(__filename) +const { response } = require('@utils/response') +const formatSimplifiedAccountPathsFor = require('@utils/simplified-account/format/format-simplified-account-paths-for') +const paths = require('@root/paths') +const { setConfirmationEnabledByServiceIdAndAccountType } = require('@services/email.service') +const logger = require('@utils/logger')(__filename) function get (req, res) { const account = req.account diff --git a/app/controllers/simplified-account/settings/email-notifications/payment-confirmation-emails/payment-confirmation-emails.controller.test.js b/app/controllers/simplified-account/settings/email-notifications/payment-confirmation-emails/payment-confirmation-emails.controller.test.js index 913d36a011..e773244519 100644 --- a/app/controllers/simplified-account/settings/email-notifications/payment-confirmation-emails/payment-confirmation-emails.controller.test.js +++ b/app/controllers/simplified-account/settings/email-notifications/payment-confirmation-emails/payment-confirmation-emails.controller.test.js @@ -1,7 +1,7 @@ const sinon = require('sinon') -const User = require('../../../../../models/User.class') +const User = require('@models/User.class') const { expect } = require('chai') -const paths = require('../../../../../paths') +const paths = require('@root/paths') const proxyquire = require('proxyquire') const ACCOUNT_TYPE = 'test' @@ -11,8 +11,8 @@ let req, res, responseStub, paymentConfirmationEmailsController, setConfirmation const getController = (stubs = {}) => { return proxyquire('./payment-confirmation-emails.controller', { - '../../../../../utils/response': { response: stubs.response }, - '../../../../../services/email.service': { setConfirmationEnabledByServiceIdAndAccountType: stubs.setConfirmationEnabledByServiceIdAndAccountType } + '@utils/response': { response: stubs.response }, + '@services/email.service': { setConfirmationEnabledByServiceIdAndAccountType: stubs.setConfirmationEnabledByServiceIdAndAccountType } }) } diff --git a/app/controllers/simplified-account/settings/email-notifications/refund-emails/refund-emails.controller.js b/app/controllers/simplified-account/settings/email-notifications/refund-emails/refund-emails.controller.js index c9bf18de3f..615a20d42d 100644 --- a/app/controllers/simplified-account/settings/email-notifications/refund-emails/refund-emails.controller.js +++ b/app/controllers/simplified-account/settings/email-notifications/refund-emails/refund-emails.controller.js @@ -1,8 +1,8 @@ -const { response } = require('../../../../../utils/response') -const formatSimplifiedAccountPathsFor = require('../../../../../utils/simplified-account/format/format-simplified-account-paths-for') -const paths = require('../../../../../paths') -const { setRefundEmailEnabledByServiceIdAndAccountType } = require('../../../../../services/email.service') -const logger = require('../../../../../utils/logger')(__filename) +const { response } = require('@utils/response') +const formatSimplifiedAccountPathsFor = require('@utils/simplified-account/format/format-simplified-account-paths-for') +const paths = require('@root/paths') +const { setRefundEmailEnabledByServiceIdAndAccountType } = require('@services/email.service') +const logger = require('@utils/logger')(__filename) function get (req, res) { const account = req.account diff --git a/app/controllers/simplified-account/settings/email-notifications/refund-emails/refund-emails.controller.test.js b/app/controllers/simplified-account/settings/email-notifications/refund-emails/refund-emails.controller.test.js index 110a9dc285..a0a019577a 100644 --- a/app/controllers/simplified-account/settings/email-notifications/refund-emails/refund-emails.controller.test.js +++ b/app/controllers/simplified-account/settings/email-notifications/refund-emails/refund-emails.controller.test.js @@ -1,7 +1,7 @@ const sinon = require('sinon') -const User = require('../../../../../models/User.class') +const User = require('@models/User.class') const { expect } = require('chai') -const paths = require('../../../../../paths') +const paths = require('@root/paths') const proxyquire = require('proxyquire') const ACCOUNT_TYPE = 'test' @@ -11,8 +11,8 @@ let req, res, responseStub, refundEmailsController, setRefundEmailEnabledByServi const getController = (stubs = {}) => { return proxyquire('./refund-emails.controller', { - '../../../../../utils/response': { response: stubs.response }, - '../../../../../services/email.service': { setRefundEmailEnabledByServiceIdAndAccountType: stubs.setRefundEmailEnabledByServiceIdAndAccountType } + '@utils/response': { response: stubs.response }, + '@services/email.service': { setRefundEmailEnabledByServiceIdAndAccountType: stubs.setRefundEmailEnabledByServiceIdAndAccountType } }) } diff --git a/app/controllers/simplified-account/settings/email-notifications/templates/custom-paragraph.controller.test.js b/app/controllers/simplified-account/settings/email-notifications/templates/custom-paragraph.controller.test.js index 73b3487ea6..c043dab10e 100644 --- a/app/controllers/simplified-account/settings/email-notifications/templates/custom-paragraph.controller.test.js +++ b/app/controllers/simplified-account/settings/email-notifications/templates/custom-paragraph.controller.test.js @@ -1,7 +1,7 @@ const sinon = require('sinon') -const User = require('../../../../../models/User.class') +const User = require('@models/User.class') const { expect } = require('chai') -const paths = require('../../../../../paths') +const paths = require('@root/paths') const proxyquire = require('proxyquire') const ACCOUNT_TYPE = 'test' diff --git a/app/controllers/simplified-account/settings/email-notifications/templates/templates.controller.js b/app/controllers/simplified-account/settings/email-notifications/templates/templates.controller.js index 85c76cd7fc..6dae96502e 100644 --- a/app/controllers/simplified-account/settings/email-notifications/templates/templates.controller.js +++ b/app/controllers/simplified-account/settings/email-notifications/templates/templates.controller.js @@ -1,6 +1,6 @@ -const { response } = require('../../../../../utils/response') -const formatSimplifiedAccountPathsFor = require('../../../../../utils/simplified-account/format/format-simplified-account-paths-for') -const paths = require('../../../../../paths') +const { response } = require('@utils/response') +const formatSimplifiedAccountPathsFor = require('@utils/simplified-account/format/format-simplified-account-paths-for') +const paths = require('@root/paths') function get (req, res) { const account = req.account diff --git a/app/controllers/simplified-account/settings/email-notifications/templates/templates.controller.test.js b/app/controllers/simplified-account/settings/email-notifications/templates/templates.controller.test.js index 4428d0c41f..83851d5642 100644 --- a/app/controllers/simplified-account/settings/email-notifications/templates/templates.controller.test.js +++ b/app/controllers/simplified-account/settings/email-notifications/templates/templates.controller.test.js @@ -1,7 +1,7 @@ const sinon = require('sinon') -const User = require('../../../../../models/User.class') +const User = require('@models/User.class') const { expect } = require('chai') -const paths = require('../../../../../paths') +const paths = require('@root/paths') const proxyquire = require('proxyquire') const ACCOUNT_TYPE = 'test' @@ -12,7 +12,7 @@ let req, res, responseStub, templatesController const getController = (stubs = {}) => { return proxyquire('./templates.controller', { - '../../../../../utils/response': { response: stubs.response } + '@utils/response': { response: stubs.response } }) } diff --git a/app/controllers/static.controller.js b/app/controllers/static.controller.js index 877ec5296a..3d77c04039 100644 --- a/app/controllers/static.controller.js +++ b/app/controllers/static.controller.js @@ -1,4 +1,4 @@ -const logger = require('../utils/logger')(__filename) +const logger = require('@utils/logger')(__filename) module.exports.naxsiError = function (req, res) { res.status(400) diff --git a/app/controllers/stripe-setup/add-psp-account-details/get.controller.js b/app/controllers/stripe-setup/add-psp-account-details/get.controller.js index 27f8061314..21af603300 100644 --- a/app/controllers/stripe-setup/add-psp-account-details/get.controller.js +++ b/app/controllers/stripe-setup/add-psp-account-details/get.controller.js @@ -1,9 +1,9 @@ 'use strict' -const paths = require('../../../paths') -const formatAccountPathsFor = require('../../../utils/format-account-paths-for') -const { getCurrentCredential } = require('../../../utils/credentials') -const { response } = require('../../../utils/response') +const paths = require('@root/paths') +const formatAccountPathsFor = require('@utils/format-account-paths-for') +const { getCurrentCredential } = require('@utils/credentials') +const { response } = require('@utils/response') module.exports = async function getPspAccountDetails (req, res, next) { if (!req.account || !req.account.connectorGatewayAccountStripeProgress) { diff --git a/app/controllers/stripe-setup/add-psp-account-details/get.controller.test.js b/app/controllers/stripe-setup/add-psp-account-details/get.controller.test.js index 78a8747e0c..70fbabf301 100644 --- a/app/controllers/stripe-setup/add-psp-account-details/get.controller.test.js +++ b/app/controllers/stripe-setup/add-psp-account-details/get.controller.test.js @@ -2,7 +2,7 @@ const sinon = require('sinon') -const gatewayAccountFixture = require('../../../../test/fixtures/gateway-account.fixtures') +const gatewayAccountFixture = require('@test/fixtures/gateway-account.fixtures') const getController = require('./get.controller') describe('Stripe setup get controller', () => { diff --git a/app/controllers/stripe-setup/bank-details/bank-details-validations.js b/app/controllers/stripe-setup/bank-details/bank-details-validations.js index bb39f1fa77..969327f432 100644 --- a/app/controllers/stripe-setup/bank-details/bank-details-validations.js +++ b/app/controllers/stripe-setup/bank-details/bank-details-validations.js @@ -1,6 +1,6 @@ 'use strict' -const { isEmpty, isNotAccountNumber, isNotSortCode } = require('../../../utils/validation/field-validation-checks') +const { isEmpty, isNotAccountNumber, isNotSortCode } = require('@utils/validation/field-validation-checks') exports.validateAccountNumber = (accountNumber) => { if (isEmpty(accountNumber)) { diff --git a/app/controllers/stripe-setup/bank-details/get.controller.js b/app/controllers/stripe-setup/bank-details/get.controller.js index 6ab1410ba6..09609a3835 100644 --- a/app/controllers/stripe-setup/bank-details/get.controller.js +++ b/app/controllers/stripe-setup/bank-details/get.controller.js @@ -1,7 +1,7 @@ 'use strict' -const { response } = require('../../../utils/response') -const { isSwitchingCredentialsRoute, getCurrentCredential, isEnableStripeOnboardingTaskListRoute } = require('../../../utils/credentials') +const { response } = require('@utils/response') +const { isSwitchingCredentialsRoute, getCurrentCredential, isEnableStripeOnboardingTaskListRoute } = require('@utils/credentials') const { getAlreadySubmittedErrorPageData } = require('../stripe-setup.util') module.exports = (req, res, next) => { diff --git a/app/controllers/stripe-setup/bank-details/post.controller.js b/app/controllers/stripe-setup/bank-details/post.controller.js index b8aedc976c..5fcc0b5901 100644 --- a/app/controllers/stripe-setup/bank-details/post.controller.js +++ b/app/controllers/stripe-setup/bank-details/post.controller.js @@ -2,17 +2,17 @@ const lodash = require('lodash') -const logger = require('../../../utils/logger')(__filename) -const { response } = require('../../../utils/response') -const { isSwitchingCredentialsRoute, getCurrentCredential, isEnableStripeOnboardingTaskListRoute } = require('../../../utils/credentials') +const logger = require('@utils/logger')(__filename) +const { response } = require('@utils/response') +const { isSwitchingCredentialsRoute, getCurrentCredential, isEnableStripeOnboardingTaskListRoute } = require('@utils/credentials') const { getStripeAccountId, getAlreadySubmittedErrorPageData } = require('../stripe-setup.util') const bankDetailsValidations = require('./bank-details-validations') -const { updateBankAccount } = require('../../../services/clients/stripe/stripe.client') -const { ConnectorClient } = require('../../../services/clients/connector.client') +const { updateBankAccount } = require('@services/clients/stripe/stripe.client') +const { ConnectorClient } = require('@services/clients/connector.client') const connector = new ConnectorClient(process.env.CONNECTOR_URL) -const paths = require('../../../paths') -const formatAccountPathsFor = require('../../../utils/format-account-paths-for') -const fieldValidationChecks = require('../../../utils/validation/field-validation-checks') +const paths = require('@root/paths') +const formatAccountPathsFor = require('@utils/format-account-paths-for') +const fieldValidationChecks = require('@utils/validation/field-validation-checks') // Constants const ACCOUNT_NUMBER_FIELD = 'account-number' diff --git a/app/controllers/stripe-setup/bank-details/post.controller.test.js b/app/controllers/stripe-setup/bank-details/post.controller.test.js index 3a5a527f03..86d37304e1 100644 --- a/app/controllers/stripe-setup/bank-details/post.controller.test.js +++ b/app/controllers/stripe-setup/bank-details/post.controller.test.js @@ -2,7 +2,7 @@ const proxyquire = require('proxyquire') const sinon = require('sinon') -const paths = require('../../../paths') +const paths = require('@root/paths') const { expect } = require('chai') describe('Bank details post controller', () => { @@ -274,10 +274,10 @@ describe('Bank details post controller', () => { function getControllerWithMocks () { return proxyquire('./post.controller', { - '../../../services/clients/stripe/stripe.client': { + '@services/clients/stripe/stripe.client': { updateBankAccount: updateBankAccountMock }, - '../../../services/clients/connector.client': { + '@services/clients/connector.client': { ConnectorClient: function () { this.setStripeAccountSetupFlag = setStripeAccountSetupFlagMock } diff --git a/app/controllers/stripe-setup/check-org-details/get.controller.js b/app/controllers/stripe-setup/check-org-details/get.controller.js index 7e29792ef4..3605e3bb04 100644 --- a/app/controllers/stripe-setup/check-org-details/get.controller.js +++ b/app/controllers/stripe-setup/check-org-details/get.controller.js @@ -1,7 +1,7 @@ 'use strict' -const { response } = require('../../../utils/response') -const { isSwitchingCredentialsRoute, getCurrentCredential, isEnableStripeOnboardingTaskListRoute } = require('../../../utils/credentials') +const { response } = require('@utils/response') +const { isSwitchingCredentialsRoute, getCurrentCredential, isEnableStripeOnboardingTaskListRoute } = require('@utils/credentials') const { getAlreadySubmittedErrorPageData } = require('../stripe-setup.util') const lodash = require('lodash') diff --git a/app/controllers/stripe-setup/check-org-details/get.controller.test.js b/app/controllers/stripe-setup/check-org-details/get.controller.test.js index d07c814234..1c95b660ac 100644 --- a/app/controllers/stripe-setup/check-org-details/get.controller.test.js +++ b/app/controllers/stripe-setup/check-org-details/get.controller.test.js @@ -3,11 +3,11 @@ const sinon = require('sinon') const { expect } = require('chai') const getController = require('./get.controller') -const Service = require('../../../models/Service.class') -const User = require('../../../models/User.class') -const serviceFixtures = require('../../../../test/fixtures/service.fixtures') -const userFixtures = require('../../../../test/fixtures/user.fixtures') -const gatewayAccountFixture = require('../../../../test/fixtures/gateway-account.fixtures') +const Service = require('@models/Service.class') +const User = require('@models/User.class') +const serviceFixtures = require('@test/fixtures/service.fixtures') +const userFixtures = require('@test/fixtures/user.fixtures') +const gatewayAccountFixture = require('@test/fixtures/gateway-account.fixtures') describe('Check org details - get controller', () => { let req diff --git a/app/controllers/stripe-setup/check-org-details/post.controller.js b/app/controllers/stripe-setup/check-org-details/post.controller.js index 5905d0d3d4..5bbfbdc277 100644 --- a/app/controllers/stripe-setup/check-org-details/post.controller.js +++ b/app/controllers/stripe-setup/check-org-details/post.controller.js @@ -2,13 +2,13 @@ const lodash = require('lodash') -const logger = require('../../../utils/logger')(__filename) -const { response } = require('../../../utils/response') +const logger = require('@utils/logger')(__filename) +const { response } = require('@utils/response') const { getAlreadySubmittedErrorPageData } = require('../stripe-setup.util') -const paths = require('../../../paths') -const formatAccountPathsFor = require('../../../utils/format-account-paths-for') -const { getCredentialByExternalId, isSwitchingCredentialsRoute, getCurrentCredential, isEnableStripeOnboardingTaskListRoute } = require('../../../utils/credentials') -const { ConnectorClient } = require('../../../services/clients/connector.client') +const paths = require('@root/paths') +const formatAccountPathsFor = require('@utils/format-account-paths-for') +const { getCredentialByExternalId, isSwitchingCredentialsRoute, getCurrentCredential, isEnableStripeOnboardingTaskListRoute } = require('@utils/credentials') +const { ConnectorClient } = require('@services/clients/connector.client') const connector = new ConnectorClient(process.env.CONNECTOR_URL) const { getStripeAccountId } = require('../stripe-setup.util') diff --git a/app/controllers/stripe-setup/check-org-details/post.controller.test.js b/app/controllers/stripe-setup/check-org-details/post.controller.test.js index a73aab6b54..3e5654769e 100644 --- a/app/controllers/stripe-setup/check-org-details/post.controller.test.js +++ b/app/controllers/stripe-setup/check-org-details/post.controller.test.js @@ -3,11 +3,11 @@ const sinon = require('sinon') const proxyquire = require('proxyquire') const { expect } = require('chai') -const Service = require('../../../models/Service.class') -const User = require('../../../models/User.class') -const serviceFixtures = require('../../../../test/fixtures/service.fixtures') -const userFixtures = require('../../../../test/fixtures/user.fixtures') -const gatewayAccountFixture = require('../../../../test/fixtures/gateway-account.fixtures') +const Service = require('@models/Service.class') +const User = require('@models/User.class') +const serviceFixtures = require('@test/fixtures/service.fixtures') +const userFixtures = require('@test/fixtures/user.fixtures') +const gatewayAccountFixture = require('@test/fixtures/gateway-account.fixtures') const stripeAcountId = 'acct_123example123' const stubGetStripeAccountId = sinon.stub().resolves(stripeAcountId) @@ -23,7 +23,7 @@ describe('Check org details - post controller', () => { function getControllerWithMocks () { return proxyquire('./post.controller', { - '../../../services/clients/connector.client': { + '@services/clients/connector.client': { ConnectorClient: function () { this.setStripeAccountSetupFlag = setStripeAccountSetupFlagMock } @@ -33,7 +33,7 @@ describe('Check org details - post controller', () => { return stubGetStripeAccountId(...params) } }, - '../../../utils/logger': function (filename) { + '@utils/logger': function (filename) { return { info: loggerInfoMock } diff --git a/app/controllers/stripe-setup/company-number/company-number-validations.js b/app/controllers/stripe-setup/company-number/company-number-validations.js index 35ae931a41..aba60cb155 100644 --- a/app/controllers/stripe-setup/company-number/company-number-validations.js +++ b/app/controllers/stripe-setup/company-number/company-number-validations.js @@ -4,7 +4,7 @@ const { validationErrors, isEmpty, isNotCompanyNumber -} = require('../../../utils/validation/field-validation-checks') +} = require('@utils/validation/field-validation-checks') exports.validateCompanyNumberDeclaration = function validateCompanyNumberDeclaration (value) { if (!value) { diff --git a/app/controllers/stripe-setup/company-number/get.controller.js b/app/controllers/stripe-setup/company-number/get.controller.js index 67f17ef7a7..f1f75581b4 100644 --- a/app/controllers/stripe-setup/company-number/get.controller.js +++ b/app/controllers/stripe-setup/company-number/get.controller.js @@ -1,7 +1,7 @@ 'use strict' -const { response } = require('../../../utils/response') -const { isSwitchingCredentialsRoute, getCurrentCredential, isEnableStripeOnboardingTaskListRoute } = require('../../../utils/credentials') +const { response } = require('@utils/response') +const { isSwitchingCredentialsRoute, getCurrentCredential, isEnableStripeOnboardingTaskListRoute } = require('@utils/credentials') const { getAlreadySubmittedErrorPageData } = require('../stripe-setup.util') module.exports = (req, res, next) => { diff --git a/app/controllers/stripe-setup/company-number/post.controller.js b/app/controllers/stripe-setup/company-number/post.controller.js index 741cad4264..1332e9934f 100644 --- a/app/controllers/stripe-setup/company-number/post.controller.js +++ b/app/controllers/stripe-setup/company-number/post.controller.js @@ -2,16 +2,16 @@ const lodash = require('lodash') -const logger = require('../../../utils/logger')(__filename) -const { response } = require('../../../utils/response') -const { isSwitchingCredentialsRoute, isEnableStripeOnboardingTaskListRoute, getCurrentCredential } = require('../../../utils/credentials') +const logger = require('@utils/logger')(__filename) +const { response } = require('@utils/response') +const { isSwitchingCredentialsRoute, isEnableStripeOnboardingTaskListRoute, getCurrentCredential } = require('@utils/credentials') const { getStripeAccountId, getAlreadySubmittedErrorPageData } = require('../stripe-setup.util') -const { updateCompany } = require('../../../services/clients/stripe/stripe.client') +const { updateCompany } = require('@services/clients/stripe/stripe.client') const companyNumberValidations = require('./company-number-validations') -const { ConnectorClient } = require('../../../services/clients/connector.client') +const { ConnectorClient } = require('@services/clients/connector.client') const connector = new ConnectorClient(process.env.CONNECTOR_URL) -const paths = require('../../../paths') -const formatAccountPathsFor = require('../../../utils/format-account-paths-for') +const paths = require('@root/paths') +const formatAccountPathsFor = require('@utils/format-account-paths-for') // Constants const COMPANY_NUMBER_DECLARATION_FIELD = 'company-number-declaration' diff --git a/app/controllers/stripe-setup/company-number/post.controller.test.js b/app/controllers/stripe-setup/company-number/post.controller.test.js index d8fb2e82ca..8dd5d5850e 100644 --- a/app/controllers/stripe-setup/company-number/post.controller.test.js +++ b/app/controllers/stripe-setup/company-number/post.controller.test.js @@ -3,7 +3,7 @@ const proxyquire = require('proxyquire') const sinon = require('sinon') const { expect } = require('chai') -const paths = require('../../../paths') +const paths = require('@root/paths') describe('Company number POST controller', () => { const postBody = { @@ -19,10 +19,10 @@ describe('Company number POST controller', () => { function getControllerWithMocks () { return proxyquire('./post.controller', { - '../../../services/clients/stripe/stripe.client': { + '@services/clients/stripe/stripe.client': { updateCompany: updateCompanyMock }, - '../../../services/clients/connector.client': { + '@services/clients/connector.client': { ConnectorClient: function () { this.setStripeAccountSetupFlag = setStripeAccountSetupFlagMock } diff --git a/app/controllers/stripe-setup/director/get.controller.js b/app/controllers/stripe-setup/director/get.controller.js index f473c3bf58..d4010817c1 100644 --- a/app/controllers/stripe-setup/director/get.controller.js +++ b/app/controllers/stripe-setup/director/get.controller.js @@ -1,7 +1,7 @@ 'use strict' -const { response } = require('../../../utils/response') -const { isSwitchingCredentialsRoute, getCurrentCredential, isEnableStripeOnboardingTaskListRoute } = require('../../../utils/credentials') +const { response } = require('@utils/response') +const { isSwitchingCredentialsRoute, getCurrentCredential, isEnableStripeOnboardingTaskListRoute } = require('@utils/credentials') const { getAlreadySubmittedErrorPageData } = require('../stripe-setup.util') module.exports = (req, res, next) => { diff --git a/app/controllers/stripe-setup/director/post.controller.js b/app/controllers/stripe-setup/director/post.controller.js index cd731b9421..ba9d3cbdf0 100644 --- a/app/controllers/stripe-setup/director/post.controller.js +++ b/app/controllers/stripe-setup/director/post.controller.js @@ -2,14 +2,14 @@ const lodash = require('lodash') -const logger = require('../../../utils/logger')(__filename) -const paths = require('../../../paths') -const formatAccountPathsFor = require('../../../utils/format-account-paths-for') -const { isSwitchingCredentialsRoute, getCurrentCredential, isEnableStripeOnboardingTaskListRoute } = require('../../../utils/credentials') -const { response } = require('../../../utils/response') -const { validateMandatoryField, validateEmail } = require('../../../utils/validation/server-side-form-validations') -const { validationErrors } = require('../../../utils/validation/field-validation-checks') -const { listPersons, updateDirector, createDirector, updateCompany } = require('../../../services/clients/stripe/stripe.client') +const logger = require('@utils/logger')(__filename) +const paths = require('@root/paths') +const formatAccountPathsFor = require('@utils/format-account-paths-for') +const { isSwitchingCredentialsRoute, getCurrentCredential, isEnableStripeOnboardingTaskListRoute } = require('@utils/credentials') +const { response } = require('@utils/response') +const { validateMandatoryField, validateEmail } = require('@utils/validation/server-side-form-validations') +const { validationErrors } = require('@utils/validation/field-validation-checks') +const { listPersons, updateDirector, createDirector, updateCompany } = require('@services/clients/stripe/stripe.client') const { validateField, validateDoB, @@ -17,7 +17,7 @@ const { getStripeAccountId, getAlreadySubmittedErrorPageData } = require('../stripe-setup.util') -const { ConnectorClient } = require('../../../services/clients/connector.client') +const { ConnectorClient } = require('@services/clients/connector.client') const connector = new ConnectorClient(process.env.CONNECTOR_URL) const FIRST_NAME_FIELD = 'first-name' const LAST_NAME_FIELD = 'last-name' diff --git a/app/controllers/stripe-setup/director/post.controller.test.js b/app/controllers/stripe-setup/director/post.controller.test.js index cabfe11fb3..ea01d0ce05 100644 --- a/app/controllers/stripe-setup/director/post.controller.test.js +++ b/app/controllers/stripe-setup/director/post.controller.test.js @@ -4,10 +4,10 @@ const proxyquire = require('proxyquire') const sinon = require('sinon') const assert = require('assert') const { expect } = require('chai') -const paths = require('../../../paths') -const gatewayAccountFixtures = require('../../../../test/fixtures/gateway-account.fixtures') -const userFixtures = require('../../../../test/fixtures/user.fixtures') -const User = require('../../../models/User.class') +const paths = require('@root/paths') +const gatewayAccountFixtures = require('@test/fixtures/gateway-account.fixtures') +const userFixtures = require('@test/fixtures/user.fixtures') +const User = require('@models/User.class') describe('Director POST controller', () => { const firstName = 'Chesney ' @@ -55,13 +55,13 @@ describe('Director POST controller', () => { function getControllerWithMocks () { return proxyquire('./post.controller', { - '../../../services/clients/stripe/stripe.client': { + '@services/clients/stripe/stripe.client': { listPersons: listPersonsMock, updateDirector: updateDirectorMock, createDirector: createDirectorMock, updateCompany: updateCompanyMock }, - '../../../services/clients/connector.client': { + '@services/clients/connector.client': { ConnectorClient: function () { this.setStripeAccountSetupFlag = setStripeAccountSetupFlagMock } diff --git a/app/controllers/stripe-setup/government-entity-document/get.controller.js b/app/controllers/stripe-setup/government-entity-document/get.controller.js index 3a8f2c295c..49c4b76185 100644 --- a/app/controllers/stripe-setup/government-entity-document/get.controller.js +++ b/app/controllers/stripe-setup/government-entity-document/get.controller.js @@ -1,7 +1,7 @@ 'use strict' -const { response } = require('../../../utils/response') -const { isSwitchingCredentialsRoute, getCurrentCredential, isEnableStripeOnboardingTaskListRoute } = require('../../../utils/credentials') +const { response } = require('@utils/response') +const { isSwitchingCredentialsRoute, getCurrentCredential, isEnableStripeOnboardingTaskListRoute } = require('@utils/credentials') const { getAlreadySubmittedErrorPageData } = require('../stripe-setup.util') module.exports = (req, res, next) => { diff --git a/app/controllers/stripe-setup/government-entity-document/post.controller.js b/app/controllers/stripe-setup/government-entity-document/post.controller.js index e205bb2f51..1dd1995c2d 100644 --- a/app/controllers/stripe-setup/government-entity-document/post.controller.js +++ b/app/controllers/stripe-setup/government-entity-document/post.controller.js @@ -2,15 +2,15 @@ const lodash = require('lodash') -const logger = require('../../../utils/logger')(__filename) -const { response } = require('../../../utils/response') -const { isSwitchingCredentialsRoute, getCurrentCredential, isEnableStripeOnboardingTaskListRoute } = require('../../../utils/credentials') +const logger = require('@utils/logger')(__filename) +const { response } = require('@utils/response') +const { isSwitchingCredentialsRoute, getCurrentCredential, isEnableStripeOnboardingTaskListRoute } = require('@utils/credentials') const { getStripeAccountId, getAlreadySubmittedErrorPageData } = require('../stripe-setup.util') -const { uploadFile, updateAccount } = require('../../../services/clients/stripe/stripe.client') -const { ConnectorClient } = require('../../../services/clients/connector.client') +const { uploadFile, updateAccount } = require('@services/clients/stripe/stripe.client') +const { ConnectorClient } = require('@services/clients/connector.client') const connector = new ConnectorClient(process.env.CONNECTOR_URL) -const paths = require('../../../paths') -const formatAccountPathsFor = require('../../../utils/format-account-paths-for') +const paths = require('@root/paths') +const formatAccountPathsFor = require('@utils/format-account-paths-for') const GOVERNMENT_ENTITY_DOCUMENT_FIELD = 'government-entity-document' diff --git a/app/controllers/stripe-setup/government-entity-document/post.controller.test.js b/app/controllers/stripe-setup/government-entity-document/post.controller.test.js index 1de922f95a..d51e9546ec 100644 --- a/app/controllers/stripe-setup/government-entity-document/post.controller.test.js +++ b/app/controllers/stripe-setup/government-entity-document/post.controller.test.js @@ -3,7 +3,7 @@ const proxyquire = require('proxyquire') const sinon = require('sinon') const { expect } = require('chai') -const paths = require('../../../paths') +const paths = require('@root/paths') const assert = require('assert') describe('Government entity document POST controller', () => { @@ -21,11 +21,11 @@ describe('Government entity document POST controller', () => { function getControllerWithMocks () { return proxyquire('./post.controller', { - '../../../services/clients/stripe/stripe.client': { + '@services/clients/stripe/stripe.client': { uploadFile: uploadFileMock, updateAccount: updateAccountMock }, - '../../../services/clients/connector.client': { + '@services/clients/connector.client': { ConnectorClient: function () { this.setStripeAccountSetupFlag = setStripeAccountSetupFlagMock } diff --git a/app/controllers/stripe-setup/responsible-person/get.controller.js b/app/controllers/stripe-setup/responsible-person/get.controller.js index d1ac94a1b5..e010730e13 100644 --- a/app/controllers/stripe-setup/responsible-person/get.controller.js +++ b/app/controllers/stripe-setup/responsible-person/get.controller.js @@ -1,7 +1,7 @@ 'use strict' -const { response } = require('../../../utils/response') -const { isSwitchingCredentialsRoute, getCurrentCredential, isEnableStripeOnboardingTaskListRoute } = require('../../../utils/credentials') +const { response } = require('@utils/response') +const { isSwitchingCredentialsRoute, getCurrentCredential, isEnableStripeOnboardingTaskListRoute } = require('@utils/credentials') const { getAlreadySubmittedErrorPageData } = require('../stripe-setup.util') module.exports = async function showResponsiblePersonForm (req, res, next) { diff --git a/app/controllers/stripe-setup/responsible-person/post.controller.js b/app/controllers/stripe-setup/responsible-person/post.controller.js index a899f334ea..581fe2b4be 100644 --- a/app/controllers/stripe-setup/responsible-person/post.controller.js +++ b/app/controllers/stripe-setup/responsible-person/post.controller.js @@ -3,10 +3,10 @@ const lodash = require('lodash') const ukPostcode = require('uk-postcode') -const logger = require('../../../utils/logger')(__filename) -const paths = require('../../../paths') -const formatAccountPathsFor = require('../../../utils/format-account-paths-for') -const { isSwitchingCredentialsRoute, getCurrentCredential, isEnableStripeOnboardingTaskListRoute } = require('../../../utils/credentials') +const logger = require('@utils/logger')(__filename) +const paths = require('@root/paths') +const formatAccountPathsFor = require('@utils/format-account-paths-for') +const { isSwitchingCredentialsRoute, getCurrentCredential, isEnableStripeOnboardingTaskListRoute } = require('@utils/credentials') const { validateField, validateDoB, @@ -14,18 +14,18 @@ const { getStripeAccountId, getAlreadySubmittedErrorPageData } = require('../stripe-setup.util') -const { response } = require('../../../utils/response') +const { response } = require('@utils/response') const { validateMandatoryField, validateOptionalField, validatePostcode, validatePhoneNumber, validateEmail -} = require('../../../utils/validation/server-side-form-validations') -const { formatPhoneNumberWithCountryCode } = require('../../../utils/telephone-number-utils') -const { validationErrors } = require('../../../utils/validation/field-validation-checks') -const { listPersons, updatePerson, createPerson, updateCompany } = require('../../../services/clients/stripe/stripe.client') -const { ConnectorClient } = require('../../../services/clients/connector.client') +} = require('@utils/validation/server-side-form-validations') +const { formatPhoneNumberWithCountryCode } = require('@utils/telephone-number-utils') +const { validationErrors } = require('@utils/validation/field-validation-checks') +const { listPersons, updatePerson, createPerson, updateCompany } = require('@services/clients/stripe/stripe.client') +const { ConnectorClient } = require('@services/clients/connector.client') const connector = new ConnectorClient(process.env.CONNECTOR_URL) const FIRST_NAME_FIELD = 'first-name' diff --git a/app/controllers/stripe-setup/responsible-person/post.controller.test.js b/app/controllers/stripe-setup/responsible-person/post.controller.test.js index cc774525f6..9d3a2ff7cc 100644 --- a/app/controllers/stripe-setup/responsible-person/post.controller.test.js +++ b/app/controllers/stripe-setup/responsible-person/post.controller.test.js @@ -4,10 +4,10 @@ const proxyquire = require('proxyquire') const sinon = require('sinon') const assert = require('assert') const { expect } = require('chai') -const paths = require('../../../paths') -const gatewayAccountFixtures = require('../../../../test/fixtures/gateway-account.fixtures') -const userFixtures = require('../../../../test/fixtures/user.fixtures') -const User = require('../../../models/User.class') +const paths = require('@root/paths') +const gatewayAccountFixtures = require('@test/fixtures/gateway-account.fixtures') +const userFixtures = require('@test/fixtures/user.fixtures') +const User = require('@models/User.class') describe('Responsible person POST controller', () => { const firstName = 'Chesney ' @@ -87,13 +87,13 @@ describe('Responsible person POST controller', () => { function getControllerWithMocks () { return proxyquire('./post.controller', { - '../../../services/clients/stripe/stripe.client': { + '@services/clients/stripe/stripe.client': { listPersons: listPersonsMock, updatePerson: updatePersonMock, createPerson: createPersonMock, updateCompany: updateCompanyMock }, - '../../../services/clients/connector.client': { + '@services/clients/connector.client': { ConnectorClient: function () { this.setStripeAccountSetupFlag = setStripeAccountSetupFlagMock } diff --git a/app/controllers/stripe-setup/stripe-setup-link/stripe-setup-dashboard-redirect.controller.js b/app/controllers/stripe-setup/stripe-setup-link/stripe-setup-dashboard-redirect.controller.js index 727c9aa36e..055a8076ad 100644 --- a/app/controllers/stripe-setup/stripe-setup-link/stripe-setup-dashboard-redirect.controller.js +++ b/app/controllers/stripe-setup/stripe-setup-link/stripe-setup-dashboard-redirect.controller.js @@ -1,10 +1,10 @@ 'use strict' const paths = require('../../../../app/paths') -const formatAccountPathsFor = require('../../../utils/format-account-paths-for') -const { ConnectorClient } = require('../../../services/clients/connector.client') +const formatAccountPathsFor = require('@utils/format-account-paths-for') +const { ConnectorClient } = require('@services/clients/connector.client') const connectorClient = new ConnectorClient(process.env.CONNECTOR_URL) -const logger = require('../../../utils/logger')(__filename) +const logger = require('@utils/logger')(__filename) function getTargetServiceForRedirect (user, externalServiceId) { return user.serviceRoles.filter((serviceRole) => serviceRole.service.externalId === externalServiceId)[0] diff --git a/app/controllers/stripe-setup/stripe-setup-link/stripe-setup-dashboard-redirect.controller.test.js b/app/controllers/stripe-setup/stripe-setup-link/stripe-setup-dashboard-redirect.controller.test.js index ce3a6019f9..157154838d 100644 --- a/app/controllers/stripe-setup/stripe-setup-link/stripe-setup-dashboard-redirect.controller.test.js +++ b/app/controllers/stripe-setup/stripe-setup-link/stripe-setup-dashboard-redirect.controller.test.js @@ -1,9 +1,9 @@ const sinon = require('sinon') -const { ConnectorClient } = require('../../../services/clients/connector.client') -const User = require('../../../models/User.class') -const { validUser } = require('../../../../test/fixtures/user.fixtures') -const { validGatewayAccountsResponse } = require('../../../../test/fixtures/gateway-account.fixtures') +const { ConnectorClient } = require('@services/clients/connector.client') +const User = require('@models/User.class') +const { validUser } = require('@test/fixtures/user.fixtures') +const { validGatewayAccountsResponse } = require('@test/fixtures/gateway-account.fixtures') const dashboardRedirectController = require('./stripe-setup-dashboard-redirect.controller') describe('Dashboard redirect controller', () => { diff --git a/app/controllers/stripe-setup/stripe-setup.util.js b/app/controllers/stripe-setup/stripe-setup.util.js index b75bb0e26c..3ce8b20d6f 100644 --- a/app/controllers/stripe-setup/stripe-setup.util.js +++ b/app/controllers/stripe-setup/stripe-setup.util.js @@ -2,12 +2,12 @@ const lodash = require('lodash') -const { getSwitchingCredential } = require('../../utils/credentials') -const { ConnectorClient } = require('../../services/clients/connector.client') +const { getSwitchingCredential } = require('@utils/credentials') +const { ConnectorClient } = require('@services/clients/connector.client') const connector = new ConnectorClient(process.env.CONNECTOR_URL) -const { validateDateOfBirth } = require('../../utils/validation/server-side-form-validations') -const paths = require('../../paths') -const formatAccountPathsFor = require('../../utils/format-account-paths-for') +const { validateDateOfBirth } = require('@utils/validation/server-side-form-validations') +const paths = require('@root/paths') +const formatAccountPathsFor = require('@utils/format-account-paths-for') const trimField = (key, store) => lodash.get(store, key, '').trim() diff --git a/app/controllers/stripe-setup/stripe-setup.util.test.js b/app/controllers/stripe-setup/stripe-setup.util.test.js index 75688728e2..2cb006796d 100644 --- a/app/controllers/stripe-setup/stripe-setup.util.test.js +++ b/app/controllers/stripe-setup/stripe-setup.util.test.js @@ -2,7 +2,7 @@ const proxyquire = require('proxyquire') const { assert, expect } = require('chai') -const { validateMandatoryField } = require('../../utils/validation/server-side-form-validations') +const { validateMandatoryField } = require('@utils/validation/server-side-form-validations') let addNewCapabilitiesMock, retrieveAccountDetailsMock let setStripeAccountSetupFlagMock @@ -101,11 +101,11 @@ describe('Stripe setup util', () => { function getStripeSetupUtil () { return proxyquire('./stripe-setup.util', { - '../../services/clients/stripe/stripe.client': { + '@services/clients/stripe/stripe.client': { addNewCapabilities: addNewCapabilitiesMock, retrieveAccountDetails: retrieveAccountDetailsMock }, - '../../services/clients/connector.client': { + '@services/clients/connector.client': { ConnectorClient: function () { this.getStripeAccount = () => Promise.resolve({ stripeAccountId: 'acct_123example123' diff --git a/app/controllers/stripe-setup/vat-number/get.controller.js b/app/controllers/stripe-setup/vat-number/get.controller.js index 802a0cfff2..36d6622ce4 100644 --- a/app/controllers/stripe-setup/vat-number/get.controller.js +++ b/app/controllers/stripe-setup/vat-number/get.controller.js @@ -1,7 +1,7 @@ 'use strict' -const { response } = require('../../../utils/response') -const { isSwitchingCredentialsRoute, getCurrentCredential, isEnableStripeOnboardingTaskListRoute } = require('../../../utils/credentials') +const { response } = require('@utils/response') +const { isSwitchingCredentialsRoute, getCurrentCredential, isEnableStripeOnboardingTaskListRoute } = require('@utils/credentials') const { getAlreadySubmittedErrorPageData } = require('../stripe-setup.util') module.exports = (req, res, next) => { diff --git a/app/controllers/stripe-setup/vat-number/post.controller.js b/app/controllers/stripe-setup/vat-number/post.controller.js index 23ffe23b7f..a435652cdf 100644 --- a/app/controllers/stripe-setup/vat-number/post.controller.js +++ b/app/controllers/stripe-setup/vat-number/post.controller.js @@ -2,16 +2,16 @@ const lodash = require('lodash') -const logger = require('../../../utils/logger')(__filename) -const { response } = require('../../../utils/response') -const { isSwitchingCredentialsRoute, getCurrentCredential, isEnableStripeOnboardingTaskListRoute } = require('../../../utils/credentials') +const logger = require('@utils/logger')(__filename) +const { response } = require('@utils/response') +const { isSwitchingCredentialsRoute, getCurrentCredential, isEnableStripeOnboardingTaskListRoute } = require('@utils/credentials') const { getStripeAccountId, getAlreadySubmittedErrorPageData } = require('../stripe-setup.util') -const { updateCompany } = require('../../../services/clients/stripe/stripe.client') +const { updateCompany } = require('@services/clients/stripe/stripe.client') const vatNumberValidations = require('./vat-number-validations') -const { ConnectorClient } = require('../../../services/clients/connector.client') +const { ConnectorClient } = require('@services/clients/connector.client') const connector = new ConnectorClient(process.env.CONNECTOR_URL) -const paths = require('../../../paths') -const formatAccountPathsFor = require('../../../utils/format-account-paths-for') +const paths = require('@root/paths') +const formatAccountPathsFor = require('@utils/format-account-paths-for') // Constants const VAT_NUMBER_FIELD = 'vat-number' diff --git a/app/controllers/stripe-setup/vat-number/post.controller.test.js b/app/controllers/stripe-setup/vat-number/post.controller.test.js index 6337f86db4..bbb14ccccb 100644 --- a/app/controllers/stripe-setup/vat-number/post.controller.test.js +++ b/app/controllers/stripe-setup/vat-number/post.controller.test.js @@ -3,7 +3,7 @@ const proxyquire = require('proxyquire') const sinon = require('sinon') const { expect } = require('chai') -const paths = require('../../../paths') +const paths = require('@root/paths') describe('VAT number POST controller', () => { const postBody = { @@ -19,10 +19,10 @@ describe('VAT number POST controller', () => { function getControllerWithMocks () { return proxyquire('./post.controller', { - '../../../services/clients/stripe/stripe.client': { + '@services/clients/stripe/stripe.client': { updateCompany: updateCompanyMock }, - '../../../services/clients/connector.client': { + '@services/clients/connector.client': { ConnectorClient: function () { this.setStripeAccountSetupFlag = setStripeAccountSetupFlagMock } diff --git a/app/controllers/stripe-setup/vat-number/vat-number-validations.js b/app/controllers/stripe-setup/vat-number/vat-number-validations.js index 819e719e3f..3f719eb67f 100644 --- a/app/controllers/stripe-setup/vat-number/vat-number-validations.js +++ b/app/controllers/stripe-setup/vat-number/vat-number-validations.js @@ -1,6 +1,6 @@ 'use strict' -const { isEmpty, isNotVatNumber, validationErrors } = require('../../../utils/validation/field-validation-checks') +const { isEmpty, isNotVatNumber, validationErrors } = require('@utils/validation/field-validation-checks') exports.validateVatNumber = function validateVatNumber (value) { if (isEmpty(value)) { diff --git a/app/controllers/stripe-setup/vat-number/vat-number-validations.test.js b/app/controllers/stripe-setup/vat-number/vat-number-validations.test.js index 3988fadaa0..904abe1cfe 100644 --- a/app/controllers/stripe-setup/vat-number/vat-number-validations.test.js +++ b/app/controllers/stripe-setup/vat-number/vat-number-validations.test.js @@ -3,7 +3,7 @@ const { expect } = require('chai') const vatNumberValidations = require('./vat-number-validations') -const { validationErrors } = require('../../../utils/validation/field-validation-checks') +const { validationErrors } = require('@utils/validation/field-validation-checks') // Constants const standardVatNumber = 'GB999 9999 73' diff --git a/app/controllers/stripeTermsAndConditions.controller.js b/app/controllers/stripeTermsAndConditions.controller.js index 0cf4daf755..f494440cd8 100644 --- a/app/controllers/stripeTermsAndConditions.controller.js +++ b/app/controllers/stripeTermsAndConditions.controller.js @@ -1,6 +1,6 @@ 'use strict' -const { response } = require('../utils/response') +const { response } = require('@utils/response') module.exports.get = function (req, res) { return response(req, res, 'policy/stripe-terms-and-conditions/stripe-terms-and-conditions') diff --git a/app/controllers/subscribe-service.controller.js b/app/controllers/subscribe-service.controller.js index 873be07a39..2e6d57a491 100644 --- a/app/controllers/subscribe-service.controller.js +++ b/app/controllers/subscribe-service.controller.js @@ -1,11 +1,11 @@ 'use strict' -const logger = require('../utils/logger')(__filename) -const adminusersClient = require('../services/clients/adminusers.client')() -const paths = require('../paths') -const { INVITE_SESSION_COOKIE_NAME } = require('../utils/constants') -const { SMS } = require('../models/second-factor-method') -const { ExpiredInviteError } = require('../errors') +const logger = require('@utils/logger')(__filename) +const adminusersClient = require('@services/clients/adminusers.client')() +const paths = require('@root/paths') +const { INVITE_SESSION_COOKIE_NAME } = require('@utils/constants') +const { SMS } = require('@models/second-factor-method') +const { ExpiredInviteError } = require('@root/errors') const subscribeService = async function subscribeService (req, res, next) { const sessionData = req[INVITE_SESSION_COOKIE_NAME] diff --git a/app/controllers/subscribe-service.controller.test.js b/app/controllers/subscribe-service.controller.test.js index 3c856d7f18..6792df026f 100644 --- a/app/controllers/subscribe-service.controller.test.js +++ b/app/controllers/subscribe-service.controller.test.js @@ -3,11 +3,11 @@ const sinon = require('sinon') const proxyquire = require('proxyquire') -const userFixtures = require('../../test/fixtures/user.fixtures') -const inviteFixtures = require('../../test/fixtures/invite.fixtures') -const paths = require('../paths') -const User = require('../models/User.class') -const { ExpiredInviteError } = require('../errors') +const userFixtures = require('@test/fixtures/user.fixtures') +const inviteFixtures = require('@test/fixtures/invite.fixtures') +const paths = require('@root/paths') +const User = require('@models/User.class') +const { ExpiredInviteError } = require('@root/errors') const { RESTClientError } = require('@govuk-pay/pay-js-commons/lib/utils/axios-base-client/errors') describe('Subscribe service controller', () => { @@ -48,7 +48,7 @@ describe('Subscribe service controller', () => { describe('Subscribe service', () => { function getController (mockCompleteInvite) { return proxyquire('./subscribe-service.controller', { - '../services/clients/adminusers.client': () => ({ + '@services/clients/adminusers.client': () => ({ completeInvite: mockCompleteInvite }) }) diff --git a/app/controllers/switch-psp/organisation-url/get.controller.js b/app/controllers/switch-psp/organisation-url/get.controller.js index ac88f3b153..8d98fa9d06 100644 --- a/app/controllers/switch-psp/organisation-url/get.controller.js +++ b/app/controllers/switch-psp/organisation-url/get.controller.js @@ -1,7 +1,7 @@ 'use strict' -const { response } = require('../../../utils/response') -const { isSwitchingCredentialsRoute, getCurrentCredential } = require('../../../utils/credentials') +const { response } = require('@utils/response') +const { isSwitchingCredentialsRoute, getCurrentCredential } = require('@utils/credentials') module.exports = (req, res, next) => { const isSwitchingCredentials = isSwitchingCredentialsRoute(req) diff --git a/app/controllers/switch-psp/switch-psp.controller.js b/app/controllers/switch-psp/switch-psp.controller.js index 08d70346f5..29c57636a7 100644 --- a/app/controllers/switch-psp/switch-psp.controller.js +++ b/app/controllers/switch-psp/switch-psp.controller.js @@ -1,11 +1,11 @@ 'use strict' -const { response } = require('../../utils/response') -const formatAccountPathsFor = require('../../utils/format-account-paths-for') -const formatPSPName = require('../../utils/format-PSP-name') -const paths = require('../../paths') +const { response } = require('@utils/response') +const formatAccountPathsFor = require('@utils/format-account-paths-for') +const formatPSPName = require('@utils/format-PSP-name') +const paths = require('@root/paths') const switchTasks = require('./switch-tasks.service') -const { getSwitchingCredential, getActiveCredential } = require('../../utils/credentials') -const { ConnectorClient } = require('../../services/clients/connector.client') +const { getSwitchingCredential, getActiveCredential } = require('@utils/credentials') +const { ConnectorClient } = require('@services/clients/connector.client') const connectorClient = new ConnectorClient(process.env.CONNECTOR_URL) function switchPSPPage (req, res, next) { diff --git a/app/controllers/switch-psp/switch-psp.controller.test.js b/app/controllers/switch-psp/switch-psp.controller.test.js index e97dbcc2a6..67e71d2966 100644 --- a/app/controllers/switch-psp/switch-psp.controller.test.js +++ b/app/controllers/switch-psp/switch-psp.controller.test.js @@ -1,9 +1,9 @@ const proxyquire = require('proxyquire') const sinon = require('sinon') -const gatewayAccountFixtures = require('../../../test/fixtures/gateway-account.fixtures') -const userFixtures = require('../../../test/fixtures/user.fixtures') -const User = require('../../models/User.class') +const gatewayAccountFixtures = require('@test/fixtures/gateway-account.fixtures') +const userFixtures = require('@test/fixtures/user.fixtures') +const User = require('@models/User.class') const postAccountSwitchPSPMock = sinon.spy(() => Promise.resolve()) let req, res, next @@ -65,7 +65,7 @@ function setupEnvironment (switchingCredentialState) { function getControllerWithMocks () { return proxyquire('./switch-psp.controller', { - '../../services/clients/connector.client': { + '@services/clients/connector.client': { ConnectorClient: function () { this.postAccountSwitchPSP = postAccountSwitchPSPMock } diff --git a/app/controllers/switch-psp/switch-tasks.service.js b/app/controllers/switch-psp/switch-tasks.service.js index b7a592b83e..0c9b94e35b 100644 --- a/app/controllers/switch-psp/switch-tasks.service.js +++ b/app/controllers/switch-psp/switch-tasks.service.js @@ -1,6 +1,6 @@ 'use strict' -const { CREDENTIAL_STATE } = require('../../utils/credentials') +const { CREDENTIAL_STATE } = require('@utils/credentials') const lodash = require('lodash') function linkCredentialsComplete (targetCredential) { diff --git a/app/controllers/switch-psp/switch-tasks.service.test.js b/app/controllers/switch-psp/switch-tasks.service.test.js index 8b96fd45dc..ac9fdd1a0a 100644 --- a/app/controllers/switch-psp/switch-tasks.service.test.js +++ b/app/controllers/switch-psp/switch-tasks.service.test.js @@ -1,7 +1,7 @@ const { expect } = require('chai') const { getTaskList, isComplete } = require('./switch-tasks.service') -const { getSwitchingCredential } = require('../../utils/credentials') -const gatewayAccountFixtures = require('../../../test/fixtures/gateway-account.fixtures') +const { getSwitchingCredential } = require('@utils/credentials') +const gatewayAccountFixtures = require('@test/fixtures/gateway-account.fixtures') describe('Switching PSP service', () => { describe('parses a task list based on switching credential', () => { diff --git a/app/controllers/switch-psp/verify-psp-integration.controller.js b/app/controllers/switch-psp/verify-psp-integration.controller.js index 8a43533c6e..912e0c4362 100644 --- a/app/controllers/switch-psp/verify-psp-integration.controller.js +++ b/app/controllers/switch-psp/verify-psp-integration.controller.js @@ -1,16 +1,16 @@ 'use strict' const urljoin = require('url-join') -const paths = require('../../paths') -const { response } = require('../../utils/response') -const { ConnectorClient } = require('../../services/clients/connector.client') -const { getSwitchingCredential } = require('../../utils/credentials') -const formatAccountPathsFor = require('../../utils/format-account-paths-for') -const { CREDENTIAL_STATE } = require('../../utils/credentials') +const paths = require('@root/paths') +const { response } = require('@utils/response') +const { ConnectorClient } = require('@services/clients/connector.client') +const { getSwitchingCredential } = require('@utils/credentials') +const formatAccountPathsFor = require('@utils/format-account-paths-for') +const { CREDENTIAL_STATE } = require('@utils/credentials') const { VERIFY_PSP_INTEGRATION_CHARGE_EXTERNAL_ID_KEY, filterNextUrl -} = require('../../utils/verify-psp-integration') -const logger = require('../../utils/logger')(__filename) +} = require('@utils/verify-psp-integration') +const logger = require('@utils/logger')(__filename) const connectorClient = new ConnectorClient(process.env.CONNECTOR_URL) const selfserviceURL = process.env.SELFSERVICE_URL diff --git a/app/controllers/switch-psp/verify-psp-integration.controller.test.js b/app/controllers/switch-psp/verify-psp-integration.controller.test.js index 5029eb79ed..f72ff9a291 100644 --- a/app/controllers/switch-psp/verify-psp-integration.controller.test.js +++ b/app/controllers/switch-psp/verify-psp-integration.controller.test.js @@ -1,10 +1,10 @@ const proxyquire = require('proxyquire') const sinon = require('sinon') -const gatewayAccountFixtures = require('../../../test/fixtures/gateway-account.fixtures') -const connectorChargeFixtures = require('../../../test/fixtures/connector-charge.fixtures') -const userFixtures = require('../../../test/fixtures/user.fixtures') -const User = require('../../models/User.class') +const gatewayAccountFixtures = require('@test/fixtures/gateway-account.fixtures') +const connectorChargeFixtures = require('@test/fixtures/connector-charge.fixtures') +const userFixtures = require('@test/fixtures/user.fixtures') +const User = require('@models/User.class') const { expect } = require('chai') const defaultCharge = connectorChargeFixtures.validChargeResponse() @@ -98,7 +98,7 @@ describe('Verify PSP integration controller', () => { function getControllerWithMocks () { return proxyquire('./verify-psp-integration.controller', { - '../../services/clients/connector.client': { + '@services/clients/connector.client': { ConnectorClient: function () { this.postChargeRequest = postChargeRequestMock this.patchAccountGatewayAccountCredentialsState = patchAccountGatewayAccountCredentialsStateMock diff --git a/app/controllers/test-with-your-users/create.controller.js b/app/controllers/test-with-your-users/create.controller.js index c9120b3f30..5cfd5b78b7 100644 --- a/app/controllers/test-with-your-users/create.controller.js +++ b/app/controllers/test-with-your-users/create.controller.js @@ -2,7 +2,7 @@ const lodash = require('lodash') -const { response } = require('../../utils/response.js') +const { response } = require('@utils/response.js') module.exports = (req, res) => { const pageData = lodash.get(req, 'session.pageData.createPrototypeLink', {}) diff --git a/app/controllers/test-with-your-users/disable.controller.js b/app/controllers/test-with-your-users/disable.controller.js index e8bd0a0ab8..71d5937478 100644 --- a/app/controllers/test-with-your-users/disable.controller.js +++ b/app/controllers/test-with-your-users/disable.controller.js @@ -1,9 +1,9 @@ 'use strict' -const logger = require('../../utils/logger')(__filename) -const paths = require('../../paths') -const productsClient = require('../../services/clients/products.client.js') -const formatAccountPathsFor = require('../../utils/format-account-paths-for') +const logger = require('@utils/logger')(__filename) +const paths = require('@root/paths') +const productsClient = require('@services/clients/products.client.js') +const formatAccountPathsFor = require('@utils/format-account-paths-for') module.exports = (req, res) => { const gatewayAccountId = req.account.gateway_account_id diff --git a/app/controllers/test-with-your-users/index.controller.js b/app/controllers/test-with-your-users/index.controller.js index 5c6d1d5052..1a10735020 100644 --- a/app/controllers/test-with-your-users/index.controller.js +++ b/app/controllers/test-with-your-users/index.controller.js @@ -1,6 +1,6 @@ 'use strict' -const { response } = require('../../utils/response.js') +const { response } = require('@utils/response.js') const PAGE_PARAMS = { productsTab: false diff --git a/app/controllers/test-with-your-users/links.controller.js b/app/controllers/test-with-your-users/links.controller.js index ad166b2cb8..17715c2569 100644 --- a/app/controllers/test-with-your-users/links.controller.js +++ b/app/controllers/test-with-your-users/links.controller.js @@ -1,8 +1,8 @@ 'use strict' -const { response } = require('../../utils/response.js') -const paths = require('../../paths') -const productsClient = require('../../services/clients/products.client.js') +const { response } = require('@utils/response.js') +const paths = require('@root/paths') +const productsClient = require('@services/clients/products.client.js') const formatAccountPathsFor = require('../../../app/utils/format-account-paths-for') module.exports = async function getIndex (req, res, next) { diff --git a/app/controllers/test-with-your-users/submit.controller.js b/app/controllers/test-with-your-users/submit.controller.js index 5b1ace6f8a..2b1e412944 100644 --- a/app/controllers/test-with-your-users/submit.controller.js +++ b/app/controllers/test-with-your-users/submit.controller.js @@ -2,15 +2,15 @@ const lodash = require('lodash') -const logger = require('../../utils/logger')(__filename) -const { response } = require('../../utils/response.js') -const paths = require('../../paths') -const productsClient = require('../../services/clients/products.client.js') -const productTypes = require('../../utils/product-types') -const publicAuthClient = require('../../services/clients/public-auth.client') -const { isCurrency, isHttps, isAboveMaxAmount } = require('../../utils/validation/field-validation-checks') -const { penceToPounds, safeConvertPoundsStringToPence } = require('../../utils/currency-formatter') -const formatAccountPathsFor = require('../../utils/format-account-paths-for') +const logger = require('@utils/logger')(__filename) +const { response } = require('@utils/response.js') +const paths = require('@root/paths') +const productsClient = require('@services/clients/products.client.js') +const productTypes = require('@utils/product-types') +const publicAuthClient = require('@services/clients/public-auth.client') +const { isCurrency, isHttps, isAboveMaxAmount } = require('@utils/validation/field-validation-checks') +const { penceToPounds, safeConvertPoundsStringToPence } = require('@utils/currency-formatter') +const formatAccountPathsFor = require('@utils/format-account-paths-for') module.exports = async (req, res) => { const gatewayAccountId = req.account.gateway_account_id diff --git a/app/controllers/toggle-moto-mask-card-number/toggleMotoMaskCardNumber.get.controller.js b/app/controllers/toggle-moto-mask-card-number/toggleMotoMaskCardNumber.get.controller.js index 7015496483..a00181eaf8 100644 --- a/app/controllers/toggle-moto-mask-card-number/toggleMotoMaskCardNumber.get.controller.js +++ b/app/controllers/toggle-moto-mask-card-number/toggleMotoMaskCardNumber.get.controller.js @@ -1,6 +1,6 @@ 'use strict' -const { response } = require('../../utils/response') +const { response } = require('@utils/response') module.exports = function showToggleMaskCardNumberPage (req, res) { const pageData = { diff --git a/app/controllers/toggle-moto-mask-card-number/toggleMotoMaskCardNumber.post.controller.js b/app/controllers/toggle-moto-mask-card-number/toggleMotoMaskCardNumber.post.controller.js index 09f6687af6..eb056a5957 100644 --- a/app/controllers/toggle-moto-mask-card-number/toggleMotoMaskCardNumber.post.controller.js +++ b/app/controllers/toggle-moto-mask-card-number/toggleMotoMaskCardNumber.post.controller.js @@ -1,8 +1,8 @@ 'use strict' -const paths = require('../../paths') -const formatAccountPathsFor = require('../../utils/format-account-paths-for') -const { ConnectorClient } = require('../../services/clients/connector.client') +const paths = require('@root/paths') +const formatAccountPathsFor = require('@utils/format-account-paths-for') +const { ConnectorClient } = require('@services/clients/connector.client') const connector = new ConnectorClient(process.env.CONNECTOR_URL) diff --git a/app/controllers/toggle-moto-mask-security-code/maskSecurityCode.get.controller.js b/app/controllers/toggle-moto-mask-security-code/maskSecurityCode.get.controller.js index 7958925ff9..c31339aa9e 100644 --- a/app/controllers/toggle-moto-mask-security-code/maskSecurityCode.get.controller.js +++ b/app/controllers/toggle-moto-mask-security-code/maskSecurityCode.get.controller.js @@ -1,6 +1,6 @@ 'use strict' -const { response } = require('../../utils/response') +const { response } = require('@utils/response') module.exports = function showToggleMaskCardSecurityCodePage (req, res) { const pageData = { diff --git a/app/controllers/toggle-moto-mask-security-code/maskSecurityCode.post.controller.js b/app/controllers/toggle-moto-mask-security-code/maskSecurityCode.post.controller.js index 0498dc4193..6a75421451 100644 --- a/app/controllers/toggle-moto-mask-security-code/maskSecurityCode.post.controller.js +++ b/app/controllers/toggle-moto-mask-security-code/maskSecurityCode.post.controller.js @@ -1,8 +1,8 @@ 'use strict' -const paths = require('../../paths') -const formatAccountPathsFor = require('../../utils/format-account-paths-for') -const { ConnectorClient } = require('../../services/clients/connector.client') +const paths = require('@root/paths') +const formatAccountPathsFor = require('@utils/format-account-paths-for') +const { ConnectorClient } = require('@services/clients/connector.client') const connector = new ConnectorClient(process.env.CONNECTOR_URL) diff --git a/app/controllers/transactions/transaction-detail-redirect.controller.js b/app/controllers/transactions/transaction-detail-redirect.controller.js index 42ea73f9a6..5c0e0cfbb9 100644 --- a/app/controllers/transactions/transaction-detail-redirect.controller.js +++ b/app/controllers/transactions/transaction-detail-redirect.controller.js @@ -1,11 +1,11 @@ 'use strict' -const { userServicesContainsGatewayAccount } = require('../../utils/permissions') -const Ledger = require('../../services/clients/ledger.client') +const { userServicesContainsGatewayAccount } = require('@utils/permissions') +const Ledger = require('@services/clients/ledger.client') const router = require('../../routes') -const formatAccountPathsFor = require('../../utils/format-account-paths-for') -const { ConnectorClient } = require('../../services/clients/connector.client') -const { NotFoundError } = require('../../errors') +const formatAccountPathsFor = require('@utils/format-account-paths-for') +const { ConnectorClient } = require('@services/clients/connector.client') +const { NotFoundError } = require('@root/errors') const connector = new ConnectorClient(process.env.CONNECTOR_URL) module.exports = async function redirectToTransactionDetail (req, res, next) { diff --git a/app/controllers/transactions/transaction-detail.controller.js b/app/controllers/transactions/transaction-detail.controller.js index 8c8bb88ecd..b45131ad34 100644 --- a/app/controllers/transactions/transaction-detail.controller.js +++ b/app/controllers/transactions/transaction-detail.controller.js @@ -1,8 +1,8 @@ 'use strict' -const { NotFoundError } = require('../../errors') -const { ledgerFindWithEvents } = require('../../services/transaction.service') -const { response } = require('../../utils/response.js') +const { NotFoundError } = require('@root/errors') +const { ledgerFindWithEvents } = require('@services/transaction.service') +const { response } = require('@utils/response.js') module.exports = async function showTransactionDetails (req, res, next) { const accountId = req.account.gateway_account_id diff --git a/app/controllers/transactions/transaction-details.controller.it.test.js b/app/controllers/transactions/transaction-details.controller.it.test.js index c7bf3bc2ad..70c4145d43 100644 --- a/app/controllers/transactions/transaction-details.controller.it.test.js +++ b/app/controllers/transactions/transaction-details.controller.it.test.js @@ -4,9 +4,9 @@ const sinon = require('sinon') const nock = require('nock') const gatewayAccountId = '15486734' -const { validGatewayAccountResponse } = require('../../../test/fixtures/gateway-account.fixtures') +const { validGatewayAccountResponse } = require('@test/fixtures/gateway-account.fixtures') const transactionDetailController = require('./transaction-detail.controller') -const { NotFoundError } = require('../../errors') +const { NotFoundError } = require('@root/errors') const EXTERNAL_GATEWAY_ACCOUNT_ID = 'an-external-id' const LEDGER_TRANSACTION_PATH = '/v1/transaction/{transactionId}?account_id=' + gatewayAccountId diff --git a/app/controllers/transactions/transaction-download.controller.js b/app/controllers/transactions/transaction-download.controller.js index fe43274846..aad4cbe417 100644 --- a/app/controllers/transactions/transaction-download.controller.js +++ b/app/controllers/transactions/transaction-download.controller.js @@ -1,9 +1,9 @@ 'use strict' -const transactionService = require('../../services/transaction.service') -const date = require('../../utils/dates') -const { renderErrorView } = require('../../utils/response') -const Stream = require('../../services/clients/stream.client') +const transactionService = require('@services/transaction.service') +const date = require('@utils/dates') +const { renderErrorView } = require('@utils/response') +const Stream = require('@services/clients/stream.client') const fetchTransactionCsvWithHeader = function fetchTransactionCsvWithHeader (req, res) { const accountId = req.account.gateway_account_id diff --git a/app/controllers/transactions/transaction-list.controller.it.test.js b/app/controllers/transactions/transaction-list.controller.it.test.js index 8aec50c982..40fe794f69 100644 --- a/app/controllers/transactions/transaction-list.controller.it.test.js +++ b/app/controllers/transactions/transaction-list.controller.it.test.js @@ -1,17 +1,17 @@ 'use strict' const sinon = require('sinon') -const paths = require('../../paths') -const formatAccountPathsFor = require('../../utils/format-account-paths-for') -const { validGatewayAccountResponse } = require('../../../test/fixtures/gateway-account.fixtures') +const paths = require('@root/paths') +const formatAccountPathsFor = require('@utils/format-account-paths-for') +const { validGatewayAccountResponse } = require('@test/fixtures/gateway-account.fixtures') const transactionListController = require('./transaction-list.controller') const proxyquire = require('proxyquire') -const ledgerTransactionFixture = require('../../../test/fixtures/ledger-transaction.fixtures') -const gatewayAccountFixture = require('../../../test/fixtures/gateway-account.fixtures') -const Service = require('../../models/Service.class') -const serviceFixtures = require('../../../test/fixtures/service.fixtures') -const User = require('../../models/User.class') -const userFixtures = require('../../../test/fixtures/user.fixtures') +const ledgerTransactionFixture = require('@test/fixtures/ledger-transaction.fixtures') +const gatewayAccountFixture = require('@test/fixtures/gateway-account.fixtures') +const Service = require('@models/Service.class') +const serviceFixtures = require('@test/fixtures/service.fixtures') +const User = require('@models/User.class') +const userFixtures = require('@test/fixtures/user.fixtures') // Setup const gatewayAccountId = '651342' @@ -135,10 +135,10 @@ describe('The /transactions endpoint', () => { function getController () { return proxyquire('./transaction-list.controller', { - '../../services/transaction.service': { + '@services/transaction.service': { search: sinon.spy(() => Promise.resolve(transactionSearchResponse)) }, - '../../services/clients/connector.client.js': { + '@services/clients/connector.client.js': { ConnectorClient: class {async getAllCardTypes () { return {} }} } }) diff --git a/app/controllers/transactions/transaction-list.controller.js b/app/controllers/transactions/transaction-list.controller.js index 873b6e7082..6d484d00c5 100644 --- a/app/controllers/transactions/transaction-list.controller.js +++ b/app/controllers/transactions/transaction-list.controller.js @@ -4,14 +4,14 @@ const url = require('url') const _ = require('lodash') const router = require('../../routes.js') -const transactionService = require('../../services/transaction.service') -const { ConnectorClient } = require('../../services/clients/connector.client.js') -const { buildPaymentList } = require('../../utils/transaction-view.js') -const { response } = require('../../utils/response.js') -const { getFilters, describeFilters } = require('../../utils/filters.js') -const states = require('../../utils/states') +const transactionService = require('@services/transaction.service') +const { ConnectorClient } = require('@services/clients/connector.client.js') +const { buildPaymentList } = require('@utils/transaction-view.js') +const { response } = require('@utils/response.js') +const { getFilters, describeFilters } = require('@utils/filters.js') +const states = require('@utils/states') const client = new ConnectorClient(process.env.CONNECTOR_URL) -const formatAccountPathsFor = require('../../utils/format-account-paths-for') +const formatAccountPathsFor = require('@utils/format-account-paths-for') module.exports = async function showTransactionList (req, res, next) { const accountId = req.account.gateway_account_id diff --git a/app/controllers/transactions/transaction-list.controller.test.js b/app/controllers/transactions/transaction-list.controller.test.js index 29aa356b6c..6ffd5caa7b 100644 --- a/app/controllers/transactions/transaction-list.controller.test.js +++ b/app/controllers/transactions/transaction-list.controller.test.js @@ -1,11 +1,11 @@ const sinon = require('sinon') const proxyquire = require('proxyquire') -const User = require('../../models/User.class') -const userFixtures = require('../../../test/fixtures/user.fixtures') -const gatewayAccountFixture = require('../../../test/fixtures/gateway-account.fixtures') -const Service = require('../../models/Service.class') -const serviceFixtures = require('../../../test/fixtures/service.fixtures') -const ledgerTransactionFixture = require('../../../test/fixtures/ledger-transaction.fixtures') +const User = require('@models/User.class') +const userFixtures = require('@test/fixtures/user.fixtures') +const gatewayAccountFixture = require('@test/fixtures/gateway-account.fixtures') +const Service = require('@models/Service.class') +const serviceFixtures = require('@test/fixtures/service.fixtures') +const ledgerTransactionFixture = require('@test/fixtures/ledger-transaction.fixtures') describe('List transactions - GET', () => { let req, res, next @@ -58,13 +58,13 @@ describe('List transactions - GET', () => { function getController () { return proxyquire('./transaction-list.controller', { - '../../services/transaction.service': { + '@services/transaction.service': { search: sinon.spy(() => Promise.resolve(transactionSearchResponse)) }, - '../../services/clients/connector.client.js': { + '@services/clients/connector.client.js': { ConnectorClient: class {async getAllCardTypes () { return {} }} }, - '../../utils/states': { + '@utils/states': { allDisplayStateSelectorObjects: allDisplayStateSelectorObjectsMock } }) diff --git a/app/controllers/transactions/transaction-refund.controller.it.test.js b/app/controllers/transactions/transaction-refund.controller.it.test.js index b5bf42d431..bc4b0b59a7 100644 --- a/app/controllers/transactions/transaction-refund.controller.it.test.js +++ b/app/controllers/transactions/transaction-refund.controller.it.test.js @@ -4,7 +4,7 @@ const sinon = require('sinon') const nock = require('nock') const refundController = require('./transaction-refund.controller.js') -const transactionFixtures = require('../../../test/fixtures/refund.fixtures') +const transactionFixtures = require('@test/fixtures/refund.fixtures') const ACCOUNT_ID = '123' const CHARGE_ID = '123456' diff --git a/app/controllers/transactions/transaction-refund.controller.js b/app/controllers/transactions/transaction-refund.controller.js index 752a56364a..6270bc576e 100644 --- a/app/controllers/transactions/transaction-refund.controller.js +++ b/app/controllers/transactions/transaction-refund.controller.js @@ -1,9 +1,9 @@ 'use strict' -const { refund } = require('../../services/transaction.service') +const { refund } = require('@services/transaction.service') const router = require('../../routes.js') -const { safeConvertPoundsStringToPence } = require('../../utils/currency-formatter') -const formatAccountPathsFor = require('../../utils/format-account-paths-for') +const { safeConvertPoundsStringToPence } = require('@utils/currency-formatter') +const formatAccountPathsFor = require('@utils/format-account-paths-for') const refundTransaction = async function refundTransaction (req, res, next) { try { diff --git a/app/controllers/user/degateway/get.controller.js b/app/controllers/user/degateway/get.controller.js index 82a99c5ecf..cafaf63811 100644 --- a/app/controllers/user/degateway/get.controller.js +++ b/app/controllers/user/degateway/get.controller.js @@ -1,10 +1,10 @@ 'use strict' -const { response } = require('../../../utils/response') -const userService = require('../../../services/user.service') -const { SHOW_DEGATEWAY_SETTINGS } = require('../../../utils/constants') -const paths = require('../../../paths') -const logger = require('../../../utils/logger')(__filename) +const { response } = require('@utils/response') +const userService = require('@services/user.service') +const { SHOW_DEGATEWAY_SETTINGS } = require('@utils/constants') +const paths = require('@root/paths') +const logger = require('@utils/logger')(__filename) module.exports = async function getDegatewayPreference (req, res, next) { if (!SHOW_DEGATEWAY_SETTINGS) { diff --git a/app/controllers/user/degateway/post.controller.js b/app/controllers/user/degateway/post.controller.js index 28bf2118a0..66082ddaaa 100644 --- a/app/controllers/user/degateway/post.controller.js +++ b/app/controllers/user/degateway/post.controller.js @@ -1,9 +1,9 @@ 'use strict' -const userService = require('../../../services/user.service') -const paths = require('../../../paths') -const logger = require('../../../utils/logger')(__filename) -const { SHOW_DEGATEWAY_SETTINGS } = require('../../../utils/constants') +const userService = require('@services/user.service') +const paths = require('@root/paths') +const logger = require('@utils/logger')(__filename) +const { SHOW_DEGATEWAY_SETTINGS } = require('@utils/constants') module.exports = async function postDegatewayPreference (req, res, next) { const degatewayPreference = req.body['degateway-preference'] diff --git a/app/controllers/user/phone-number/get.controller.js b/app/controllers/user/phone-number/get.controller.js index 5b65dd71f1..90b8d4df60 100644 --- a/app/controllers/user/phone-number/get.controller.js +++ b/app/controllers/user/phone-number/get.controller.js @@ -1,7 +1,7 @@ 'use strict' -const { response } = require('../../../utils/response') -const userService = require('../../../services/user.service') +const { response } = require('@utils/response') +const userService = require('@services/user.service') module.exports = async function showUpdatePhoneNumber (req, res, next) { try { diff --git a/app/controllers/user/phone-number/post.controller.js b/app/controllers/user/phone-number/post.controller.js index 556fb5d4f4..34ae5fef80 100644 --- a/app/controllers/user/phone-number/post.controller.js +++ b/app/controllers/user/phone-number/post.controller.js @@ -1,10 +1,10 @@ 'use strict' -const { response } = require('../../../utils/response') -const userService = require('../../../services/user.service') -const paths = require('../../../paths') -const { invalidTelephoneNumber } = require('../../../utils/telephone-number-utils') -const { validationErrors } = require('../../../utils/validation/field-validation-checks') +const { response } = require('@utils/response') +const userService = require('@services/user.service') +const paths = require('@root/paths') +const { invalidTelephoneNumber } = require('@utils/telephone-number-utils') +const { validationErrors } = require('@utils/validation/field-validation-checks') module.exports = async function updatePhoneNumber (req, res, next) { const telephoneNumber = req.body.phone diff --git a/app/controllers/user/two-factor-auth/get-configure.controller.js b/app/controllers/user/two-factor-auth/get-configure.controller.js index a933588b57..04af9844ab 100644 --- a/app/controllers/user/two-factor-auth/get-configure.controller.js +++ b/app/controllers/user/two-factor-auth/get-configure.controller.js @@ -3,10 +3,10 @@ const lodash = require('lodash') const qrcode = require('qrcode') -const logger = require('../../../utils/logger')(__filename) -const { response } = require('../../../utils/response.js') -const paths = require('../../../paths') -const secondFactorMethod = require('../../../models/second-factor-method') +const logger = require('@utils/logger')(__filename) +const { response } = require('@utils/response.js') +const paths = require('@root/paths') +const secondFactorMethod = require('@models/second-factor-method') module.exports = async function showConfigureSecondFactorMethod (req, res) { const method = lodash.get(req, 'session.pageData.twoFactorAuthMethod', secondFactorMethod.APP) diff --git a/app/controllers/user/two-factor-auth/get-index.controller.js b/app/controllers/user/two-factor-auth/get-index.controller.js index 55e0b9b272..55a8f19d55 100644 --- a/app/controllers/user/two-factor-auth/get-index.controller.js +++ b/app/controllers/user/two-factor-auth/get-index.controller.js @@ -1,7 +1,7 @@ 'use strict' -const { response } = require('../../../utils/response.js') -const secondFactorMethod = require('../../../models/second-factor-method') +const { response } = require('@utils/response.js') +const secondFactorMethod = require('@models/second-factor-method') module.exports = (req, res) => { return response(req, res, 'two-factor-auth/index', { diff --git a/app/controllers/user/two-factor-auth/get-phone-number.controller.js b/app/controllers/user/two-factor-auth/get-phone-number.controller.js index 66f3dad0e8..6b34d4fa3f 100644 --- a/app/controllers/user/two-factor-auth/get-phone-number.controller.js +++ b/app/controllers/user/two-factor-auth/get-phone-number.controller.js @@ -1,6 +1,6 @@ 'use strict' -const { response } = require('../../../utils/response.js') +const { response } = require('@utils/response.js') module.exports = function showPhoneNumberPage (req, res) { return response(req, res, 'two-factor-auth/phone-number') diff --git a/app/controllers/user/two-factor-auth/get-resend.controller.js b/app/controllers/user/two-factor-auth/get-resend.controller.js index 8ce2bdca27..a631ba5505 100644 --- a/app/controllers/user/two-factor-auth/get-resend.controller.js +++ b/app/controllers/user/two-factor-auth/get-resend.controller.js @@ -1,6 +1,6 @@ 'use strict' -const { response } = require('../../../utils/response.js') +const { response } = require('@utils/response.js') module.exports = function showResendSmsCodePage (req, res) { return response(req, res, 'two-factor-auth/resend-sms-code', { phone: req.user.telephoneNumber }) diff --git a/app/controllers/user/two-factor-auth/post-configure.controller.js b/app/controllers/user/two-factor-auth/post-configure.controller.js index 6b9bcb72d8..a2bd3b23a4 100644 --- a/app/controllers/user/two-factor-auth/post-configure.controller.js +++ b/app/controllers/user/two-factor-auth/post-configure.controller.js @@ -2,13 +2,13 @@ const lodash = require('lodash') -const paths = require('../../../paths') -const userService = require('../../../services/user.service.js') -const secondFactorMethod = require('../../../models/second-factor-method') +const paths = require('@root/paths') +const userService = require('@services/user.service.js') +const secondFactorMethod = require('@models/second-factor-method') const { RESTClientError } = require('@govuk-pay/pay-js-commons/lib/utils/axios-base-client/errors') -const { validateOtp } = require('../../../utils/validation/server-side-form-validations') -const { validationErrors } = require('../../../utils/validation/field-validation-checks') -const { sanitiseSecurityCode } = require('../../../utils/security-code-utils') +const { validateOtp } = require('@utils/validation/server-side-form-validations') +const { validationErrors } = require('@utils/validation/field-validation-checks') +const { sanitiseSecurityCode } = require('@utils/security-code-utils') module.exports = async function postUpdateSecondFactorMethod (req, res, next) { const code = sanitiseSecurityCode(req.body.code) diff --git a/app/controllers/user/two-factor-auth/post-configure.controller.test.js b/app/controllers/user/two-factor-auth/post-configure.controller.test.js index be29fe1455..c1f4324103 100644 --- a/app/controllers/user/two-factor-auth/post-configure.controller.test.js +++ b/app/controllers/user/two-factor-auth/post-configure.controller.test.js @@ -2,11 +2,11 @@ const sinon = require('sinon') const proxyquire = require('proxyquire') const { expect } = require('chai') -const userFixtures = require('../../../../test/fixtures/user.fixtures') -const User = require('../../../models/User.class') -const paths = require('../../../paths') +const userFixtures = require('@test/fixtures/user.fixtures') +const User = require('@models/User.class') +const paths = require('@root/paths') const { RESTClientError } = require('@govuk-pay/pay-js-commons/lib/utils/axios-base-client/errors') -const secondFactorMethod = require('../../../models/second-factor-method') +const secondFactorMethod = require('@models/second-factor-method') const userExternalId = 'user-id' const twoFactorAuthMethod = secondFactorMethod.SMS @@ -138,7 +138,7 @@ describe('Configure new second factor method post controller', () => { function getController (configureNewOtpKeySpy) { return proxyquire('./post-configure.controller', { - '../../../services/user.service.js': { + '@services/user.service.js': { configureNewOtpKey: configureNewOtpKeySpy } }) diff --git a/app/controllers/user/two-factor-auth/post-index.controller.js b/app/controllers/user/two-factor-auth/post-index.controller.js index 39841b7831..043e641cf1 100644 --- a/app/controllers/user/two-factor-auth/post-index.controller.js +++ b/app/controllers/user/two-factor-auth/post-index.controller.js @@ -2,9 +2,9 @@ const lodash = require('lodash') -const userService = require('../../../services/user.service.js') -const paths = require('../../../paths') -const secondFactorMethod = require('../../../models/second-factor-method') +const userService = require('@services/user.service.js') +const paths = require('@root/paths') +const secondFactorMethod = require('@models/second-factor-method') module.exports = async (req, res, next) => { const method = req.body['two-fa-method'] diff --git a/app/controllers/user/two-factor-auth/post-index.controller.test.js b/app/controllers/user/two-factor-auth/post-index.controller.test.js index 9cfb6defb2..21df4946a8 100644 --- a/app/controllers/user/two-factor-auth/post-index.controller.test.js +++ b/app/controllers/user/two-factor-auth/post-index.controller.test.js @@ -2,9 +2,9 @@ const sinon = require('sinon') const proxyquire = require('proxyquire') const { expect } = require('chai') -const userFixtures = require('../../../../test/fixtures/user.fixtures') -const User = require('../../../models/User.class') -const paths = require('../../../paths') +const userFixtures = require('@test/fixtures/user.fixtures') +const User = require('@models/User.class') +const paths = require('@root/paths') const userExternalId = 'user-id' @@ -109,7 +109,7 @@ describe('Select new second factor method post controller', () => { function getController (provisionNewOtpKeySpy, sendProvisionalOtpSpy) { return proxyquire('./post-index.controller', { - '../../../services/user.service.js': { + '@services/user.service.js': { provisionNewOtpKey: provisionNewOtpKeySpy, sendProvisionalOTP: sendProvisionalOtpSpy } diff --git a/app/controllers/user/two-factor-auth/post-phone-number.controller.js b/app/controllers/user/two-factor-auth/post-phone-number.controller.js index b67d1e62b9..1ce3bf6cbc 100644 --- a/app/controllers/user/two-factor-auth/post-phone-number.controller.js +++ b/app/controllers/user/two-factor-auth/post-phone-number.controller.js @@ -1,10 +1,10 @@ 'use string' -const { response } = require('../../../utils/response') -const paths = require('../../../paths') -const { invalidTelephoneNumber } = require('../../../utils/telephone-number-utils') -const { validationErrors } = require('../../../utils/validation/field-validation-checks') -const userService = require('../../../services/user.service') +const { response } = require('@utils/response') +const paths = require('@root/paths') +const { invalidTelephoneNumber } = require('@utils/telephone-number-utils') +const { validationErrors } = require('@utils/validation/field-validation-checks') +const userService = require('@services/user.service') module.exports = async function submitPhoneNumber (req, res, next) { const { phone } = req.body diff --git a/app/controllers/user/two-factor-auth/post-phone-number.controller.test.js b/app/controllers/user/two-factor-auth/post-phone-number.controller.test.js index 0fa3a8d8ab..fea1cafdf6 100644 --- a/app/controllers/user/two-factor-auth/post-phone-number.controller.test.js +++ b/app/controllers/user/two-factor-auth/post-phone-number.controller.test.js @@ -1,10 +1,10 @@ const sinon = require('sinon') const proxyquire = require('proxyquire') -const userFixtures = require('../../../../test/fixtures/user.fixtures') -const User = require('../../../models/User.class') -const paths = require('../../../paths') -const { validationErrors } = require('../../../utils/validation/field-validation-checks') +const userFixtures = require('@test/fixtures/user.fixtures') +const User = require('@models/User.class') +const paths = require('@root/paths') +const { validationErrors } = require('@utils/validation/field-validation-checks') const userExternalId = 'user-id' @@ -84,7 +84,7 @@ describe('The POST set phone number for updating 2FA method controller', () => { function getController (updatePhoneNumberSpy, provisionNewOtpKeySpy, sendProvisionalOTPSpy) { return proxyquire('./post-phone-number.controller', { - '../../../services/user.service': { + '@services/user.service': { updatePhoneNumber: updatePhoneNumberSpy, provisionNewOtpKey: provisionNewOtpKeySpy, sendProvisionalOTP: sendProvisionalOTPSpy diff --git a/app/controllers/user/two-factor-auth/post-resend.controller.js b/app/controllers/user/two-factor-auth/post-resend.controller.js index 56d1a64e01..12d5f8a3a0 100644 --- a/app/controllers/user/two-factor-auth/post-resend.controller.js +++ b/app/controllers/user/two-factor-auth/post-resend.controller.js @@ -1,10 +1,10 @@ 'use strict' -const userService = require('../../../services/user.service.js') -const paths = require('../../../paths') -const { invalidTelephoneNumber } = require('../../../utils/telephone-number-utils') -const { validationErrors } = require('../../../utils/validation/field-validation-checks') -const { response } = require('../../../utils/response') +const userService = require('@services/user.service') +const paths = require('@root/paths') +const { invalidTelephoneNumber } = require('@utils/telephone-number-utils') +const { validationErrors } = require('@utils/validation/field-validation-checks') +const { response } = require('@utils/response') module.exports = async function resendSmsCode (req, res, next) { const { phone } = req.body diff --git a/app/controllers/user/two-factor-auth/post-resend.controller.test.js b/app/controllers/user/two-factor-auth/post-resend.controller.test.js index e4a4b6da9f..15b1b0cf71 100644 --- a/app/controllers/user/two-factor-auth/post-resend.controller.test.js +++ b/app/controllers/user/two-factor-auth/post-resend.controller.test.js @@ -1,10 +1,10 @@ const sinon = require('sinon') const proxyquire = require('proxyquire') -const userFixtures = require('../../../../test/fixtures/user.fixtures') -const User = require('../../../models/User.class') -const paths = require('../../../paths') -const { validationErrors } = require('../../../utils/validation/field-validation-checks') +const userFixtures = require('@test/fixtures/user.fixtures') +const User = require('@models/User.class') +const paths = require('@root/paths') +const { validationErrors } = require('@utils/validation/field-validation-checks') const userExternalId = 'user-id' @@ -81,7 +81,7 @@ describe('The POST resend code for updating 2FA to SMS controller', () => { function getController (updatePhoneNumberSpy, sendProvisionalOTPSpy) { return proxyquire('./post-resend.controller', { - '../../../services/user.service': { + '@services/user.service': { updatePhoneNumber: updatePhoneNumberSpy, sendProvisionalOTP: sendProvisionalOTPSpy } diff --git a/app/controllers/webhooks/webhooks-forms.test.js b/app/controllers/webhooks/webhooks-forms.test.js index 49ed0d04b6..7ad937eb42 100644 --- a/app/controllers/webhooks/webhooks-forms.test.js +++ b/app/controllers/webhooks/webhooks-forms.test.js @@ -2,7 +2,7 @@ const { expect } = require('chai') const { WebhooksForm } = require('./webhooks-form') -const webhooksFixtures = require('./../../../test/fixtures/webhooks.fixtures') +const webhooksFixtures = require('@test/fixtures/webhooks.fixtures') describe('Webhooks forms', () => { it('constructs a form with no fields', () => { diff --git a/app/controllers/webhooks/webhooks.controller.js b/app/controllers/webhooks/webhooks.controller.js index 6db0cf1a1c..5a17125a60 100644 --- a/app/controllers/webhooks/webhooks.controller.js +++ b/app/controllers/webhooks/webhooks.controller.js @@ -2,12 +2,12 @@ const { constants } = require('@govuk-pay/pay-js-commons') -const { response } = require('../../utils/response.js') -const paths = require('../../paths') -const formatFutureStrategyAccountPathsFor = require('../../utils/format-future-strategy-account-paths-for') +const { response } = require('@utils/response.js') +const paths = require('@root/paths') +const formatFutureStrategyAccountPathsFor = require('@utils/format-future-strategy-account-paths-for') const webhooksService = require('./webhooks.service') -const logger = require('../../utils/logger.js')(__filename) +const logger = require('@utils/logger.js')(__filename) const { WebhooksForm } = require('./webhooks-form') const webhooksFormSchema = new WebhooksForm() diff --git a/app/controllers/webhooks/webhooks.service.js b/app/controllers/webhooks/webhooks.service.js index 4a0cd397e2..101b828a32 100644 --- a/app/controllers/webhooks/webhooks.service.js +++ b/app/controllers/webhooks/webhooks.service.js @@ -1,7 +1,7 @@ 'use strict' -const webhooksClient = require('./../../services/clients/webhooks.client') -const Paginator = require('../../utils/paginator') +const webhooksClient = require('@services/clients/webhooks.client') +const Paginator = require('@utils/paginator') const PAGE_SIZE = 10 diff --git a/app/controllers/webhooks/webhooks.service.test.js b/app/controllers/webhooks/webhooks.service.test.js index 3409ba4edc..9410751373 100644 --- a/app/controllers/webhooks/webhooks.service.test.js +++ b/app/controllers/webhooks/webhooks.service.test.js @@ -3,7 +3,7 @@ const sinon = require('sinon') const proxyquire = require('proxyquire') -const webhooksFixture = require('./../../../test/fixtures/webhooks.fixtures') +const webhooksFixture = require('@test/fixtures/webhooks.fixtures') describe('webhooks service', () => { describe('list webhooks', () => { @@ -115,7 +115,7 @@ describe('webhooks service', () => { }) function getWebhooksServiceWithStub (stub) { - const webhooksService = proxyquire('./webhooks.service.js', { './../../services/clients/webhooks.client': stub }) + const webhooksService = proxyquire('./webhooks.service.js', { '@services/clients/webhooks.client': stub }) return webhooksService } diff --git a/app/controllers/your-psp/get-flex.controller.js b/app/controllers/your-psp/get-flex.controller.js index acab07220a..db97450e92 100644 --- a/app/controllers/your-psp/get-flex.controller.js +++ b/app/controllers/your-psp/get-flex.controller.js @@ -1,10 +1,10 @@ 'use strict' const lodash = require('lodash') -const { getCredentialByExternalId } = require('../../utils/credentials') -const { isSwitchingCredentialsRoute } = require('../../utils/credentials') +const { getCredentialByExternalId } = require('@utils/credentials') +const { isSwitchingCredentialsRoute } = require('@utils/credentials') -const { response } = require('../../utils/response') +const { response } = require('@utils/response') module.exports = (req, res, next) => { try { diff --git a/app/controllers/your-psp/get-flex.controller.test.js b/app/controllers/your-psp/get-flex.controller.test.js index e23adba8f5..6b08141713 100644 --- a/app/controllers/your-psp/get-flex.controller.test.js +++ b/app/controllers/your-psp/get-flex.controller.test.js @@ -2,7 +2,7 @@ const sinon = require('sinon') const getController = require('./get-flex.controller') -const gatewayAccountFixtures = require('../../../test/fixtures/gateway-account.fixtures') +const gatewayAccountFixtures = require('@test/fixtures/gateway-account.fixtures') const { expect } = require('chai') const credentialId = 'a-valid-credential-id' diff --git a/app/controllers/your-psp/get.controller.js b/app/controllers/your-psp/get.controller.js index 5203e94c17..84c51abd19 100644 --- a/app/controllers/your-psp/get.controller.js +++ b/app/controllers/your-psp/get.controller.js @@ -1,13 +1,13 @@ 'use strict' -const { response } = require('../../utils/response') +const { response } = require('@utils/response') const { getCredentialByExternalId, getCurrentCredential, getSwitchingCredentialIfExists, hasSwitchedProvider, worldpayMerchantDetailOperations -} = require('../../utils/credentials') +} = require('@utils/credentials') const yourPspTasks = require('./your-psp-tasks.service') module.exports = async (req, res, next) => { diff --git a/app/controllers/your-psp/get.controller.test.js b/app/controllers/your-psp/get.controller.test.js index 8897ed91b5..636a07802c 100644 --- a/app/controllers/your-psp/get.controller.test.js +++ b/app/controllers/your-psp/get.controller.test.js @@ -2,7 +2,7 @@ const sinon = require('sinon') const getController = require('./get.controller') -const gatewayAccountFixtures = require('../../../test/fixtures/gateway-account.fixtures') +const gatewayAccountFixtures = require('@test/fixtures/gateway-account.fixtures') const { expect } = require('chai') const credentialId = 'a-valid-credential-id' diff --git a/app/controllers/your-psp/post-flex.controller.js b/app/controllers/your-psp/post-flex.controller.js index 24789948a2..76b52d3e70 100644 --- a/app/controllers/your-psp/post-flex.controller.js +++ b/app/controllers/your-psp/post-flex.controller.js @@ -2,14 +2,14 @@ const lodash = require('lodash') -const paths = require('../../paths') -const formatAccountPathsFor = require('../../utils/format-account-paths-for') -const { renderErrorView } = require('../../utils/response') -const { ConnectorClient } = require('../../services/clients/connector.client') -const { validationErrors } = require('../../utils/validation/field-validation-checks') +const paths = require('@root/paths') +const formatAccountPathsFor = require('@utils/format-account-paths-for') +const { renderErrorView } = require('@utils/response') +const { ConnectorClient } = require('@services/clients/connector.client') +const { validationErrors } = require('@utils/validation/field-validation-checks') const worldpay3dsFlexValidations = require('./worldpay-3ds-flex-validations') -const { getCredentialByExternalId } = require('../../utils/credentials') -const { isSwitchingCredentialsRoute } = require('../../utils/credentials') +const { getCredentialByExternalId } = require('@utils/credentials') +const { isSwitchingCredentialsRoute } = require('@utils/credentials') const connector = new ConnectorClient(process.env.CONNECTOR_URL) // Constants diff --git a/app/controllers/your-psp/post-flex.controller.test.js b/app/controllers/your-psp/post-flex.controller.test.js index 3ebdab4a2b..d81305d0d1 100644 --- a/app/controllers/your-psp/post-flex.controller.test.js +++ b/app/controllers/your-psp/post-flex.controller.test.js @@ -3,7 +3,7 @@ const proxyquire = require('proxyquire') const sinon = require('sinon') -const gatewayAccountFixtures = require('../../../test/fixtures/gateway-account.fixtures') +const gatewayAccountFixtures = require('@test/fixtures/gateway-account.fixtures') describe('Post 3DS Flex controller', () => { const gatewayAccountExternalId = 'a-gateway-account-external-id' @@ -105,14 +105,14 @@ describe('Post 3DS Flex controller', () => { function getControllerWithMocks () { return proxyquire('./post-flex.controller', { - '../../services/clients/connector.client': { + '@services/clients/connector.client': { ConnectorClient: function () { this.postCheckWorldpay3dsFlexCredentials = postCheckWorldpay3dsFlexCredentials this.post3dsFlexAccountCredentials = post3dsFlexAccountCredentials this.updateIntegrationVersion3ds = updateIntegrationVersion3dsMock } }, - '../../utils/response': { + '@utils/response': { renderErrorView: renderErrorViewMock } }) diff --git a/app/controllers/your-psp/worldpay-3ds-flex-validations.js b/app/controllers/your-psp/worldpay-3ds-flex-validations.js index 7e3af39120..5ee28a9325 100644 --- a/app/controllers/your-psp/worldpay-3ds-flex-validations.js +++ b/app/controllers/your-psp/worldpay-3ds-flex-validations.js @@ -1,7 +1,7 @@ 'use strict' const { isNotWorldpay3dsFlexOrgUnitId, isNotWorldpay3dsFlexIssuer, isNotWorldpay3dsFlexJwtMacKey } = - require('../../utils/validation/field-validation-checks') + require('@utils/validation/field-validation-checks') exports.validateOrgUnitId = (orgUnitId) => { const isNotWorldpay3dsFlexOrgUnitIdErrorMessage = isNotWorldpay3dsFlexOrgUnitId(orgUnitId) diff --git a/app/controllers/your-psp/your-psp-tasks.service.test.js b/app/controllers/your-psp/your-psp-tasks.service.test.js index 7382434e8a..82ce0dd94d 100644 --- a/app/controllers/your-psp/your-psp-tasks.service.test.js +++ b/app/controllers/your-psp/your-psp-tasks.service.test.js @@ -1,7 +1,7 @@ const { expect } = require('chai') -const { getCurrentCredential } = require('../../utils/credentials') +const { getCurrentCredential } = require('@utils/credentials') const { getStripeTaskList, stripeTaskListIsComplete, stripeTaskListNumberOftasksComplete } = require('./your-psp-tasks.service') -const gatewayAccountFixtures = require('../../../test/fixtures/gateway-account.fixtures') +const gatewayAccountFixtures = require('@test/fixtures/gateway-account.fixtures') describe('Stripe task list', () => { describe('Get Stripe task list status', () => { diff --git a/app/middleware/error-handler.js b/app/middleware/error-handler.js index 64406bba63..a742c3a0b1 100644 --- a/app/middleware/error-handler.js +++ b/app/middleware/error-handler.js @@ -4,7 +4,7 @@ const Sentry = require('@sentry/node') const { AxiosError } = require('axios') const { RESTClientError } = require('@govuk-pay/pay-js-commons/lib/utils/axios-base-client/errors') -const logger = require('../utils/logger')(__filename) +const logger = require('@utils/logger')(__filename) const { NotAuthenticatedError, UserAccountDisabledError, @@ -20,8 +20,8 @@ const { GatewayTimeoutForAllServicesSearchError, TaskAlreadyCompletedError } = require('../errors') const paths = require('../paths') -const { renderErrorView, response } = require('../utils/response') -const formatSimplifiedAccountPathsFor = require('../utils/simplified-account/format/format-simplified-account-paths-for') +const { renderErrorView, response } = require('@utils/response') +const formatSimplifiedAccountPathsFor = require('@utils/simplified-account/format/format-simplified-account-paths-for') module.exports = function errorHandler (err, req, res, next) { if (res.headersSent) { diff --git a/app/middleware/error-handler.test.js b/app/middleware/error-handler.test.js index 1555486757..91a2c93ad9 100644 --- a/app/middleware/error-handler.test.js +++ b/app/middleware/error-handler.test.js @@ -6,11 +6,11 @@ const { ExpiredInviteError } = require('../errors') const paths = require('../paths') -const User = require('../models/User.class') -const Service = require('../models/Service.class') -const userFixtures = require('../../test/fixtures/user.fixtures') -const serviceFixtures = require('../../test/fixtures/service.fixtures') -const gatewayAccountFixtures = require('../../test/fixtures/gateway-account.fixtures') +const User = require('@models/User.class') +const Service = require('@models/Service.class') +const userFixtures = require('@test/fixtures/user.fixtures') +const serviceFixtures = require('@test/fixtures/service.fixtures') +const gatewayAccountFixtures = require('@test/fixtures/gateway-account.fixtures') const correlationId = 'a-request-id' const req = { @@ -36,7 +36,7 @@ describe('Error handler middleware', () => { infoLoggerSpy = sinon.spy() sentrySpy = sinon.spy() errorHandler = proxyquire('./error-handler', { - '../utils/logger': () => { + '@utils/logger': () => { return { info: infoLoggerSpy } diff --git a/app/middleware/get-service-and-gateway-account.middleware.js b/app/middleware/get-service-and-gateway-account.middleware.js index b712c0bb1b..1eb7fd4740 100644 --- a/app/middleware/get-service-and-gateway-account.middleware.js +++ b/app/middleware/get-service-and-gateway-account.middleware.js @@ -2,13 +2,13 @@ const _ = require('lodash') -const logger = require('../utils/logger')(__filename) +const logger = require('@utils/logger')(__filename) const { SERVICE_EXTERNAL_ID, GATEWAY_ACCOUNT_EXTERNAL_ID, ENVIRONMENT_ID } = require('../paths').keys -const Connector = require('../services/clients/connector.client.js').ConnectorClient +const Connector = require('@services/clients/connector.client.js').ConnectorClient const { keys } = require('@govuk-pay/pay-js-commons').logging -const { addField } = require('../services/clients/base/request-context') -const { getSwitchingCredentialIfExists } = require('../utils/credentials') +const { addField } = require('@services/clients/base/request-context') +const { getSwitchingCredentialIfExists } = require('@utils/credentials') const connectorClient = new Connector(process.env.CONNECTOR_URL) async function getGatewayAccountByExternalId (gatewayAccountExternalId) { diff --git a/app/middleware/get-service-and-gateway-account.middleware.test.js b/app/middleware/get-service-and-gateway-account.middleware.test.js index 2d30e80cc7..f0d6a4232f 100644 --- a/app/middleware/get-service-and-gateway-account.middleware.test.js +++ b/app/middleware/get-service-and-gateway-account.middleware.test.js @@ -4,9 +4,9 @@ const path = require('path') const proxyquire = require('proxyquire') const sinon = require('sinon') const { expect } = require('chai') -const User = require('../models/User.class') -const userFixtures = require('../../test/fixtures/user.fixtures') -const stripeAccountSetupFixture = require('../../test/fixtures/stripe-account-setup.fixtures') +const User = require('@models/User.class') +const userFixtures = require('@test/fixtures/user.fixtures') +const stripeAccountSetupFixture = require('@test/fixtures/stripe-account-setup.fixtures') let req, res, next, connectorGetAccountMock, connectorGetStripeAccountSetupMock @@ -49,7 +49,7 @@ const setupGetGatewayAccountAndService = function (gatewayAccountID, gatewayAcco } return proxyquire(path.join(__dirname, './get-service-and-gateway-account.middleware'), { - '../services/clients/connector.client.js': connectorMock + '@services/clients/connector.client.js': connectorMock }) } const setupGetGatewayAccountClientError = function (gatewayAccountExternalId, errorCode) { @@ -63,7 +63,7 @@ const setupGetGatewayAccountClientError = function (gatewayAccountExternalId, er }) return proxyquire(path.join(__dirname, './get-service-and-gateway-account.middleware'), { - '../services/clients/connector.client.js': connectorMock + '@services/clients/connector.client.js': connectorMock }) } diff --git a/app/middleware/invite-cookie-is-present.js b/app/middleware/invite-cookie-is-present.js index 22398005f5..310e486f08 100644 --- a/app/middleware/invite-cookie-is-present.js +++ b/app/middleware/invite-cookie-is-present.js @@ -1,9 +1,9 @@ 'use strict' const { RegistrationSessionMissingError } = require('../errors') -const { INVITE_SESSION_COOKIE_NAME } = require('../utils/constants') -const { addField } = require('../services/clients/base/request-context') -const { isInternalGDSEmail } = require('../utils/email-tools') +const { INVITE_SESSION_COOKIE_NAME } = require('@utils/constants') +const { addField } = require('@services/clients/base/request-context') +const { isInternalGDSEmail } = require('@utils/email-tools') module.exports = function inviteCookieIsPresent (req, res, next) { const cookie = req[INVITE_SESSION_COOKIE_NAME] diff --git a/app/middleware/logging-middleware.js b/app/middleware/logging-middleware.js index 9943a1a019..00fd99bdc5 100644 --- a/app/middleware/logging-middleware.js +++ b/app/middleware/logging-middleware.js @@ -1,5 +1,5 @@ const morgan = require('morgan') -const logger = require('../utils/logger')(__filename) +const logger = require('@utils/logger')(__filename) const { CORRELATION_HEADER } = require('../../config') const { format } = require('@govuk-pay/pay-js-commons').logging.requestLogFormat(CORRELATION_HEADER) diff --git a/app/middleware/permission.test.js b/app/middleware/permission.test.js index 314f82dd09..93104892bc 100644 --- a/app/middleware/permission.test.js +++ b/app/middleware/permission.test.js @@ -5,10 +5,10 @@ const { expect } = require('chai') const getPermissionMiddleware = require('./permission') const { PermissionDeniedError } = require('../errors') -const User = require('../models/User.class') -const Service = require('../models/Service.class') -const userFixtures = require('../../test/fixtures/user.fixtures') -const serviceFixtures = require('../../test/fixtures/service.fixtures') +const User = require('@models/User.class') +const Service = require('@models/Service.class') +const userFixtures = require('@test/fixtures/user.fixtures') +const serviceFixtures = require('@test/fixtures/service.fixtures') const serviceExternalId = 'a-service-external-id' const permission = 'do-cool-things' diff --git a/app/middleware/restrict-to-switching-account.test.js b/app/middleware/restrict-to-switching-account.test.js index 2e33afbbee..8ee0847d20 100644 --- a/app/middleware/restrict-to-switching-account.test.js +++ b/app/middleware/restrict-to-switching-account.test.js @@ -4,7 +4,7 @@ const sinon = require('sinon') const { expect } = require('chai') const { NotFoundError } = require('../errors') -const gatewayAccountFixtures = require('../../test/fixtures/gateway-account.fixtures') +const gatewayAccountFixtures = require('@test/fixtures/gateway-account.fixtures') const restrictToSwitchingAccount = require('./restrict-to-switching-account') describe('restrict-to-switching-account middleware', () => { diff --git a/app/middleware/simplified-account/simplified-account-strategy.middleware.test.js b/app/middleware/simplified-account/simplified-account-strategy.middleware.test.js index 1fbaaff4a3..5a8e202bfb 100644 --- a/app/middleware/simplified-account/simplified-account-strategy.middleware.test.js +++ b/app/middleware/simplified-account/simplified-account-strategy.middleware.test.js @@ -3,10 +3,10 @@ const { NotFoundError } = require('../../errors') const path = require('path') const proxyquire = require('proxyquire') const sinon = require('sinon') -const User = require('../../models/User.class') -const userFixtures = require('../../../test/fixtures/user.fixtures') -const stripeAccountSetupFixture = require('../../../test/fixtures/stripe-account-setup.fixtures') const GatewayAccount = require('@models/GatewayAccount.class') +const User = require('@models/User.class') +const userFixtures = require('@test/fixtures/user.fixtures') +const stripeAccountSetupFixture = require('@test/fixtures/stripe-account-setup.fixtures') const A_GATEWAY_EXTERNAL_ID = 'a-gateway-external-id' const A_SERVICE_EXTERNAL_ID = 'a-service-external-id' diff --git a/app/middleware/stripe-setup/restrict-to-stripe-account-context.js b/app/middleware/stripe-setup/restrict-to-stripe-account-context.js index 6762af7b26..0bf34d390b 100644 --- a/app/middleware/stripe-setup/restrict-to-stripe-account-context.js +++ b/app/middleware/stripe-setup/restrict-to-stripe-account-context.js @@ -1,6 +1,6 @@ 'use strict' -const { getSwitchingCredentialIfExists } = require('../../utils/credentials') +const { getSwitchingCredentialIfExists } = require('@utils/credentials') const { NotFoundError } = require('../../errors') module.exports = function restrictRequestsToLiveAccounts (req, res, next) { diff --git a/app/middleware/user-is-authorised.test.js b/app/middleware/user-is-authorised.test.js index 7d3f77d051..548992c888 100644 --- a/app/middleware/user-is-authorised.test.js +++ b/app/middleware/user-is-authorised.test.js @@ -4,10 +4,10 @@ const sinon = require('sinon') const { expect } = require('chai') const { NotAuthorisedError, NotAuthenticatedError, UserAccountDisabledError } = require('../errors') const userIsAuthorised = require('./user-is-authorised') -const User = require('../models/User.class') -const Service = require('../models/Service.class') -const userFixtures = require('../../test/fixtures/user.fixtures') -const serviceFixtures = require('../../test/fixtures/service.fixtures') +const User = require('@models/User.class') +const Service = require('@models/Service.class') +const userFixtures = require('@test/fixtures/user.fixtures') +const serviceFixtures = require('@test/fixtures/service.fixtures') const serviceExternalId = 'a-service-external-id' const sessionVersion = 1 diff --git a/app/models/DisputeTransaction.class.js b/app/models/DisputeTransaction.class.js index 11be4f669a..e03b9abaf5 100644 --- a/app/models/DisputeTransaction.class.js +++ b/app/models/DisputeTransaction.class.js @@ -1,9 +1,9 @@ 'use strict' const lodash = require('lodash') -const { penceToPoundsWithCurrency } = require('../utils/currency-formatter') +const { penceToPoundsWithCurrency } = require('@utils/currency-formatter') -const states = require('../utils/states') -const dates = require('../utils/dates') +const states = require('@utils/states') +const dates = require('@utils/dates') const reasonToFriendlyString = new Map() diff --git a/app/models/DisputeTransaction.class.test.js b/app/models/DisputeTransaction.class.test.js index 6ce6b91a14..37e0b5ae49 100644 --- a/app/models/DisputeTransaction.class.test.js +++ b/app/models/DisputeTransaction.class.test.js @@ -2,7 +2,7 @@ const { expect } = require('chai') const DisputeTransaction = require('./DisputeTransaction.class') -const dates = require('../utils/dates') +const dates = require('@utils/dates') describe('Dispute transaction model', () => { it('should build dispute transaction correctly for full dispute data', () => { diff --git a/app/models/TransactionEvent.class.js b/app/models/TransactionEvent.class.js index c7c28c96b4..e0164c9c22 100644 --- a/app/models/TransactionEvent.class.js +++ b/app/models/TransactionEvent.class.js @@ -1,9 +1,9 @@ 'use strict' const lodash = require('lodash') -const { penceToPoundsWithCurrency } = require('../utils/currency-formatter') +const { penceToPoundsWithCurrency } = require('@utils/currency-formatter') -const states = require('../utils/states') -const dates = require('../utils/dates') +const states = require('@utils/states') +const dates = require('@utils/dates') class TransactionEvent { constructor (eventData) { diff --git a/app/models/User.class.js b/app/models/User.class.js index 7bc4463e28..0c80a5c5d8 100644 --- a/app/models/User.class.js +++ b/app/models/User.class.js @@ -2,8 +2,8 @@ const _ = require('lodash') const ServiceRole = require('./ServiceRole.class') -const { isInternalGDSEmail } = require('../utils/email-tools') -const logger = require('../utils/logger')(__filename) +const { isInternalGDSEmail } = require('@utils/email-tools') +const logger = require('@utils/logger')(__filename) const DEGATEWAY_FLAG = process.env.DEGATEWAY_FLAG === 'true' /** diff --git a/app/models/User.class.test.js b/app/models/User.class.test.js index f3fed5d495..6b61d1a3e3 100644 --- a/app/models/User.class.test.js +++ b/app/models/User.class.test.js @@ -2,7 +2,7 @@ const { expect } = require('chai') const User = require('./User.class') -const userFixtures = require('../../test/fixtures/user.fixtures') +const userFixtures = require('@test/fixtures/user.fixtures') // Assignments etc let user, service, result, permission, role diff --git a/app/services/auth.service.js b/app/services/auth.service.js index 7fdb5ad6aa..3c99420163 100644 --- a/app/services/auth.service.js +++ b/app/services/auth.service.js @@ -4,18 +4,18 @@ const lodash = require('lodash') const passport = require('passport') const LocalStrategy = require('passport-local').Strategy const CustomStrategy = require('passport-custom').Strategy -const { addField } = require('../services/clients/base/request-context') +const { addField } = require('@services/clients/base/request-context') const { USER_EXTERNAL_ID } = require('@govuk-pay/pay-js-commons').logging.keys -const logger = require('../utils/logger')(__filename) +const logger = require('@utils/logger')(__filename) const sessionValidator = require('./session-validator.js') const paths = require('../paths.js') const userService = require('./user.service.js') const { validationErrors } = require('./../utils/validation/field-validation-checks') -const secondFactorMethod = require('../models/second-factor-method') -const { validateOtp } = require('../utils/validation/server-side-form-validations') -const { sanitiseSecurityCode } = require('../utils/security-code-utils') -const { INVITE_SESSION_COOKIE_NAME } = require('../utils/constants') +const secondFactorMethod = require('@models/second-factor-method') +const { validateOtp } = require('@utils/validation/server-side-form-validations') +const { sanitiseSecurityCode } = require('@utils/security-code-utils') +const { INVITE_SESSION_COOKIE_NAME } = require('@utils/constants') // Exports module.exports = { diff --git a/app/services/auth.service.test.js b/app/services/auth.service.test.js index d4c64cdd97..40f94066d9 100644 --- a/app/services/auth.service.test.js +++ b/app/services/auth.service.test.js @@ -9,10 +9,10 @@ const { expect } = require('chai') const auth = require('./auth.service.js') const paths = require('../paths.js') -const mockSession = require('../../test/test-helpers/mock-session.js') -const userFixtures = require('../../test/fixtures/user.fixtures') -const User = require('../models/User.class') -const secondFactorMethod = require('../models/second-factor-method') +const mockSession = require('@test/test-helpers/mock-session.js') +const userFixtures = require('@test/fixtures/user.fixtures') +const User = require('@models/User.class') +const secondFactorMethod = require('@models/second-factor-method') const { RESTClientError } = require('@govuk-pay/pay-js-commons/lib/utils/axios-base-client/errors') // Assignments and Variables diff --git a/app/services/clients/adminusers.client.js b/app/services/clients/adminusers.client.js index b847def5b5..8664c04524 100644 --- a/app/services/clients/adminusers.client.js +++ b/app/services/clients/adminusers.client.js @@ -4,8 +4,8 @@ const lodash = require('lodash') const { Client } = require('@govuk-pay/pay-js-commons/lib/utils/axios-base-client/axios-base-client') const { configureClient } = require('./base/config') -const User = require('../../models/User.class') -const Service = require('../../models/Service.class') +const User = require('@models/User.class') +const Service = require('@models/Service.class') // Constants const SERVICE_NAME = 'adminusers' diff --git a/app/services/clients/base/config.js b/app/services/clients/base/config.js index d7523f6017..2ee17ff08c 100644 --- a/app/services/clients/base/config.js +++ b/app/services/clients/base/config.js @@ -1,7 +1,7 @@ 'use strict' const requestLogger = require('./request-logger') -const { getRequestCorrelationIDField } = require('../../../services/clients/base/request-context') +const { getRequestCorrelationIDField } = require('./request-context') const { CORRELATION_HEADER } = require('../../../../config') function transformRequestAddHeaders () { diff --git a/app/services/clients/base/config.test.js b/app/services/clients/base/config.test.js index 146d5f24cc..03b9b2d22d 100644 --- a/app/services/clients/base/config.test.js +++ b/app/services/clients/base/config.test.js @@ -17,7 +17,7 @@ function getConfigWithMocks (correlationId) { getRequestCorrelationIDField: () => correlationId }, './request-logger': proxyquire('./request-logger', { - '../../../utils/logger': () => ({ + '@utils/logger': () => ({ info: logInfoSpy }) }) diff --git a/app/services/clients/base/request-logger.js b/app/services/clients/base/request-logger.js index 32db38ef4a..3d0c369cc1 100644 --- a/app/services/clients/base/request-logger.js +++ b/app/services/clients/base/request-logger.js @@ -1,4 +1,4 @@ -const logger = require('../../../utils/logger')(__filename) +const logger = require('@utils/logger')(__filename) module.exports = { logRequestStart: context => { diff --git a/app/services/clients/connector.client.js b/app/services/clients/connector.client.js index a559dc64d7..39951256f7 100644 --- a/app/services/clients/connector.client.js +++ b/app/services/clients/connector.client.js @@ -1,11 +1,11 @@ 'use strict' -const logger = require('../../utils/logger')(__filename) +const logger = require('@utils/logger')(__filename) const { Client } = require('@govuk-pay/pay-js-commons/lib/utils/axios-base-client/axios-base-client') const { configureClient } = require('./base/config') -const StripeAccountSetup = require('../../models/StripeAccountSetup.class') -const StripeAccount = require('../../models/StripeAccount.class') const GatewayAccount = require('@models/GatewayAccount.class') +const StripeAccountSetup = require('@models/StripeAccountSetup.class') +const StripeAccount = require('@models/StripeAccount.class') // Constants const SERVICE_NAME = 'connector' diff --git a/app/services/clients/ledger.client.js b/app/services/clients/ledger.client.js index e2622445cd..07680c1c7f 100644 --- a/app/services/clients/ledger.client.js +++ b/app/services/clients/ledger.client.js @@ -9,7 +9,7 @@ const { legacyConnectorTransactionsParity, legacyConnectorTransactionSummaryParity } = require('./utils/ledger-legacy-connector-parity') -const getQueryStringForParams = require('../../utils/get-query-string-for-params') +const getQueryStringForParams = require('@utils/get-query-string-for-params') const qs = require('qs') const defaultOptions = { diff --git a/app/services/clients/ledger.client.test.js b/app/services/clients/ledger.client.test.js index cc1d45e8d2..e6406fb3f2 100644 --- a/app/services/clients/ledger.client.test.js +++ b/app/services/clients/ledger.client.test.js @@ -3,7 +3,7 @@ const sinon = require('sinon') const proxyquire = require('proxyquire') const { expect } = require('chai') -const transactionDetailsFixtures = require('../../../test/fixtures/ledger-transaction.fixtures') +const transactionDetailsFixtures = require('@test/fixtures/ledger-transaction.fixtures') const configureSpy = sinon.spy() diff --git a/app/services/clients/products.client.js b/app/services/clients/products.client.js index fe0bcaf19f..20a30cefc1 100644 --- a/app/services/clients/products.client.js +++ b/app/services/clients/products.client.js @@ -1,11 +1,11 @@ 'use strict' -const Product = require('../../models/Product.class') -const Payment = require('../../models/Payment.class') +const Product = require('@models/Product.class') +const Payment = require('@models/Payment.class') const { Client } = require('@govuk-pay/pay-js-commons/lib/utils/axios-base-client/axios-base-client') const { configureClient } = require('./base/config') const { PRODUCTS_URL } = require('../../../config') -const supportedLanguage = require('../../models/supported-language') +const supportedLanguage = require('@models/supported-language') // Constants const SERVICE_NAME = 'products' diff --git a/app/services/clients/stream.client.js b/app/services/clients/stream.client.js index 9f6c1f7748..e80f307afc 100644 --- a/app/services/clients/stream.client.js +++ b/app/services/clients/stream.client.js @@ -2,7 +2,7 @@ const http = require('http') const https = require('https') const url = require('url') -const logger = require('../../utils/logger')(__filename) +const logger = require('@utils/logger')(__filename) class Stream { constructor (dataCallback, successCallback, errorCallback, headers) { diff --git a/app/services/email.service.js b/app/services/email.service.js index e320ce86bc..f9e1579c80 100644 --- a/app/services/email.service.js +++ b/app/services/email.service.js @@ -1,6 +1,6 @@ 'use strict' -const logger = require('../utils/logger')(__filename) +const logger = require('@utils/logger')(__filename) const ConnectorClient = require('./clients/connector.client.js').ConnectorClient const connectorClient = new ConnectorClient(process.env.CONNECTOR_URL) diff --git a/app/services/service.create-service.test.js b/app/services/service.create-service.test.js index 535466409e..f845024916 100644 --- a/app/services/service.create-service.test.js +++ b/app/services/service.create-service.test.js @@ -4,7 +4,7 @@ const proxyquire = require('proxyquire') const chai = require('chai') const chaiAsPromised = require('chai-as-promised') const sinon = require('sinon') -const { CREATED } = require('../models/psp-test-account-stage') +const { CREATED } = require('@models/psp-test-account-stage') const expect = chai.expect chai.use(chaiAsPromised) diff --git a/app/services/service.service.js b/app/services/service.service.js index 4e3946af8a..f134b9e1fe 100644 --- a/app/services/service.service.js +++ b/app/services/service.service.js @@ -2,15 +2,15 @@ const lodash = require('lodash') -const logger = require('../utils/logger')(__filename) +const logger = require('@utils/logger')(__filename) const getAdminUsersClient = require('./clients/adminusers.client') const { ConnectorClient } = require('./clients/connector.client') -const CardGatewayAccount = require('../models/GatewayAccount.class') -const Service = require('../models/Service.class') +const CardGatewayAccount = require('@models/GatewayAccount.class') +const Service = require('@models/Service.class') const connectorClient = new ConnectorClient(process.env.CONNECTOR_URL) const adminUsersClient = getAdminUsersClient() -const { DEFAULT_SERVICE_NAME } = require('../utils/constants') -const { CREATED } = require('../models/psp-test-account-stage') +const { DEFAULT_SERVICE_NAME } = require('@utils/constants') +const { CREATED } = require('@models/psp-test-account-stage') async function getGatewayAccounts (gatewayAccountIds) { const cardGatewayAccounts = await connectorClient.getAccounts({ diff --git a/app/services/service.service.test.js b/app/services/service.service.test.js index 58971974a1..ca8b16a715 100644 --- a/app/services/service.service.test.js +++ b/app/services/service.service.test.js @@ -7,7 +7,7 @@ const chaiAsPromised = require('chai-as-promised') chai.use(chaiAsPromised) const sinon = require('sinon') -const gatewayAccountFixtures = require('../../test/fixtures/gateway-account.fixtures') +const gatewayAccountFixtures = require('@test/fixtures/gateway-account.fixtures') const expect = chai.expect @@ -44,7 +44,7 @@ describe('service service', function () { serviceService = proxyquire('./service.service', { - '../services/clients/connector.client': connectorClientStub + './clients/connector.client': connectorClientStub }) const gatewayAccounts = await serviceService.getGatewayAccounts([gatewayAccountId1, gatewayAccountId2, nonExistentId]) @@ -82,7 +82,7 @@ describe('service service', function () { } serviceService = proxyquire('./service.service', { - '../services/clients/connector.client': connectorClientStub, + './clients/connector.client': connectorClientStub, './clients/adminusers.client': adminusersClientStub }) @@ -140,7 +140,7 @@ describe('service service', function () { } serviceService = proxyquire('./service.service', { - '../services/clients/connector.client': connectorClientStub, + './clients/connector.client': connectorClientStub, './clients/adminusers.client': adminusersClientStub }) diff --git a/app/services/session-validator.test.js b/app/services/session-validator.test.js index 96ea0ce21f..4667a01107 100644 --- a/app/services/session-validator.test.js +++ b/app/services/session-validator.test.js @@ -1,5 +1,5 @@ const assert = require('assert') -const mockSession = require('../../test/test-helpers/mock-session') +const mockSession = require('@test/test-helpers/mock-session') const sessionValidator = require('./session-validator') describe('session validator', () => { diff --git a/app/services/stripe-details.service.js b/app/services/stripe-details.service.js index 29083b6fb5..cd72867079 100644 --- a/app/services/stripe-details.service.js +++ b/app/services/stripe-details.service.js @@ -4,7 +4,7 @@ const { listPersons, updatePerson, createPerson, updateCompany, uploadFile, updateAccount, retrieveAccountDetails, listBankAccount } = require('@services/clients/stripe/stripe.client') -const logger = require('../utils/logger')(__filename) +const logger = require('@utils/logger')(__filename) const connector = new ConnectorClient(process.env.CONNECTOR_URL) /** diff --git a/app/services/transaction.service.js b/app/services/transaction.service.js index ec518417e6..54fb8e0da0 100644 --- a/app/services/transaction.service.js +++ b/app/services/transaction.service.js @@ -3,14 +3,14 @@ const qs = require('qs') const lodash = require('lodash') -const logger = require('../utils/logger')(__filename) +const logger = require('@utils/logger')(__filename) const { keys } = require('@govuk-pay/pay-js-commons').logging const Ledger = require('./clients/ledger.client') const { ConnectorClient } = require('./clients/connector.client') -const getQueryStringForParams = require('../utils/get-query-string-for-params') -const userService = require('../services/user.service') -const transactionView = require('../utils/transaction-view') -const errorIdentifier = require('../models/error-identifier') +const getQueryStringForParams = require('@utils/get-query-string-for-params') +const userService = require('@services/user.service') +const transactionView = require('@utils/transaction-view') +const errorIdentifier = require('@models/error-identifier') const { GatewayTimeoutError, GatewayTimeoutForAllServicesSearchError } = require('../errors') const connector = new ConnectorClient(process.env.CONNECTOR_URL) diff --git a/app/utils/credentials.test.js b/app/utils/credentials.test.js index d9b66ab209..0df432f8cc 100644 --- a/app/utils/credentials.test.js +++ b/app/utils/credentials.test.js @@ -1,6 +1,6 @@ const { expect } = require('chai') const paths = require('../paths') -const gatewayAccountFixtures = require('../../test/fixtures/gateway-account.fixtures') +const gatewayAccountFixtures = require('@test/fixtures/gateway-account.fixtures') const { InvalidConfigurationError } = require('../errors') const { getCurrentCredential, getSwitchingCredential, isSwitchingCredentialsRoute, getPSPPageLinks, getCredentialByExternalId, hasSwitchedProvider, getSwitchingCredentialIfExists, getActiveCredential, isEnableStripeOnboardingTaskListRoute, getWorldpayMerchantDetailOperationByKey, worldpayMerchantDetailOperations } = require('./credentials') diff --git a/app/utils/dates.test.js b/app/utils/dates.test.js index c728a46664..fa3ca270a8 100644 --- a/app/utils/dates.test.js +++ b/app/utils/dates.test.js @@ -1,4 +1,4 @@ -require('../../test/test-helpers/html-assertions.js') +require('@test/test-helpers/html-assertions.js') const assert = require('assert') const dates = require('./dates.js') diff --git a/app/utils/filters.js b/app/utils/filters.js index 2e4d937ba5..d38910c0ab 100644 --- a/app/utils/filters.js +++ b/app/utils/filters.js @@ -3,8 +3,8 @@ const qs = require('qs') const moment = require('moment-timezone') const check = require('check-types') -const Paginator = require('../utils/paginator.js') -const states = require('../utils/states') +const Paginator = require('@utils/paginator.js') +const states = require('@utils/states') const _ = require('lodash') function validateFilters (filters) { diff --git a/app/utils/logger.js b/app/utils/logger.js index ffe1e2b776..f7ddd2396b 100644 --- a/app/utils/logger.js +++ b/app/utils/logger.js @@ -2,7 +2,7 @@ const { createLogger, format, transports } = require('winston') const { json, splat, prettyPrint, combine, timestamp, printf, colorize } = format const { govUkPayLoggingFormat } = require('@govuk-pay/pay-js-commons').logging const { addSentryToErrorLevel } = require('./sentry.js') -const { getLoggingFields } = require('../services/clients/base/request-context') +const { getLoggingFields } = require('@services/clients/base/request-context') const supplementSharedLoggingFields = format((info) => { if (getLoggingFields()) { diff --git a/app/utils/nav-builder.test.js b/app/utils/nav-builder.test.js index e0b6d7cc44..09b7ba2c48 100644 --- a/app/utils/nav-builder.test.js +++ b/app/utils/nav-builder.test.js @@ -1,5 +1,5 @@ const { expect } = require('chai') -const gatewayAccountFixtures = require('../../test/fixtures/gateway-account.fixtures') +const gatewayAccountFixtures = require('@test/fixtures/gateway-account.fixtures') const { yourPSPNavigationItems } = require('./nav-builder') describe('navigation builder', () => { diff --git a/app/utils/payment-links.js b/app/utils/payment-links.js index 43ad0b7191..9ffc47be05 100644 --- a/app/utils/payment-links.js +++ b/app/utils/payment-links.js @@ -4,7 +4,7 @@ const lodash = require('lodash') const paths = require('../paths') -const formatAccountPathsFor = require('../utils/format-account-paths-for') +const formatAccountPathsFor = require('@utils/format-account-paths-for') // the edit and create flows handle storing cookie session data in separate places, // abstract this away from the controller by adding accessors that can be based diff --git a/app/utils/permissions.js b/app/utils/permissions.js index 963a8ec51d..1d719bd733 100644 --- a/app/utils/permissions.js +++ b/app/utils/permissions.js @@ -1,6 +1,6 @@ 'use strict' const _ = require('lodash') -const { ConnectorClient } = require('../services/clients/connector.client.js') +const { ConnectorClient } = require('@services/clients/connector.client.js') const client = new ConnectorClient(process.env.CONNECTOR_URL) const userServicesContainsGatewayAccount = function userServicesContainsGatewayAccount (accountId, user) { diff --git a/app/utils/permissions.test.js b/app/utils/permissions.test.js index f7dc0bf361..5f02588f1b 100644 --- a/app/utils/permissions.test.js +++ b/app/utils/permissions.test.js @@ -2,11 +2,11 @@ const sinon = require('sinon') const { expect } = require('chai') const proxyquire = require('proxyquire') -const { ConnectorClient } = require('../services/clients/connector.client') -const User = require('../models/User.class') +const { ConnectorClient } = require('@services/clients/connector.client') +const User = require('@models/User.class') -const { validUser } = require('../../test/fixtures/user.fixtures') -const { validGatewayAccountResponse } = require('../../test/fixtures/gateway-account.fixtures') +const { validUser } = require('@test/fixtures/user.fixtures') +const { validGatewayAccountResponse } = require('@test/fixtures/gateway-account.fixtures') describe('gateway account filter utiltiies', () => { const { userServicesContainsGatewayAccount } = require('./permissions') @@ -43,7 +43,7 @@ describe('gateway account filter utiltiies', () => { it('correctly identifies stripe and moto headers for relavent accounts', async () => { const { getGatewayAccountsFor } = proxyquire('./permissions', { - '../services/clients/connector.client.js': { + '@services/clients/connector.client.js': { ConnectorClient: class { async getAccounts () { return { @@ -72,7 +72,7 @@ describe('gateway account filter utiltiies', () => { it('correctly identifies non stripe and moto headers', async () => { const { getGatewayAccountsFor } = proxyquire('./permissions', { - '../services/clients/connector.client.js': { + '@services/clients/connector.client.js': { ConnectorClient: class { async getAccounts () { return { @@ -92,7 +92,7 @@ describe('gateway account filter utiltiies', () => { it('correctly filters accounts', async () => { const { getGatewayAccountsFor } = proxyquire('./permissions', { - '../services/clients/connector.client.js': { + '@services/clients/connector.client.js': { ConnectorClient: class { async getAccounts () { return { @@ -130,7 +130,7 @@ describe('gateway account filter utiltiies', () => { it('correctly filters services by users permission role', async () => { const { getGatewayAccountsFor } = proxyquire( - './permissions', { '../services/clients/connector.client.js': ConnectorClient } + './permissions', { '@services/clients/connector.client.js': ConnectorClient } ) getGatewayAccountsFor(user, true, 'perm-1') @@ -139,7 +139,7 @@ describe('gateway account filter utiltiies', () => { it('does not interract with the backend if no services have the required permissions', () => { const { getGatewayAccountsFor } = proxyquire( - './permissions', { '../services/clients/connector.client.js': ConnectorClient } + './permissions', { '@services/clients/connector.client.js': ConnectorClient } ) getGatewayAccountsFor(user, true, 'permission-user-does-not-have') diff --git a/app/utils/simplified-account/format/arrange-users-by-role.js b/app/utils/simplified-account/format/arrange-users-by-role.js index d55aaf9892..14df89a1ca 100644 --- a/app/utils/simplified-account/format/arrange-users-by-role.js +++ b/app/utils/simplified-account/format/arrange-users-by-role.js @@ -1,6 +1,6 @@ const _ = require('lodash') const paths = require('../../../paths') -const formatSimplifiedAccountPathsFor = require('../../../utils/simplified-account/format/format-simplified-account-paths-for') +const formatSimplifiedAccountPathsFor = require('@utils/simplified-account/format/format-simplified-account-paths-for') const { roles } = require('../../roles') function mapTeamMembersByRoles (users, externalServiceId, accountType, currentUser) { diff --git a/app/utils/simplified-account/format/arrange-users-by-role.test.js b/app/utils/simplified-account/format/arrange-users-by-role.test.js index 381ea1d70f..745e5f9919 100644 --- a/app/utils/simplified-account/format/arrange-users-by-role.test.js +++ b/app/utils/simplified-account/format/arrange-users-by-role.test.js @@ -1,7 +1,7 @@ const { expect } = require('chai') const { mapTeamMembersByRoles, mapInvitedTeamMembersByRoles } = require('./arrange-users-by-role') -const User = require('../../../models/User.class') -const userFixtures = require('../../../../test/fixtures/user.fixtures') +const User = require('@models/User.class') +const userFixtures = require('@test/fixtures/user.fixtures') const paths = require('../../../paths') const ACCOUNT_TYPE = 'test' const SERVICE_ID = 'service-id-123abc' diff --git a/app/utils/simplified-account/settings/service-settings.js b/app/utils/simplified-account/settings/service-settings.js index 6d1cbc34cf..472d539c7a 100644 --- a/app/utils/simplified-account/settings/service-settings.js +++ b/app/utils/simplified-account/settings/service-settings.js @@ -1,7 +1,7 @@ const paths = require('../../../paths') const formatSimplifiedAccountPathsFor = require('../format/format-simplified-account-paths-for') const SettingsBuilder = require('./SettingsBuilder.class') -const { LIVE } = require('../../../models/go-live-stage') +const { LIVE } = require('@models/go-live-stage') /** * @param {GatewayAccount} account diff --git a/app/utils/transaction-view.js b/app/utils/transaction-view.js index 868197135a..1a8b66940e 100644 --- a/app/utils/transaction-view.js +++ b/app/utils/transaction-view.js @@ -2,7 +2,7 @@ const lodash = require('lodash') const changeCase = require('change-case') -const dates = require('../utils/dates.js') +const dates = require('@utils/dates.js') const router = require('../routes.js') const qs = require('qs') const { penceToPoundsWithCurrency } = require('./currency-formatter') @@ -10,9 +10,9 @@ const Paginator = require('./paginator') const states = require('./states') const check = require('check-types') const url = require('url') -const TransactionEvent = require('../models/TransactionEvent.class') -const DisputeTransaction = require('../models/DisputeTransaction.class') -const formatAccountPathsFor = require('../utils/format-account-paths-for') +const TransactionEvent = require('@models/TransactionEvent.class') +const DisputeTransaction = require('@models/DisputeTransaction.class') +const formatAccountPathsFor = require('@utils/format-account-paths-for') const DATA_UNAVAILABLE = 'Data unavailable' const REDACTED_PII_FIELD_VALUE = '' diff --git a/app/utils/transaction-view.test.js b/app/utils/transaction-view.test.js index bba0105403..da57e6e0c3 100644 --- a/app/utils/transaction-view.test.js +++ b/app/utils/transaction-view.test.js @@ -3,7 +3,7 @@ const { expect } = require('chai') const { buildPaymentView } = require('./transaction-view') -const transactionFixtures = require('../../test/fixtures/ledger-transaction.fixtures') +const transactionFixtures = require('@test/fixtures/ledger-transaction.fixtures') describe('Transaction view utilities', () => { describe('disputed payment refundable', () => { diff --git a/app/utils/verify-psp-integration.test.js b/app/utils/verify-psp-integration.test.js index cc455b8bdb..c8ebcfe247 100644 --- a/app/utils/verify-psp-integration.test.js +++ b/app/utils/verify-psp-integration.test.js @@ -1,5 +1,5 @@ const { expect } = require('chai') -const connectorChargeFixtures = require('../../test/fixtures/connector-charge.fixtures') +const connectorChargeFixtures = require('@test/fixtures/connector-charge.fixtures') const { filterNextUrl } = require('./verify-psp-integration') describe('verify psp integration utility', () => {