Merge pull request #1804 from ChildMindInstitute/release/2025.04.0

Release/2025.04.0 [main]

Author: mbanting

src/apps/activities/domain/activity_create.py

@@ -9,6 +9,7 @@
     validate_item_flow,
     validate_performance_task_type,
     validate_phrasal_templates,
+    validate_request_health_record_data,
     validate_score_and_sections,
     validate_subscales,
 )
@@ -60,3 +61,7 @@ def validate_performance_task_type(cls, values):
     @root_validator()
     def validate_phrasal_templates(cls, values):
         return validate_phrasal_templates(values)
+
+    @root_validator()
+    def validate_request_health_record_data(cls, values):
+        return validate_request_health_record_data(values)

src/apps/activities/domain/activity_update.py

@@ -9,6 +9,7 @@
     validate_item_flow,
     validate_performance_task_type,
     validate_phrasal_templates,
+    validate_request_health_record_data,
     validate_score_and_sections,
     validate_subscales,
 )
@@ -61,6 +62,10 @@ def validate_performance_task_type(cls, values):
     def validate_phrasal_templates(cls, values):
         return validate_phrasal_templates(values)
 
+    @root_validator()
+    def validate_request_health_record_data(cls, values):
+        return validate_request_health_record_data(values)
+
 
 class ActivityReportConfiguration(PublicModel):
     report_included_item_name: str | None

src/apps/activities/domain/custom_validation.py

@@ -1,5 +1,5 @@
 from apps.activities.domain.response_type_config import PerformanceTaskType, ResponseType
-from apps.activities.domain.response_values import PhrasalTemplateFieldType
+from apps.activities.domain.response_values import PhrasalTemplateFieldType, RequestHealthRecordDataOptType
 from apps.activities.domain.scores_reports import ReportType, Score, SubscaleItemType, SubscaleSetting
 from apps.activities.errors import (
     IncorrectConditionItemError,
@@ -274,3 +274,33 @@ def validate_phrasal_templates(values: dict):
                             raise IncorrectPhrasalTemplateItemIndexError()
 
     return values
+
+
+def validate_request_health_record_data(values: dict):
+    items = values.get("items", [])
+    for item in items:
+        if item.response_type == ResponseType.REQUEST_HEALTH_RECORD_DATA:
+            if item.response_values.opt_in_out_options is None or len(item.response_values.opt_in_out_options) != 2:
+                raise ValueError("Request Health Record Data item must have 2 opt-in/out options")
+            opt_in_item = next(
+                (
+                    option
+                    for option in item.response_values.opt_in_out_options
+                    if option.id == RequestHealthRecordDataOptType.OPT_IN
+                ),
+                None,
+            )
+            if opt_in_item is None:
+                raise ValueError("Request Health Record Data item must have opt-in option")
+            opt_out_item = next(
+                (
+                    option
+                    for option in item.response_values.opt_in_out_options
+                    if option.id == RequestHealthRecordDataOptType.OPT_OUT
+                ),
+                None,
+            )
+            if opt_out_item is None:
+                raise ValueError("Request Health Record Data item must have opt-out option")
+
+    return values

src/apps/activities/domain/response_type_config.py

@@ -56,6 +56,7 @@ class ResponseType(StrEnum):
     ABTRAILS = "ABTrails"
     UNITY = "unity"
     PHRASAL_TEMPLATE = "phrasalTemplate"
+    REQUEST_HEALTH_RECORD_DATA = "requestHealthRecordData"
 
     @classmethod
     def get_non_response_types(cls):
@@ -263,6 +264,11 @@ class PhrasalTemplateConfig(PublicModel):
     remove_back_button: bool
 
 
+class RequestHealthRecordDataConfig(PublicModel):
+    type: Literal[ResponseType.REQUEST_HEALTH_RECORD_DATA] | None
+    remove_back_button: bool
+
+
 class UnityConfig(PublicModel):
     type: Literal[ResponseType.UNITY] | None
     device_type: str | None
@@ -472,4 +478,5 @@ def get_values(cls) -> list[str]:
     | ABTrailsConfig
     | PhrasalTemplateConfig
     | UnityConfig
+    | RequestHealthRecordDataConfig
 )

src/apps/activities/domain/response_values.py

@@ -19,6 +19,7 @@
     ParagraphTextConfig,
     PhotoConfig,
     PhrasalTemplateConfig,
+    RequestHealthRecordDataConfig,
     ResponseType,
     SingleSelectionConfig,
     SingleSelectionRowsConfig,
