Update mock services with new/revised data and functionality (#3031)

ministryofjustice · Jan 14, 2025 · b6abd2a · b6abd2a
1 parent 6cbdafd
commit b6abd2a
Show file tree

Hide file tree

Showing 9 changed files with 355 additions and 271 deletions.
diff --git a/mock-integrations/lpa-data-store/mock-responses.js b/mock-integrations/lpa-data-store/mock-responses.js
@@ -50,6 +50,7 @@
       address: {
         line1: "74 Cloob Close",
         town: "Mahhhhhhhhhh",
+        postcode: "TP6 8EX",
         country: "GB"
       },
       dateOfBirth: "1970-01-24",
@@ -68,12 +69,27 @@
         address: {
           line1: "81 NighOnTimeWeBuiltIt Street",
           town: "Mahhhhhhhhhh",
+          postcode: "PC4 6UZ",
           country: "GB"
         },
         dateOfBirth: "1982-07-24",
         status: "active",
         channel: "paper",
         signedAt: "2024-01-10T23:00:00Z"
+      },
+      {
+        uid: "9201a0b8-70a2-47db-93f2-c7510b4210ae",
+        firstNames: "Jessica",
+        lastName: "Seakrest",
+        address: {
+          line1: "81 NighOnTimeWeBuiltIt Street",
+          town: "Mahhhhhhhhhh",
+          country: "GB"
+        },
+        dateOfBirth: "1984-04-13",
+        status: "replacement",
+        channel: "online",
+        signedAt: "2024-01-10T23:00:00Z"
       }
     ],
     trustCorporations: [
@@ -120,7 +136,7 @@
     UX3_default
   ];
   var getLpa = (uid) => {
-    const lpas = self.getList([uid]);
+    const lpas = getList([uid]);
     return lpas.lpas.pop();
   };
   var getList = (uids) => {

diff --git a/mock-integrations/lpa-data-store/src/lpas/4UX3.json b/mock-integrations/lpa-data-store/src/lpas/4UX3.json
@@ -12,6 +12,7 @@
     "address": {
       "line1": "74 Cloob Close",
       "town": "Mahhhhhhhhhh",
+      "postcode": "TP6 8EX",
       "country": "GB"
     },
     "dateOfBirth": "1970-01-24",
@@ -30,12 +31,27 @@
       "address": {
         "line1": "81 NighOnTimeWeBuiltIt Street",
         "town": "Mahhhhhhhhhh",
+        "postcode": "PC4 6UZ",
         "country": "GB"
       },
       "dateOfBirth": "1982-07-24",
       "status": "active",
       "channel": "paper",
       "signedAt": "2024-01-10T23:00:00Z"
+    },
+    {
+      "uid": "9201a0b8-70a2-47db-93f2-c7510b4210ae",
+      "firstNames": "Jessica",
+      "lastName": "Seakrest",
+      "address": {
+        "line1": "81 NighOnTimeWeBuiltIt Street",
+        "town": "Mahhhhhhhhhh",
+        "country": "GB"
+      },
+      "dateOfBirth": "1984-04-13",
+      "status": "replacement",
+      "channel": "online",
+      "signedAt": "2024-01-10T23:00:00Z"
     }
   ],
   "trustCorporations": [

diff --git a/mock-integrations/lpa-data-store/src/lpas/lpas.mjs b/mock-integrations/lpa-data-store/src/lpas/lpas.mjs
@@ -5,7 +5,7 @@ const lpaData = [
 ]
 
 const getLpa = uid => {
-  const lpas = self.getList([uid])
+  const lpas = getList([uid])
 
   return lpas.lpas.pop()
 }

diff --git a/mock-integrations/nginx.conf b/mock-integrations/nginx.conf
@@ -14,7 +14,6 @@ map $request_uri $swagger_example {
     "~700000000252" "lpa0252";
     "~700000000138" "lpa0138";
     "~700000000047" "lpa0047";
-
     # 404 - results in a "waiting" status in Make
     # NB there doesn't seem to be a way to supply an example for a non-200
     # response so we just request an example which doesn't exist, which

diff --git a/mock-integrations/opg-data-lpa/generate_examples/make_examples.sh b/mock-integrations/opg-data-lpa/generate_examples/make_examples.sh
@@ -9,13 +9,17 @@ for n in $(cat list.txt )
 do
     echo "Working on $n..."
     example_name="lpa${n: -4:4}"
-    lpa_yaml_data=$(python3 ../../../scripts/call-api-gateway/call_api_gateway.py $n | yq -P)
+    lpa_yaml_data=$(\
+        python3 ../../../scripts/call-api-gateway/call_api_gateway.py $n | \
+        yq '(.. | select(key == "uId")) |= sub("-", "")' -P \
+    )
     lpa_example_name=$example_name lpa_data=$lpa_yaml_data \
     yq 'with(.paths[].get.responses.[].content.[].examples; . | .[env(lpa_example_name)].value=env(lpa_data))' \
     temp.yaml >> temp.yaml
-    sed -i '' -e "5s/^//p; 6s/^.*/    \"~$n\" \"$example_name\";/" ../../nginx.conf
+    sed -i '' -e "5s/^//p; 6s/^.*/    \"~$n\" \"$example_name\";/" nginx.conf
 done
 
 yq ea '. as $item ireduce ({}; . * $item )' temp.yaml > ../mock-openapi-examples.yaml
 
+mv nginx.conf ../../nginx.conf
 rm -f temp.yaml
diff --git a/mock-integrations/opg-data-lpa/generate_examples/nginx-template.conf b/mock-integrations/opg-data-lpa/generate_examples/nginx-template.conf
@@ -17,11 +17,18 @@ server {
 
     location /v1/use-an-lpa/lpas/ {
         rewrite ^/v1(.*)$ $1 last;
+    }
+
+    location /use-an-lpa/lpas/ {
         proxy_set_header Prefer example=$swagger_example;
         proxy_pass http://mock-data-lpa:4010;
     }
 
     location /v1/image-request/ {
-        proxy_pass http://mock-image-request-handler:8080;
+        proxy_pass http://mock-image-request-handler:4012;
+    }
+
+    location / {
+        root /var/www/html;
     }
 }