feat(Police Force Area): Add PFA model

src/app/lib/setup.ts

@@ -11,6 +11,7 @@ import {
   Ward,
   ScottishConstituency,
   Outcode,
+  PoliceForceArea,
 } from "../models/index";
 
 // List of support tables generated from data/ directory
@@ -26,6 +27,7 @@ export const SUPPORT_TABLES = [
   Parish,
   Ward,
   ScottishConstituency,
+  PoliceForceArea,
 ];
 
 /**

src/app/models/index.ts

@@ -16,3 +16,4 @@ export * from "./terminated_postcode";
 export * from "./ced";
 export * from "./lsoa";
 export * from "./msoa";
+export * from "./police_force_area";

src/app/models/police_force_area.ts

@@ -0,0 +1,5 @@
+import { generateAttributeMethods } from "./attribute_base";
+
+const relation = "police_force_areas";
+
+export const PoliceForceArea = generateAttributeMethods({ relation });

src/app/models/postcode.ts

@@ -62,6 +62,7 @@ export interface PostcodeInterface {
     lsoa: string | null;
     msoa: string | null;
     lau2: string | null;
+    pfa: string | null;
   };
 }
 
@@ -105,6 +106,7 @@ export interface PostcodeTuple {
   ced: string;
   ccg: string;
   nuts: string;
+  pfa_id: string;
 }
 
 const relation: Relation = {
@@ -137,6 +139,7 @@ const relation: Relation = {
     ced_id: "VARCHAR(32)",
     constituency_id: "VARCHAR(32)",
     date_of_introduction: "VARCHAR(6)",
+    pfa_id: "VARCHAR(32)",
   },
   indexes: [
     {
@@ -802,6 +805,7 @@ const toJson = function (
       lsoa: p.lsoa_id,
       msoa: p.msoa_id,
       lau2: p.nuts_id,
+      pfa: p.pfa_id,
     },
     // Insert distance if present
     //@ts-ignore
@@ -868,6 +872,7 @@ const seedPostcodes = async (filepath: string) => {
     { column: "ced_id", method: (row) => row.extract("ced") },
     { column: "ccg_id", method: (row) => row.extract("ccg") },
     { column: "date_of_introduction", method: row => row.extract("dointr") },
+    { column: "pfa_id", method: row => row.extract("pfa") },
   ]);
 
   await methods.csvSeed({

src/bin/clear_test_db.ts

@@ -10,6 +10,7 @@ import {
   ScottishPostcode,
   Nuts,
   Ward,
+  PoliceForceArea,
   Outcode,
   Place,
   TerminatedPostcode,
@@ -31,6 +32,7 @@ const clear = async () => {
   await ScottishConstituency.destroyRelation();
   await Ccg.destroyRelation();
   await Ward.destroyRelation();
+  await PoliceForceArea.destroyRelation();
   await Outcode.destroyRelation();
   await Ced.destroyRelation();
   await Lsoa.destroyRelation();

src/bin/create_test_db.ts

@@ -9,6 +9,7 @@ import {
   ScottishPostcode,
   Nuts,
   Ward,
+  PoliceForceArea,
   Outcode,
   Place,
   TerminatedPostcode,
@@ -48,6 +49,7 @@ const clear = async (): Promise<unknown> => {
   await ScottishConstituency.destroyRelation();
   await Ccg.destroyRelation();
   await Ward.destroyRelation();
+  await PoliceForceArea.destroyRelation();
   await Outcode.destroyRelation();
   await Ced.destroyRelation();
 };
@@ -70,6 +72,7 @@ const seed = async (): Promise<unknown> => {
   await ScottishConstituency.setupTable();
   await Ccg.setupTable();
   await Ward.setupTable();
+  await PoliceForceArea.setupTable();
   await Outcode.setupTable();
   console.log("Created outcodes relation");
   await Ced.setupTable();

test/attribute_base.models.unit.ts

@@ -11,6 +11,7 @@ import {
   Ward,
   Msoa,
   Lsoa,
+  PoliceForceArea,
 } from "../src/app/models/index";
 
 const { rigCoreSpecs } = AttributeBaseSuite;
@@ -26,3 +27,4 @@ rigCoreSpecs(Parish);
 rigCoreSpecs(Ward);
 rigCoreSpecs(Msoa);
 rigCoreSpecs(Lsoa);
+rigCoreSpecs(PoliceForceArea);

test/helper/setup.ts

@@ -16,6 +16,7 @@ import {
   Ced,
   Lsoa,
   Msoa,
+  PoliceForceArea,
 } from "../../src/app/models/index";
 import { QueryResult } from "pg";
 
@@ -49,6 +50,7 @@ const clearTestDb = async (): Promise<any[] | null> => {
     Msoa.destroyRelation(),
     Outcode.destroyRelation(),
     Ced.destroyRelation(),
+    PoliceForceArea.destroyRelation(),
   ]);
 };
 
@@ -76,6 +78,7 @@ const seedPostcodeDb = async (): Promise<any[] | null> => {
     Msoa.setupTable(),
     Outcode.setupTable(),
     Ced.setupTable(),
+    PoliceForceArea.setupTable(),
   ]);
 };
 

test/postcode.regression.unit.ts

@@ -55,6 +55,7 @@ describe("Postcode data regression testing", function () {
         nuts: "Aberdeen City and Aberdeenshire",
         nuts_code: "TLM50",
         nuts_id: result.nuts_id,
+        pfa_id: "S23000009",
       },
       result
     );
@@ -103,6 +104,7 @@ describe("Postcode data regression testing", function () {
         nuts: "Lewisham and Southwark",
         nuts_code: "TLI44",
         nuts_id: result.nuts_id,
+        pfa_id: "E23000001",
       },
       result
     );
@@ -153,6 +155,7 @@ describe("Postcode data regression testing", function () {
         nuts: null,
         nuts_code: null,
         nuts_id: result.nuts_id,
+        pfa_id: "L99999999",
       },
       result
     );