From a6fff804dcd0e529102a595d6244a01e63ca3b8f Mon Sep 17 00:00:00 2001
From: Patrick Troy <patrick.troy@socialfinance.org.uk>
Date: Tue, 18 Jun 2024 15:51:07 +0100
Subject: [PATCH] update school census schema 23 and 24

---
 .../spec/school_census_schema_2023.diff.yml   | 101 ++++++++++++++++++
 .../spec/school_census_schema_2024.diff.yml   |  26 +++++
 2 files changed, 127 insertions(+)

diff --git a/liiatools/school_census_pipeline/spec/school_census_schema_2023.diff.yml b/liiatools/school_census_pipeline/spec/school_census_schema_2023.diff.yml
index e3e5c39f..4e2d4591 100644
--- a/liiatools/school_census_pipeline/spec/school_census_schema_2023.diff.yml
+++ b/liiatools/school_census_pipeline/spec/school_census_schema_2023.diff.yml
@@ -12,6 +12,107 @@ Autumn:
       - code: "C"
       - code: "O"
       canbeblank: yes
+  column_map.schoolarrangedapdetailoffroll:
+    type: add
+    description: Adds new table for 2023 return
+    value:
+      schoolarrangedapdetailoffrolltableid:
+        &alphanumeric-not-blank
+        string: "alphanumeric"
+        canbeblank: no
+      NativeId:
+        *alphanumeric-not-blank
+      schoolarrangedapdetailoffrollorderseqcolumn:
+        *alphanumeric-not-blank
+      sourceid:
+        *alphanumeric-not-blank
+      pupilnolongeronrolltableid:
+        *alphanumeric-not-blank
+      urn:
+        &int-blank
+        numeric:
+          type: "integer"
+        canbeblank: yes
+      ukprn:
+        *int-blank
+      entrydate:
+        &date
+        date: "%Y-%b-%d %H:%M:%S"
+        canbeblank: yes
+      leavingdate:
+        *date
+      apsessionsperweek:
+        *int-blank
+      apsettingtype:
+        &ap-setting
+        category:
+          - code: "NFE"
+          - code: "OOT"
+          - code: "OTH"
+          - code: "WBP"
+        canbeblank: yes
+      placementreason:
+        &placement-reason
+        category:
+          - code: "BHS"
+          - code: "SUS"
+          - code: "EXR"
+          - code: "MHN"
+          - code: "OTH"
+          - code: "PHN"
+        canbeblank: yes
+      senprovisionentry:
+        &sen-provision
+        category:
+          - code: "N"
+          - code: "E"
+          - code: "K"
+          - code: "S"
+          - code: "A"
+          - code: "P"
+        canbeblank: yes
+      senprovisionleaving:
+        *sen-provision
+      apattendancepattern:
+        &attendance-pattern
+        category:
+          - code: "FT"
+          - code: "PT"
+        canbeblank: yes
+  column_map.schoolarrangedapdetailonroll:
+    type: add
+    description: Adds new table for 2023 return
+    value:
+      schoolarrangedapdetailonrolltableid:
+        *alphanumeric-not-blank
+      NativeId:
+        *alphanumeric-not-blank
+      schoolarrangedapdetailonrollorderseqcolumn:
+        *alphanumeric-not-blank
+      sourceid:
+        *alphanumeric-not-blank
+      pupilonrolltableid:
+        *alphanumeric-not-blank
+      urn:
+        *int-blank
+      ukprn:
+        *int-blank
+      entrydate:
+        *date
+      leavingdate:
+        *date
+      apsessionsperweek:
+        *int-blank
+      apsettingtype:
+        *ap-setting
+      placementreason:
+        *placement-reason
+      senprovisionentry:
+        *sen-provision
+      senprovisionleaving:
+        *sen-provision
+      apattendancepattern:
+        *attendance-pattern
 
 Spring:
   column_map.pupilnolongeronroll:
diff --git a/liiatools/school_census_pipeline/spec/school_census_schema_2024.diff.yml b/liiatools/school_census_pipeline/spec/school_census_schema_2024.diff.yml
index bc782ef0..a009bf2a 100644
--- a/liiatools/school_census_pipeline/spec/school_census_schema_2024.diff.yml
+++ b/liiatools/school_census_pipeline/spec/school_census_schema_2024.diff.yml
@@ -9,6 +9,32 @@ Autumn:
     description: Rename column in pupilonroll
     value:
       sex
+  column_map.schoolarrangedapdetailoffroll.applacementpostcode:
+    type: add
+    description: Adds new column for schoolarrangedapdetailoffroll
+    value:
+      &postcode-blank
+      string: "postcode"
+      canbeblank: yes
+  column_map.schoolarrangedapdetailoffroll.companynumber:
+    type: add
+    description: Adds new column for schoolarrangedapdetailoffroll
+    value:
+      &company-number
+      string: "regex"
+      cell_regex:
+        - ([A-Za-z]{2}|\d{2})\d{6}
+      canbeblank: yes
+  column_map.schoolarrangedapdetailonroll.applacementpostcode:
+    type: add
+    description: Adds new column for schoolarrangedapdetailonroll
+    value:
+      *postcode-blank
+  column_map.schoolarrangedapdetailonroll.companynumber:
+    type: add
+    description: Adds new column for schoolarrangedapdetailonroll
+    value:
+      *company-number
 
 Spring:
   column_map.pupilnolongeronroll.gender: