#98 - create minos-database-aiopg

.github/workflows/minos-broker-kafka-tests.yml

@@ -20,16 +20,6 @@ jobs:
         working-directory: packages/plugins/minos-broker-kafka
 
     services:
-      postgres:
-        image: postgres
-        env:
-          POSTGRES_USER: minos
-          POSTGRES_PASSWORD: min0s
-          POSTGRES_DB: order_db
-        ports:
-          - 5432:5432
-        options: --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 5
-
       zookeeper:
         image: wurstmeister/zookeeper:latest
         ports:
@@ -44,10 +34,7 @@ jobs:
           KAFKA_ADVERTISED_HOST_NAME: kafka
           KAFKA_DELETE_TOPIC_ENABLE: "true"
     env:
-      MINOS_BROKER_QUEUE_HOST: postgres
       MINOS_BROKER_HOST: kafka
-      MINOS_REPOSITORY_HOST: postgres
-      MINOS_SNAPSHOT_HOST: postgres
 
     steps:
       - name: Check out repository code

.github/workflows/minos-broker-rabbitmq-tests.yml

@@ -18,28 +18,13 @@ jobs:
         defaults:
             run:
                 working-directory: packages/plugins/minos-broker-rabbitmq
-
         services:
-            postgres:
-                image: postgres
-                env:
-                    POSTGRES_USER: minos
-                    POSTGRES_PASSWORD: min0s
-                    POSTGRES_DB: order_db
-                ports:
-                    - 5432:5432
-                options: --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 5
-
             rabbitmq:
                 image: rabbitmq:3
                 ports:
-                    - "5672:5672"
-
+                    - 5672:5672
         env:
-            MINOS_BROKER_QUEUE_HOST: postgres
             MINOS_BROKER_HOST: rabbitmq
-            MINOS_REPOSITORY_HOST: postgres
-            MINOS_SNAPSHOT_HOST: postgres
 
         steps:
             -   name: Check out repository code

.github/workflows/minos-database-aiopg-publish.yml

@@ -0,0 +1,33 @@
+name: "Publish: minos-database-aiopg"
+
+on:
+  push:
+    branches:
+      - '*.*.x'
+    paths:
+      - 'packages/plugins/minos-database-aiopg/**'
+
+jobs:
+  deploy:
+    runs-on: ubuntu-latest
+    container: python:3.9-buster
+    defaults:
+      run:
+        working-directory: packages/plugins/minos-database-aiopg
+
+    steps:
+
+      - name: Check out repository code
+        uses: actions/checkout@v2
+
+      - name: Install Poetry
+        uses: snok/install-poetry@v1
+
+      - name: Install dependencies
+        run: make install
+
+      - name: Publish package
+        run: make release
+        env:
+          POETRY_HTTP_BASIC_PYPI_USERNAME: ${{ secrets.PYPI_USERNAME }}
+          POETRY_HTTP_BASIC_PYPI_PASSWORD: ${{ secrets.PYPI_PASSWORD }}

.github/workflows/minos-database-aiopg-tests.yml

@@ -0,0 +1,64 @@
+name: "Test: minos-database-aiopg"
+
+on:
+  push:
+    branches:
+      - main
+      - '*.*.x'
+  pull_request:
+    paths:
+      - 'packages/plugins/minos-database-aiopg/**'
+      - 'packages/core/minos-microservice-aggregate/**'
+      - 'packages/core/minos-microservice-networks/**'
+      - 'packages/core/minos-microservice-common/**'
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    container: python:3.9-buster
+    defaults:
+      run:
+        working-directory: packages/plugins/minos-database-aiopg
+
+    services:
+      postgres:
+        image: postgres
+        env:
+          POSTGRES_USER: minos
+          POSTGRES_PASSWORD: min0s
+          POSTGRES_DB: order_db
+        ports:
+          - 5432:5432
+        options: --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 5
+
+    env:
+      MINOS_DATABASES_DEFAULT_HOST: postgres
+
+    steps:
+      - name: Check out repository code
+        uses: actions/checkout@v2
+
+      - name: Install Poetry
+        uses: snok/install-poetry@v1
+
+      - name: Install dependencies
+        run: make install
+
+      - name: Lint package
+        run: make lint
+
+      - name: Test package with coverage
+        run: make coverage
+
+      - name: Publish coverage
+        uses: codecov/codecov-action@v2
+        with:
+          token: ${{ secrets.CODECOV_TOKEN }}
+          files: ./packages/plugins/minos-database-aiopg/coverage.xml
+          fail_ci_if_error: true
+
+      - name: Generate documentation
+        run: make docs
+
+      - name: Generate build
+        run: make dist

