Refactor the existing purpose condition types to be consistent

test/models/licence-version-purpose-condition-type.model.test.js

@@ -8,21 +8,23 @@ const { describe, it, beforeEach } = exports.lab = Lab.script()
 const { expect } = Code
 
 // Test helpers
-const LicenceVersionPurposeConditionModel = require('../../app/models/licence-version-purpose-condition.model.js')
 const LicenceVersionPurposeConditionHelper = require('../support/helpers/licence-version-purpose-condition.helper.js')
+const LicenceVersionPurposeConditionModel = require('../../app/models/licence-version-purpose-condition.model.js')
+const LicenceVersionPurposesConditionsTypeSeeder = require('../support/seeders/licence-version-purpose-condition-types.seeder.js')
 
 // Thing under test
 const LicenceVersionPurposeConditionTypeModel = require('../../app/models/licence-version-purpose-condition-type.model.js')
 
-describe('Licence Version Purposes model', () => {
-  const testRecordId = '4eac5d7e-21e4-475c-8108-3e0c2ece181f'
+describe('Licence Version Purposes Condition Type model', () => {
+  const licenceVersionPurposeConditionType = LicenceVersionPurposesConditionsTypeSeeder.data[0]
 
   describe('Basic query', () => {
     it('can successfully run a basic query', async () => {
-      const result = await LicenceVersionPurposeConditionTypeModel.query().findById(testRecordId)
+      const result = await LicenceVersionPurposeConditionTypeModel
+        .query().findById(licenceVersionPurposeConditionType.id)
 
       expect(result).to.be.an.instanceOf(LicenceVersionPurposeConditionTypeModel)
-      expect(result.id).to.equal(testRecordId)
+      expect(result.id).to.equal(licenceVersionPurposeConditionType.id)
     })
   })
 
@@ -32,7 +34,7 @@ describe('Licence Version Purposes model', () => {
 
       beforeEach(async () => {
         testLicenceVersionPurposeCondition = await LicenceVersionPurposeConditionHelper.add({
-          licenceVersionPurposeConditionTypeId: testRecordId
+          licenceVersionPurposeConditionTypeId: licenceVersionPurposeConditionType.id
         })
       })
 
@@ -45,11 +47,11 @@ describe('Licence Version Purposes model', () => {
 
       it('can eager load the licence version purpose condition', async () => {
         const result = await LicenceVersionPurposeConditionTypeModel.query()
-          .findById(testRecordId)
+          .findById(licenceVersionPurposeConditionType.id)
           .withGraphFetched('licenceVersionPurposeConditions')
 
         expect(result).to.be.instanceOf(LicenceVersionPurposeConditionTypeModel)
-        expect(result.id).to.equal(testRecordId)
+        expect(result.id).to.equal(licenceVersionPurposeConditionType.id)
 
         const foundRecord = result.licenceVersionPurposeConditions.find((record) => {
           return record.id === testLicenceVersionPurposeCondition.id

test/models/licence-version-purpose-condition.model.test.js

@@ -9,9 +9,10 @@ const { expect } = Code
 
 // Test helpers
 const LicenceVersionPurposeConditionHelper = require('../support/helpers/licence-version-purpose-condition.helper.js')
+const LicenceVersionPurposeConditionTypeModel = require('../../app/models/licence-version-purpose-condition-type.model.js')
 const LicenceVersionPurposeHelper = require('../support/helpers/licence-version-purpose.helper.js')
 const LicenceVersionPurposeModel = require('../../app/models/licence-version-purpose.model.js')
-const LicenceVersionPurposeConditionTypeModel = require('../../app/models/licence-version-purpose-condition-type.model.js')
+const LicenceVersionPurposesConditionsTypeSeeder = require('../support/seeders/licence-version-purpose-condition-types.seeder.js')
 
 // Thing under test
 const LicenceVersionPurposeConditionModel = require('../../app/models/licence-version-purpose-condition.model.js')
@@ -65,11 +66,11 @@ describe('Licence Version Purpose Condition model', () => {
     })
 
     describe('when linking to licence version purpose condition type', () => {
-      const testLicenceVersionPurposeConditionTypeId = '4eac5d7e-21e4-475c-8108-3e0c2ece181f'
+      const licenceVersionPurposeConditionType = LicenceVersionPurposesConditionsTypeSeeder.data[0]
 
       beforeEach(async () => {
         testRecord = await LicenceVersionPurposeConditionHelper.add({
-          licenceVersionPurposeConditionTypeId: testLicenceVersionPurposeConditionTypeId
+          licenceVersionPurposeConditionTypeId: licenceVersionPurposeConditionType.id
         })
       })
 
@@ -89,7 +90,7 @@ describe('Licence Version Purpose Condition model', () => {
         expect(result.id).to.equal(testRecord.id)
 
         expect(result.licenceVersionPurposeConditionType).to.be.an.instanceOf(LicenceVersionPurposeConditionTypeModel)
-        expect(result.licenceVersionPurposeConditionType.id).to.equal(testLicenceVersionPurposeConditionTypeId)
+        expect(result.licenceVersionPurposeConditionType.id).to.equal(licenceVersionPurposeConditionType.id)
       })
     })
   })

test/services/licences/fetch-licence-summary.service.test.js

@@ -18,6 +18,7 @@ const LicenceHolderSeeder = require('../../support/seeders/licence-holder.seeder
 const LicenceVersionHelper = require('../../support/helpers/licence-version.helper.js')
 const LicenceVersionPurposeConditionHelper = require('../../support/helpers/licence-version-purpose-condition.helper.js')
 const LicenceVersionPurposeHelper = require('../../support/helpers/licence-version-purpose.helper.js')
+const LicenceVersionPurposesConditionsTypeSeeder = require('../../support/seeders/licence-version-purpose-condition-types.seeder.js')
 const PermitLicenceHelper = require('../../support/helpers/permit-licence.helper.js')
 const PurposeSeeder = require('../../support/seeders/purposes.seeder.js')
 const RegionHelper = require('../../support/helpers/region.helper.js')
@@ -34,11 +35,16 @@ describe('Fetch Licence Summary service', () => {
   let licenceVersion
   let licenceVersionPurpose
   let licenceVersionPurposeCondition
+  let licenceVersionPurposeConditionType
   let permitLicence
   let purpose
   let region
 
   beforeEach(async () => {
+    licenceVersionPurposeConditionType = LicenceVersionPurposesConditionsTypeSeeder.data.find((conditionType) => {
+      return conditionType.displayTitle === 'Aggregate condition link between licences'
+    })
+
     region = await RegionHelper.add()
 
     licence = await LicenceHelper.add({
@@ -64,7 +70,7 @@ describe('Fetch Licence Summary service', () => {
 
     licenceVersionPurposeCondition = await LicenceVersionPurposeConditionHelper.add({
       licenceVersionPurposeId: licenceVersionPurpose.id,
-      licenceVersionPurposeConditionTypeId: '4c0b378d-a9c2-4b50-b1bd-9aeefe988f93'
+      licenceVersionPurposeConditionTypeId: licenceVersionPurposeConditionType.id
     })
 
     licenceHolderSeed = await LicenceHolderSeeder.seed(licence.licenceRef)
@@ -141,7 +147,7 @@ describe('Fetch Licence Summary service', () => {
               licenceVersionPurposeConditions: [{
                 id: licenceVersionPurposeCondition.id,
                 licenceVersionPurposeConditionType: {
-                  id: '4c0b378d-a9c2-4b50-b1bd-9aeefe988f93',
+                  id: licenceVersionPurposeConditionType.id,
                   displayTitle: 'Aggregate condition link between licences'
                 }
               }]