fix: [#56025] Handle to dates for extensions

Feraidoon Hamidi · Feraidoon Hamidi · commit 21563bb2f18f · 2023-08-29T14:25:21.000+02:00
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -1,44 +1,43 @@
-# SPDX-FileCopyrightText: 2023 Magenta ApS <https://magenta.dk>
+# SPDX-FileCopyrightText: 2022 Magenta ApS <https://magenta.dk>
 # SPDX-License-Identifier: MPL-2.0
-
 default_language_version:
   python: python3.11
 
 repos:
   - repo: https://github.com/asottile/pyupgrade
-    rev: v3.4.0
+    rev: v3.8.0
     hooks:
       - id: pyupgrade
         args: [ "--py311-plus" ]
         exclude: |
                     (?x)(
                         ^autogenerated_graphql_client/|
-                        ^queries.graphql|
-                        ^schema.graphql
                     )
 
+
+
   - repo: https://github.com/psf/black
-    rev: 23.3.0
+    rev: 23.7.0
     hooks:
       - id: black
         exclude: |
                     (?x)(
                         ^autogenerated_graphql_client/|
-                        ^queries.graphql|
-                        ^schema.graphql
                     )
 
+
+
   - repo: https://github.com/asottile/reorder_python_imports
     rev: v3.10.0
     hooks:
       - id: reorder-python-imports
         exclude: |
                     (?x)(
                         ^autogenerated_graphql_client/|
-                        ^queries.graphql|
-                        ^schema.graphql
                     )
 
+
+
   - repo: https://github.com/pycqa/flake8
     rev: 6.0.0
     hooks:
@@ -47,27 +46,24 @@ repos:
         exclude: |
                     (?x)(
                         ^autogenerated_graphql_client/|
-                        ^queries.graphql|
-                        ^schema.graphql
                     )
 
 
+
+
   - repo: https://github.com/pre-commit/mirrors-mypy
-    rev: v1.4.0
+    rev: v1.4.1
     hooks:
       - id: mypy
-        args: [ "--ignore-missing-imports", "--config-file=pyproject.toml" ]
+        args: [ "--ignore-missing-imports", "--config-file=pyproject.toml", "--no-strict-optional" ]
         additional_dependencies:
-          - aiohttp
           - fastapi
+          - gql
           - httpx
           - pydantic==1.10.11
-          - starlette_context
-          - strawberry-graphql
           - pytest
           - structlog
-          - gql
-        exclude: ^autogenerated_graphql_client/
+
 
   - repo: https://github.com/pre-commit/mirrors-prettier
     rev: v3.0.0-alpha.6
@@ -90,36 +86,21 @@ repos:
       - id: check-byte-order-marker
         exclude: ^autogenerated_graphql_client/
       - id: check-docstring-first
-        exclude: ^autogenerated_graphql_client/
       - id: check-executables-have-shebangs
-        exclude: ^autogenerated_graphql_client/
       - id: check-merge-conflict
-        exclude: ^autogenerated_graphql_client/
       - id: check-yaml
-        exclude: ^autogenerated_graphql_client/
       - id: end-of-file-fixer
-        exclude: |
-                    (?x)(
-                        ^autogenerated_graphql_client/|
-                        ^queries.graphql|
-                        ^schema.graphql
-                    )
       - id: pretty-format-json
-        exclude: ^autogenerated_graphql_client/
       - id: mixed-line-ending
-        exclude: ^autogenerated_graphql_client/
       - id: trailing-whitespace
-        exclude: ^autogenerated_graphql_client/
 
   - repo: https://github.com/dosisod/refurb
-    rev: v1.15.0
+    rev: v1.17.0
     hooks:
       - id: refurb
         exclude: |
                     (?x)(
                         ^autogenerated_graphql_client/|
-                        ^queries.graphql|
-                        ^schema.graphql
                     )
 
   - repo: https://github.com/fsfe/reuse-tool
diff --git a/.reuse/dep5 b/.reuse/dep5
@@ -2,6 +2,6 @@ Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: OS2mo-amqp-trigger-job-function-configurator
 Upstream-Contact: Magenta ApS <info@magenta.dk>
 
-Files: poetry.* *poetry.lock autogenerated_graphql_client/*
+Files: poetry.* *poetry.lock job_function_configurator/autogenerated_graphql_client/*
 Copyright: 2023 Magenta ApS <https://magenta.dk>
 License: MPL-2.0
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -13,9 +13,9 @@ services:
     networks:
       - os2mo_default
     volumes:
-      - ./job_function_configurator:/opt/app/
+      - ./job_function_configurator:/app/job_function_configurator
     ports:
-      - "8200:8000"
+      - "8000:8000"
 
 networks:
   os2mo_default:
diff --git a/docker.env b/docker.env
@@ -1,7 +1,7 @@
 # SPDX-FileCopyrightText: 2023 Magenta ApS <https://magenta.dk>
 # SPDX-License-Identifier: MPL-2.0
 
-AMQP__URL="amqp://guest:guest@msg_broker:5672/"
+AMQP__URL="amqp://guest:guest@msg-broker:5672/"
 
 MO_URL="http://mo"
 
diff --git a/job_function_configurator/autogenerated_graphql_client/__init__.py b/job_function_configurator/autogenerated_graphql_client/__init__.py
@@ -1,4 +1,4 @@
-# Generated by ariadne-codegen on 2023-07-28 09:56
+# Generated by ariadne-codegen on 2023-08-29 12:26
 
 from .async_base_client import AsyncBaseClient
 from .base_model import BaseModel
diff --git a/job_function_configurator/autogenerated_graphql_client/async_base_client.py b/job_function_configurator/autogenerated_graphql_client/async_base_client.py
@@ -1,4 +1,4 @@
-# Generated by ariadne-codegen on 2023-07-28 09:56
+# Generated by ariadne-codegen on 2023-08-29 12:26
 
 import enum
 import json
diff --git a/job_function_configurator/autogenerated_graphql_client/base_model.py b/job_function_configurator/autogenerated_graphql_client/base_model.py
@@ -1,4 +1,4 @@
-# Generated by ariadne-codegen on 2023-07-28 09:56
+# Generated by ariadne-codegen on 2023-08-29 12:26
 
 from typing import Any, Dict, Type, Union, get_args, get_origin
 
diff --git a/job_function_configurator/autogenerated_graphql_client/client.py b/job_function_configurator/autogenerated_graphql_client/client.py
@@ -1,4 +1,4 @@
-# Generated by ariadne-codegen on 2023-07-28 09:56
+# Generated by ariadne-codegen on 2023-08-29 12:26
 # Source: queries.graphql
 
 from datetime import datetime
@@ -78,13 +78,14 @@ async def update_extension_field(
         self,
         uuid: UUID,
         from_date: datetime,
+        to_date: Union[Optional[datetime], UnsetType] = UNSET,
         extension_3: Union[Optional[str], UnsetType] = UNSET,
     ) -> UpdateExtensionFieldEngagementUpdate:
         query = gql(
             """
-            mutation UpdateExtensionField($uuid: UUID!, $from_date: DateTime!, $extension_3: String) {
+            mutation UpdateExtensionField($uuid: UUID!, $from_date: DateTime!, $to_date: DateTime, $extension_3: String) {
               engagement_update(
-                input: {uuid: $uuid, validity: {from: $from_date}, extension_3: $extension_3}
+                input: {uuid: $uuid, validity: {from: $from_date, to: $to_date}, extension_3: $extension_3}
               ) {
                 uuid
               }
@@ -94,6 +95,7 @@ async def update_extension_field(
         variables: dict[str, object] = {
             "uuid": uuid,
             "from_date": from_date,
+            "to_date": to_date,
             "extension_3": extension_3,
         }
         response = await self.execute(query=query, variables=variables)
diff --git a/job_function_configurator/autogenerated_graphql_client/enums.py b/job_function_configurator/autogenerated_graphql_client/enums.py
@@ -1,4 +1,4 @@
-# Generated by ariadne-codegen on 2023-07-28 09:56
+# Generated by ariadne-codegen on 2023-08-29 12:26
 # Source: schema.graphql
 
 from enum import Enum
diff --git a/job_function_configurator/autogenerated_graphql_client/exceptions.py b/job_function_configurator/autogenerated_graphql_client/exceptions.py
@@ -1,4 +1,4 @@
-# Generated by ariadne-codegen on 2023-07-28 09:56
+# Generated by ariadne-codegen on 2023-08-29 12:26
 
 from typing import Any, Dict, List, Optional, Union
 
diff --git a/job_function_configurator/autogenerated_graphql_client/get_engagement.py b/job_function_configurator/autogenerated_graphql_client/get_engagement.py
@@ -1,4 +1,4 @@
-# Generated by ariadne-codegen on 2023-07-28 09:56
+# Generated by ariadne-codegen on 2023-08-29 12:26
 # Source: queries.graphql
 
 from datetime import datetime
diff --git a/job_function_configurator/autogenerated_graphql_client/input_types.py b/job_function_configurator/autogenerated_graphql_client/input_types.py
@@ -1,4 +1,4 @@
-# Generated by ariadne-codegen on 2023-07-28 09:56
+# Generated by ariadne-codegen on 2023-08-29 12:26
 # Source: schema.graphql
 
 from datetime import datetime
diff --git a/job_function_configurator/autogenerated_graphql_client/my_mutation.py b/job_function_configurator/autogenerated_graphql_client/my_mutation.py
diff --git a/job_function_configurator/autogenerated_graphql_client/scalars.py b/job_function_configurator/autogenerated_graphql_client/scalars.py
@@ -1,4 +1,4 @@
-# Generated by ariadne-codegen on 2023-07-28 09:56
+# Generated by ariadne-codegen on 2023-08-29 12:26
 
 from typing import Any, Callable, Dict
 
diff --git a/job_function_configurator/autogenerated_graphql_client/update_extension_field.py b/job_function_configurator/autogenerated_graphql_client/update_extension_field.py
@@ -1,4 +1,4 @@
-# Generated by ariadne-codegen on 2023-07-28 09:56
+# Generated by ariadne-codegen on 2023-08-29 12:26
 # Source: queries.graphql
 
 from uuid import UUID
diff --git a/job_function_configurator/autogenerated_graphql_client/update_job_function.py b/job_function_configurator/autogenerated_graphql_client/update_job_function.py
diff --git a/job_function_configurator/depends.py b/job_function_configurator/depends.py
@@ -5,6 +5,6 @@
 from fastapi import Depends
 from ramqp.depends import from_context
 
-from autogenerated_graphql_client import GraphQLClient as _GraphQLClient
+from job_function_configurator.autogenerated_graphql_client import GraphQLClient as _GraphQLClient
 
 GraphQLClient = Annotated[_GraphQLClient, Depends(from_context("graphql_client"))]
diff --git a/job_function_configurator/main.py b/job_function_configurator/main.py
@@ -8,7 +8,7 @@
 from ramqp.mo import MORouter
 from ramqp.mo import PayloadUUID
 
-from autogenerated_graphql_client import GraphQLClient
+from job_function_configurator.autogenerated_graphql_client import GraphQLClient
 from job_function_configurator import depends
 from job_function_configurator.config import get_settings
 from job_function_configurator.log import setup_logging
diff --git a/job_function_configurator/process_events.py b/job_function_configurator/process_events.py
@@ -5,7 +5,7 @@
 import structlog
 from more_itertools import one
 
-from autogenerated_graphql_client import GraphQLClient
+from job_function_configurator.autogenerated_graphql_client import GraphQLClient
 from job_function_configurator.config import get_settings
 from job_function_configurator.helper_functions import (
     check_for_blacklisted_engagement_job_function_user_keys,
@@ -39,10 +39,7 @@ async def process_engagement_events(
         engagement_uuid, settings.email_user_key_for_address_type
     )
 
-    if (
-        engagement_object_parsed_as_model
-        or engagement_object_parsed_as_model.objects is None
-    ):
+    if len(engagement_object_parsed_as_model.objects) == 0:
         # No objects were found in the GraphQL payload - might be a termination.
         logger.info("Engagement objects are missing")
         return
@@ -60,6 +57,7 @@ async def process_engagement_events(
 
     # Use the engagements current "from" date to avoid multiple entries in database.
     update_from_date = engagement_objects.validity.from_
+    update_to_date = engagement_objects.validity.to
 
     # Check whether job functions codes are in blacklist.
     job_function_user_key = engagement_objects.job_function.user_key
@@ -70,6 +68,7 @@ async def process_engagement_events(
         await mo.update_extension_field(
             engagement_uuid,
             update_from_date,
+            update_to_date,
             settings.emtpy_content_for_extension_field_update,
         )
 
@@ -90,7 +89,7 @@ async def process_engagement_events(
             )
             job_function_name_from_sd = engagement_objects.job_function.name
             await mo.update_extension_field(
-                engagement_uuid, update_from_date, job_function_name_from_sd
+                engagement_uuid, update_from_date, update_to_date, job_function_name_from_sd
             )
             # We should have passed the check for blacklisted job function codes (user keys)
             # at this point.
@@ -131,7 +130,7 @@ async def process_engagement_events(
             new_job_function = engagement_objects.extension_2
             # Make a mutation, write the contents of extension_2, to extension_x.
             await mo.update_extension_field(
-                engagement_uuid, update_from_date, new_job_function
+                engagement_uuid, update_from_date, update_to_date, new_job_function
             )
             logger.info(
                 "An update with the contents of extension_2 was successfully made to"
@@ -142,7 +141,7 @@ async def process_engagement_events(
             # Make mutation, write what is the current job function name to the extension.
             job_function_name_from_sd = engagement_objects.job_function.name
             await mo.update_extension_field(
-                engagement_uuid, update_from_date, job_function_name_from_sd
+                engagement_uuid, update_from_date, update_to_date, job_function_name_from_sd
             )
             logger.info(
                 "An update with the job function from SD was successfully made to"
@@ -154,7 +153,7 @@ async def process_engagement_events(
         # job functions name to the new extension.
         job_function_name_from_sd = engagement_objects.job_function.name
         await mo.update_extension_field(
-            engagement_uuid, update_from_date, job_function_name_from_sd
+            engagement_uuid, update_from_date, update_to_date, job_function_name_from_sd
         )
         logger.info(
             "An update with the job function from SD was successfully made to"
diff --git a/poetry.lock b/poetry.lock
diff --git a/pyproject.toml b/pyproject.toml
diff --git a/queries.graphql b/queries.graphql
diff --git a/tests/test_queries.py b/tests/test_queries.py

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-# Generated by ariadne-codegen on 2023-07-28 09:56`
	`1`	`+# Generated by ariadne-codegen on 2023-08-29 12:26`
`2`	`2`
`3`	`3`	`from .async_base_client import AsyncBaseClient`
`4`	`4`	`from .base_model import BaseModel`