Updated API Endpoints for Intake Profile and Dynamic Forms

backend/app/core/logging.py

@@ -37,8 +37,10 @@ def emit(self, record):
                 )
 
         logging.basicConfig(handlers=[InterceptHandler()], level=0, force=True)
-
-        if settings.HUU_ENVIRONMENT.lower() in ["development", "qa", "local"]:
+        '''
+        A logging file can replace logging to standard out by changing sys.stdout to filename.log
+        '''
+        if settings.HUU_ENVIRONMENT.lower() in ["development", "local"]:
             logger.add(
                 sys.stdout,
                 format="<white>{time:YYYY-MM-DD HH:mm:ss}</white> | <level>{level: <8}</level> | <cyan>{name}</cyan>:<green>{function}</green> - <white>{message}</white>",

backend/app/modules/deps.py

@@ -26,6 +26,7 @@ def get_form_1():
         import json
         with open("form_data/form1.json", "r") as f:
             FORM_1 = json.load(f)
+            FORM_1['id'] = 'guest'
     return FORM_1
 
 
@@ -35,6 +36,7 @@ def get_form_2():
         import json
         with open("form_data/form2.json", "r") as f:
             FORM_2 = json.load(f)
+            FORM_2['id'] = 'host'
     return FORM_2
 ################################################################################
 

backend/app/modules/intake_profile/controller.py

@@ -6,58 +6,77 @@
 router = APIRouter()
 
 
-@router.put("/responses/{user_id}", status_code=status.HTTP_501_NOT_IMPLEMENTED)
-def update_intake_profile_responses(user_id, body, db_session: DbSessionDep):
-    pass
-    # TODO: Implement update intake profile responses
-    # with db_session.begin() as session:
-    #     user_repo = UserRepository(session)
-    #     forms_repo = FormsRepository(session)
-    #     user = user_repo.get_user(token_info['Username'])
-
-    #     form = forms_repo.get_form(form_id)
-    #     if not form:
-    #         return f"Form with id {form_id} does not exist.", 404
-
-    #     valid_field_ids = form.get_field_ids()
-    #     for response in body:
-    #         response["user_id"] = user.id
-    #         if response["field_id"] not in valid_field_ids:
-    #             return f"Form {form_id} does not contain field id {response['field_id']}", 400
-
-    #     forms_repo.add_user_responses(user.id, body)
-
-    #     return {}, 204
-
-
-@router.get("/responses/{user_id}", status_code=status.HTTP_501_NOT_IMPLEMENTED)
-def get_intake_profile_responses(user_id, db_session: DbSessionDep):
-    pass
-    # TODO: Implement get Intake Profile responses
-    # with db_session.begin() as session:
-    #     user_repo = UserRepository(session)
-    #     forms_repo = FormsRepository(session)
-
-    #     form = forms_repo.get_form_json(form_id)
-    #     if not form:
-    #         return f"Form with id {form_id} does not exist.", 404
-
-    #     user = user_repo.get_user(token_info['Username'])
-    #     responses = forms_repo.get_user_responses(user.id, form_id)
-    #     if responses:
-    #         return responses, 200
-    #     return [], 202
-
-
-@router.get("/form/{profile_id}", status_code=status.HTTP_200_OK)
-def get_intake_profile_form(profile_id: int,
-                            profile_form_1: Annotated[str, Depends(get_form_1)],
-                            profile_form_2: Annotated[str, Depends(get_form_2)]):
-    """Get the Intake Profile form definition."""
-    if profile_id == 1:
-        return profile_form_1
-    if profile_id == 2:
-        return profile_form_2
+# @router.put("/responses/{user_id}", status_code=status.HTTP_501_NOT_IMPLEMENTED)
+# def update_intake_profile_responses(user_id, body, db_session: DbSessionDep):
+#     pass
+    # TODO: Implement the functionality to update intake profile responses.
+    # This should:
+    # 1. Use the `db_session` to initiate a transaction.
+    # 2. Retrieve the user data using the `user_id`.
+    # 3. Get the specific form by `form_id`.
+    # 4. Check if the form exists. If not, return an error (404).
+    # 5. Validate the field IDs in the response body against the form's field IDs.
+    # 6. If any field ID is invalid, return an error (400).
+    # 7. Save the valid responses in the database.
+    # 8. Return a success response with status 204 (no content) if everything goes well.
+
+# @router.get("/responses/{user_id}", status_code=status.HTTP_501_NOT_IMPLEMENTED)
+# def get_intake_profile_responses(user_id, db_session: DbSessionDep):
+#     pass
+    # TODO: Implement the functionality to retrieve intake profile responses for a user.
+    # This should:
+    # 1. Use the `db_session` to begin a transaction.
+    # 2. Retrieve the user using the `user_id`.
+    # 3. Fetch the form associated with the user's responses.
+    # 4. If the form does not exist, return a 404 error.
+    # 5. Get the user responses for the form from the database.
+    # 6. If responses are found, return them with status 200.
+    # 7. If no responses are found, return an empty list with status 202.
+
+# @router.get("/responses/{profile_type}", status_code=status.HTTP_200_OK)
+# def get_intake_profile_form(profile_type: str,
+#                             profile_form_1: Annotated[dict, Depends(get_form_1)],
+#                             profile_form_2: Annotated[dict, Depends(get_form_2)]):
+#     """Get the Intake Profile form definition for host or guest."""
+#     if profile_type == "guest":
+#         return profile_form_1
+#     if profile_type == "host":
+#         return profile_form_2
+    # TODO: Return the appropriate form based on the `profile_type` (either "guest" or "host").
+    # 1. Use `profile_form_1` for the "guest" type and return it.
+    # 2. Use `profile_form_2` for the "host" type and return it.
+    # 3. If the `profile_type` is not recognized, raise a 404 error.
+
+# @router.get("/form/{profile_id}", status_code=status.HTTP_200_OK)
+# def get_intake_profile_form(profile_id: int,
+#                             profile_form_1: Annotated[str, Depends(get_form_1)],
+#                             profile_form_2: Annotated[str, Depends(get_form_2)]):
+#     """Get the Intake Profile form definition."""
+#     if profile_id == 1:
+#         return profile_form_1
+#     if profile_id == 2:
+#         return profile_form_2
+    # TODO: Return the form based on the `profile_id`.
+    # 1. If the `profile_id` is 1, return `profile_form_1`.
+    # 2. If the `profile_id` is 2, return `profile_form_2`.
+    # 3. If the `profile_id` is not valid, raise a 404 error.
+
+# This is your current working function:
+@router.get("/form/{profile_type}", status_code=status.HTTP_200_OK)
+def get_intake_profile_form(profile_type: str,
+                            profile_form_1: Annotated[dict, Depends(get_form_1)],
+                            profile_form_2: Annotated[dict, Depends(get_form_2)]):
+    """Get the Intake Profile form definition and responses for host or guest."""
+    if profile_type == "guest":
+        return {
+            "form": profile_form_1,
+            "responses": profile_form_1.get("responses", [])
+        }
+    if profile_type == "host":
+        return {
+            "form": profile_form_2,
+            "responses": profile_form_2.get("responses", [])
+        }
 
     raise HTTPException(status_code=status.HTTP_404_NOT_FOUND,
-                        detail=f"Form with id {profile_id} does not exist.")
+                        detail=f"Form type {profile_type} does not exist.")