Move /check modules into their own folder

DEFRA · Oct 20, 2024 · 6656eb4 · 6656eb4
1 parent 816c377
commit 6656eb4
Show file tree

Hide file tree

Showing 14 changed files with 45 additions and 45 deletions.
diff --git a/app/controllers/return-requirements-setup.controller.js b/app/controllers/return-requirements-setup.controller.js
@@ -10,7 +10,7 @@ const AddService = require('../services/return-requirements/setup/add.service.js
 const AdditionalSubmissionOptionsService = require('../services/return-requirements/setup/additional-submission-options.service.js')
 const AgreementsExceptionsService = require('../services/return-requirements/setup/agreements-exceptions.service.js')
 const CancelService = require('../services/return-requirements/setup/cancel.service.js')
-const CheckService = require('../services/return-requirements/setup/check.service.js')
+const CheckService = require('../services/return-requirements/setup/check/check.service.js')
 const DeleteNoteService = require('../services/return-requirements/setup/delete-note.service.js')
 const ExistingService = require('../services/return-requirements/setup/existing.service.js')
 const FeatureFlagsConfig = require('../../config/feature-flags.config.js')
@@ -30,7 +30,7 @@ const SubmitAbstractionPeriod = require('../services/return-requirements/setup/s
 const SubmitAdditionalSubmissionOptionsService = require('../services/return-requirements/setup/submit-additional-submission-options.service.js')
 const SubmitAgreementsExceptions = require('../services/return-requirements/setup/submit-agreements-exceptions.service.js')
 const SubmitCancel = require('../services/return-requirements/setup/submit-cancel.service.js')
-const SubmitCheckService = require('../services/return-requirements/setup/submit-check.service.js')
+const SubmitCheckService = require('../services/return-requirements/setup/check/submit-check.service.js')
 const SubmitExistingService = require('../services/return-requirements/setup/submit-existing.service.js')
 const SubmitFrequencyCollectedService = require('../services/return-requirements/setup/submit-frequency-collected.service.js')
 const SubmitFrequencyReportedService = require('../services/return-requirements/setup/submit-frequency-reported.service.js')

diff --git a/...eturn-requirements/setup/check.service.js → ...requirements/setup/check/check.service.js b/...eturn-requirements/setup/check.service.js → ...requirements/setup/check/check.service.js
@@ -5,10 +5,10 @@
  * @module CheckService
  */
 
-const CheckPresenter = require('../../../presenters/return-requirements/setup/check/check.presenter.js')
-const FetchPointsService = require('./fetch-points.service.js')
-const ReturnRequirementsPresenter = require('../../../presenters/return-requirements/setup/check/returns-requirements.presenter.js')
-const SessionModel = require('../../../models/session.model.js')
+const CheckPresenter = require('../../../../presenters/return-requirements/setup/check/check.presenter.js')
+const FetchPointsService = require('../fetch-points.service.js')
+const ReturnRequirementsPresenter = require('../../../../presenters/return-requirements/setup/check/returns-requirements.presenter.js')
+const SessionModel = require('../../../../models/session.model.js')
 
 /**
  * Orchestrates fetching and presenting the data for `/return-requirements/setup/{sessionId}/check` page

diff --git a/...te-return-version-requirements.service.js → ...te-return-version-requirements.service.js b/...te-return-version-requirements.service.js → ...te-return-version-requirements.service.js
@@ -5,9 +5,9 @@
  * @module GenerateReturnVersionRequirementsService
  */
 
-const LicenceModel = require('../../../models/licence.model.js')
-const LicenceVersionModel = require('../../../models/licence-version.model.js')
-const ReturnRequirementModel = require('../../../models/return-requirement.model.js')
+const LicenceModel = require('../../../../models/licence.model.js')
+const LicenceVersionModel = require('../../../../models/licence-version.model.js')
+const ReturnRequirementModel = require('../../../../models/return-requirement.model.js')
 
 /**
  * Uses the session data to generate the data sets required to create the return version requirements for a licence

diff --git a/.../setup/generate-return-version.service.js → .../check/generate-return-version.service.js b/.../setup/generate-return-version.service.js → .../check/generate-return-version.service.js
@@ -7,7 +7,7 @@
 
 const GenerateReturnVersionRequirementsService = require('./generate-return-version-requirements.service.js')
 const ProcessExistingReturnVersionsService = require('./process-existing-return-versions.service.js')
-const ReturnVersionModel = require('../../../models/return-version.model.js')
+const ReturnVersionModel = require('../../../../models/return-version.model.js')
 
 /**
  * Uses the session data to generate the data sets required to create a new return version for a licence

diff --git a/...s/setup/persist-return-version.service.js → ...p/check/persist-return-version.service.js b/...s/setup/persist-return-version.service.js → ...p/check/persist-return-version.service.js
@@ -5,10 +5,10 @@
  * @module PersistReturnVersionService
  */
 
-const ReturnRequirementModel = require('../../../models/return-requirement.model.js')
-const ReturnRequirementPointModel = require('../../../models/return-requirement-point.model.js')
-const ReturnRequirementPurposeModel = require('../../../models/return-requirement-purpose.model.js')
-const ReturnVersionModel = require('../../../models/return-version.model.js')
+const ReturnRequirementModel = require('../../../../models/return-requirement.model.js')
+const ReturnRequirementPointModel = require('../../../../models/return-requirement-point.model.js')
+const ReturnRequirementPurposeModel = require('../../../../models/return-requirement-purpose.model.js')
+const ReturnVersionModel = require('../../../../models/return-version.model.js')
 
 /**
  * Persists the data required to create a new return version

diff --git a/...ocess-existing-return-versions.service.js → ...ocess-existing-return-versions.service.js b/...ocess-existing-return-versions.service.js → ...ocess-existing-return-versions.service.js
@@ -5,7 +5,7 @@
  * @module ProcessExistingReturnVersionsService
  */
 
-const ReturnVersionModel = require('../../../models/return-version.model.js')
+const ReturnVersionModel = require('../../../../models/return-version.model.js')
 
 /**
  * Processes existing return versions to update the their `status` and `endDate` when a new return version is created

diff --git a/...equirements/setup/submit-check.service.js → ...ments/setup/check/submit-check.service.js b/...equirements/setup/submit-check.service.js → ...ments/setup/check/submit-check.service.js
@@ -7,7 +7,7 @@
 
 const GenerateReturnVersionService = require('./generate-return-version.service.js')
 const PersistReturnVersionService = require('./persist-return-version.service.js')
-const SessionModel = require('../../../models/session.model.js')
+const SessionModel = require('../../../../models/session.model.js')
 
 /**
  * Manages converting the session data to return requirement records when check return requirements is confirmed

diff --git a/test/controllers/return-requirements-setup.controller.test.js b/test/controllers/return-requirements-setup.controller.test.js
@@ -16,7 +16,7 @@ const AbstractionPeriodService = require('../../app/services/return-requirements
 const AdditionalSubmissionOptionsService = require('../../app/services/return-requirements/setup/additional-submission-options.service.js')
 const AgreementsExceptionService = require('../../app/services/return-requirements/setup/agreements-exceptions.service.js')
 const CancelService = require('../../app/services/return-requirements/setup/cancel.service.js')
-const CheckService = require('../../app/services/return-requirements/setup/check.service.js')
+const CheckService = require('../../app/services/return-requirements/setup/check/check.service.js')
 const DeleteNoteService = require('../../app/services/return-requirements/setup/delete-note.service.js')
 const ExistingService = require('../../app/services/return-requirements/setup/existing.service.js')
 const FrequencyCollectedService = require('../../app/services/return-requirements/setup/frequency-collected.service.js')

diff --git a/...-requirements/setup/check.service.test.js → ...rements/setup/check/check.service.test.js b/...-requirements/setup/check.service.test.js → ...rements/setup/check/check.service.test.js
@@ -9,11 +9,11 @@ const { describe, it, beforeEach, afterEach } = exports.lab = Lab.script()
 const { expect } = Code
 
 // Test helpers
-const FetchPointsService = require('../../../../app/services/return-requirements/setup/fetch-points.service.js')
-const SessionHelper = require('../../../support/helpers/session.helper.js')
+const FetchPointsService = require('../../../../../app/services/return-requirements/setup/fetch-points.service.js')
+const SessionHelper = require('../../../../support/helpers/session.helper.js')
 
 // Thing under test
-const CheckService = require('../../../../app/services/return-requirements/setup/check.service.js')
+const CheckService = require('../../../../../app/services/return-requirements/setup/check/check.service.js')
 
 describe('Return Requirements Setup - Check service', () => {
  let session

diff --git a/...turn-version-requirements.service.test.js → ...turn-version-requirements.service.test.js b/...turn-version-requirements.service.test.js → ...turn-version-requirements.service.test.js
@@ -8,14 +8,14 @@ const { describe, it, beforeEach } = exports.lab = Lab.script()
 const { expect } = Code
 
 // Test helpers
-const { generateUUID } = require('../../../../app/lib/general.lib.js')
-const LicenceHelper = require('../../../support/helpers/licence.helper.js')
-const LicenceVersionHelper = require('../../../support/helpers/licence-version.helper.js')
-const LicenceVersionPurposeHelper = require('../../../support/helpers/licence-version-purpose.helper.js')
-const RegionHelper = require('../../../support/helpers/region.helper.js')
+const { generateUUID } = require('../../../../../app/lib/general.lib.js')
+const LicenceHelper = require('../../../../support/helpers/licence.helper.js')
+const LicenceVersionHelper = require('../../../../support/helpers/licence-version.helper.js')
+const LicenceVersionPurposeHelper = require('../../../../support/helpers/licence-version-purpose.helper.js')
+const RegionHelper = require('../../../../support/helpers/region.helper.js')
 
 // Thing under test
-const GenerateReturnVersionRequirementsService = require('../../../../app/services/return-requirements/setup/generate-return-version-requirements.service.js')
+const GenerateReturnVersionRequirementsService = require('../../../../../app/services/return-requirements/setup/check/generate-return-version-requirements.service.js')
 
 describe('Return Requirements Setup - Generate Return Version Requirements service', () => {
  let licenceId

diff --git a/...p/generate-return-version.service.test.js → ...k/generate-return-version.service.test.js b/...p/generate-return-version.service.test.js → ...k/generate-return-version.service.test.js
@@ -9,15 +9,15 @@ const { describe, it, beforeEach, afterEach } = exports.lab = Lab.script()
 const { expect } = Code
 
 // Test helpers
-const { generateUUID } = require('../../../../app/lib/general.lib.js')
-const ReturnVersionHelper = require('../../../support/helpers/return-version.helper.js')
+const { generateUUID } = require('../../../../../app/lib/general.lib.js')
+const ReturnVersionHelper = require('../../../../support/helpers/return-version.helper.js')
 
 // Things we need to stub
-const GenerateReturnVersionRequirementsService = require('../../../../app/services/return-requirements/setup/generate-return-version-requirements.service.js')
-const ProcessExistingReturnVersionsService = require('../../../../app/services/return-requirements/setup/process-existing-return-versions.service.js')
+const GenerateReturnVersionRequirementsService = require('../../../../../app/services/return-requirements/setup/check/generate-return-version-requirements.service.js')
+const ProcessExistingReturnVersionsService = require('../../../../../app/services/return-requirements/setup/check/process-existing-return-versions.service.js')
 
 // Thing under test
-const GenerateReturnVersionService = require('../../../../app/services/return-requirements/setup/generate-return-version.service.js')
+const GenerateReturnVersionService = require('../../../../../app/services/return-requirements/setup/check/generate-return-version.service.js')
 
 describe('Return Requirements Setup - Generate Return Version service', () => {
  const userId = 12345

diff --git a/...up/persist-return-version.service.test.js → ...ck/persist-return-version.service.test.js b/...up/persist-return-version.service.test.js → ...ck/persist-return-version.service.test.js
@@ -8,14 +8,14 @@ const { describe, it, beforeEach } = exports.lab = Lab.script()
 const { expect } = Code
 
 // Test helpers
-const { generateUUID } = require('../../../../app/lib/general.lib.js')
-const ReturnVersionModel = require('../../../../app/models/return-version.model.js')
-const ReturnRequirementModel = require('../../../../app/models/return-requirement.model.js')
-const ReturnRequirementPointModel = require('../../../../app/models/return-requirement-point.model.js')
-const ReturnRequirementPurposeModel = require('../../../../app/models/return-requirement-purpose.model.js')
+const { generateUUID } = require('../../../../../app/lib/general.lib.js')
+const ReturnVersionModel = require('../../../../../app/models/return-version.model.js')
+const ReturnRequirementModel = require('../../../../../app/models/return-requirement.model.js')
+const ReturnRequirementPointModel = require('../../../../../app/models/return-requirement-point.model.js')
+const ReturnRequirementPurposeModel = require('../../../../../app/models/return-requirement-purpose.model.js')
 
 // Thing under test
-const PersistReturnVersionService = require('../../../../app/services/return-requirements/setup/persist-return-version.service.js')
+const PersistReturnVersionService = require('../../../../../app/services/return-requirements/setup/check/persist-return-version.service.js')
 
 describe('Return Requirements Setup - Persist Return Version service', () => {
  describe('when called with data to persist', () => {

diff --git a/...-existing-return-versions.service.test.js → ...-existing-return-versions.service.test.js b/...-existing-return-versions.service.test.js → ...-existing-return-versions.service.test.js
@@ -8,12 +8,12 @@ const { describe, it, beforeEach } = exports.lab = Lab.script()
 const { expect } = Code
 
 // Test helpers
-const { generateUUID } = require('../../../../app/lib/general.lib.js')
-const ReturnVersionHelper = require('../../../support/helpers/return-version.helper.js')
-const ReturnVersionModel = require('../../../../app/models/return-version.model.js')
+const { generateUUID } = require('../../../../../app/lib/general.lib.js')
+const ReturnVersionHelper = require('../../../../support/helpers/return-version.helper.js')
+const ReturnVersionModel = require('../../../../../app/models/return-version.model.js')
 
 // Thing under test
-const ProcessExistingReturnVersionsService = require('../../../../app/services/return-requirements/setup/process-existing-return-versions.service.js')
+const ProcessExistingReturnVersionsService = require('../../../../../app/services/return-requirements/setup/check/process-existing-return-versions.service.js')
 
 describe('Return Requirements Setup - Process Existing Return Versions service', () => {
  let existingReturnVersionId

diff --git a/...ements/setup/submit-check.service.test.js → .../setup/check/submit-check.service.test.js b/...ements/setup/submit-check.service.test.js → .../setup/check/submit-check.service.test.js
@@ -9,14 +9,14 @@ const { describe, it, beforeEach, afterEach } = exports.lab = Lab.script()
 const { expect } = Code
 
 // Test helpers
-const SessionHelper = require('../../../support/helpers/session.helper.js')
+const SessionHelper = require('../../../../support/helpers/session.helper.js')
 
 // Things we need to stub
-const GenerateReturnVersionService = require('../../../../app/services/return-requirements/setup/generate-return-version.service.js')
-const PersistReturnVersionService = require('../../../../app/services/return-requirements/setup/persist-return-version.service.js')
+const GenerateReturnVersionService = require('../../../../../app/services/return-requirements/setup/check/generate-return-version.service.js')
+const PersistReturnVersionService = require('../../../../../app/services/return-requirements/setup/check/persist-return-version.service.js')
 
 // Thing under test
-const SubmitCheckService = require('../../../../app/services/return-requirements/setup/submit-check.service.js')
+const SubmitCheckService = require('../../../../../app/services/return-requirements/setup/check/submit-check.service.js')
 
 describe('Return Requirements Setup - Submit Check service', () => {
  let session