Require aiod_entry instead of concept

Author: PGijsbers

src/database/authorization.py

@@ -82,17 +82,14 @@ def register_user(kc_user: KeycloakUser, session: Session) -> User:
 
 
 def set_permission(
-    user: KeycloakUser, resource: AIoDConcept, session: Session, *, type_: PermissionType
+    user: KeycloakUser, resource: AIoDEntryORM, session: Session, *, type_: PermissionType
 ):
     key = {
         "user_identifier": user._subject_identifier,
-        "aiod_entry_identifier": resource.aiod_entry_identifier,
+        "aiod_entry_identifier": resource.identifier,
     }
     permission = session.get(Permission, key)
     if permission is None:
-        permission = Permission(
-            user_identifier=user._subject_identifier,
-            aiod_entry=resource.aiod_entry,
-        )
+        permission = Permission(user_identifier=user._subject_identifier, aiod_entry=resource)
     permission.type_ = type_
     session.add(permission)

src/routers/resource_router.py

@@ -418,7 +418,9 @@ def register_resource(
                     try:
                         resource = self.create_resource(session, resource_create)
                         register_user(user, session)
-                        set_permission(user, resource, session, type_=PermissionType.ADMIN)
+                        set_permission(
+                            user, resource.aiod_entry, session, type_=PermissionType.ADMIN
+                        )
                         session.commit()
                         return self._wrap_with_headers({"identifier": resource.identifier})
                     except Exception as e:

src/tests/authorization/test_authorization.py

@@ -325,7 +325,7 @@ def register_asset(asset: AIoDConcept, /, *, owner: KeycloakUser, status: EntryS
         session.commit()
 
         register_user(owner, session)
-        set_permission(owner, asset, session, type_=PermissionType.ADMIN)
+        set_permission(owner, asset.aiod_entry, session, type_=PermissionType.ADMIN)
 
         asset.aiod_entry.status = status
         if status in [EntryStatus.SUBMITTED, EntryStatus.PUBLISHED, EntryStatus.REJECTED]: