Persist match and allocate issues and status

app/models/licence.model.js

@@ -64,12 +64,12 @@ class LicenceModel extends BaseModel {
           to: 'regions.id'
         }
       },
-      reviewResults: {
+      reviewLicences: {
         relation: Model.HasManyRelation,
-        modelClass: 'review-result.model',
+        modelClass: 'review-licence.model',
         join: {
           from: 'licences.id',
-          to: 'reviewResults.licenceId'
+          to: 'reviewLicences.licenceId'
         }
       },
       workflows: {

app/models/review-charge-element-return.model.js

@@ -0,0 +1,16 @@
+'use strict'
+
+/**
+ * Model for review_charge_elements_returns
+ * @module ReviewChargeElementReturnModel
+ */
+
+const BaseModel = require('./base.model.js')
+
+class ReviewChargeElementReturnModel extends BaseModel {
+  static get tableName () {
+    return 'reviewChargeElementsReturns'
+  }
+}
+
+module.exports = ReviewChargeElementReturnModel

app/models/review-charge-element.model.js

@@ -0,0 +1,43 @@
+'use strict'
+
+/**
+ * Model for review_charge_elements
+ * @module ReviewChargeElementModel
+ */
+
+const { Model } = require('objection')
+
+const BaseModel = require('./base.model.js')
+
+class ReviewChargeElementModel extends BaseModel {
+  static get tableName () {
+    return 'reviewChargeElements'
+  }
+
+  static get relationMappings () {
+    return {
+      reviewChargeReference: {
+        relation: Model.BelongsToOneRelation,
+        modelClass: 'review-charge-reference.model',
+        join: {
+          from: 'reviewChargeElements.reviewChargeReferenceId',
+          to: 'reviewChargeReferences.id'
+        }
+      },
+      reviewReturns: {
+        relation: Model.ManyToManyRelation,
+        modelClass: 'review-return.model',
+        join: {
+          from: 'reviewChargeElements.id',
+          through: {
+            from: 'reviewChargeElementsReturns.reviewChargeElementId',
+            to: 'reviewChargeElementsReturns.reviewReturnId'
+          },
+          to: 'reviewReturns.id'
+        }
+      }
+    }
+  }
+}
+
+module.exports = ReviewChargeElementModel

app/models/review-charge-reference.model.js

@@ -0,0 +1,39 @@
+'use strict'
+
+/**
+ * Model for review_charge_references
+ * @module ReviewChargeReferenceModel
+ */
+
+const { Model } = require('objection')
+
+const BaseModel = require('./base.model.js')
+
+class ReviewChargeReferenceModel extends BaseModel {
+  static get tableName () {
+    return 'reviewChargeReferences'
+  }
+
+  static get relationMappings () {
+    return {
+      reviewChargeVersion: {
+        relation: Model.BelongsToOneRelation,
+        modelClass: 'review-charge-version.model',
+        join: {
+          from: 'reviewChargeReferences.reviewChargeVersionId',
+          to: 'reviewChargeVersions.id'
+        }
+      },
+      reviewChargeElements: {
+        relation: Model.HasManyRelation,
+        modelClass: 'review-charge-element.model',
+        join: {
+          from: 'reviewChargeReferences.id',
+          to: 'reviewChargeElements.reviewChargeReferenceId'
+        }
+      }
+    }
+  }
+}
+
+module.exports = ReviewChargeReferenceModel

app/models/review-charge-version.model.js

@@ -0,0 +1,39 @@
+'use strict'
+
+/**
+ * Model for review_charge_versions
+ * @module ReviewChargeVersionModel
+ */
+
+const { Model } = require('objection')
+
+const BaseModel = require('./base.model.js')
+
+class ReviewChargeVersionModel extends BaseModel {
+  static get tableName () {
+    return 'reviewChargeVersions'
+  }
+
+  static get relationMappings () {
+    return {
+      reviewLicence: {
+        relation: Model.BelongsToOneRelation,
+        modelClass: 'review-licence.model',
+        join: {
+          from: 'reviewChargeVersions.reviewLicenceId',
+          to: 'reviewLicences.id'
+        }
+      },
+      reviewChargeReferences: {
+        relation: Model.HasManyRelation,
+        modelClass: 'review-charge-reference.model',
+        join: {
+          from: 'reviewChargeVersions.id',
+          to: 'reviewChargeReferences.reviewChargeVersionId'
+        }
+      }
+    }
+  }
+}
+
+module.exports = ReviewChargeVersionModel

app/models/review-licence.model.js

@@ -0,0 +1,47 @@
+'use strict'
+
+/**
+ * Model for review_licences
+ * @module ReviewLicenceModel
+ */
+
+const { Model } = require('objection')
+
+const BaseModel = require('./base.model.js')
+
+class ReviewLicenceModel extends BaseModel {
+  static get tableName () {
+    return 'reviewLicences'
+  }
+
+  static get relationMappings () {
+    return {
+      licence: {
+        relation: Model.BelongsToOneRelation,
+        modelClass: 'licence.model',
+        join: {
+          from: 'reviewLicences.licenceId',
+          to: 'licences.id'
+        }
+      },
+      reviewChargeVersions: {
+        relation: Model.HasManyRelation,
+        modelClass: 'review-charge-version.model',
+        join: {
+          from: 'reviewLicences.id',
+          to: 'reviewChargeVersions.reviewLicenceId'
+        }
+      },
+      reviewReturns: {
+        relation: Model.HasManyRelation,
+        modelClass: 'review-return.model',
+        join: {
+          from: 'reviewLicences.id',
+          to: 'reviewReturns.reviewLicenceId'
+        }
+      }
+    }
+  }
+}
+
+module.exports = ReviewLicenceModel

app/models/review-return.model.js

@@ -0,0 +1,50 @@
+'use strict'
+
+/**
+ * Model for review_returns
+ * @module ReviewReturnModel
+ */
+
+const { Model } = require('objection')
+
+const BaseModel = require('./base.model.js')
+
+class ReviewReturnModel extends BaseModel {
+  static get tableName () {
+    return 'reviewReturns'
+  }
+
+  // Defining which fields contain json allows us to insert an object without needing to stringify it first
+  static get jsonAttributes () {
+    return [
+      'purposes'
+    ]
+  }
+
+  static get relationMappings () {
+    return {
+      reviewLicence: {
+        relation: Model.BelongsToOneRelation,
+        modelClass: 'review-licence.model',
+        join: {
+          from: 'reviewReturns.reviewLicenceId',
+          to: 'reviewLicences.id'
+        }
+      },
+      reviewChargeElements: {
+        relation: Model.ManyToManyRelation,
+        modelClass: 'review-charge-element.model',
+        join: {
+          from: 'reviewReturns.id',
+          through: {
+            from: 'reviewChargeElementsReturns.reviewReturnId',
+            to: 'reviewChargeElementsReturns.reviewChargeElementId'
+          },
+          to: 'reviewChargeElements.id'
+        }
+      }
+    }
+  }
+}
+
+module.exports = ReviewReturnModel

app/presenters/bill-runs/two-part-tariff/review-bill-run.presenter.js

@@ -33,7 +33,7 @@ function _prepareLicences (licences) {
     }
 
     preparedLicences.push({
-      id: licence.id,
+      id: licence.licenceId,
       licenceRef: licence.licenceRef,
       licenceHolder: licence.licenceHolder,
       status: licence.status,