.github/workflows/minos-http-aiohttp-tests.yml

@@ -19,23 +19,6 @@ jobs:
       run:
         working-directory: packages/plugins/minos-http-aiohttp
 
-    services:
-      postgres:
-        image: postgres
-        env:
-          POSTGRES_USER: minos
-          POSTGRES_PASSWORD: min0s
-          POSTGRES_DB: order_db
-        ports:
-          - 5432:5432
-        options: --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 5
-
-    env:
-      MINOS_BROKER_QUEUE_HOST: postgres
-      MINOS_BROKER_HOST: kafka
-      MINOS_REPOSITORY_HOST: postgres
-      MINOS_SNAPSHOT_HOST: postgres
-
     steps:
       - name: Check out repository code
         uses: actions/checkout@v2

.github/workflows/minos-microservice-aggregate-tests.yml

@@ -19,22 +19,6 @@ jobs:
       run:
         working-directory: packages/core/minos-microservice-aggregate
 
-    services:
-      postgres:
-        image: postgres
-        env:
-          POSTGRES_USER: minos
-          POSTGRES_PASSWORD: min0s
-          POSTGRES_DB: order_db
-        ports:
-          - 5432:5432
-        options: --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 5
-
-    env:
-      MINOS_BROKER_QUEUE_HOST: postgres
-      MINOS_REPOSITORY_HOST: postgres
-      MINOS_SNAPSHOT_HOST: postgres
-
     steps:
       - name: Check out repository code
         uses: actions/checkout@v2

.github/workflows/minos-microservice-common-tests.yml

@@ -17,21 +17,6 @@ jobs:
       run:
         working-directory: packages/core/minos-microservice-common
 
-    services:
-      postgres:
-        image: postgres
-        env:
-          POSTGRES_USER: minos
-          POSTGRES_PASSWORD: min0s
-          POSTGRES_DB: order_db
-        ports:
-          - 5432:5432
-        options: --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 5
-
-    env:
-      MINOS_DATABASES_DEFAULT_HOST: postgres
-      MINOS_DATABASES_QUERY_HOST: postgres
-
     steps:
       - name: Check out repository code
         uses: actions/checkout@v2

.github/workflows/minos-microservice-cqrs-tests.yml

@@ -20,22 +20,6 @@ jobs:
       run:
         working-directory: packages/core/minos-microservice-cqrs
 
-    services:
-      postgres:
-        image: postgres
-        env:
-          POSTGRES_USER: minos
-          POSTGRES_PASSWORD: min0s
-          POSTGRES_DB: order_db
-        ports:
-          - 5432:5432
-        options: --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 5
-
-    env:
-      MINOS_BROKER_QUEUE_HOST: postgres
-      MINOS_REPOSITORY_HOST: postgres
-      MINOS_SNAPSHOT_HOST: postgres
-
     steps:
       - name: Check out repository code
         uses: actions/checkout@v2

.github/workflows/minos-microservice-networks-tests.yml

@@ -18,23 +18,6 @@ jobs:
       run:
         working-directory: packages/core/minos-microservice-networks
 
-    services:
-      postgres:
-        image: postgres
-        env:
-          POSTGRES_USER: minos
-          POSTGRES_PASSWORD: min0s
-          POSTGRES_DB: order_db
-        ports:
-          - 5432:5432
-        options: --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 5
-
-    env:
-      MINOS_BROKER_QUEUE_HOST: postgres
-      MINOS_BROKER_HOST: kafka
-      MINOS_REPOSITORY_HOST: postgres
-      MINOS_SNAPSHOT_HOST: postgres
-
     steps:
       - name: Check out repository code
         uses: actions/checkout@v2

.github/workflows/minos-router-graphql-tests.yml

@@ -19,23 +19,6 @@ jobs:
       run:
         working-directory: packages/plugins/minos-router-graphql
 
