feat(functional): merge train -> merge request :> status fetch

isaac-philip · JohnVillalovos · commit 761ff6741761 · 2025-06-07T08:04:51.000-07:00
diff --git a/gitlab/v4/objects/merge_trains.py b/gitlab/v4/objects/merge_trains.py
@@ -1,14 +1,32 @@
-from gitlab.base import RESTObject
-from gitlab.mixins import ListMixin
+from gitlab.base import RESTManager, RESTObject
+from gitlab.mixins import CRUDMixin, GetMixin, ListMixin
+from gitlab.types import RequiredOptional
 
-__all__ = ["ProjectMergeTrain", "ProjectMergeTrainManager"]
+__all__ = [
+    "ProjectMergeTrain",
+    "ProjectMergeTrainManager",
+    "ProjectMergeTrainMergeRequest",
+    "ProjectMergeTrainMergeRequestManager",
+]
 
 
-class ProjectMergeTrain(RESTObject):
+class ProjectMergeTrainMergeRequest(RESTObject):
     pass
 
 
-class ProjectMergeTrainManager(ListMixin[ProjectMergeTrain]):
+class ProjectMergeTrainMergeRequestManager(CRUDMixin, RESTManager):
+    _path = "/projects/{project_id}/merge_trains/merge_requests"
+    _obj_cls = ProjectMergeTrainMergeRequest
+    _from_parent_attrs = {"project_id": "project_id"}
+
+    _update_attrs = RequiredOptional(optional=("position",))
+
+
+class ProjectMergeTrain(RESTObject):
+    merge_requests: ProjectMergeTrainMergeRequestManager
+
+
+class ProjectMergeTrainManager(GetMixin, ListMixin, RESTManager):
     _path = "/projects/{project_id}/merge_trains"
     _obj_cls = ProjectMergeTrain
     _from_parent_attrs = {"project_id": "id"}
diff --git a/gitlab/v4/objects/projects.py b/gitlab/v4/objects/projects.py
@@ -64,7 +64,7 @@
     ProjectApprovalRuleManager,
 )
 from .merge_requests import ProjectMergeRequestManager  # noqa: F401
-from .merge_trains import ProjectMergeTrainManager  # noqa: F401
+from .merge_trains import ProjectMergeTrainManager
 from .milestones import ProjectMilestoneManager  # noqa: F401
 from .notes import ProjectNoteManager  # noqa: F401
 from .notification_settings import ProjectNotificationSettingsManager  # noqa: F401
diff --git a/tests/unit/objects/test_merge_trains.py b/tests/unit/objects/test_merge_trains.py
@@ -6,7 +6,7 @@
 import pytest
 import responses
 
-from gitlab.v4.objects import ProjectMergeTrain
+from gitlab.v4.objects import ProjectMergeTrain, ProjectMergeTrainMergeRequest
 
 mr_content = {
     "id": 110,
@@ -60,7 +60,31 @@ def resp_list_merge_trains():
         yield rsps
 
 
+@pytest.fixture
+def resp_merge_trains_merge_request_get():
+    with responses.RequestsMock() as rsps:
+        rsps.add(
+            method=responses.GET,
+            url="http://localhost/api/v4/projects/1/merge_trains/merge_requests/123",
+            json=mr_content,
+            content_type="application/json",
+            status=200,
+        )
+        yield rsps
+
+
 def test_list_project_merge_requests(project, resp_list_merge_trains):
     merge_trains = project.merge_trains.list()
     assert isinstance(merge_trains[0], ProjectMergeTrain)
     assert merge_trains[0].id == mr_content["id"]
+
+
+def test_merge_trains_status_merge_request(
+    project, resp_merge_trains_merge_request_get
+):
+    # flow will be : project -> merge_trains : -> get merge_requests -> merge_request_iod
+    merge_train_mr: ProjectMergeTrainMergeRequest = project.merge_trains.get(
+        1, lazy=True
+    ).merge_requests.get(123)
+    assert isinstance(merge_train_mr, ProjectMergeTrainMergeRequest)
+    assert merge_train_mr.get_id() == 110

Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,7 @@`
`64`	`64`	`ProjectApprovalRuleManager,`
`65`	`65`	`)`
`66`	`66`	`from .merge_requests import ProjectMergeRequestManager # noqa: F401`
`67`		`-from .merge_trains import ProjectMergeTrainManager # noqa: F401`
	`67`	`+from .merge_trains import ProjectMergeTrainManager`
`68`	`68`	`from .milestones import ProjectMilestoneManager # noqa: F401`
`69`	`69`	`from .notes import ProjectNoteManager # noqa: F401`
`70`	`70`	`from .notification_settings import ProjectNotificationSettingsManager # noqa: F401`