daily work

Author: matusdrobuliak66

packages/models-library/src/models_library/projects_state.py

@@ -52,6 +52,7 @@ class ProjectStatus(str, Enum):
     EXPORTING = "EXPORTING"
     OPENING = "OPENING"
     OPENED = "OPENED"
+    MAINTAINING = "MAINTAINING"
 
 
 class ProjectLocked(BaseModel):

packages/postgres-database/src/simcore_postgres_database/utils_projects.py

@@ -0,0 +1,32 @@
+import uuid
+from datetime import datetime, timezone
+
+import sqlalchemy as sa
+from pydantic import parse_obj_as
+from sqlalchemy.ext.asyncio import AsyncConnection
+
+from .models.projects import projects
+from .utils_repos import transaction_context
+
+
+class ProjectsRepo:
+    def __init__(self, engine):
+        self.engine = engine
+
+    async def get_project_last_change_date(
+        self,
+        project_uuid: uuid.UUID,
+        *,
+        connection: AsyncConnection | None = None,
+    ) -> datetime | None:
+        async with transaction_context(self.engine, connection) as conn:
+            get_stmt = sa.select(projects.c.last_change_date).where(
+                projects.c.uuid == f"{project_uuid}"
+            )
+
+            result = await conn.execute(get_stmt)
+            row = result.first()
+            if row is None:
+                return None
+            date = parse_obj_as(datetime, row[0])
+            return date.replace(tzinfo=timezone.utc)

packages/postgres-database/tests/conftest.py

@@ -206,7 +206,7 @@ async def connection(aiopg_engine: Engine) -> AsyncIterator[SAConnection]:
 
 
 @pytest.fixture
-async def asyncpg_engine(
+async def asyncpg_engine(  # <-- WE SHOULD USE THIS ONE
     is_pdb_enabled: bool,
     pg_sa_engine: sa.engine.Engine,
     make_asyncpg_engine: Callable[[bool], AsyncEngine],

packages/pytest-simcore/src/pytest_simcore/faker_projects_data.py

@@ -9,11 +9,15 @@
 """
 
 
+from typing import Any
+
 import pytest
 from faker import Faker
 from models_library.projects import ProjectID
 from models_library.projects_nodes_io import NodeID
+from models_library.users import UserID
 from pydantic import parse_obj_as
+from pytest_simcore.helpers.faker_factories import random_project
 
 _MESSAGE = (
     "If set, it overrides the fake value of `{}` fixture."
@@ -43,3 +47,12 @@ def project_id(faker: Faker, request: pytest.FixtureRequest) -> ProjectID:
 @pytest.fixture
 def node_id(faker: Faker) -> NodeID:
     return parse_obj_as(NodeID, faker.uuid4())
+
+
+@pytest.fixture
+def project(
+    faker: Faker,
+    project_id: ProjectID,
+    user_id: UserID,
+) -> dict[str, Any]:
+    return random_project(fake=faker, uuid=f"{project_id}", prj_owner=user_id)

services/director-v2/tests/unit/test_utils_distributed_identifier.py

@@ -163,6 +163,7 @@ async def _destroy(
         self.api.delete(identifier)
 
 
+# MD: here redis
 @pytest.fixture
 async def redis_client_sdk(
     redis_service: RedisSettings,

services/docker-compose.yml

@@ -413,6 +413,11 @@ services:
       REDIS_PORT: ${REDIS_PORT}
       REDIS_SECURE: ${REDIS_SECURE}
       REDIS_USER: ${REDIS_USER}
+      POSTGRES_DB: ${POSTGRES_DB}
+      POSTGRES_HOST: ${POSTGRES_HOST}
+      POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
+      POSTGRES_PORT: ${POSTGRES_PORT}
+      POSTGRES_USER: ${POSTGRES_USER}
       SC_USER_ID: ${SC_USER_ID}
       SC_USER_NAME: ${SC_USER_NAME}
       EFS_USER_ID: ${EFS_USER_ID}

services/efs-guardian/requirements/_base.in

@@ -9,6 +9,7 @@
 --requirement ../../../packages/models-library/requirements/_base.in
 --requirement ../../../packages/settings-library/requirements/_base.in
 --requirement ../../../packages/aws-library/requirements/_base.in
+--requirement ../../../packages/postgres-database/requirements/_base.in
 # service-library[fastapi]
 --requirement ../../../packages/service-library/requirements/_base.in
 --requirement ../../../packages/service-library/requirements/_fastapi.in