From 540fbc5be79e06de677bc19fcc72d22c535eb62a Mon Sep 17 00:00:00 2001
From: Bea <66849242+beawitcht@users.noreply.github.com>
Date: Sat, 19 Oct 2024 16:35:26 +0100
Subject: [PATCH 1/2] update dependencies

---
 app/requirements.txt | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/requirements.txt b/app/requirements.txt
index 03a0c63..db5ac21 100644
--- a/app/requirements.txt
+++ b/app/requirements.txt
@@ -2,14 +2,14 @@ gunicorn==23.0.0
 flask==3.0.3
 docxtpl==0.18.0
 jinja2==3.1.4
-convertapi==1.8.0
+convertapi==2.0.0
 python-dotenv==1.0.1
 Flask-WTF==1.2.0
 email_validator==2.2.0
 Flask-Limiter==3.8.0
 Flask-Caching==2.3.0
-deepdiff==7.0.1
+deepdiff==8.0.1
 discord.py==2.4.0
-pandas==2.2.2
+pandas==2.2.3
 bs4==0.0.2
 feedparser==6.0.11
\ No newline at end of file

From 27844b2c88aada9c2dc880c2397890b6490f05f9 Mon Sep 17 00:00:00 2001
From: Bea <66849242+beawitcht@users.noreply.github.com>
Date: Sat, 19 Oct 2024 16:39:16 +0100
Subject: [PATCH 2/2] fix wgs nation assignment

---
 app/forms/GICs.json | 2 +-
 app/scripts/gics.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/forms/GICs.json b/app/forms/GICs.json
index 7a5de8c..63c67e7 100644
--- a/app/forms/GICs.json
+++ b/app/forms/GICs.json
@@ -1 +1 @@
-{"GICs": [["England", "Welsh Gender Service - Wait time (months): 15"], ["Scotland", "The Edinburgh Chalmers Gender Identity Clinic - Wait time (months): 23"], ["Y-Northern Ireland", "KOI (young people) - Wait time (months): 24"], ["England", "Nottinghamshire Healthcare NHS Foundation Trust The Nottingham Centre for Transgender Health - Wait time (months): 27"], ["Scotland", "Highland Gender Identity Service - Wait time (months): 29"], ["Scotland", "Grampian Gender Identity Clinic - Wait time (months): 34"], ["England", "Northamptonshire Healthcare NHS Foundation Trust Gender Identity Clinic - Wait time (months): 53"], ["Y-Scotland", "The Sandyford NHS Gender Identity Clinic (Young People) - Wait time (months): 58"], ["England", "Leeds and York Partnership NHS Foundation Trust Gender Identity Service - Wait time (months): 58"], ["England", "The\u00a0Tavistock and Portman NHS Foundation Trust: Gender Identity Clinic for Adults - Wait time (months): 61"], ["Scotland", "The Sandyford NHS Gender Identity Clinic (Adults) - Wait time (months): 65"], ["England", "Sheffield Health and Social Care NHS Foundation Trust Gender Identity Service - Wait time (months): 65"], ["Northern Ireland", "Brackenburn Clinic Gender Identity Service - Wait time (months): 75"], ["England", "Devon Partnership NHS Trust West of England Specialist Gender Identity Clinic - Wait time (months): 88"], ["Y-England", "National Referral Support Service - Wait time: Unknown"], ["Y-Wales", "National Referral Support Service - Wait time: Unknown"]]}
\ No newline at end of file
+{"GICs": [["Wales", "Welsh Gender Service - Wait time (months): 15"], ["Scotland", "The Edinburgh Chalmers Gender Identity Clinic - Wait time (months): 23"], ["Y-Northern Ireland", "KOI (young people) - Wait time (months): 24"], ["England", "Nottinghamshire Healthcare NHS Foundation Trust The Nottingham Centre for Transgender Health - Wait time (months): 27"], ["Scotland", "Highland Gender Identity Service - Wait time (months): 29"], ["Scotland", "Grampian Gender Identity Clinic - Wait time (months): 34"], ["England", "Northamptonshire Healthcare NHS Foundation Trust Gender Identity Clinic - Wait time (months): 53"], ["Y-Scotland", "The Sandyford NHS Gender Identity Clinic (Young People) - Wait time (months): 58"], ["England", "Leeds and York Partnership NHS Foundation Trust Gender Identity Service - Wait time (months): 58"], ["England", "The\u00a0Tavistock and Portman NHS Foundation Trust: Gender Identity Clinic for Adults - Wait time (months): 61"], ["Scotland", "The Sandyford NHS Gender Identity Clinic (Adults) - Wait time (months): 65"], ["England", "Sheffield Health and Social Care NHS Foundation Trust Gender Identity Service - Wait time (months): 65"], ["Northern Ireland", "Brackenburn Clinic Gender Identity Service - Wait time (months): 75"], ["England", "Devon Partnership NHS Trust West of England Specialist Gender Identity Clinic - Wait time (months): 88"], ["Y-England", "National Referral Support Service - Wait time: Unknown"], ["Y-Wales", "National Referral Support Service - Wait time: Unknown"]]}
\ No newline at end of file
diff --git a/app/scripts/gics.py b/app/scripts/gics.py
index 9a8a10c..808c015 100644
--- a/app/scripts/gics.py
+++ b/app/scripts/gics.py
@@ -60,7 +60,7 @@ async def on_ready():
     # Determine the country based on the service name
     if re.search(r"\b(Brackenburn|KOI)\b", service):
         country = "Northern Ireland"
-    elif "Wales" in service:
+    elif "Welsh" in service:
         country = "Wales"
     elif re.search(r"\b(Edinburgh|Glasgow|Grampian|Inverness|Sandyford|Highland)\b", service):
         country = "Scotland"