Merge Prod Release into Master

changelog-master.xml

@@ -14,6 +14,7 @@
     <include  file="sql/00007_create_interim_fix_evl_tables.sql" relativeToChangelogFile="true"/>
     <include  file="sql/00008_alter_make_model_table.sql" relativeToChangelogFile="true"/>
     <include  file="sql/00009_alter_plateSerialNumber_field.sql" relativeToChangelogFile="true"/>
+    <include  file="sql/00010_fix_auth_into_service_column_names.sql" relativeToChangelogFile="true"/>
     <include  file="sql/10000_views.sql" relativeToChangelogFile="true"/>
     <include  file="sql/10001_tfl_views.sql" relativeToChangelogFile="true"/>
     <include  file="sql/20000_evl_temporary_tweak_sp.sql" relativeToChangelogFile="true"/>

sql/00010_fix_auth_into_service_column_names.sql

@@ -0,0 +1,7 @@
+--liquibase formatted sql
+--changeset liquibase:modifyDataType -multiple-tables:1 splitStatements:true endDelimiter:; context:dev
+
+ALTER TABLE auth_into_service CHANGE dateReceived dateReceived_old DATETIME;
+ALTER TABLE auth_into_service CHANGE dateAuthorised dateAuthorised_old DATETIME;
+ALTER TABLE auth_into_service CHANGE dateReceived_old dateAuthorised DATETIME DEFAULT NULL;
+ALTER TABLE auth_into_service CHANGE dateAuthorised_old dateReceived DATETIME DEFAULT NULL;

sql/10000_views.sql

@@ -1,51 +1,55 @@
 --liquibase formatted sql
 --changeset liquibase:3 -multiple-tables:1 splitStatements:true endDelimiter:; context:dev runOnChange:true
 CREATE OR REPLACE VIEW evl_view AS
-    SELECT 
-        MAX(testExpiryDate) AS testExpiryDate
-        ,vrm_trm
+    SELECT
+        vrm_trm
         ,certificateNumber
+        ,testExpiryDate
     FROM (
-        SELECT
-            SubQ.vrm_trm
-            ,t.certificateNumber
-            ,t.testExpiryDate
-        FROM test_result t
-        JOIN test_type tt ON t.test_type_id = tt.id
-        JOIN (
-            SELECT MAX(createdAt),
-                id
-                ,vrm_trm
-            FROM vehicle
-            WHERE 
-                LENGTH(vrm_trm) < 8
-                AND vrm_trm NOT REGEXP '^[a-zA-Z][0-9]{6}$'
-                AND vrm_trm NOT REGEXP '^[0-9]{6}[zZ]$'
-            GROUP BY 
-                id
-                ,vrm_trm
-        ) SubQ ON SubQ.id = t.vehicle_id
-        WHERE 
-            t.testExpiryDate > DATE(NOW() - INTERVAL 3 DAY)
-            AND t.testStatus != 'cancelled'
-            AND tt.testTypeClassification = 'Annual With Certificate'
-            AND 
-                (
-                t.certificateNumber IS NOT NULL
-                AND t.certificateNumber != ''
-                AND NOT LOCATE(' ', t.certificateNumber) > 0
-                )
-        UNION ALL
         SELECT
             vrm_trm
             ,certificateNumber
             ,testExpiryDate
-        FROM vt_evl_additions
-    ) vt_cvs_union
-    GROUP BY
-        vrm_trm
-        ,certificateNumber
+            ,ROW_NUMBER() OVER (PARTITION BY vrm_trm ORDER BY testExpiryDate DESC) AS rownumber
+        FROM (
+            SELECT
+                SubQ.vrm_trm
+                ,t.certificateNumber
+                ,t.testExpiryDate
+            FROM test_result t
+            JOIN test_type tt ON t.test_type_id = tt.id
+            JOIN (
+                SELECT MAX(createdAt),
+                    id
+                    ,vrm_trm
+                FROM vehicle
+                WHERE 
+                    LENGTH(vrm_trm) < 8
+                    AND vrm_trm NOT REGEXP '^[a-zA-Z][0-9]{6}$'
+                    AND vrm_trm NOT REGEXP '^[0-9]{6}[zZ]$'
+                GROUP BY 
+                    id
+                    ,vrm_trm
+            ) SubQ ON SubQ.id = t.vehicle_id
+            WHERE 
+                t.testExpiryDate > DATE(NOW() - INTERVAL 3 DAY)
+                AND t.testStatus != 'cancelled'
+                AND tt.testTypeClassification = 'Annual With Certificate'
+                AND 
+                    (
+                    t.certificateNumber IS NOT NULL
+                    AND t.certificateNumber != ''
+                    AND NOT LOCATE(' ', t.certificateNumber) > 0
+                    )
+            UNION ALL
+            SELECT
+                vrm_trm
+                ,certificateNumber
+                ,testExpiryDate
+            FROM vt_evl_additions
+        ) vt_cvs_union
+    ) windowed_evl_data
+    WHERE rownumber = 1
     ORDER BY
         vrm_trm
-        ,testExpiryDate DESC
 ;