feat: compatibility with erru schema 3.4 VOL-5817 (#576)

Co-authored-by: Shaun Hare <[email protected]>
dvsa · Jan 28, 2025 · acd73b1 · acd73b1
1 parent 4f32ef7
commit acd73b1
Show file tree

Hide file tree

Showing 81 changed files with 604 additions and 2,130 deletions.
diff --git a/app/api/config/autoload/global.php b/app/api/config/autoload/global.php
@@ -90,7 +90,8 @@
     'nr' => [
         'max_schema_errors' => 10, //maximum number of xml schema problems to return (prevents massive error messages)
         'compliance_episode' => [
-            'xmlNs' => 'https://webgate.ec.testa.eu/erru/1.0',
+            'xmlNs' => 'https://webgate.ec.testa.eu/move-hub/erru/',
+            'erruVersion' => "3.4",
         ],
     ]
 ];
diff --git a/app/api/module/Api/config/module.config.php b/app/api/module/Api/config/module.config.php
@@ -1157,7 +1157,7 @@
             __DIR__ . '/../data/ebsr/xsd/TransXChange_schema_2.5/TransXChange_registration.xsd',
         'http://naptan.dft.gov.uk/transxchange/publisher/schema/3.1.2/TransXChangePublisherService.xsd' =>
             __DIR__ . '/../data/ebsr/xsd/TransXChange_schema_2.4/TransXChangePublisherService_2_4.xsd',
