moderation: removed resource & refactored service

Author: alejandromumo

invenio_requests/config.py

@@ -8,7 +8,7 @@
 
 """Invenio module for generic and customizable requests."""
 
-from invenio_users_resources.entity_resolvers import RoleResolver, UserResolver
+from invenio_users_resources.entity_resolvers import GroupResolver, UserResolver
 
 from invenio_requests.services.requests import facets
 
@@ -27,7 +27,7 @@
 ]
 """Configuration for registered Request Event Types."""
 
-REQUESTS_ENTITY_RESOLVERS = [UserResolver(), RoleResolver()]
+REQUESTS_ENTITY_RESOLVERS = [UserResolver(), GroupResolver()]
 """Registered resolvers for resolving/creating references in request metadata."""
 
 REQUESTS_ROUTES = {
@@ -53,3 +53,6 @@
 
 REQUESTS_TIMELINE_PAGE_SIZE = 15
 """Amount of items per page on the request details timeline"""
+
+REQUESTS_USER_MODERATION_RECEIVER = None
+"""Default receiver for user moderation requests."""

invenio_requests/customizations/user_moderation/user_moderation.py

@@ -7,7 +7,7 @@
 """User moderation requests."""
 
 from invenio_i18n import lazy_gettext as _
-from invenio_users_resources.permissions import moderation_action
+from invenio_users_resources.proxies import current_users_service
 
 from invenio_requests.customizations import RequestType, actions
 
@@ -17,26 +17,20 @@ class BlockUserAction(actions.DeclineAction):
 
     def execute(self, identity, uow):
         """Executes block action."""
-        # TODO add specific user block actions
+        user = self.request.topic.resolve()
+        current_users_service.block(identity, user.id, uow=uow)
         super().execute(identity, uow)
 
-    # Allow APPROVED -> BLOCKED transition
-    status_from = ["submitted", "accepted"]
-    status_to = "declined"
-
 
 class ApproveUserAction(actions.AcceptAction):
     """Represents an accept action used to aprove an user."""
 
     def execute(self, identity, uow):
         """Executes aprove action."""
-        # TODO add specific user block actions
+        user = self.request.topic.resolve()
+        current_users_service.approve(identity, user.id, uow=uow)
         super().execute(identity, uow)
 
-    # Allow BLOCKED -> APPROVED transition
-    status_from = ["submitted", "declined"]
-    status_to = "accepted"
-
 
 class UserModeration(RequestType):
     """Request to moderate an user."""
@@ -46,12 +40,10 @@ class UserModeration(RequestType):
 
     creator_can_be_none = False
     topic_can_be_none = False
-    allowed_creator_ref_types = ["role"]
-    allowed_receiver_ref_types = ["role"]
+    allowed_creator_ref_types = ["group"]
+    allowed_receiver_ref_types = ["group"]
     allowed_topic_ref_types = ["user"]
 
-    needs_context = {"roles": [moderation_action.value]}
-
     available_actions = {
         "delete": actions.DeleteAction,
         "submit": actions.SubmitAction,

invenio_requests/ext.py

@@ -18,8 +18,6 @@
     RequestCommentsResourceConfig,
     RequestsResource,
     RequestsResourceConfig,
-    UserModerationResource,
-    UserModerationResourceConfig,
 )
 from .services import (
     RequestEventsService,
@@ -92,11 +90,6 @@ def init_resources(self):
             config=RequestCommentsResourceConfig,
         )
 
-        self.user_moderation_requests_resource = UserModerationResource(
-            service=self.user_moderation_requests_service,
-            config=UserModerationResourceConfig,
-        )
-
     def init_registry(self, app):
         """Initialize the registry for Requests per type."""
         self.request_type_registry = TypeRegistry(

invenio_requests/resources/__init__.py

@@ -12,13 +12,10 @@
 
 from .events import RequestCommentsResource, RequestCommentsResourceConfig
 from .requests import RequestsResource, RequestsResourceConfig
-from .user_moderation import UserModerationResource, UserModerationResourceConfig
 
 __all__ = (
     "RequestsResource",
     "RequestsResourceConfig",
     "RequestCommentsResource",
     "RequestCommentsResourceConfig",
-    "UserModerationResource",
-    "UserModerationResourceConfig",
 )

invenio_requests/resources/user_moderation/__init__.py

@@ -10,15 +10,14 @@
 
 """Request permissions."""
 
-from invenio_records_permissions import BasePermissionPolicy, RecordPermissionPolicy
+from invenio_records_permissions import RecordPermissionPolicy
 from invenio_records_permissions.generators import (
     AnyUser,
     AuthenticatedUser,
     Disable,
     SystemProcess,
     SystemProcessWithoutSuperUser,
 )
-from invenio_users_resources.services.generators import UserModeration
 
 from .generators import Commenter, Creator, Receiver, Status