Update as per PR comments

DEFRA · Sep 4, 2024 · ae87adb · ae87adb
1 parent 3eaaa20
commit ae87adb
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/app/services/bill-runs/setup/submit-year.service.js b/app/services/bill-runs/setup/submit-year.service.js
@@ -48,8 +48,8 @@ async function go (sessionId, payload) {
   }
 
   const regionId = session.region
-  const twoPartTariff = session.type.startsWith('two_part')
-  const licenceSupplementaryYears = await FetchLicenceSupplementaryYearsService.go(regionId, twoPartTariff)
+  const twoPartTariffSupplementary = session.type === 'two_part_supplementary'
+  const licenceSupplementaryYears = await FetchLicenceSupplementaryYearsService.go(regionId, twoPartTariffSupplementary)
 
   const formattedData = YearPresenter.go(licenceSupplementaryYears, session)
 

diff --git a/app/services/bill-runs/setup/year.service.js b/app/services/bill-runs/setup/year.service.js
@@ -6,8 +6,8 @@
  */
 
 const FetchLicenceSupplementaryYearsService = require('./fetch-licence-supplementary-years.service.js')
-const YearPresenter = require('../../../presenters/bill-runs/setup/year.presenter.js')
 const SessionModel = require('../../../models/session.model.js')
+const YearPresenter = require('../../../presenters/bill-runs/setup/year.presenter.js')
 
 /**
  * Orchestrates fetching and presenting the data for `/bill-runs/setup/{sessionId}/year` page
@@ -23,8 +23,8 @@ async function go (sessionId) {
   const session = await SessionModel.query().findById(sessionId)
 
   const regionId = session.region
-  const twoPartTariff = session.type.startsWith('two_part')
-  const licenceSupplementaryYears = await FetchLicenceSupplementaryYearsService.go(regionId, twoPartTariff)
+  const twoPartTariffSupplementary = session.type === 'two_part_supplementary'
+  const licenceSupplementaryYears = await FetchLicenceSupplementaryYearsService.go(regionId, twoPartTariffSupplementary)
 
   const formattedData = YearPresenter.go(licenceSupplementaryYears, session)