fix: draft 11 metadata structure

Signed-off-by: Daniel Bluhm <[email protected]>

oid4vci/oid4vci/v1_0/models/supported_cred.py

@@ -57,10 +57,10 @@ def __init__(
         self.display = display
         self.format_data = format_data
 
-    # @property
-    # def supported_cred_id(self):
-    #    """Accessor for the ID associated with this record."""
-    #    return self._id
+    @property
+    def supported_cred_id(self):
+        """Accessor for the ID associated with this record."""
+        return self._id
 
     @property
     def record_value(self) -> dict:
@@ -88,7 +88,7 @@ def to_issuer_metadata(self) -> dict:
             prop: getattr(self, prop)
             for prop in (
                 "format",
-                # "identifier",
+                "identifier",
                 "cryptographic_binding_methods_supported",
                 "cryptographic_suites_supported",
                 "display",
@@ -99,7 +99,7 @@ def to_issuer_metadata(self) -> dict:
             **issuer_metadata,
             **(self.format_data or {}),
         }
-        return {self.identifier: issuer_metadata}
+        return issuer_metadata
 
 
 class SupportedCredentialSchema(BaseRecordSchema):
@@ -116,7 +116,7 @@ class Meta:
     )
     format = fields.Str(required=True, metadata={"example": "jwt_vc_json"})
     identifier = fields.Str(
-        data_key="id", required=True, metadata={"example": "UniversityDegreeCredential"}
+        required=True, metadata={"example": "UniversityDegreeCredential"}
     )
     cryptographic_binding_methods_supported = fields.List(
         fields.Str(), metadata={"example": []}

oid4vci/tests/models/test_supported_cred.py

@@ -0,0 +1,33 @@
+from aries_cloudagent.core.profile import Profile
+import pytest
+
+from oid4vci.v1_0.models.supported_cred import SupportedCredential
+
+
+@pytest.fixture
+def record():
+    yield SupportedCredential(
+        format="jwt_vc_json",
+        identifier="MyCredential",
+        cryptographic_suites_supported=["EdDSA"],
+        format_data={
+            "credentialSubject": {"name": "alice"},
+        },
+    )
+
+
+def test_serde(record: SupportedCredential):
+    record._id = "123"
+    serialized = record.serialize()
+    deserialized = SupportedCredential.deserialize(serialized)
+    assert record == deserialized
+
+
+@pytest.mark.asyncio
+async def test_save(profile: Profile, record: SupportedCredential):
+    async with profile.session() as session:
+        await record.save(session)
+        loaded = await SupportedCredential.retrieve_by_id(
+            session, record.supported_cred_id
+        )
+        assert loaded == record