Fix swapped strict_match check and wrong approval access

niklasstoffers · Dec 22, 2023 · 29f12f9 · 29f12f9
1 parent 227d01d
commit 29f12f9
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/services/gitlab/events/comment/comment_event_service.py b/src/services/gitlab/events/comment/comment_event_service.py
@@ -21,8 +21,8 @@ def __is_command_invocation(self, event: CommentEvent, command: Command):
             message = message.lower()
 
         if command.strict_match:
-            return keyword in message
-        return keyword == message
+            return keyword == message
+        return keyword in message
 
     def __handle_merge_comment(self, event: CommentEvent):
         if event.merge_request is None:

diff --git a/src/services/gitlab/gitlab_client.py b/src/services/gitlab/gitlab_client.py
@@ -22,7 +22,7 @@ def get_merge_request(self, project_id: int, merge_request_iid: int) -> ProjectM
     def is_merge_request_approved_by(self, merge_request: ProjectMergeRequest, username: str) -> bool:
         approvals: ProjectMergeRequestApproval = merge_request.approvals.get()
         for approval in approvals.attributes["approved_by"]:
-            if approval.user is not None and approval.user.username == username:
+            if approval['user']['username'] == username:
                 return True
         return False