Merge branch 'tough-dev-school:master' into lesson1

Author: AlexKupreev

.github/workflows/ci.yml

@@ -26,13 +26,13 @@ jobs:
         run: cp config/.env.template config/.env
 
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
+        uses: docker/setup-qemu-action@v3
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
+        uses: docker/setup-buildx-action@v3
 
       - name: Build the image
-        uses: docker/bake-action@v3
+        uses: docker/bake-action@v4
         with:
           files: docker-compose.yml
           targets: web

.importlinter

@@ -16,10 +16,10 @@ containers =
 layers =
   (urls) | (admin)
   (views)
-  (infrastructure)
+  (container)
   (logic)
+  (infrastructure)
   (models)
-  (container)
 
 
 [importlinter:contract:apps-independence]

…apps/identity/intrastructure/__init__.py …apps/identity/infrastructure/__init__.pyserver/apps/identity/intrastructure/__init__.py renamed to server/apps/identity/infrastructure/__init__.py server/apps/identity/intrastructure/__init__.py renamed to server/apps/identity/infrastructure/__init__.py

@@ -17,7 +17,7 @@ class UserResponse(pydantic_model.BaseModel):
 # TODO: use redis-based caching
 @final
 class LeadCreate(http.BaseFetcher):
-    """Service around creating new users and fething their :term:`lead_id`."""
+    """Service around creating new users and fetching their :term:`lead_id`."""
 
     _url_path = '/users'
 
@@ -33,7 +33,7 @@ def __call__(
             timeout=self._api_timeout,
         )
         response.raise_for_status()
-        return UserResponse.parse_raw(response.text)
+        return UserResponse.model_validate_json(response.text)
 
 
 @final

…entity/intrastructure/django/__init__.py …entity/infrastructure/django/__init__.pyserver/apps/identity/intrastructure/django/__init__.py renamed to server/apps/identity/infrastructure/django/__init__.py server/apps/identity/intrastructure/django/__init__.py renamed to server/apps/identity/infrastructure/django/__init__.py

@@ -2,7 +2,7 @@
 
 import attr
 
-from server.apps.identity.intrastructure.services import placeholder
+from server.apps.identity.infrastructure.services import placeholder
 from server.apps.identity.models import User
 from server.common.django.types import Settings
 

…tity/intrastructure/django/decorators.py …tity/infrastructure/django/decorators.pyserver/apps/identity/intrastructure/django/decorators.py renamed to server/apps/identity/infrastructure/django/decorators.py server/apps/identity/intrastructure/django/decorators.py renamed to server/apps/identity/infrastructure/django/decorators.py

@@ -2,7 +2,7 @@
 
 import attr
 
-from server.apps.identity.intrastructure.services import placeholder
+from server.apps.identity.infrastructure.services import placeholder
 from server.apps.identity.models import User
 from server.common.django.types import Settings