Save for MergeRequestApprovalRule is working.

robinson96 · robinson96 · commit 7ad436e60137 · 2020-09-29T09:58:27.000-07:00
diff --git a/gitlab/__init__.py b/gitlab/__init__.py
@@ -588,6 +588,7 @@ def http_get(self, path, query_data=None, streamed=False, raw=False, **kwargs):
             GitlabParsingError: If the json data could not be parsed
         """
         query_data = query_data or {}
+        print(f"http_get with path {path}, {query_data}, {streamed}")
         result = self.http_request(
             "get", path, query_data=query_data, streamed=streamed, **kwargs
         )
@@ -709,6 +710,8 @@ def http_put(self, path, query_data=None, post_data=None, files=None, **kwargs):
         query_data = query_data or {}
         post_data = post_data or {}
 
+        print(f"put with {path} data {query_data}, {post_data}")
+
         result = self.http_request(
             "put",
             path,
diff --git a/gitlab/mixins.py b/gitlab/mixins.py
@@ -355,11 +355,14 @@ class SaveMixin(object):
     def _get_updated_data(self):
         updated_data = {}
         required, optional = self.manager.get_update_attrs()
+        print(f"required, optional : {required}, {optional}, {self.manager}")
         for attr in required:
             # Get everything required, no matter if it's been updated
+            print(f"getattr {attr}")
             updated_data[attr] = getattr(self, attr)
         # Add the updated attributes
         updated_data.update(self._updated_attrs)
+        print(f"updated_data is {updated_data}")
 
         return updated_data
 
@@ -384,6 +387,7 @@ def save(self, **kwargs):
         obj_id = self.get_id()
         server_data = self.manager.update(obj_id, updated_data, **kwargs)
         if server_data is not None:
+            print(f"result is {server_data}")
             self._update_attrs(server_data)
 
 
diff --git a/gitlab/v4/objects.py b/gitlab/v4/objects.py
@@ -2992,13 +2992,13 @@ class ProjectMergeRequestApprovalManager(GetWithoutIdMixin, UpdateMixin, RESTMan
 
     @exc.on_http_error(exc.GitlabUpdateError)
     def set_approvers(
-        self, approvals_required, approver_ids=None, approver_group_ids=None, **kwargs
+        self, approvals_required, approver_ids=None, approver_group_ids=None, approval_rule_name="name", **kwargs
     ):
         """Change MR-level allowed approvers and approver groups.
 
         Args:
             approvals_required (integer): The number of required approvals for this rule
-            approver_ids (list): User IDs that can approve MRs
+            approver_ids (list of integers): User IDs that can approve MRs
             approver_group_ids (list): Group IDs whose members can approve MRs
 
         Raises:
@@ -3013,14 +3013,79 @@ def set_approvers(
             self._parent.get_id(),
         )
         data = {
-            "name": "name",
+            "name": approval_rule_name,
             "approvals_required": approvals_required,
             "rule_type": "regular",
             "user_ids": approver_ids,
             "group_ids": approver_group_ids,
         }
-        self.gitlab.http_post(path, post_data=data, **kwargs)
+        print(f" data for set approvals: {data}, path {path}")
+
+        approval_rules = self.gitlab.http_get(path)
+        print(f"got some rules! {approval_rules}")
+        # TODO: this list is working, but the filtering does not appear to be working
+        approval_rules = self._parent.approval_rules.list(name=approval_rule_name)
+        print(f"approval_rules list {approval_rules}")
+        for ar in approval_rules:
+            print(f"id {ar.id} name {ar.name}, dict {ar.__dict__}")
+            if ar.name == approval_rule_name:
+                print("FOUND IT")
+                ar.user_ids = approver_ids
+                ar.save()
+        exit(0)
+        try:
+            self.gitlab.http_post(path, post_data=data, **kwargs)
+        except exc.GitlabHttpError as e:
+            name_exists = False
+            try:
+                message = e.response_body.decode()
+                name_exists = '{"message":{"name":["has already been taken"]}}' in message
+                if (name_exists):
+                    """ in this case, we determine id of name and update that approval rule."""
+                    print(self.__dict__)
+                    approval_rule = self.get(self.list(name=approval_rule_name)[0])
+                    try:
+                        approval_rule.update(data)
+                    except Exception as update_error:
+                        print("Update failed")
+                        raise  update_error
+            except:
+                raise e
+        except Exception as e:
+            print("in generic handler")
+            print(e)
+            print(e.__dict__)
+            print(type(e))
+            raise e
+        print("done with post")
+
+
+class ProjectMergeRequestApprovalRule(SaveMixin, RESTObject):
+    _id_attr = "approval_rule_id"
+    _short_print_attr = "approval_rule"
 
+    def save(self, **kwargs):
+       """ There is a mismatch between the name of our attributes and the put REST API expected names,
+           we map them over here.
+           TODO: Am I missing something more elegant here?
+        """
+       orig_id = self.id
+       self.approval_rule_id = self.id
+       self.merge_request_iid = self._parent_attrs["mr_iid"]
+       self.id = self._parent_attrs["project_id"]
+       super().save(**kwargs)
+       """ save will update self.id with the result from the server, so no need to overwrite with 
+           what it was before we hacked it."""
+
+    
+
+class ProjectMergeRequestApprovalRuleManger(ListMixin, UpdateMixin, RESTManager):
+    _path = "/projects/%(project_id)s/merge_requests/%(mr_iid)s/approval_rules"
+    _obj_cls = ProjectMergeRequestApprovalRule
+    _from_parent_attrs = {"project_id": "project_id", "mr_iid": "iid"}
+    _list_filters = ("name","rule_type")
+    _update_attrs = (("id","merge_request_iid","approval_rule_id","name","approvals_required"),
+                    ("user_ids","group_ids")) 
 
 class ProjectMergeRequestAwardEmoji(ObjectDeleteMixin, RESTObject):
     pass
@@ -3145,6 +3210,7 @@ class ProjectMergeRequest(
 
     _managers = (
         ("approvals", "ProjectMergeRequestApprovalManager"),
+        ("approval_rules", "ProjectMergeRequestApprovalRuleManger"),
         ("awardemojis", "ProjectMergeRequestAwardEmojiManager"),
         ("diffs", "ProjectMergeRequestDiffManager"),
         ("discussions", "ProjectMergeRequestDiscussionManager"),