@@ -41,6 +42,11 @@
 from apps.shared.domain import PublicModel, validate_color, validate_image, validate_uuid
 
 
+class RequestHealthRecordDataOptType(StrEnum):
+    OPT_IN = "opt_in"
+    OPT_OUT = "opt_out"
+
+
 class PhrasalTemplateFieldType(StrEnum):
     SENTENCE = "sentence"
     ITEM_RESPONSE = "item_response"
@@ -388,6 +394,16 @@ class PhrasalTemplateValues(PublicModel):
     phrases: list[PhrasalTemplatePhrase]
 
 
+class RequestHealthRecordDataOption(PublicModel):
+    id: RequestHealthRecordDataOptType = Field(default=...)  # ellipsis indicates that the field is required
+    label: str = Field(default=...)
+
+
+class RequestHealthRecordDataValues(PublicModel):
+    type: Literal[ResponseType.REQUEST_HEALTH_RECORD_DATA] | None
+    opt_in_out_options: list[RequestHealthRecordDataOption]
+
+
 ResponseValueConfigOptions = [
     TextValues,
     ParagraphTextValues,
@@ -413,6 +429,7 @@ class PhrasalTemplateValues(PublicModel):
     ABTrailsValues,
     UnityValues,
     PhrasalTemplateValues,
+    RequestHealthRecordDataValues,
 ]
 
 
@@ -430,6 +447,7 @@ class PhrasalTemplateValues(PublicModel):
     | TimeValues
     | UnityValues
     | PhrasalTemplateValues
+    | RequestHealthRecordDataValues
 )
 
 
@@ -486,6 +504,7 @@ def validate_none_option_flag(options):
     ABTrailsConfig,
     UnityConfig,
     PhrasalTemplateConfig,
+    RequestHealthRecordDataConfig,
 ]
 
 ResponseTypeValueConfig = {}

src/apps/activities/tests/fixtures/configs.py

@@ -15,6 +15,7 @@
     ParagraphTextConfig,
     PhotoConfig,
     PhrasalTemplateConfig,
+    RequestHealthRecordDataConfig,
     ResponseType,
     SingleSelectionConfig,
     SingleSelectionRowsConfig,
@@ -186,3 +187,8 @@ def phrasal_template_config(default_config: DefaultConfig) -> PhrasalTemplateCon
 @pytest.fixture
 def unity_config(default_config: DefaultConfig) -> UnityConfig:
     return UnityConfig(**default_config.dict(), type=ResponseType.UNITY)
+
+
+@pytest.fixture
+def request_health_record_data_config(default_config: DefaultConfig) -> RequestHealthRecordDataConfig:
+    return RequestHealthRecordDataConfig(**default_config.dict(), type=ResponseType.REQUEST_HEALTH_RECORD_DATA)

src/apps/activities/tests/fixtures/items.py

@@ -14,6 +14,7 @@
     ParagraphTextConfig,
     PhotoConfig,
     PhrasalTemplateConfig,
+    RequestHealthRecordDataConfig,
     ResponseType,
     SingleSelectionConfig,
     SingleSelectionRowsConfig,
@@ -32,6 +33,7 @@
     MultiSelectionValues,
     NumberSelectionValues,
     PhrasalTemplateValues,
+    RequestHealthRecordDataValues,
     SingleSelectionRowsValues,
     SingleSelectionValues,
     SliderRowsValues,
@@ -334,3 +336,17 @@ def phrasal_template_with_paragraph_create(
     )
 
     return [paragraph_text_item_create, phrasal_item]
+
+
+@pytest.fixture
+def request_health_record_data_create(
+    request_health_record_data_config: RequestHealthRecordDataConfig,
+    request_health_record_data_response_values: RequestHealthRecordDataValues,
+    base_item_data: BaseItemData,
+) -> ActivityItemCreate:
+    return ActivityItemCreate(
+        **base_item_data.dict(),
+        response_type=ResponseType.REQUEST_HEALTH_RECORD_DATA,
+        config=request_health_record_data_config,
+        response_values=request_health_record_data_response_values,
+    )

src/apps/activities/tests/fixtures/response_values.py

@@ -17,6 +17,9 @@
     PhrasalTemplateField,
     PhrasalTemplatePhrase,
     PhrasalTemplateValues,
+    RequestHealthRecordDataOption,
+    RequestHealthRecordDataOptType,
+    RequestHealthRecordDataValues,
     SingleSelectionRowsValues,
     SingleSelectionValues,
     SliderRowsValue,
