Merge pull request #207 from communitiesuk/FS-2940

FS-2940 - Fix for yes no fields no correctly displaying in file submission download

app/notification/application/map_contents.py

@@ -104,7 +104,9 @@ def get_questions_and_answers(cls, notification: Notification) -> dict:
         """
         forms = cls.get_forms(notification)
 
-        questions_answers = extract_questions_and_answers(forms)
+        questions_answers = extract_questions_and_answers(
+            forms, notification.content["application"]["language"]
+        )
         return questions_answers
 
     @classmethod

examplar_data/application_data.py

@@ -16,6 +16,7 @@
             "round_name": "summer",
             "date_submitted": "2022-05-14T09:25:44.124542",
             "fund_name": "Community Ownership Fund",
+            "language": "en",
             NotifyConstants.APPLICATION_FORMS_FIELD: [
                 {
                     NotifyConstants.APPLICATION_NAME_FIELD: "about-your-org",

requirements-dev.txt

@@ -1,5 +1,5 @@
 #
-# This file is autogenerated by pip-compile with Python 3.10
+# This file is autogenerated by pip-compile with Python 3.11
 # by the following command:
 #
 #    pip-compile requirements-dev.in
@@ -8,10 +8,6 @@ alembic==1.11.1
     # via
     #   -r requirements.txt
     #   flask-migrate
-async-timeout==4.0.3
-    # via
-    #   -r requirements.txt
-    #   redis
 attrs==23.1.0
     # via
     #   -r requirements.txt
@@ -77,6 +73,12 @@ clickclick==20.10.2
     # via
     #   -r requirements.txt
     #   connexion
+colorama==0.4.6
+    # via
+    #   -r requirements.txt
+    #   build
+    #   click
+    #   pytest
 commonmark==0.9.1
     # via
     #   -r requirements.txt
@@ -97,8 +99,6 @@ docopt==0.6.2
     # via
     #   -r requirements.txt
     #   notifications-python-client
-exceptiongroup==1.1.1
-    # via pytest
 filelock==3.12.0
     # via virtualenv
 flask==2.2.5
@@ -135,7 +135,7 @@ flipper-client==1.3.2
     # via
     #   -r requirements.txt
     #   funding-service-design-utils
-funding-service-design-utils==2.0.41
+funding-service-design-utils==2.0.43
     # via -r requirements.txt
 greenlet==3.0.1
     # via
@@ -346,10 +346,6 @@ ruamel-yaml==0.17.21
     # via
     #   -r requirements.txt
     #   prance
-ruamel-yaml-clib==0.2.8
-    # via
-    #   -r requirements.txt
-    #   ruamel-yaml
 s3transfer==0.6.1
     # via
     #   -r requirements.txt
@@ -387,11 +383,6 @@ thrift==0.16.0
     # via
     #   -r requirements.txt
     #   flipper-client
-tomli==2.0.1
-    # via
-    #   black
-    #   build
-    #   pytest
 typing-extensions==4.6.2
     # via
     #   -r requirements.txt

requirements.in

@@ -1,7 +1,7 @@
 #-----------------------------------
 #   FSD Utils
 #-----------------------------------
-funding-service-design-utils>=2.0.41,<2.1.0
+funding-service-design-utils>=2.0.43,<2.1.0
 requests
 
 #-----------------------------------

requirements.txt

@@ -1,13 +1,11 @@
 #
-# This file is autogenerated by pip-compile with Python 3.10
+# This file is autogenerated by pip-compile with Python 3.11
 # by the following command:
 #
 #    pip-compile requirements.in
 #
 alembic==1.11.1
     # via flask-migrate
-async-timeout==4.0.3
-    # via redis
 attrs==23.1.0
     # via
     #   jsonschema
@@ -44,6 +42,8 @@ click==8.1.3
     #   flask
 clickclick==20.10.2
     # via connexion
+colorama==0.4.6
+    # via click
 commonmark==0.9.1
     # via rich
 connexion==2.14.2
@@ -76,7 +76,7 @@ flask-talisman==0.8.1
     # via -r requirements.in
 flipper-client==1.3.2
     # via funding-service-design-utils
-funding-service-design-utils==2.0.41
+funding-service-design-utils==2.0.43
     # via -r requirements.in
 greenlet==3.0.1
     # via sqlalchemy
@@ -193,8 +193,6 @@ rpds-py==0.12.0
     #   referencing
 ruamel-yaml==0.17.21
     # via prance
-ruamel-yaml-clib==0.2.8
-    # via ruamel-yaml
 s3transfer==0.6.1
     # via boto3
 sentry-sdk[flask]==1.31.0