diff --git a/build.gradle b/build.gradle index d1ec5f8bd7..155896f559 100644 --- a/build.gradle +++ b/build.gradle @@ -5,7 +5,7 @@ plugins { id 'checkstyle' id 'pmd' id 'jacoco' - id 'org.owasp.dependencycheck' version '11.1.0' + id 'org.owasp.dependencycheck' version '12.1.0' } def buildNumber = System.getenv("RELEASE_VERSION")?.replace("refs/tags/", "") ?: "DEV-SNAPSHOT" diff --git a/config/owasp/suppressions.xml b/config/owasp/suppressions.xml index fd9868afb4..fa23137970 100755 --- a/config/owasp/suppressions.xml +++ b/config/owasp/suppressions.xml @@ -1,7 +1,7 @@ - - CVE-2024-38820 + + CVE-2024-23444 CVE-2024-45772 diff --git a/src/main/java/uk/gov/hmcts/reform/sscs/service/AirLookupService.java b/src/main/java/uk/gov/hmcts/reform/sscs/service/AirLookupService.java index 91804d86e7..b20ad734a9 100644 --- a/src/main/java/uk/gov/hmcts/reform/sscs/service/AirLookupService.java +++ b/src/main/java/uk/gov/hmcts/reform/sscs/service/AirLookupService.java @@ -47,7 +47,7 @@ public class AirLookupService { .csaVenue("Birmingham") .ibcVenue("Birmingham") .build(); - static final String AIR_LOOKUP_FILE = "reference-data/AIRLookup_22.2.xlsx"; + static final String AIR_LOOKUP_FILE = "reference-data/AIRLookup_23.1.xlsx"; static final String AIR_LOOKUP_VENUE_IDS_CSV = "airLookupVenueIds.csv"; private static final int POSTCODE_COLUMN = 0; private static final int REGIONAL_CENTRE_COLUMN = 8; diff --git a/src/main/resources/reference-data/AIRLookup22.xlsx b/src/main/resources/reference-data/AIRLookup22.xlsx deleted file mode 100644 index ac5208d998..0000000000 Binary files a/src/main/resources/reference-data/AIRLookup22.xlsx and /dev/null differ diff --git a/src/main/resources/reference-data/AIRLookup_22.1.xlsx b/src/main/resources/reference-data/AIRLookup_22.1.xlsx deleted file mode 100644 index a7158f4d8d..0000000000 Binary files a/src/main/resources/reference-data/AIRLookup_22.1.xlsx and /dev/null differ diff --git a/src/main/resources/reference-data/AIRLookup_22.2.xlsx b/src/main/resources/reference-data/AIRLookup_22.2.xlsx deleted file mode 100644 index 2b9960188d..0000000000 Binary files a/src/main/resources/reference-data/AIRLookup_22.2.xlsx and /dev/null differ diff --git a/src/main/resources/reference-data/AIRLookup_23.1.xlsx b/src/main/resources/reference-data/AIRLookup_23.1.xlsx new file mode 100644 index 0000000000..9daf597e35 Binary files /dev/null and b/src/main/resources/reference-data/AIRLookup_23.1.xlsx differ diff --git a/src/main/resources/reference-data/sscs-venues.csv b/src/main/resources/reference-data/sscs-venues.csv index 38fa3e9ddc..bcdcd066fb 100644 --- a/src/main/resources/reference-data/sscs-venues.csv +++ b/src/main/resources/reference-data/sscs-venues.csv @@ -14,7 +14,7 @@ "37","SC037","SSCS Birmingham","Kettering Magistrates Court","The Court House","London Road","Kettering","","NN15 7QP","01536-410333",201,"https://www.google.com/maps/place/The+Court+House+London+Road+Kettering+NN15+7QP/@52.399079,-0.726940","No","Kettering C","Not active","000000" "38","SC038","SSCS Birmingham","Kings Court","","5A New Walk","","Leicester","LE1 6TE","01162-531730",201,"https://www.google.com/maps/place/52%C2%B037'48.5%22N+1%C2%B007'50.0%22W/@52.6301497,-1.1327347,17z/data=!3m1!4b1!4m5!3m4!1s0x0:0x0!8m2!3d52.6301497!4d-1.130546","No","Leicester C","Replaced by Venue - 1221","000000" "40","SC040","SSCS Birmingham","Lincoln County Court Building","360 High Street","","Lincoln","Lincolnshire","LN5 7PS","01522-567151",201,"https://www.google.com/maps/place/Lincoln+County+Court/@53.2244617,-0.5450222,17z/data=!4m15!1m9!2m8!1sHotels!3m6!1sHotels!2s53.2244617,+-0.5428335!3s0x48785b2e4915e91f:0x7c0a2b187113f637!4m2!1d-0.5428335!2d53.2244617!3m4!1s0x48785b2e4915e8df:0xac30dad1e8201859!8m2!3d53.2243726!4d-0.5414549","No","Lincoln C","Replaced by Venue - 1222","000000" -"43","SC043","SSCS Bradford","Milton Keynes Magistrates Court","300 Silbury Boulevard","","Central Milton Keynes","","MK9 2AJ","",201,"https://goo.gl/maps/5nWYgZvnWGY2R3dV8","Yes","Milton Keynes","","815997" +"43","SC043","SSCS Bradford","Milton Keynes Magistrates Court","300 Silbury Boulevard","","Central Milton Keynes","","MK9 2AJ","",201,"https://goo.gl/maps/5nWYgZvnWGY2R3dV8","Yes","Milton Keynes","","497356" "44","SC044","SSCS Birmingham","St. Katherines House","St. Katherines Street","","Northampton","","NN1 2LX","01604-24152",201,"https://www.google.com/maps/place/Independent+Tribunal+Service/@52.2374067,-0.90036,20.09z/data=!4m13!1m7!3m6!1s0x48770ee76512d181:0xb3e4c576f7145a31!2sSt+Katherines+St,+Northampton+NN1,+UK!3b1!8m2!3d52.2374617!4d-0.8995206!3m4!1s0x48770ee76ec8d6a7:0x6941ec99bc37726c!8m2!3d52.2373639!4d-0.8999683","No","Northampton C","Replaced by Venue - 1223","000000" "45","SC045","SSCS Birmingham","Byron House","4th Floor","2a Maid Marian Way","Nottingham","","NG1 6HS","01159-241774",201,"https://www.google.com/maps/place/Byron+House,+4+Maid+Marian+Way,+NG1+6HS,+UK/@52.9529668,-1.155384,19z/data=!3m1!4b1!4m5!3m4!1s0x4879c22a1653fc7f:0xf87eac605b23f187!8m2!3d52.952988!4d-1.1546132","No","Nottingham C","This is now in a different region","000000" "48","SC048","SSCS Birmingham","Oxford Combined Court Centre","St Aldates","","Oxford","","OX1 1TL","01865 248245",401,"https://www.google.com/maps?q=51.7481704505,-1.25707212708","No","Oxford C","Replaced by Venue - 1209","000000" @@ -38,25 +38,25 @@ "81","SC081","SSCS Glasgow","The AB1 Building","48 Huntly Street","","Aberdeen","","AB10 1SH","",501,"https://www.google.com/maps/place/AB1+Building/@57.145774,-2.1092923,17z/data=!4m8!1m2!2m1!1sab1+building+48+Huntly+Street+Aberdeen+AB10+1SH!3m4!1s0x48840e23f4627621:0xd296eb1b5d3d8ee3!8m2!3d57.1459279!4d-2.1070763","Yes","Aberdeen","","219164" "84","SC084","SSCS Glasgow","Russell House","King Street","","Ayr","","KA8 0BD","",501,"https://www.google.com/maps/place/Russell+House,+King+St,+Ayr+KA8+0BE,+UK/@55.4664801,-4.6271002,17z/data=!3m1!4b1!4m5!3m4!1s0x4889d420ddacc5b9:0xb6e56f0b29fa2a40!8m2!3d55.4664032!4d-4.6248978","Yes","Ayr","","206150" "85","SC085","SSCS Glasgow","Burgh Hall","Church Street","","Dumbarton","","G82 1QL","",501,"https://www.google.com/maps/place/Burgh+Hall,+10+Church+St,+Dumbarton+G82+1QL,+UK/@55.9435322,-4.5680991,18z/data=!3m1!4b1!4m5!3m4!1s0x488852a11c8e30d7:0xa43b598c023233c5!8m2!3d55.9435712!4d-4.5672617","No","Dumbarton","Not active","000000" -"86","SC086","SSCS Glasgow","Campbeltown Town Hall","54 Main Street","","Campbeltown","Argyll","PA28 6AB","",501,"https://goo.gl/maps/MfM1iVNTmmMdQJgA6","Yes","Campbeltown","","999998" +"86","SC086","SSCS Glasgow","Campbeltown Town Hall","54 Main Street","","Campbeltown","Argyll","PA28 6AB","",501,"https://goo.gl/maps/MfM1iVNTmmMdQJgA6","No","Campbeltown","Closed","000000" "89","SC948","SSCS Glasgow","Dundee Tribunal Centre","Ground Floor","Endeavour House, 1 Greenmarket","Dundee","","DD1 4BQ","",501,"https://goo.gl/maps/MxZaNRT4P3zxzi5E9","Yes","Dundee","","367564" "90","SC090","SSCS Glasgow","St Leonards Church Hall","Woodmill Street","","Dunfermline","","KY11 4JN","",501,"https://www.google.com/maps/place/HM+Courts+%26+Tribunal+Service/@56.0675323,-3.4550886,17z/data=!4m8!1m2!2m1!1sSt+Leonards+Church+Hall+Woodmill+Street+Dunfermline+KY11+4JN!3m4!1s0x0:0x2795c4a07bb58f29!8m2!3d56.0668728!4d-3.4540281","Yes","Dunfermline","","999995" "91","SC091","SSCS Glasgow","Edinburgh Social Security and Child Support Tribunal","Floor 1, George House","126 George Street","Edinburgh","","EH2 4HH","",501,"https://www.google.com/maps/place/126+George+St,+Edinburgh+EH2+4LH/@55.9519688,-3.2053246,20z/data=!4m15!1m8!3m7!","Yes","Edinburgh","","376138" "92","SC092","SSCS Glasgow","Phoenix House","1 Wards Road","","Elgin","Morayshire","IV30 1QL","",501,"https://www.google.com/maps/place/1+Wards+Road+Elgin+Morayshire+IV30+1QL/@57.643429,-3.313722","No","Elgin","Not active","000000" -"94","SC094","SSCS Glasgow","Old Gala House","Scott Street","","Galashiels","","TD1 3JS","",501,"https://www.google.com/maps/place/Old+Gala+House/@55.6139186,-2.8109789,17z/data=!3m1!4b1!4m5!3m4!1s0x48878497ed0146c9:0xb52f68bbad9c92e2!8m2!3d55.6139156!4d-2.8087902","Yes","Galashiels","","999993" +"94","SC094","SSCS Glasgow","Old Gala House","Scott Street","","Galashiels","","TD1 3JS","",501,"https://www.google.com/maps/place/Old+Gala+House/@55.6139186,-2.8109789,17z/data=!3m1!4b1!4m5!3m4!1s0x48878497ed0146c9:0xb52f68bbad9c92e2!8m2!3d55.6139156!4d-2.8087902","No","Galashiels","Closed","000000" "96","SC100","SSCS Glasgow","The Glasgow Tribunals Centre","20 York Street","","Glasgow","","G2 8GT","0141 353 1441",501,"https://goo.gl/maps/SXcNpteaJR5FeUuq8","Yes","Glasgow","","366559" -"97","SC942","SSCS Glasgow","Cairndale Hotel","Park House Conference Centre","","English Street","Dumfries","DG1 2DF","",501,"https://www.google.com/maps/place/Cairndale+Hotel+and+Leisure+Club/@55.0695532,-3.6078285,17z/data=!3m1!4b1!4m5!3m4!1s0x4862ca6c3fb8bee3:0xc6d81ae005b51c12!8m2!3d55.0695501!4d-3.6056398","Yes","Dumfries","","999997" +"97","SC942","SSCS Glasgow","Cairndale Hotel","Park House Conference Centre","","English Street","Dumfries","DG1 2DF","",501,"https://www.google.com/maps/place/Cairndale+Hotel+and+Leisure+Club/@55.0695532,-3.6078285,17z/data=!3m1!4b1!4m5!3m4!1s0x4862ca6c3fb8bee3:0xc6d81ae005b51c12!8m2!3d55.0695501!4d-3.6056398","No","Dumfries","Closed","000000" "101","SC101","SSCS Glasgow","Hamilton Tribunal Centre","Ground Floor","Block C, Brandon Gate","Leechlee Road","Hamilton","ML3 6AU","",501,"https://www.google.com/maps/place/Brandon+Gate,+1+Leechlee+Rd,+Hamilton+ML3+6AU,+UK/@55.7746349,-4.0403292,17z/data=!3m1!4b1!4m5!3m4!1s0x4888152953f283f9:0x90dd2857d999ea51!8m2!3d55.7746342!4d-4.0385962","Yes","Hamilton","","723075" "104","SC104","SSCS Glasgow","Inverness Justice Centre","Longman Road","","Inverness","","IV1 1AH","",501,"https://goo.gl/maps/2QcQDAiKNLefjyE57","Yes","Inverness","","900001" "105","SC105","SSCS Glasgow","Volunteer Rooms","19 High Street","","Irvine","","KA12 0BA","",501,"https://www.google.com/maps/place/Volunteer+Rooms/@55.613285,-4.6670893,17z/data=!3m1!4b1!4m5!3m4!1s0x4889ce70826bada3:0x6e9c5c12a699c568!8m2!3d55.613282!4d-4.6649006","No","Irvine","Not active","000000" -"106","SC106","SSCS Glasgow","Kilmarnock (Grand Hall)","9 Green Street","","East Ayrshire","Kilmarnock","KA1 3BN","",501,"https://goo.gl/maps/dV5v3JCXeu6BPBcB6","Yes","Kilmarnock","","999991" +"106","SC106","SSCS Glasgow","Kilmarnock (Grand Hall)","9 Green Street","","East Ayrshire","Kilmarnock","KA1 3BN","",501,"https://goo.gl/maps/dV5v3JCXeu6BPBcB6","No","Kilmarnock","Closed","000000" "108","SC108","SSCS Glasgow","The New Volunteer House","16 East Fergus Place","","Kirkcaldy","","KY1 1XT","",501,"https://www.google.com/maps/place/16+East+Fergus+Place+Kirkcaldy+KY1+1XY/@56.110359,-3.165411","Yes","Kirkcaldy","","999990" -"109","SC109","SSCS Glasgow","St Magnus Centre","Palace Road","","Kirkwall","","KW15 1PA","",501,"https://www.google.com/maps/place/St+Magnus+Centre/@58.9810307,-2.9617829,17z/data=!4m13!1m7!3m6!1s0x489b01618535d601:0xab9aa4f81d4897c7!2sPalace+Rd,+Kirkwall+KW15+1PA,+UK!3b1!8m2!3d58.9810307!4d-2.9595942!3m4!1s0x489b01622ebeab85:0xc42f83702ca7779b!8m2!3d58.9809914!4d-2.9581453","Yes","Kirkwall","","999989" -"110","SC110","SSCS Glasgow","Islesburgh Community Centre","King Harald Street","","Lerwick","","ZE1 0EQ","",501,"https://www.google.com/maps/place/King+Harald+Street+Lerwick+ZE1+0EQ/@60.152732,-1.149263","Yes","Lerwick","","999988" +"109","SC109","SSCS Glasgow","St Magnus Centre","Palace Road","","Kirkwall","","KW15 1PA","",501,"https://www.google.com/maps/place/St+Magnus+Centre/@58.9810307,-2.9617829,17z/data=!4m13!1m7!3m6!1s0x489b01618535d601:0xab9aa4f81d4897c7!2sPalace+Rd,+Kirkwall+KW15+1PA,+UK!3b1!8m2!3d58.9810307!4d-2.9595942!3m4!1s0x489b01622ebeab85:0xc42f83702ca7779b!8m2!3d58.9809914!4d-2.9581453","No","Kirkwall","Close","000000" +"110","SC110","SSCS Glasgow","Islesburgh Community Centre","King Harald Street","","Lerwick","","ZE1 0EQ","",501,"https://www.google.com/maps/place/King+Harald+Street+Lerwick+ZE1+0EQ/@60.152732,-1.149263","No","Lerwick","Closed","000000" "111","SC111","SSCS Glasgow","The Bayhead Bridge Centre","Lamont Lane","Bayhead","Stornoway","Isle of Lewis","HS1 2EB","",501,"https://www.google.com/maps/place/The+Bayhead+Bridge+Centre/@58.2130578,-6.3896899,17z/data=!3m1!4b1!4m5!3m4!1s0x4892082a65a7ea67:0xf22a312ecfe11c13!8m2!3d58.213055!4d-6.3875012","Yes","Lewis","","999986" "112","SC112","SSCS Glasgow","The Corran Halls","54 Esplanade","","Oban","","PA34 5AB","",501,"https://www.google.com/maps/place/54+Esplanade+Oban+PA34+5AB/@56.419119,-5.476135","Yes","Oban","","999987" -"114","SC114","SSCS Glasgow","The High Kirk","Leswalt High Road","","Stranraer","","DG9 0AA","",501,"https://www.google.com/maps/place/High+Kirk,+Leswalt+High+Rd+Stranraer/@54.9047076,-5.0362165,17z/data=!3m1!4b1!4m5!3m4!1s0x48623bb247a8fa8f:0x56379a32df7fd4c7!8m2!3d54.9047045!4d-5.0340278","Yes","Stranraer","","999984" -"115","SC115","SSCS Glasgow","The Mowatt Room","Assembly Rooms","Sinclair Terrace","","Wick","KW1 5AB","",501,"https://www.google.com/maps/place/Wick+Assembly+Rooms/@58.4392267,-3.0920903,17z/data=!3m1!4b1!4m5!3m4!1s0x489ad6baf714f0ed:0x38c71102a5f53703!8m2!3d58.4392239!4d-3.0899016","Yes","Wick","","999983" +"114","SC114","SSCS Glasgow","The High Kirk","Leswalt High Road","","Stranraer","","DG9 0AA","",501,"https://www.google.com/maps/place/High+Kirk,+Leswalt+High+Rd+Stranraer/@54.9047076,-5.0362165,17z/data=!3m1!4b1!4m5!3m4!1s0x48623bb247a8fa8f:0x56379a32df7fd4c7!8m2!3d54.9047045!4d-5.0340278","No","Stranraer","Closed","000000" +"115","SC115","SSCS Glasgow","The Mowatt Room","Assembly Rooms","Sinclair Terrace","","Wick","KW1 5AB","",501,"https://www.google.com/maps/place/Wick+Assembly+Rooms/@58.4392267,-3.0920903,17z/data=!3m1!4b1!4m5!3m4!1s0x489ad6baf714f0ed:0x38c71102a5f53703!8m2!3d58.4392239!4d-3.0899016","No","Wick","Close","000000" "122","SC122","SSCS Liverpool","Bayley House","St Georges Square","","Bolton","Greater Manchester","BL1 2HB","",601,"https://www.google.com/maps/place/St+George's+St,+Bolton+BL1+2HB,+UK/@53.5832288,-2.4294378,17z/data=!3m1!4b1!4m5!3m4!1s0x487ba6ff655ed027:0xd1303ea7271b3a2d!8m2!3d53.5829622!4d-2.4275295","Yes","Bolton","","210228" "123","SC123","SSCS Liverpool","St James House","1st Floor","St. James Row","Burnley","Lancashire","BB11 1LH","01282 416587",601,"https://www.google.com/maps/place/1st+Floor+St.+James+Row+Burnley+Lancashire+BB11+1LH/@53.788887,-2.244236","Yes","Burnley","","443089" "132","SC132","SSCS Birmingham","Norfolk House","23 Southway","","Colchester","Essex","CO3 3EG","01206 576230",201,"https://www.google.com/maps/place/23+Southway+Colchester+Essex+CO3+3EG/@51.887490,0.893785","No","Colchester","Not active","000000" @@ -90,12 +90,12 @@ "199","SC199","SSCS Cardiff","Plas Dolerw","Milford Road","","Newtown","Powys","SY16 2EH","",301,"https://www.google.com/maps/place/Newtown+SY16+2EH,+UK/@52.5154719,-3.3240503,18.59z/data=!4m5!3m4!1s0x486ffb6490d5c873:0x250622992707e85d!8m2!3d52.5156711!4d-3.323016","No","Newtown","Not active","000000" "200","SC200","SSCS Cardiff","Plymouth St Catherine's House, Ground Floor","St Catherine's House","5 Notte Street","Plymouth","Devon","PL1 2TS","01752 268361",4503,"https://www.google.com/maps/place/Devon+%26+Cornwall+Probation+Area/@50.3683877,-4.1444777,19.9z/data=!4m13!1m7!3m6!1s0x486c934e0e649539:0x5c5c14a015c134f8!2sNotte+St,+Plymouth+PL1+2TS,+UK!3b1!8m2!3d50.3684757!4d-4.1440661!3m4!1s0x486c934e0eddf545:0xe13156092c94bcb9!8m2!3d50.3684152!4d-4.1440538","Yes","Plymouth","","235590" "201","SC201","SSCS Cardiff","Havant Magistrates Court Building","The Courthouse","Elmleigh Road","","Havant","PO9 2AL","02 392 839 238",4503,"https://www.google.com/maps/place/Magistrates+Court/@50.8565386,-0.9854132,17z/data=!3m1!4b1!4m5!3m4!1s0x487444db5abdb8a9:0xd441b0067d2e7b28!8m2!3d50.8565352!4d-0.9832245","Yes","Havant","","741758" -"203","SC203","SSCS Cardiff","Southampton Crown Court","The Courts of Justice","London Road","Southampton","Hants","SO15 2XQ","",4503,"https://www.google.com/maps/place/Southampton+Crown+Court/@50.9136832,-1.4033626,17.45z/data=!3m1!5s0x487476ac23b8b3e5:0x9e7862fbbec9109e!4m13!1m7!3m6!1s0x487476ac3b782539:0x5548c2a84b80bd0b!2sSouthampton+SO15+2XQ!3b1!8m2!3d50.9136969!4d-1.4029679!3m4!1s0x487476ac3c7dec37:0xc7e2f12290ad7393!8m2!3d50.9138088!4d-1.4029186","Yes","Southampton","","43104" +"203","SC203","SSCS Cardiff","Southampton Crown Court","The Courts of Justice","London Road","Southampton","Hants","SO15 2XQ","",4503,"https://www.google.com/maps/place/Southampton+Crown+Court/@50.9136832,-1.4033626,17.45z/data=!3m1!5s0x487476ac23b8b3e5:0x9e7862fbbec9109e!4m13!1m7!3m6!1s0x487476ac3b782539:0x5548c2a84b80bd0b!2sSouthampton+SO15+2XQ!3b1!8m2!3d50.9136969!4d-1.4029679!3m4!1s0x487476ac3c7dec37:0xc7e2f12290ad7393!8m2!3d50.9138088!4d-1.4029186","No","Southampton","Closed","000000" "205","SC205","SSCS Cardiff","Magistrates Court","Princess Street","","Swindon","Wiltshire","SN1 2JB","",4503,"https://www.google.com/maps/place/Swindon+Magistrates+Court/@51.5608037,-1.7831842,17z/data=!3m1!4b1!4m5!3m4!1s0x48714448ea55e1f1:0x649f5b2cc5505d48!8m2!3d51.5608004!4d-1.7809955","Yes","Swindon","","314074" "206","SC206","SSCS Cardiff","Taunton Magistrates Court","St John’s Road","","Taunton","","TA1 4AX","",4503,"https://www.google.com/maps/place/Taunton+Magistrates'+Court/@51.0133679,-3.1109224,17z/data=!4m8!1m2!2m1!1sTaunton+Magistrates+Court!3m4!1s0x486df458c6fabc4b:0xb90d69a0d1978518!8m2!3d51.0140544!4d-3.1096639","Yes","Taunton","","506742" "209","SC209","SSCS Cardiff","The Law Courts","Bodhyfryd","","Wrexham","","LL12 7BP","",301,"https://goo.gl/maps/pTLPG6hbmdswZTtf7","Yes","Wrexham","","637145" "210","SC188","SSCS Cardiff","Eastgate House","City Road Entrance","Newport Road","Cardiff","","CF24 0AB","",301,"https://www.google.com/maps/place/Eastgate+House,+35-43+Newport+Rd,+Cardiff+CF24+0AB,+UK/@51.4850547,-3.1680269,17z/data=!3m1!4b1!4m5!3m4!1s0x486e1cc65a7b76a7:0x44ee35803c574bf7!8m2!3d51.4850514!4d-3.1658382","Yes","Eastgate House, Cardiff","","372653" -"221","SC221","SSCS Leeds","The Voluntary Centre","5 Tweed Street","","Berwick upon Tweed","Northumberland","TD15 1NG","01289 330661",101,"https://www.google.com/maps/place/5+Tweed+Street+Berwick+upon+Tweed+Northumberland+TD15+1NG/@55.771565,-2.008505","Yes","Berwick","","999974" +"221","SC221","SSCS Leeds","The Voluntary Centre","5 Tweed Street","","Berwick upon Tweed","Northumberland","TD15 1NG","01289 330661",101,"https://www.google.com/maps/place/5+Tweed+Street+Berwick+upon+Tweed+Northumberland+TD15+1NG/@55.771565,-2.008505","No","Berwick","Closed","000000" "224","SC224","SSCS Leeds","Northgate House","Unit 3","St. Augustine Way","Darlington","County Durham","DL1 1XA","",101,"https://www.google.com/maps/place/Northgate+House,+St+Augustines+Way,+Darlington+DL1+1XA,+UK/@54.5286078,-1.5556802,17z/data=!3m1!4b1!4m5!3m4!1s0x487e9bc6020fb7ff:0x79224c35936a23b9!8m2!3d54.5286047!4d-1.5534915","No","Darlington","Not active","000000" "225","SC225","SSCS Leeds","Elvet House","Hallgarth Street","","Durham","Co Durham","DH1 3BP","0191 3877156",101,"https://www.google.com/maps/place/Hallgarth+Street+Durham+Co+Durham+DH1+3BP/@54.771135,-1.569411","No","Durham","Not active","000000" "226","SC226","SSCS Leeds","Hartlepool County and Magistrates Court","Hartlepool County and Mags Court","Victoria Road","Hartlepool","Cleveland","TS24 8AG","01429 266345",101,"https://www.google.com/maps/place/Hartlepool+Magistrates/@54.6857569,-1.2166649,17z/data=!4m8!1m2!2m1!1sHartlepool+County+and+Magistrates+court!3m4!1s0x487ef3867865c5c9:0x36ade5e7a25231f0!8m2!3d54.6857924!4d-1.2140195","No","Hartlepool","Not active","000000" @@ -122,7 +122,7 @@ "1000","SC316","SSCS Birmingham","St. Katherines House","St. Katherines Street","","Northampton","","NN1 2LX","01604-24152",4201,"https://www.google.com/maps/place/Independent+Tribunal+Service/@52.2374067,-0.90036,20.09z/data=!4m13!1m7!3m6!1s0x48770ee76512d181:0xb3e4c576f7145a31!2sSt+Katherines+St,+Northampton+NN1,+UK!3b1!8m2!3d52.2374617!4d-0.8995206!3m4!1s0x48770ee76ec8d6a7:0x6941ec99bc37726c!8m2!3d52.2373639!4d-0.8999683","No","Northampton B","Not active","000000" "1001","SC317","SSCS Birmingham","Byron House","4th Floor","2a Maid Marian Way","Nottingham","","NG1 6HS","01159-241774",4201,"https://www.google.com/maps/place/Byron+House,+4+Maid+Marian+Way,+NG1+6HS,+UK/@52.9529668,-1.155384,19z/data=!3m1!4b1!4m5!3m4!1s0x4879c22a1653fc7f:0xf87eac605b23f187!8m2!3d52.952988!4d-1.1546132","No","Nottingham B","Not active","000000" "1002","SC002","SSCS Birmingham","Shrewsbury Justice Centre","Magistrates Court House","Preston Street","","Shrewsbury","SY2 5NX","",401,"https://goo.gl/maps/RbzoAoKutkmxsTtcA","Yes","Shrewsbury","","259170" -"1003","SC005","SSCS Liverpool","Manchester Medical Appeal Tribunal","1st Floor, Piccadilly Exchange","2 Piccadilly Plaza","Mosley Street","Manchester","M1 4AH","",601,"https://www.google.com/maps/place/2+Piccadilly%2C+Manchester+M1+4AH/@53.480472,-2.239094","Yes","Manchester MAT","","512401" +"1003","SC005","SSCS Liverpool","Manchester Medical Appeal Tribunal","1st Floor, Piccadilly Exchange","2 Piccadilly Plaza","Mosley Street","Manchester","M1 4AH","",601,"https://www.google.com/maps/place/2+Piccadilly%2C+Manchester+M1+4AH/@53.480472,-2.239094","No","Manchester MAT","Closed","000000" "1004","SC242","SSCS Sutton","Fox Court","14 Gray's Inn Road","","London","","WC1X 8HN","",4201,"https://www.google.com/maps/place/14+Gray%27s+Inn+Road+London+WC1X+8HN/@51.518938,-0.110982","No","Fox Court (S) B","Not active","000000" "1005","SC102","SSCS Sutton","Anchorage House","2nd Floor (Reception Area B)","Anchorage House","2 Clove Crescent","London","E14 2BE","",201,"https://www.google.com/maps/place/East+London+Employment+Tribunals+Service/@51.5102981,-0.0070105,17z/data=!4m8!1m2!2m1!1sAnchorage+House+++++++++++++++++%092nd+Floor+(Reception+Area+B)%09Anchorage+House+++++++++++++++++%092+Clove+Crescent%09London%09E14+2BE!3m4!1s0x0:0x3ca2d9057f8b0c3b!8m2!3d51.510017!4d-0.004773","No","East London C","Replaced by Venue - 1043","000000" "1008","SC919","SSCS Birmingham","Acorn House","Great Oaks","","Basildon","","SS14 1AH","",4201,"https://www.google.com/maps/place/Great+Oaks+Basildon+SS14+1AH/@51.571550,0.458347","No","Basildon B","Not active","000000" @@ -145,7 +145,7 @@ "1038","SC023","SSCS Cardiff","Cardiff Caradog House","1-6 St Andrews Place","","Cardiff","","CF10 3BE","",301,"https://www.google.com/maps/place/Caradog+House,+St+Andrew's+Pl,+Cardiff+CF10+3SE,+UK/@51.4855282,-3.1753035,18.94z/data=!4m5!3m4!1s0x486e1cb97396a6b1:0xb89324da44da9fa7!8m2!3d51.4858021!4d-3.1751798","No","Cardiff Caradog Hse","Not active","000000" "1043","SC124","SSCS Sutton","2nd Floor (Reception Area B)","Import Building, (formerly 'Anchorage House')","2 Clove Crescent","","London","E14 2BE","",4501,"https://www.google.com/maps/place/East+London+Employment+Tribunals+Service/@51.5100168,-0.0069672,17z/data=!3m1!4b1!4m5!3m4!1s0x487602abe27c150d:0x3ca2d9057f8b0c3b!8m2!3d51.5100168!4d-0.0047732","Yes","East London (S)","","816964" "1044","SC126","SSCS Cardiff","Barnstaple Civic Centre","N Walk","","Barnstaple","Devon","EX31 1DX","",4503,"https://www.google.com/maps/place/Civic+Centre+BARNSTAPLE+Devon+EX31+1DX/@51.081349,-4.065329","Yes","Barnstaple Civic","","774335" -"1045","SC125","SSCS Cardiff","Bodmin County Court","Launceston Road","","BODMIN","Cornwall","PL31 2AL","",4503,"https://www.google.com/maps/place/Bodmin+County+Court/@50.4689429,-4.7105062,17z/data=!3m1!4b1!4m5!3m4!1s0x486b7a42d246defb:0x5a423abc191c1670!8m2!3d50.4689395!4d-4.7083175","Yes","Bodmin","","271813" +"1045","SC125","SSCS Cardiff","Bodmin County Court","Launceston Road","","BODMIN","Cornwall","PL31 2AL","",4503,"https://www.google.com/maps/place/Bodmin+County+Court/@50.4689429,-4.7105062,17z/data=!3m1!4b1!4m5!3m4!1s0x486b7a42d246defb:0x5a423abc191c1670!8m2!3d50.4689395!4d-4.7083175","No","Bodmin","Closed","000000" "1046","SC127","SSCS Liverpool","Chester & District Housing Trust","Centurion House","77 Northgate Street","","CHESTER","CH1 2HQ","",601,"https://www.google.com/maps/place/Centurion+House+77+Northgate+Street+CHESTER+CH1+2HQ/@53.193634,-2.893370","No","Chester 2","Not active","000000" "1047","SC128","SSCS Leeds","Huddersfield Magistrates Court House","Civic Centre","","Huddersfield","West Yorkshire","HD1 2NH","",101,"https://www.google.com/maps/place/Civic+Centre+Huddersfield+West+Yorkshire+HD1+2NH/@53.644414,-1.784503","No","Huddersfield","Not active","000000" "1048","SC129","SSCS Cardiff","Torquay County Court Building","The Willows","Nicholson Road","Torquay","Devon","TQ2 7AZ","",4503,"https://www.google.com/maps/place/Torquay+%26+Newton+Abbot+County+Court/@50.4856801,-3.5542785,17.15z/data=!4m8!1m2!2m1!1stourquay+county+court+building!3m4!1s0x486d0f8e2d67c945:0xc54671e3bc0286d4!8m2!3d50.4867507!4d-3.5518166","No","Torquay","Not active","000000" @@ -188,7 +188,7 @@ "1146","SC222","SSCS Birmingham","Warwickshire Justice Centre","Vicarage Street","","Nuneaton","","CV11 4JU","",401,"https://www.google.com/maps/place/Nuneaton+Magistrates+Court/@52.5230294,-1.4638489,18.36z/data=!4m8!1m2!2m1!1swarwickshire+justice+centre+Vicarage+Street+Nuneaton+CV11+4JU!3m4!1s0x0:0xa129d1540d3f095e!8m2!3d52.523013!4d-1.4625579","Yes","Nuneaton","","228231" "1147","SC223","SSCS Birmingham","Warwickshire Justice Centre","Newbold Terrace","","Leamington Spa","","CV32 4EL","",401,"https://www.google.com/maps/place/Warwickshire+Justice+Centre/@52.2881904,-1.5353091,17z/data=!3m1!4b1!4m5!3m4!1s0x487734f2a008bc97:0x779cd44c1bd61c5e!8m2!3d52.2881904!4d-1.5331204","No","Leamington Spa","Not active","000000" "1148","SC238","SSCS Cardiff","Poole Magistrates Court","Park Road","","Poole","Dorset","BH15 2NS","",4503,"https://www.google.com/maps/place/Poole+Magistrates+Court/@50.7214586,-1.9639703,17z/data=!4m13!1m7!3m6!1s0x4873a6cbd732bd1f:0xcfdbf936ba13558f!2sPoole+BH15+2NS,+UK!3b1!8m2!3d50.7215014!4d-1.9617187!3m4!1s0x4873a6cbd12c0f69:0xe06cfc4757f3427a!8m2!3d50.7221028!4d-1.960615","Yes","Poole","","490237" -"1149","SC239","SSCS Glasgow","Caladh Trust","An Caladh","East Camp","Balivanich","Isle of Benbecula","HS7 5LA","",501,"https://www.google.com/maps/place/Caladh+Trust/@57.472166,-7.3673201,17z/data=!3m1!4b1!4m5!3m4!1s0x488d1e5850c17f71:0xf8e9ee227ed01f07!8m2!3d57.4721631!4d-7.3651314","Yes","Benbecula","","999999" +"1149","SC239","SSCS Glasgow","Caladh Trust","An Caladh","East Camp","Balivanich","Isle of Benbecula","HS7 5LA","",501,"https://www.google.com/maps/place/Caladh+Trust/@57.472166,-7.3673201,17z/data=!3m1!4b1!4m5!3m4!1s0x488d1e5850c17f71:0xf8e9ee227ed01f07!8m2!3d57.4721631!4d-7.3651314","No","Benbecula","Closed","000000" "1150","SC241","SSCS Bradford","Southend Combined Court","The Court House","80 Victoria Road","Southend on Sea","","SS2 6EU","",241,"https://goo.gl/maps/Gxj1KfJCJYPEm9UQ8","Yes","Southend","","781139" "1151","SC243","SSCS Cardiff","Newton Abbot Magistrates Court","Newfoundland Way","","Newton Abbot","Devon","TQ12 1NG","",4503,"https://goo.gl/maps/k3LyFJRrkiaGcq2a9","Yes","Newton Abbot","","270253" "1152","SC244","SSCS Liverpool","St Helens Courthouse","Ground Floor Entrance","Birchley Street","St Helens","","WA10 1HT","",601,"https://www.google.co.uk/maps/place/St+Helens+%26+Knowsley+Magistrates+Court/@53.4575193,-2.7446786,15.26z/data=!4m8!1m2!2m1!1sSt+Helens+Courthouse!3m4!1s0x0:0xd0d5cb59274f1650!8m2!3d53.4549403!4d-2.7364755","Yes","St Helens","","563906" @@ -211,7 +211,7 @@ "1189","SC270","SSCS Cardiff","Exeter Court House","The Court House","Heavitree Road","Exeter","Devon","EX1 2LS","",4503,"https://www.google.com/maps/place/Central+Devon+Magistrates+Courts/@50.7236975,-3.5195846,17z/data=!4m8!1m2!2m1!1sThe+Court+House+EX1+2LS!3m4!1s0x0:0x9d4a2131de01e4af!8m2!3d50.7243841!4d-3.5179143","No","Exeter Court House","Not active","000000" "1190","SC271","SSCS Bradford","Basildon Combined Court","The Gore","","Basildon","Essex","SS14 2BU","",201,"https://www.google.com/maps/place/51%C2%B034'21.3%22N+0%C2%B027'17.3%22E/@51.5725712,0.4526041,17z/data=!3m1!4b1!4m5!3m4!1s0x0:0x0!8m2!3d51.5725712!4d0.4547928","Yes","Basildon Combined Court","","694840" "1192","SC273","SSCS Cardiff","Plymouth and District Magistrates Court","Plymouth and District","Magistrates Court","St Andrew Street","Plymouth","PL1 2DP","",4503,"https://www.google.com/maps/place/Plymouth+Magistrates+Court/@50.3692343,-4.142859,17z/data=!4m8!1m2!2m1!1sPlymouth+and+District+Magistrates+Court!3m4!1s0x486c934d6a5f5725:0x3d37a6321b5ee87b!8m2!3d50.3692708!4d-4.1394369","Yes","Plymouth (Magistrates Court)","","764728" -"1193","SC274","SSCS Liverpool","Chester Magistrate's Court","Grosvenor Street","","Chester","Cheshire","CH1 2XA","",601,"https://www.google.com/maps/place/Chester+Magistrates'+Court/@53.1874536,-2.8958209,17z/data=!3m1!4b1!4m5!3m4!1s0x487add4a39961fa9:0x2c8662efacfbf69c!8m2!3d53.1874536!4d-2.8936322","Yes","Chester Magistrate's Court","","443014" +"1193","SC274","SSCS Liverpool","Chester Magistrate's Court","Grosvenor Street","","Chester","Cheshire","CH1 2XA","",601,"https://www.google.com/maps/place/Chester+Magistrates'+Court/@53.1874536,-2.8958209,17z/data=!3m1!4b1!4m5!3m4!1s0x487add4a39961fa9:0x2c8662efacfbf69c!8m2!3d53.1874536!4d-2.8936322","No","Chester Magistrate's Court","Closed","000000" "1194","SC275","SSCS Birmingham","Leicester County Court","90 Wellington Street","","Leicester","","LE1 6HG","",201,"https://www.google.com/maps/place/90+Wellington+Street+Leicester+LE1+6HG/@52.629660,-1.127526","No","Leicester County Court","Not active","000000" "1195","SC276","SSCS Glasgow","The Mansefield House Hotel","2 Mayne Road","","Elgin","Morayshire","IV30 3AF","",501,"https://www.google.com/maps/place/2+Mayne+Road+Elgin+Morayshire+IV30+3AF/@57.646158,-3.319835","No","Elgin (Mansefield House)","Not active","000000" "1196","SC277","SSCS Birmingham","Bow County Court Building","96 Romford Road","","London","","E15 4EG","",201,"https://www.google.com/maps/place/96+Romford+Road+London+E15+4EG/@51.542895,0.010960","No","Bow","Not active","000000" @@ -262,7 +262,7 @@ "1253","SC264","SSCS Cardiff","Worle Queensway","Queensway House","The Hedges","St Georges","","BS22 7BB","",4503,"https://www.google.co.uk/maps/place/Queensway+House,+The+Hedges,+St+Georges,+Weston-super-Mare+BS22+7BB/@51.3608462,-2.9079592,17z/data=!3m1!4b1!4m5!3m4!1s0x4871f9c9b4a6f089:0x8e26bdd0ff4c6e54!8m2!3d51.3608429!4d-2.9057705","No","Worle Queensway","Not active","000000" "1254","SC2656","SSCS Bradford","The Law Courts","Easton Street","High Wycombe","Buckinghamshire","","HP11 1LR","",201,"https://www.google.co.uk/maps/place/The+Law+Courts/@51.6276531,-0.7483165,17z/data=!3m1!4b1!4m5!3m4!1s0x487661c568156a73:0x24a76a50cf49f035!8m2!3d51.6276498!4d-0.7461278","Yes","High Wycombe","","437303" "1250","SC297","SSCS Cardiff","Bristol Magistrates Court","Marlborough Street","","Bristol","","BS1 3NU","0117 930 2400",301,"https://goo.gl/maps/Yyq7e2pYdqP2","Yes","Bristol MC & Tribunal Hrg Centre","","781155" -"1256","SC335","SSCS Bradford","Chelmsford","Chelmsford County & Family Court","Priory Place","New London Road","Chelmsford","CM2 0PP","0344 892 4000",201,"https://www.google.com/maps/place/Chelmsford+County+%26+Family+Court/@51.7307924,0.469755,17z/data=!3m1!4b1!4m5!3m4!1s0x47d8ebd689055555:0x2ba29a3d11684ae5!8m2!3d51.7307924!4d0.4719437","Yes","Chelmsford","","624810" +"1256","SC335","SSCS Bradford","Chelmsford","Chelmsford County & Family Court","Priory Place","New London Road","Chelmsford","CM2 0PP","0344 892 4000",201,"https://www.google.com/maps/place/Chelmsford+County+%26+Family+Court/@51.7307924,0.469755,17z/data=!3m1!4b1!4m5!3m4!1s0x47d8ebd689055555:0x2ba29a3d11684ae5!8m2!3d51.7307924!4d0.4719437","Yes","Chelmsford","","816875" "1257","SC336","SSCS Bradford","Hornyte Park","Bohemia Road","","Hastings","","TN34 1QX","",201,"https://goo.gl/maps/NMZ43nC3w8N9jd6B8","Yes","Hastings","","784691" "1259","SC228","SSCS Leeds","Newcastle Civil and Family Courts & Tribunal Centre","Barras Bridge","","Newcastle upon Tyne","","NE1 8QF","",101,"https://maps.google.com/maps?q=54.978706,-1.609995","Yes","Newcastle Civic","","366796" "1261","SC338","SSCS Glasgow","Kilmarnock (Grand Hall)","Grand Hall","9 Green Street","East Ayrshire","Kilmarnock","KA1 3BN","",501,"https://goo.gl/maps/dV5v3JCXeu6BPBcB6","No","ZZ D U - Kilmarnock (Grand Hall)","Not active","000000" diff --git a/src/test/java/uk/gov/hmcts/reform/sscs/service/AirLookupServiceTest.java b/src/test/java/uk/gov/hmcts/reform/sscs/service/AirLookupServiceTest.java index 7a5193027f..4dd5b7a3d4 100644 --- a/src/test/java/uk/gov/hmcts/reform/sscs/service/AirLookupServiceTest.java +++ b/src/test/java/uk/gov/hmcts/reform/sscs/service/AirLookupServiceTest.java @@ -262,7 +262,7 @@ public void lookupPortOfEntryIbcCode(String portOfEntryCode, @Nullable String ex "GBSTCOL06,Chelmsford,Bradford", "GBSTWOR00,Workington,Liverpool", "GBSTABD00,Aberdeen,Glasgow", - "GBSTGRK00,Dumfries,Glasgow", + "GBSTGRK00,Ayr,Glasgow", "GBSTDUN00,Dundee,Glasgow", "GBSTARD00,Ayr,Glasgow", "GBSTAYR00,Ayr,Glasgow", @@ -279,7 +279,7 @@ public void lookupPortOfEntryIbcCode(String portOfEntryCode, @Nullable String ex "GBSTGRK04,Glasgow,Glasgow", "GBSTFRB01,Aberdeen,Glasgow", "GBSTGRK05,Glasgow,Glasgow", - "GBSTGRK06,Stranraer,Glasgow", + "GBSTGRK06,Ayr,Glasgow", "GBSTAYR01,Ayr,Glasgow", "GBSTGLW01,Glasgow,Glasgow", "GBSTGRG02,Stirling,Glasgow", @@ -292,27 +292,27 @@ public void lookupPortOfEntryIbcCode(String portOfEntryCode, @Nullable String ex "GBSTIRV00,Ayr,Glasgow", "GBSTGRK09,Glasgow,Glasgow", "GBSTKKD00,Kirkcaldy,Glasgow", - "GBSTKWL00,Kirkwall,Glasgow", + "GBSTKWL00,Inverness,Glasgow", "GBSTLEI00,Edinburgh,Glasgow", - "GBSTLER00,Lerwick,Glasgow", + "GBSTLER00,Inverness,Glasgow", "GBSTINV03,Inverness,Glasgow", "GBSTINV04,Inverness,Glasgow", "GBSTFRB02,Aberdeen,Glasgow", "GBSTGRG04,Kirkcaldy,Glasgow", "GBSTMON00,Dundee,Glasgow", "GBSTGRK10,Oban,Glasgow", - "GBSTGRK11,Dumfries,Glasgow", + "GBSTGRK11,Ayr,Glasgow", "GBSTDUN02,Dundee,Glasgow", "GBSTPHD00,Aberdeen,Glasgow", "GBSTROS00,Dunfermline,Glasgow", - "GBSTLER01,Lerwick,Glasgow", - "GBSTINV05,Wick,Glasgow", + "GBSTLER01,Inverness,Glasgow", + "GBSTINV05,Inverness,Glasgow", "GBSTSTO00,Lewis,Glasgow", - "GBSTGRK12,Stranraer,Glasgow", - "GBSTKWL01,Kirkwall,Glasgow", + "GBSTGRK12,Ayr,Glasgow", + "GBSTKWL01,Inverness,Glasgow", "GBSTDUN03,Dundee,Glasgow", "GBSTINV06,Inverness,Glasgow", - "GBSTINV07,Wick,Glasgow", + "GBSTINV07,Inverness,Glasgow", "GBATABZ00,Aberdeen,Glasgow", "GBATBQH00,Sutton,Sutton", "GBATBHX00,Birmingham CJC,Birmingham", @@ -348,7 +348,7 @@ public void lookupPortOfEntryIbcCode(String portOfEntryCode, @Nullable String ex "GBATESH00,Brighton,Bradford", "GBATSOU00,Southampton Magistrates Court,Cardiff", "GBATSEN00,Southend,Bradford", - "GBATLSI00,Lerwick,Glasgow", + "GBATLSI00,Inverness,Glasgow", "GBATBCC00,Norwich,Bradford", "GBATGLO00,Gloucester,Cardiff", "GBATKEM00,Gloucester,Cardiff", @@ -358,7 +358,7 @@ public void lookupPortOfEntryIbcCode(String portOfEntryCode, @Nullable String ex "GBATSYW00,Northampton,Birmingham", "GBATSTY00,Lewis,Glasgow", "GBATWAR00,Blackpool,Liverpool", - "GBATWIK00,Wick,Glasgow", + "GBATWIK00,Inverness,Glasgow", "GBATYVL00,Taunton,Cardiff", "GBATBZN00,Oxford,Bradford", "GBATFFD00,Gloucester,Cardiff", diff --git a/src/test/java/uk/gov/hmcts/reform/sscs/service/VenueDataLoaderTest.java b/src/test/java/uk/gov/hmcts/reform/sscs/service/VenueDataLoaderTest.java index 42665ca081..8face32e39 100644 --- a/src/test/java/uk/gov/hmcts/reform/sscs/service/VenueDataLoaderTest.java +++ b/src/test/java/uk/gov/hmcts/reform/sscs/service/VenueDataLoaderTest.java @@ -26,7 +26,7 @@ public class VenueDataLoaderTest { private static final List venueDetailsByLeedsRpc = Arrays.asList( "517400", "449358", "563156", "45900", "744412", "572158", "288691", "562808", "720624", "427519", - "366796", "999974", "107581", "495952", "852649", "491107", "195520", "641199", "574546", "320113"); + "366796", "107581", "495952", "852649", "491107", "195520", "641199", "574546", "320113"); @Before public void setUp() { @@ -35,31 +35,29 @@ public void setUp() { } @Test - @Parameters({"1", "2", "3", "8", "11", "22", "24", "30", "34", "35", "37", "38", "40", "44", "45", "48", "52", - "75", "85", "92", "105", "132", "133", "146", "147", "151", "170", "171", "175", "177", "178", "186", - "189", "199", "224", "225", "226", "227", "228", "234", "241", "260", "266", "268", "991", "996", "998", - "1000", "1001", "1004", "1005", "1008", "1009", "1012", "1013", "1014", "1015", "1016", "1020", "1021", - "1027", "1028", "1030", "1033", "1038", "1046", "1047", "1048", "1049", "1050", "1052", "1106", "1113", - "1114", "1115", "1120", "1121", "1122", "1126", "1128", "1133", "1134", "1137", "1138", "1140", "1141", - "1142", "1144", "1145", "1147", "1156", "1157", "1158", "1160", "1183", "1185", "1189", "1194", "1195", - "1196", "1197", "1198", "1199", "1200", "1201", "1202", "1203", "1207", "1208", "1212", "1214", "1217", - "1218", "1220", "1224", "1232", "1239", "1253", "1261"}) + @Parameters({"1", "2", "3", "8", "11", "22", "24", "30", "34", "35", "37", "38", "40", "44", "45", "48", "52", "75", + "85", "86", "92", "94", "97", "105", "106", "109", "110", "114", "115", "132", "133", "146", "147", "151", + "170", "171", "175", "177", "178", "186", "189", "199", "203", "221", "224", "225", "226", "227", "228", "234", + "241", "260", "266", "268", "991", "996", "998", "1000", "1001", "1003", "1004", "1005", "1008", "1009", "1012", + "1013", "1014", "1015", "1016", "1020", "1021", "1027", "1028", "1030", "1033", "1038", "1045", "1046", "1047", + "1048", "1049", "1050", "1052", "1106", "1113", "1114", "1115", "1120", "1121", "1122", "1126", "1128", "1133", + "1134", "1137", "1138", "1140", "1141", "1142", "1144", "1145", "1147", "1149", "1156", "1157", "1158", "1160", + "1183", "1185", "1189", "1193", "1194", "1195", "1196", "1197", "1198", "1199", "1200", "1201", "1202", "1203", + "1207", "1208", "1212", "1214", "1217", "1218", "1220", "1224", "1232", "1239", "1253", "1261"}) public void venuesShouldNotBeActive(String id) { assertTrue(venueDataLoader.getVenueDetailsMap().get(id).getActive().equals("No")); } @Test @Parameters({"7", "9", "10", "43", "49", "51", "53", "60", "61", "62", "63", "64", "65", "67", "68", "70", "71", - "79", "81", "84", "86", "89", "90", "91", "94", "96", "97", "101", "104", "106", "108", "109", "110", - "111", "112", "114", "115", "122", "123", "134", "140", "141", "142", "143", "154", "156", "168", "173", - "179", "185", "187", "192", "194", "195", "198", "200", "201", "203", "205", "206", "209", "210", "221", - "232", "233", "236", "240", "261", "262", "265", "267", "992", "993", "1002", "1003", "1025", "1029", - "1035", "1037", "1043", "1044", "1045", "1053", "1104", "1107", "1111", "1112", "1118", "1127", "1129", - "1130", "1131", "1132", "1135", "1136", "1139", "1143", "1146", "1148", "1149", "1150", "1151", "1152", - "1153", "1154", "1155", "1159", "1161", "1182", "1184", "1186", "1188", "1190", "1192", "1193", "1209", - "1210", "1211", "1213", "1215", "1216", "1219", "1221", "1222", "1223", "1225", "1226", "1227", "1228", - "1229", "1230", "1233", "1234", "1235", "1236", "1237", "1238", "1240", "1241", "1248", "1249", - "1254", "1250", "1256", "1257", "1259"}) + "79", "81", "84", "89", "90", "91", "96", "101", "104", "108", "111", "112", "122", "123", "134", "140", "141", + "142", "143", "154", "156", "168", "173", "179", "185", "187", "192", "194", "195", "198", "200", "201", "205", + "206", "209", "210", "232", "233", "236", "240", "261", "262", "265", "267", "992", "993", "1002", "1025", + "1029", "1035", "1037", "1043", "1044", "1053", "1104", "1107", "1111", "1112", "1118", "1127", "1129", "1130", + "1131", "1132", "1135", "1136", "1139", "1143", "1146", "1148", "1150", "1151", "1152", "1153", "1154", "1155", + "1159", "1161", "1182", "1184", "1186", "1188", "1190", "1192", "1209", "1210", "1211", "1213", "1215", "1216", + "1219", "1221", "1222", "1223", "1225", "1226", "1227", "1228", "1229", "1230", "1233", "1234", "1235", "1236", + "1237", "1238", "1240", "1241", "1248", "1249", "1254", "1250", "1256", "1257", "1259"}) public void venuesShouldBeActiveAndHaveAGoogleLink(String id) { assertTrue(venueDataLoader.getVenueDetailsMap().get(id).getActive().equals("Yes")); assertTrue(venueDataLoader.getVenueDetailsMap().get(id).getUrl().contains("https://")); @@ -151,14 +149,14 @@ public void shouldGetEpimsIdForGivenVenueId() { @Test public void shouldGetEpimsIdForGivenPostcode() { String result = venueDataLoader.getActiveVenueDetailsMapByPostcode().get("MK9 2AJ").getEpimsId(); - assertEquals("815997", result); + assertEquals("497356", result); } @Test public void testActiveVenueEpimsIdsMapByRpcReturnsVenues() { List result = venueDataLoader.getActiveVenueEpimsIdsMapByRpc().get("SSCS Leeds"); assertFalse(result.isEmpty()); - assertEquals(20, result.size()); + assertEquals(19, result.size()); result.forEach(vd -> assertTrue(venueDetailsByLeedsRpc.contains(vd.getEpimsId()))); }