Feat/save notebook focus pe 2

.env.sample

@@ -21,6 +21,8 @@ APP_URL=http://localhost:3000
 DATABASE_URL=postgres://cdb:test@localhost:5432/carnet_de_bord
 LOG_AS_JSON=false
 GQL_LOG_LEVEL=INFO # graphql cient logging level
+ENABLE_PE_DIAGNOSTIC_API=True
+ENABLE_SYNC_CONTRAINTES=False
 
 PE_AUTH_BASE_URL=https://entreprise.pe-qvr.fr
 PE_BASE_URL=https://api.peio.pe-qvr.fr

.env.test.sample

@@ -16,7 +16,8 @@ APP_URL=http://localhost:3001
 GQL_LOG_LEVEL=INFO # graphql cient logging level
 PE_AUTH_BASE_URL=https://entreprise.pe-qvr.fr
 PE_BASE_URL=https://api.peio.pe-qvr.fr
-ENABLE_SITUATION_API=true
+ENABLE_PE_DIAGNOSTIC_API=True
+ENABLE_SYNC_CONTRAINTES=False
 
 # You can't name your test database as you want. It has to be
 # carnet_de_bord otherwise you will not be able to apply

.github/workflows/test.yml

@@ -157,6 +157,20 @@ jobs:
       - name: Install Hasura CLI
         uses: ./.github/actions/hasura-cli
 
+      - name: Setup Python
+        uses: actions/setup-python@v4
+        with:
+          python-version: ${{env.PYTHON_VERSION}}
+
+      - name: Setup Poetry
+        uses: abatilo/actions-poetry@v2.1.6
+        with:
+          poetry-version: ${{env.POETRY_VERSION}}
+
+      - name: Install Python dependencies
+        working-directory: ./backend
+        run: poetry install
+
       - name: Run functional tests
         run: |
           cp .env.test.sample .env.test

app/elm/Diagnostic/AllSituations.elm

