solve merge issues

compendium_v2/migrations/versions/3cef2a22ebf1_add_gender_equality_policy.py

 """add gender equality policy field
 
 Revision ID: 3cef2a22ebf1
-Revises: 3730c7f1ea1b
+Revises: 51a29df6148c
 Create Date: 2023-09-07 14:29:11.149798
 
 """
@@ -11,7 +11,7 @@ import sqlalchemy as sa
 
 # revision identifiers, used by Alembic.
 revision = '3cef2a22ebf1'
-down_revision = '3730c7f1ea1b'
+down_revision = '51a29df6148c'
 branch_labels = None
 depends_on = None
 

compendium_v2/routes/survey.py

@@ -2,7 +2,7 @@ import logging
 from typing import Any, TypedDict, List, Dict
 
 from flask import Blueprint
-from flask_login import login_required, current_user
+from flask_login import login_required, current_user  # type: ignore
 from sqlalchemy import delete, select
 from sqlalchemy.orm import joinedload, load_only
 
@@ -91,7 +91,7 @@ def list_surveys() -> Any:
         if current_user.is_observer:
             res["lock_description"] = response.lock_description
         return res
-    
+
     for entry in surveys:
         # only include lock description if the user is an admin
         entries.append(
@@ -103,12 +103,12 @@ def list_surveys() -> Any:
 
     # add in nrens without a response if the survey is open
     nren_names = set([name for name in db.session.scalars(select(NREN.name))])
-    for entry in entries:
-        if entry["status"] != SurveyStatus.open.value:
+    for survey_dict in entries:
+        if survey_dict["status"] != SurveyStatus.open.value:
             continue
-        nrens_with_responses = set([r["nren"] for r in entry["responses"]])
+        nrens_with_responses = set([r["nren"] for r in survey_dict["responses"]])
         for nren_name in sorted(nren_names.difference(nrens_with_responses), key=str.lower):
-            entry["responses"].append({"nren": nren_name, "status": RESPONSE_NOT_STARTED, "lock_description": ""})
+            survey_dict["responses"].append({"nren": nren_name, "status": RESPONSE_NOT_STARTED, "lock_description": ""})
 
     return entries
 

test/test_survey.py

@@ -5,7 +5,7 @@ from compendium_v2.db.survey_model import Survey, SurveyStatus
 from compendium_v2.routes.survey import LIST_SURVEYS_RESPONSE_SCHEMA
 
 
-def test_survey_route_list_response(client, test_survey_data):
+def test_survey_route_list_response(client, test_survey_data, mocked_admin_user):
     rv = client.get(
         '/api/survey/list',
         headers={'Accept': ['application/json']})