-        'https://webgate.ec.testa.eu/erru/1.0' => __DIR__ . '/../data/nr/xsd/ERRU2MS_Infringement_Req.xsd'
+        'https://webgate.ec.testa.eu/move-hub/erru/3.4' => __DIR__ . '/../data/nr/xsd/NotifyCheckResult_Request.xsd'
     ],
     'validators' => [
         'invokables' => [

diff --git a/app/api/module/Api/data/nr/complianceEpisodeTemplate.xml b/app/api/module/Api/data/nr/complianceEpisodeTemplate.xml
diff --git a/app/api/module/Api/data/nr/complianceEpisodeTemplateNoNs.xml b/app/api/module/Api/data/nr/complianceEpisodeTemplateNoNs.xml
diff --git a/app/api/module/Api/data/nr/compliancePenaltiesTemplate.xml b/app/api/module/Api/data/nr/compliancePenaltiesTemplate.xml
diff --git a/app/api/module/Api/data/nr/notifyCheckResponseTemplate.xml b/app/api/module/Api/data/nr/notifyCheckResponseTemplate.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<NotifyCheckResult_Response xmlns="https://webgate.ec.testa.eu/move-hub/erru/3.4">
+  <Header version="3.4" technicalId="d0ae5498-339a-49ad-bcaa-65c1f03f6307"
+          workflowId="e933f62c-ceae-4833-b022-c4f69e2211ef" sentAt="2016-02-07T10:04:00Z"
+          timeoutValue="2016-02-07T10:04:10Z" from="UK" to="IE"/>
+  <Body businessCaseId="Notification of Check Result Example" originatingAuthority="UK Competent Authority"
+        respondingAuthority="IE Competent Authority" statusCode="OK">
+    <TransportUndertaking transportUndertakingName="International Rescue" communityLicenceNumber="CL-IR-000001-001"
+                          communityLicenceStatus="Active" numberOfVehicles="7">
+      <TransportUndertakingAddress address="Tracy Villa" postCode="SP1" city="Tracy Island" country="UK"/>
+    </TransportUndertaking>
+    <PenaltiesImposed>
+      <PenaltyImposed penaltyRequestedIdentifier="1" authorityImposingPenalty="DVSA" isImposed="false"
+                      penaltyTypeImposed="101" reason="Further sanction not required"/>
+    </PenaltiesImposed>
+  </Body>
+</NotifyCheckResult_Response>
diff --git a/app/api/module/Api/data/nr/notifyCheckResultTemplate.xml b/app/api/module/Api/data/nr/notifyCheckResultTemplate.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<NotifyCheckResult_Request xmlns="https://webgate.ec.testa.eu/move-hub/erru/3.4"
+                           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                           xsi:schemaLocation="https://webgate.ec.testa.eu/move-hub/erru/3.4">
+  <Header version="3.4" technicalId="d68f9675-72f4-486a-b5b2-c798b361af52"
+          workflowId="20776dc3-5fe7-42d5-b554-09ad12fa25c4" sentAt="2014-02-20T16:22:09Z"
+          timeoutValue="2016-01-01T00:00:20Z" from="PL" to="UK"/>
+  <Body businessCaseId="0ffefb6b-6344-4a60-9a53-4381c32f98d9" originatingAuthority="Driver &amp; Vehicle Agency"
+        requestPurpose="Control" requestSource="RSI">
+    <TransportUndertaking transportUndertakingName="TEST USER (SELF SERVICE)(12345)" communityLicenceNumber="UKGB/OB1234567/00000">
+      <Vehicle vehicleRegistrationNumber="aBc123" vehicleRegistrationCountry="UK"/>
+      <CheckSummary checkResult="Fail" dateOfCheck="2014-02-20"/>
+      <SeriousInfringement dateOfInfringement="2014-02-20" category="MSI" infringementType="101" appealPossible="true">
+        <PenaltiesImposed>
+          <PenaltyImposed penaltyImposedIdentifier="1" finalDecisionDate="2014-02-20" penaltyTypeImposed="101" startDate="2014-03-14" endDate="2014-09-17" isExecuted="Yes" />
+          <PenaltyImposed penaltyImposedIdentifier="2" finalDecisionDate="2014-06-25" penaltyTypeImposed="102" isExecuted="No" notExecutedReason="Penalty/Infringement annulled after appeal" />
+        </PenaltiesImposed>
+        <PenaltiesRequested>
+          <PenaltyRequested penaltyRequestedIdentifier="1" penaltyTypeRequested="301" duration="12" />
+          <PenaltyRequested penaltyRequestedIdentifier="2" penaltyTypeRequested="302" duration="30" />
+        </PenaltiesRequested>
+      </SeriousInfringement>
+      <SeriousInfringement dateOfInfringement="2014-03-21" category="MSI" infringementType="201" appealPossible="false">
+        <PenaltiesImposed>
+          <PenaltyImposed penaltyImposedIdentifier="3" finalDecisionDate="2014-03-21" penaltyTypeImposed="202" startDate="2014-04-15" endDate="2014-10-18" isExecuted="No" notExecutedReason="Penalty/Infringement annulled after appeal" />
+          <PenaltyImposed penaltyImposedIdentifier="4" finalDecisionDate="2014-07-26" penaltyTypeImposed="203" isExecuted="Yes" />
+        </PenaltiesImposed>
+        <PenaltiesRequested>
+          <PenaltyRequested penaltyRequestedIdentifier="3" penaltyTypeRequested="305" duration="18" />
+          <PenaltyRequested penaltyRequestedIdentifier="4" penaltyTypeRequested="306" duration="24" />
+        </PenaltiesRequested>
+      </SeriousInfringement>
+    </TransportUndertaking>
+  </Body>
+</NotifyCheckResult_Request>
diff --git a/...ta/nr/xsd/3.4/CheckGoodRepute_Request.xsd → ...i/data/nr/xsd/CheckGoodRepute_Request.xsd b/...ta/nr/xsd/3.4/CheckGoodRepute_Request.xsd → ...i/data/nr/xsd/CheckGoodRepute_Request.xsd
diff --git a/...a/nr/xsd/3.4/CheckGoodRepute_Response.xsd → .../data/nr/xsd/CheckGoodRepute_Response.xsd b/...a/nr/xsd/3.4/CheckGoodRepute_Response.xsd → .../data/nr/xsd/CheckGoodRepute_Response.xsd
diff --git a/...data/nr/xsd/3.4/CheckGoodRepute_Types.xsd → ...Api/data/nr/xsd/CheckGoodRepute_Types.xsd b/...data/nr/xsd/3.4/CheckGoodRepute_Types.xsd → ...Api/data/nr/xsd/CheckGoodRepute_Types.xsd
diff --git a/...CheckTransportUndertakingData_Request.xsd → ...CheckTransportUndertakingData_Request.xsd b/...CheckTransportUndertakingData_Request.xsd → ...CheckTransportUndertakingData_Request.xsd
diff --git a/...heckTransportUndertakingData_Response.xsd → ...heckTransportUndertakingData_Response.xsd b/...heckTransportUndertakingData_Response.xsd → ...heckTransportUndertakingData_Response.xsd
diff --git a/...4/CheckTransportUndertakingData_Types.xsd → ...d/CheckTransportUndertakingData_Types.xsd b/...4/CheckTransportUndertakingData_Types.xsd → ...d/CheckTransportUndertakingData_Types.xsd
diff --git a/app/api/module/Api/data/nr/xsd/ComplianceEpisode-v1-0.xsd b/app/api/module/Api/data/nr/xsd/ComplianceEpisode-v1-0.xsd