From cdaa6b4a3c6fde3aa0174f6376df3a8220a1c45e Mon Sep 17 00:00:00 2001 From: spwoodcock Date: Wed, 31 Jan 2024 16:14:29 +0000 Subject: [PATCH] refactor: revert setting outline_geojson in create_app_project --- src/backend/app/projects/project_crud.py | 8 +++++++- src/backend/app/projects/project_routes.py | 7 +++++-- src/backend/app/projects/project_schemas.py | 1 - 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/src/backend/app/projects/project_crud.py b/src/backend/app/projects/project_crud.py index c5cb525c5b..5b31df4878 100644 --- a/src/backend/app/projects/project_crud.py +++ b/src/backend/app/projects/project_crud.py @@ -1607,7 +1607,13 @@ async def convert_to_app_project(db_project: db_models.DbProject): return None log.debug("Converting db project to app project") - app_project: project_schemas.Project = db_project + app_project = db_project + + if db_project.outline: + log.debug("Converting project outline to geojson") + app_project.outline_geojson = geometry_to_geojson( + db_project.outline, {"id": db_project.id}, db_project.id + ) app_project.project_tasks = db_project.tasks diff --git a/src/backend/app/projects/project_routes.py b/src/backend/app/projects/project_routes.py index 65142183c8..1c662f040c 100644 --- a/src/backend/app/projects/project_routes.py +++ b/src/backend/app/projects/project_routes.py @@ -215,8 +215,8 @@ async def read_project(project_id: int, db: Session = Depends(database.get_db)): @router.delete("/{project_id}") async def delete_project( project: db_models.DbProject = Depends(project_deps.get_project_by_id), - db: Session = Depends(database.get_db), current_user: AuthUser = Depends(login_required), + db: Session = Depends(database.get_db), ): """Delete a project from both ODK Central and the local database.""" log.info( @@ -251,7 +251,10 @@ async def create_project( # Check if organisation exists org = await organisation_deps.check_org_exists(db, project_info.organisation_id) - log.debug(f"Creating project {project_info.project_info.name}") + log.info( + f"User {current_user.username} attempting creation of project " + f"{project_info.project_info.name}" + ) # Must decrypt ODK password & connect to ODK Central before proj created if project_info.odk_central_url: diff --git a/src/backend/app/projects/project_schemas.py b/src/backend/app/projects/project_schemas.py index 0991b94e72..f23020aa44 100644 --- a/src/backend/app/projects/project_schemas.py +++ b/src/backend/app/projects/project_schemas.py @@ -62,7 +62,6 @@ def remove_trailing_slash(cls, value: HttpUrlStr) -> Optional[HttpUrlStr]: @model_validator(mode="after") def all_odk_vars_together(self) -> Self: """Ensure if one ODK variable is set, then all are.""" - log.warning(self.odk_central_url) if any( [ self.odk_central_url,