@@ -27,7 +27,7 @@ syncWithPE notebookId responseMsg =
     Extra.GraphQL.postOperation
         (Diagnostic.SyncWithPE.mutation { notebookId = notebookId })
         (Result.map
-            (.refresh_notebook_situations_from_pole_emploi
+            (.update_notebook_from_pole_emploi
                 >> Maybe.map
                     (\data ->
                         { data_has_been_updated = data.data_has_been_updated

app/elm/Diagnostic/SyncWithPE.gql

@@ -1,5 +1,5 @@
 mutation ($notebookId: uuid!) {
-  refresh_notebook_situations_from_pole_emploi(notebookId: $notebookId) {
+  update_notebook_from_pole_emploi(notebookId: $notebookId) {
     data_has_been_updated
     has_pe_diagnostic
   }

backend/cdb/api/core/settings.py

@@ -35,7 +35,7 @@ class Settings(BaseSettings):
     LOG_AS_JSON: bool = True
     GQL_LOG_LEVEL: str = "WARNING"
 
-    ENABLE_SITUATION_API: bool = False
+    ENABLE_PE_DIAGNOSTIC_API: bool = False
     ENABLE_SYNC_CONTRAINTES: bool = False
 
     SENTRY_DSN: str | None

backend/cdb/api/db/crud/notebook_focus.py

@@ -0,0 +1,96 @@
+import json
+from datetime import datetime
+from typing import List
+from uuid import UUID
+
+from gql import gql
+from gql.client import AsyncClientSession
+from pydantic import BaseModel
+
+from cdb.api.domain.contraintes import FocusDifferences, FocusToAdd
+
+
+class TargetInsertInput(BaseModel):
+    target: str
+
+
+class TargetData(BaseModel):
+    data: List[TargetInsertInput]
+
+
+class FocusInsertInput(BaseModel):
+    theme: str
+    notebookId: UUID
+    createdAt: None | datetime = None
+    targets: TargetData | None = None
+
+    def jsonb(self) -> dict:
+        return json.loads(self.json())
+
+
+def to_focuses_insert_input(notebook_id: UUID, focuses: List[FocusToAdd]) -> List[dict]:
+    return [
+        FocusInsertInput(
+            notebookId=notebook_id,
+            theme=focus.theme,
+            createdAt=focus.created_at,
+            targets=TargetData(
+                data=[
+                    TargetInsertInput(target=target.target) for target in focus.targets
+                ]
+            ),
+        ).jsonb()
+        for focus in focuses
+    ]
+
+
+async def add_remove_notebook_focuses(
+    client: AsyncClientSession, notebook_id: UUID, focus_differences: FocusDifferences
+):
+    mutation = gql(
+        """
+        mutation (
+            $focuses_to_add: [notebook_focus_insert_input!]!
+            $focuses_ids_to_delete: [uuid!]!
+            $targets_to_add: [notebook_target_insert_input!]!
+            $target_ids_to_cancel: [uuid!]!
+            $target_ids_to_end: [uuid!]!
+        ) {
+            insert_notebook_focus(objects: $focuses_to_add) {
+                affected_rows
+            }
+            delete_notebook_focus(where: { id: { _in: $focuses_ids_to_delete } }) {
+                affected_rows
+            }
+            insert_notebook_target(objects: $targets_to_add) {
+                affected_rows
+            }
+            update_notebook_target_many(
+                updates: [
+                {
+                    where: { id: { _in: $target_ids_to_cancel } }
+                    _set: { status: "abandonned" }
+                }
+                { where: { id: { _in: $target_ids_to_end } }, _set: { status: "done" } }
+                ]
+            ) {
+                affected_rows
+            }
+        }"""
+    )
+
+    await client.execute(
+        mutation,
+        variable_values={
+            "focuses_to_add": to_focuses_insert_input(
+                notebook_id, focus_differences.focuses_to_add
+            ),
+            "focuses_ids_to_delete": focus_differences.focus_ids_to_delete,
+            "targets_to_add": [
+                target.jsonb()
+                for target in focus_differences.target_differences.targets_to_add
+            ],
+            "target_ids_to_cancel": focus_differences.target_differences.target_ids_to_cancel,  # noqa: E501
+            "target_ids_to_end": focus_differences.target_differences.target_ids_to_end,
+        },
+    )

backend/cdb/api/db/crud/notebook_situation.py

@@ -5,7 +5,7 @@
 from gql.client import AsyncClientSession
 
 from cdb.api.db.models.ref_situation import RefSituation
-from cdb.api.v1.payloads.socio_pro import SituationToAdd
+from cdb.api.v1.payloads.socio_pro import SituationInsertInput
 
 
 async def get_ref_situations(client: AsyncClientSession) -> List[RefSituation]:
@@ -34,7 +34,7 @@ async def get_ref_situations(client: AsyncClientSession) -> List[RefSituation]:
 async def save_notebook_situations(
     client: AsyncClientSession,
     notebookId: UUID,
-    situations_to_add: List[SituationToAdd],
+    situations_to_add: List[SituationInsertInput],
     situation_ids_to_delete: List[UUID],
 ):
     mutation = gql(

backend/cdb/api/db/models/focus.py

@@ -9,7 +9,7 @@
 class Focus(BaseModel):
     id: UUID
     theme: str
-    creator_id: UUID
+    creator_id: UUID | None
     notebook_id: UUID
     created_at: datetime
     updated_at: datetime

backend/cdb/api/db/models/ref_situation.py

@@ -15,16 +15,3 @@ class NotebookSituation(BaseModel):
     situationId: UUID
     createdAt: datetime
     deleteAt: datetime | None
-
-    @staticmethod
-    def selection_set():
-        return """ { id situationId createdAt deletedAt } """
-
-    @staticmethod
-    def parse_list(situations):
-        notebook_situations_parsed = []
-        if situations:
-            notebook_situations_parsed = [
-                NotebookSituation.parse_obj(situation) for situation in situations
-            ]
-        return notebook_situations_parsed

backend/cdb/api/db/models/target.py

@@ -10,7 +10,7 @@ class Target(BaseModel):
     id: UUID
     focus_id: UUID
     target: str
-    creator_id: UUID
+    creator_id: UUID | None
     created_at: datetime
     updated_at: datetime
     status: str