Merge: development into main

.github/actions/build-dotnet-app/action.yml

@@ -14,7 +14,7 @@ runs:
 
   steps:
     - name: Setup .NET Core SDK ${{ inputs.dotnet_version }}
-      uses: actions/setup-dotnet@v3
+      uses: actions/setup-dotnet@v4
       with:
         dotnet-version: ${{ inputs.dotnet_version }}
     - name: Install dependencies

.github/actions/post-terraform-results/action.yml

@@ -41,7 +41,7 @@ runs:
 
   steps:
     - name: Update PR with Terraform results
-      uses: actions/github-script@v6
+      uses: actions/github-script@v7
       if: github.event_name == 'pull_request'
       env:
         PLAN: "terraform\n${{ inputs.plan_stdout }}"

.github/actions/run-e2e-tests/action.yml

@@ -33,14 +33,14 @@ runs:
         config: baseUrl=${{ inputs.url }}
 
     - name: Store screenshots on test failure
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       if: failure()
       with:
         name: cypress-screenshots
         path: ./tests/Dfe.PlanTech.Web.E2ETests/cypress/screenshots
 
     - name: Store videos
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       if: always()
       with:
         name: cypress-videos

.github/scripts/clear-user-data-from-db.sql

@@ -0,0 +1,11 @@
+BEGIN TRANSACTION;
+
+  DELETE FROM [dbo].[response];
+  DELETE FROM [dbo].[submission];
+  DELETE FROM [dbo].[question];
+  DELETE FROM [dbo].[answer];
+  DELETE FROM [dbo].[signin];
+  DELETE FROM [dbo].[user];
+  DELETE FROM [dbo].[establishment];
+
+COMMIT;

.github/scripts/qa-data.py

@@ -0,0 +1,65 @@
+import os
+import pyodbc
+import json
+import struct
+from azure import identity
+
+def query_to_json(connection_string, sql_query):
+
+    if os.getenv("ENV") != "dev":
+        credential = identity.DefaultAzureCredential(exclude_interactive_browser_credential=True)
+        token_bytes = credential.get_token("https://database.windows.net/.default").token.encode("UTF-16-LE")
+        token_struct = struct.pack(f'<I{len(token_bytes)}s', len(token_bytes), token_bytes)
+        SQL_COPT_SS_ACCESS_TOKEN = 1256
+        connection = pyodbc.connect(connection_string, attrs_before={SQL_COPT_SS_ACCESS_TOKEN: token_struct})
+    else:
+        connection = pyodbc.connect(connection_string)
+    cursor = connection.cursor()
+    cursor.execute(sql_query)
+    result = cursor.fetchall()
+    connection.close()
+    return cursor, result
+
+def main():
+
+    connection_string = os.getenv("SQL_CONNECTION_STRING")
+
+    data_folder = 'data'
+    if not os.path.exists(data_folder):
+        os.makedirs(data_folder)
+
+    section_query = "SELECT id, name FROM [Contentful].[Sections]"
+    cursor, sections = query_to_json(connection_string, section_query)
+
+    for section in sections:
+        section_id, section_name = section
+
+        sql_query = f'''
+            SELECT
+                Q.Id AS QuestionId,
+                Q.Text AS QuestionText,
+                O.[Order] AS QuestionOrder,
+                A.Text,
+                A.NextQuestionId
+            FROM
+                [Contentful].[Questions] Q
+            JOIN
+                [Contentful].[ContentComponents] O ON Q.Id = O.Id
+            LEFT JOIN
+                [Contentful].[Answers] A ON Q.Id = A.ParentQuestionId
+            WHERE
+                Q.SectionId = '{section_id}'
+            ORDER BY
+                O.[Order] ASC;
+        '''
+
+        cursor, result = query_to_json(connection_string, sql_query)
+
+        json_result = json.dumps([dict(zip([column[0] for column in cursor.description], row)) for row in result], indent=2)
+
+        output_file = os.path.join(data_folder, f'{section_name}.json')
+        with open(output_file, 'w') as file:
+            file.write(json_result)
+
+if __name__ == "__main__":
+    main()

.github/scripts/qa-visualisations.py

@@ -0,0 +1,67 @@
+import os
+import json
+from graphviz import Digraph
+
+def split_text(text, max_length):
+    if len(text) <= max_length:
+        return [text]
+    else:
+        split_index = text.rfind(' ', 0, max_length)
+        if split_index == -1:
+            return [text[:max_length]] + split_text(text[max_length:], max_length)
+        else:
+            return [text[:split_index]] + split_text(text[split_index+1:], max_length)
+
+def create_questionnaire_flowchart(question_data):
+    tree = Digraph(format='png')
+
+    end_nodes = set()
+
+    for item in question_data:
+        current_question = item["QuestionId"]
+        next_question_id = item["NextQuestionId"]
+        answer_text = item["Text"]
+
+        question_lines = split_text(item["QuestionText"], 20)
+        question_text = "\n".join(question_lines)
+
+        tree.node(current_question, question_text, shape='box', style='filled', fillcolor='grey:white', width='2', gradient='200')
+
+        answer_lines = split_text(answer_text, 20)
+        answer_text = "\n".join(answer_lines)
+
+        if next_question_id:
+            tree.node(next_question_id, "Missing Content", shape='diamond', style='filled', fillcolor='red:white', width='2')
+            tree.edge(current_question, next_question_id, label=answer_text, color='black')
+        else:
+            end_nodes.add(current_question)
+
+    for end_node in end_nodes:
+        tree.node("end", "Check Answers", shape='box', style='filled', fillcolor='lightblue:white', width='2', gradient='300')
+        tree.edge(end_node, "end", label="No More Questions", color='black')
+
+    return tree
+
+def process_data_files():
+    data_folder = 'data'
+    png_folder = 'visualisations'
+    if not os.path.exists(png_folder):
+        os.makedirs(png_folder)
+
+    for filename in os.listdir(data_folder):
+        if filename.endswith('.json'):
+            file_path = os.path.join(data_folder, filename)
+            with open(file_path, 'r') as file:
+                json_data = json.load(file)
+
+            flowchart = create_questionnaire_flowchart(json_data)
+            output_file = os.path.join(png_folder, f'{os.path.splitext(filename)[0]}')
+            flowchart.graph_attr['rankdir'] = 'LR'
+            flowchart.graph_attr['beautify'] = 'true'
+            flowchart.edge_attr['arrowhead'] = 'vee'
+            flowchart.edge_attr['arrowsize'] = '0.5'
+
+            flowchart.render(output_file, cleanup=True)
+
+if __name__ == '__main__':
+    process_data_files()