-    services:
-      postgres:
-        image: postgres
-        env:
-          POSTGRES_USER: minos
-          POSTGRES_PASSWORD: min0s
-          POSTGRES_DB: order_db
-        ports:
-          - 5432:5432
-        options: --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 5
-
-    env:
-      MINOS_BROKER_QUEUE_HOST: postgres
-      MINOS_BROKER_HOST: kafka
-      MINOS_REPOSITORY_HOST: postgres
-      MINOS_SNAPSHOT_HOST: postgres
-
     steps:
       - name: Check out repository code
         uses: actions/checkout@v2

.pre-commit-config.yaml

@@ -44,6 +44,13 @@ repos:
                 files: ^packages/plugins/minos-broker-kafka/
                 language: system
 
+            -   id: minos-database-aiopg-check
+                pass_filenames: false
+                entry: make --directory=packages/plugins/minos-database-aiopg check
+                name: Check minos-database-aiopg
+                files: ^packages/plugins/minos-database-aiopg/
+                language: system
+
             -   id: minos-discovery-minos-check
                 pass_filenames: false
                 entry: make --directory=packages/plugins/minos-discovery-minos check

.sonarcloud.properties

@@ -1,3 +1,3 @@
 sonar.python.version=3.9
 sonar.exclusions=tutorials/**
-sonar.cpd.exclusions=**/tests/**
+sonar.cpd.exclusions=**/tests/**, **/testing/**

packages/core/minos-microservice-aggregate/minos/aggregate/__init__.py

@@ -29,7 +29,6 @@
     RootEntity,
 )
 from .events import (
-    AiopgEventDatabaseOperationFactory,
     DatabaseEventRepository,
     Event,
     EventDatabaseOperationFactory,
@@ -59,12 +58,7 @@
     Ordering,
 )
 from .snapshots import (
-    AiopgSnapshotDatabaseOperationFactory,
-    AiopgSnapshotQueryDatabaseOperationBuilder,
-    DatabaseSnapshotReader,
     DatabaseSnapshotRepository,
-    DatabaseSnapshotSetup,
-    DatabaseSnapshotWriter,
     InMemorySnapshotRepository,
     SnapshotDatabaseOperationFactory,
     SnapshotEntry,
@@ -73,7 +67,6 @@
 )
 from .transactions import (
     TRANSACTION_CONTEXT_VAR,
-    AiopgTransactionDatabaseOperationFactory,
     DatabaseTransactionRepository,
     InMemoryTransactionRepository,
     TransactionDatabaseOperationFactory,

packages/core/minos-microservice-aggregate/minos/aggregate/entities/collections.py

@@ -140,6 +140,8 @@ def decode_data(cls, decoder: DataDecoder, target: Any, type_: ModelType, **kwar
         :param type_: The data type.
         :return: A decoded instance.
         """
+        data_cls = get_args(type_.type_hints["data"])[1]
+        target = {decoder.build(v, data_cls, **kwargs) for v in target}
         target = {str(v["uuid"]): v for v in target}
         decoded = decoder.build(target, type_.type_hints["data"], **kwargs)
         return cls(decoded, additional_type_hints=type_.type_hints)

packages/core/minos-microservice-aggregate/minos/aggregate/entities/refs/extractors.py

@@ -61,7 +61,11 @@ def _build(self, value: Any, type_: type, ans: dict[str, set[Ref]]) -> None:
             self._build_iterable(value.values(), get_args(type_)[1], ans)
 
         elif isinstance(value, Ref):
-            cls = value.data_cls or get_args(type_)[0]
+            cls = value.data_cls
+            if cls is None and len(args := get_args(type_)):
+                cls = args[0]
+            if cls is None and len(args := get_args(type_.type_hints["data"])):
+                cls = args[0]
             name = cls.__name__
             ans[name].add(value)
 

packages/core/minos-microservice-aggregate/minos/aggregate/events/__init__.py

@@ -10,7 +10,6 @@
     Event,
 )
 from .repositories import (
-    AiopgEventDatabaseOperationFactory,
     DatabaseEventRepository,
     EventDatabaseOperationFactory,
     EventRepository,

packages/core/minos-microservice-aggregate/minos/aggregate/events/repositories/__init__.py

@@ -2,7 +2,6 @@
     EventRepository,
 )
 from .database import (
-    AiopgEventDatabaseOperationFactory,
     DatabaseEventRepository,
     EventDatabaseOperationFactory,
 )