Add assets in ValidationResultRead schema (#348)

Author: eleftherioszisis

app/schemas/validation.py

@@ -4,6 +4,7 @@
 
 from app.schemas.activity import ActivityCreate, ActivityRead, ActivityUpdate
 from app.schemas.agent import CreatedByUpdatedByMixin
+from app.schemas.asset import AssetsMixin
 from app.schemas.base import (
     AuthorizationMixin,
     AuthorizationOptionalPublicMixin,
@@ -36,6 +37,7 @@ class ValidationResultRead(
     IdentifiableMixin,
     CreatedByUpdatedByMixin,
     AuthorizationMixin,
+    AssetsMixin,
 ):
     pass
 

app/service/validation_result.py

@@ -1,7 +1,7 @@
 import uuid
 
 import sqlalchemy as sa
-from sqlalchemy.orm import joinedload, raiseload
+from sqlalchemy.orm import joinedload, raiseload, selectinload
 
 from app.db.model import Subject, ValidationResult
 from app.dependencies.auth import UserContextDep, UserContextWithProjectIdDep
@@ -23,6 +23,7 @@ def _load(query: sa.Select):
         joinedload(Subject.species),
         joinedload(ValidationResult.created_by),
         joinedload(ValidationResult.updated_by),
+        selectinload(ValidationResult.assets),
         raiseload("*"),
     )
 

tests/test_validation_result.py

@@ -35,6 +35,7 @@ def _assert_read_response(data, json_data):
     assert data["validated_entity_id"] == json_data["validated_entity_id"]
     assert data["created_by"]["id"] == data["updated_by"]["id"]
     assert data["creation_date"] == data["update_date"]
+    assert "assets" in data
 
 
 def test_read_one(client: TestClient, validation_result_id, json_data):