Merge pull request #6785 from hotosm/tasking-manager-fastapi

Tasking manager fastapi

Author: dakotabenjamin

backend/api/organisations/resources.py

@@ -93,7 +93,7 @@ async def retrieve_organisation_by_slug(
     slug: str,
     db: Database = Depends(get_db),
     omit_managers: bool = Query(
-        True,
+        False,
         alias="omitManagerList",
         description="Omit organization managers list from the response.",
     ),

backend/api/tasks/actions.py

@@ -1216,9 +1216,12 @@ async def reset_by_user(
             )
 
         if username:
-            user = await UserService.get_user_by_username(username, db)
+            revert_user = await UserService.get_user_by_username(username, db)
         revert_dto = RevertUserTasksDTO(
-            project_id=project_id, user_id=user.id, action_by=user.id, action=action
+            project_id=project_id,
+            user_id=revert_user.id,
+            action_by=user.id,
+            action=action,
         )
     except Exception as e:
         logger.error(f"Error validating request: {str(e)}")

backend/config.py

@@ -121,7 +121,7 @@ def assemble_db_connection(
     TASK_AUTOUNLOCK_AFTER: str = os.getenv("TM_TASK_AUTOUNLOCK_AFTER", "2h")
 
     # Configuration for sending emails
-    MAIL_SERVER: Optional[str] = os.getenv("TM_SMTP_HOST", None)
+    MAIL_SERVER: Optional[str] = os.getenv("TM_SMTP_HOST", "smtp.gmail.com")
     MAIL_PORT: str = os.getenv("TM_SMTP_PORT", "587")
     MAIL_USE_TLS: bool = bool(int(os.getenv("TM_SMTP_USE_TLS", True)))
     MAIL_USE_SSL: bool = bool(int(os.getenv("TM_SMTP_USE_SSL", False)))
@@ -265,7 +265,7 @@ def assemble_db_connection(
         IMAGE_UPLOAD_API_URL: str = _params.get("IMAGE_UPLOAD_API_URL", None)
 
     # Sentry backend DSN
-    SENTRY_BACKEND_DSN: str = os.getenv("TM_SENTRY_BACKEND_DSN", None)
+    SENTRY_BACKEND_DSN: Optional[str] = os.getenv("TM_SENTRY_BACKEND_DSN", None)
 
     # Ohsome Stats Token
     OHSOME_STATS_TOKEN: str = os.getenv("OHSOME_STATS_TOKEN", None)

backend/models/postgis/organisation.py

@@ -233,6 +233,7 @@ async def get_all_organisations(db: Database):
             LEFT JOIN organisation_managers om ON o.id = om.organisation_id
             LEFT JOIN users u ON om.user_id = u.id
             GROUP BY o.id
+            ORDER BY o.name
         """
         result = await db.fetch_all(query)
         return result

backend/services/messaging/template_service.py

@@ -9,7 +9,6 @@
 # Set up Jinja2 environment
 env = Environment(
     loader=FileSystemLoader(os.path.join(os.path.dirname(__file__), "templates")),
-    autoescape=False,
 )
 
 

backend/services/organisation_service.py

@@ -419,7 +419,6 @@ async def get_organisation_stats(
                 FROM projects p
                 WHERE p.organisation_id = :organisation_id
                 AND p.status = {ProjectStatus.PUBLISHED.value}
-            )
         """
 
         task_values = {"organisation_id": organisation_id}

docker-compose.yml

@@ -117,3 +117,16 @@ services:
       - --providers.docker=true
     networks:
       - tm-net
+
+  tm-frontend:
+    image: ghcr.io/hotosm/tasking-manager/frontend:main
+    build:
+      context: .
+      dockerfile: "./scripts/docker/Dockerfile.frontend_development"
+    env_file:
+      - tasking-manager.env
+    labels:
+      - traefik.http.routers.frontend.rule=Host(`127.0.0.1`) || Host(`localhost`)
+      - traefik.http.services.frontend.loadbalancer.server.port=3000
+    networks:
+      - tm-net

example.env

@@ -154,10 +154,10 @@ POSTGRES_TEST_DB=tasking-manager-test
 # Email sending server configuration (optional)
 # This is required in order to send out messages.
 #
-# TM_SMTP_HOST=
-# TM_SMTP_PORT=25
-# TM_SMTP_USER=
-# TM_SMTP_PASSWORD=
+TM_SMTP_HOST=smtp.gmail.com
+TM_SMTP_PORT=587
+TM_SMTP_USER=[email protected]
+TM_SMTP_PASSWORD=enter-app-password
 # Following two variables can have value of either 0 or 1
 # TM_SMTP_USE_TLS=0
 # TM_SMTP_USE_SSL=1
@@ -214,3 +214,4 @@ UNDERPASS_URL=https://underpass.hotosm.org
 #EXPORT_TOOL_S3_URL=https://foorawdataapi.s3.amazonaws.com
 #ENABLE_EXPORT_TOOL=0
 PROFILING=False
+USE_SENTRY=false