@@ -263,3 +266,21 @@ def phrasal_template_with_paragraph_response_values(
         card_title="test paragraph card title",
         type=ResponseType.PHRASAL_TEMPLATE,
     )
+
+
+@pytest.fixture
+def request_health_record_data_response_values() -> RequestHealthRecordDataValues:
+    opt_in_out_options = [
+        RequestHealthRecordDataOption(
+            id=RequestHealthRecordDataOptType.OPT_IN,
+            label="Opt In label",
+        ),
+        RequestHealthRecordDataOption(
+            id=RequestHealthRecordDataOptType.OPT_OUT,
+            label="Opt Out label",
+        ),
+    ]
+
+    return RequestHealthRecordDataValues(
+        type=ResponseType.REQUEST_HEALTH_RECORD_DATA, opt_in_out_options=opt_in_out_options
+    )

src/apps/applets/tests/test_applet_activity_items.py

@@ -94,6 +94,7 @@ class TestActivityItems:
             "message_item_create",
             "audio_player_item_create",
             "paragraph_text_item_create",
+            "request_health_record_data_create",
         ),
     )
     async def test_create_applet_with_each_activity_item(
@@ -211,6 +212,38 @@ async def test_create_applet_with_performance_task(
         assert resp.json()["result"]["activities"][0]["isPerformanceTask"]
         assert resp.json()["result"]["activities"][0]["performanceTaskType"] == performance_task_type
 
+    async def test_create_applet_with_request_health_record_data_invalid(
+        self,
+        client: TestClient,
+        tom: User,
+        applet_minimal_data: AppletCreate,
+        request_health_record_data_create: ActivityItemCreate,
+    ):
+        client.login(tom)
+        data = applet_minimal_data.copy(deep=True)
+        data.activities[0].items = [request_health_record_data_create]
+
+        data_dict = data.dict(by_alias=True)
+        data_dict["activities"][0]["items"][0]["responseValues"]["optInOutOptions"][1]["id"] = "opt_in"
+
+        resp = await client.post(self.applet_create_url.format(owner_id=tom.id), data=data_dict)
+        assert resp.status_code == http.HTTPStatus.UNPROCESSABLE_ENTITY
+        assert resp.json()["result"][0]["message"] == "Request Health Record Data item must have opt-out option"
+
+        data_dict = data.dict(by_alias=True)
+        data_dict["activities"][0]["items"][0]["responseValues"]["optInOutOptions"][0]["id"] = "opt_out"
+
+        resp = await client.post(self.applet_create_url.format(owner_id=tom.id), data=data_dict)
+        assert resp.status_code == http.HTTPStatus.UNPROCESSABLE_ENTITY
+        assert resp.json()["result"][0]["message"] == "Request Health Record Data item must have opt-in option"
+
+        data_dict = data.dict(by_alias=True)
+        data_dict["activities"][0]["items"][0]["responseValues"]["optInOutOptions"] = []
+
+        resp = await client.post(self.applet_create_url.format(owner_id=tom.id), data=data_dict)
+        assert resp.status_code == http.HTTPStatus.UNPROCESSABLE_ENTITY
+        assert resp.json()["result"][0]["message"] == "Request Health Record Data item must have 2 opt-in/out options"
+
     async def test_creating_applet_with_activity_items_condition(
         self,
         client: TestClient,

src/apps/schedule/api/schedule.py

@@ -25,6 +25,7 @@
 from apps.workspaces.service.check_access import CheckAccessService
 from infrastructure.database import atomic
 from infrastructure.database.deps import get_session
+from infrastructure.http import get_local_tz
 from infrastructure.logger import logger
 from infrastructure.utility import FirebaseNotificationType
 
@@ -275,6 +276,7 @@ async def schedule_get_all_by_user(
 async def schedule_get_all_by_respondent_user(
     user: User = Depends(get_current_user),
     session=Depends(get_session),
+    time_zone: str | None = Depends(get_local_tz()),
     device_id: Annotated[str | None, Header()] = None,
     os_name: Annotated[str | None, Header()] = None,
     os_version: Annotated[str | None, Header()] = None,
@@ -307,6 +309,7 @@ async def schedule_get_all_by_respondent_user(
             applet_ids=applet_ids,
             min_end_date=min_end_date,
             max_start_date=max_start_date,
+            time_zone=time_zone,
             device_id=device_id,
             os_name=os_name,
             os_version=os_version,