handle replace model case

Author: wobrschalek

src/sysmlv2_client/client.py

@@ -126,21 +126,30 @@ def get_owned_elements(self, project_id: str, element_id: str, commit_id: str =
         else:
             return []
 
-    def create_commit(self, project_id: str, commit_data: Dict[str, Any], branch_id:str = None) -> Dict[str, Any]:
-        if branch_id is None:
-            # this takes the default branch
-            endpoint = f"/projects/{project_id}/commits"
-        else:
-            endpoint = f"/projects/{project_id}/commits?branchId={branch_id}"
+    def create_commit(self, project_id: str, commit_data: Dict[str, Any], branch_id:str = None, replace:bool = False) -> Dict[str, Any]:
+        params = []
+
+        if replace:
+            params.append("replace=true")
+
+        if branch_id is not None:
+            params.append(f"branchId={branch_id}")
+
+        endpoint = f"/projects/{project_id}/commits"
+        if params:
+            endpoint += "?" + "&".join(params)
+
         #print (">>> DEBUG create_commit")
         #print (endpoint)
         #print (commit_data)
+
         return self._request(
             method="POST",
             endpoint=endpoint,
             data=commit_data,
             expected_status=200 
         )
+    
     def get_commit_by_id(self, project_id: str, commit_id: str) -> Dict[str, Any]:
         endpoint = f"/projects/{project_id}/commits/{commit_id}"
         return self._request(method="GET", endpoint=endpoint, expected_status=200)

tests/test_client.py

@@ -245,6 +245,55 @@ def test_create_commit_success(client, requests_mock):
     assert requests_mock.last_request.method == "POST"
     assert requests_mock.last_request.json() == request_data
 
+def test_create_commit_with_branch_id(client, requests_mock):
+    """Tests commit creation with a branch query parameter."""
+    branch_id = "branch_123"
+    mock_url = f"{TEST_BASE_URL}/projects/{TEST_PROJECT_ID}/commits?branchId={branch_id}"
+    request_data = {"message": "Branch commit", "parentCommitId": None}
+    response_data = {"id": "branch_commit_id", **request_data}
+    requests_mock.post(mock_url, json=response_data, status_code=200)
+
+    created_commit = client.create_commit(TEST_PROJECT_ID, request_data, branch_id=branch_id)
+
+    assert created_commit == response_data
+    assert requests_mock.last_request.url == mock_url
+    assert requests_mock.last_request.method == "POST"
+    assert requests_mock.last_request.json() == request_data
+
+def test_create_commit_with_replace(client, requests_mock):
+    """Tests commit creation with the replace query parameter."""
+    mock_url = f"{TEST_BASE_URL}/projects/{TEST_PROJECT_ID}/commits?replace=true"
+    request_data = {"message": "Replace commit", "parentCommitId": None}
+    response_data = {"id": "replace_commit_id", **request_data}
+    requests_mock.post(mock_url, json=response_data, status_code=200)
+
+    created_commit = client.create_commit(TEST_PROJECT_ID, request_data, replace=True)
+
+    assert created_commit == response_data
+    assert requests_mock.last_request.url == mock_url
+    assert requests_mock.last_request.method == "POST"
+    assert requests_mock.last_request.json() == request_data
+
+def test_create_commit_with_branch_id_and_replace(client, requests_mock):
+    """Tests commit creation with both branchId and replace query parameters."""
+    branch_id = "branch_123"
+    mock_url = f"{TEST_BASE_URL}/projects/{TEST_PROJECT_ID}/commits?replace=true&branchId={branch_id}"
+    request_data = {"message": "Replace branch commit", "parentCommitId": None}
+    response_data = {"id": "replace_branch_commit_id", **request_data}
+    requests_mock.post(mock_url, json=response_data, status_code=200)
+
+    created_commit = client.create_commit(
+        TEST_PROJECT_ID,
+        request_data,
+        branch_id=branch_id,
+        replace=True,
+    )
+
+    assert created_commit == response_data
+    assert requests_mock.last_request.url == mock_url
+    assert requests_mock.last_request.method == "POST"
+    assert requests_mock.last_request.json() == request_data
+
 def test_create_commit_bad_request(client, requests_mock):
     """Tests 400 Bad Request during commit creation."""
     mock_url = f"{TEST_BASE_URL}/projects/{TEST_PROJECT_ID}/commits"
@@ -460,4 +509,4 @@ def test_list_relationships_element_not_found(client, requests_mock):
     mock_url = f"{TEST_BASE_URL}/projects/{TEST_PROJECT_ID}/commits/{TEST_COMMIT_ID}/elements/invalid_element/relationships?direction=both"
     requests_mock.get(mock_url, status_code=404)
     with pytest.raises(SysMLV2NotFoundError):
-        client.list_relationships(TEST_PROJECT_ID, "invalid_element", TEST_COMMIT_ID)
+        client.list_relationships(TEST_PROJECT_ID, "invalid_element", TEST_COMMIT_ID)