updating git config and added pr workflow

Author: Deepak-Gnanasekar

CLAUDE.md

@@ -44,11 +44,39 @@ Frontend:
 - [x] `DraftValidator`: implemented at `backend/application/model_validator/draft_validator.py`
 - [x] `validate_draft` view: fully wired to DraftValidator
 
+### Git Config Feature — COMPLETE
+Security: Admin-only write endpoints, server-side token validation,
+  project-level access check, log level fix, double encryption guard
+GitHub Actions: Branch creation, PR creation, PR workflow on commit
+GitLab: Full parity with GitHub — all 10 methods, MR support,
+  self-hosted detection
+
+- [x] Phase 1A: Admin-only endpoints + server-side token validation + log level fix + double encryption guard
+- [x] Phase 1B: Project-level access check on all git config operations
+- [x] Phase 2A: Branch + PR methods in GitHubService
+- [x] Phase 2B: PR workflow service + model fields + commit wire-in
+- [x] Phase 2C: branches, enable-pr-workflow, get-version-pr endpoints
+- [x] Phase 2D: PR workflow UI in GitConfigTab + PR badge in VersionTimeline
+- [x] Phase 3: GitLab support (GitLabService + factory + frontend labels)
+- [x] Manual PR workflow: pr_mode enum (disabled/auto/manual)
+- [x] git_branch_name on ModelVersion for manual PR tracking
+- [x] git_pr_service split: push_version_to_branch + create_pr_for_version
+- [x] create-pr endpoint: POST version/{n}/create-pr
+- [x] GitConfigTab: Segmented mode selector (Off/Auto PR/Manual PR)
+- [x] VersionTimeline: Create PR/MR in action dropdown (manual mode only)
+- [x] 409 handled gracefully — existing PR shown with link
+
 ### Bug fixes (post-migration)
 - `execute_version`: fixed concurrency (Redis lock + `select_for_update`)
 - `_serialize_version`: added `is_current` to response dict
 - `get_draft_status`: fixed `committed_data` lookup to use project-level ModelVersion (`config_model=None`) instead of model-scoped versions
 - dual-write: added `skip_draft_write` flag to `_update_model` — execution pipeline no longer creates false draft records
 - `set_current_version`: added cache invalidation after DB update
 - `handleExecuteSuccess`: added `loadDraftStatus()` call to clear stale draft indicator after execute
+- `execute_version`: model data now persists on success (restore only on failure)
+- `_update_config`: replaced `pr_workflow_enabled` with `pr_mode` in field list, added `_READONLY_PROPS` skip set
+- `enable_pr_workflow` view: sends `pr_mode` instead of `pr_workflow_enabled`
+- `_serialize_config`: added `pr_mode` to API response (was missing — caused UI to reset to Off on tab switch)
+- VersionTimeline: `isManualMode` → `prWorkflowEnabled` — Create PR button now shows for any enabled PR mode
+- GitConfigTab: added `useEffect` to sync `prMode`/`prBaseBranch`/`prBranchPrefix` from gitConfig on async load
 ---

backend/backend/core/migrations/0005_pr_workflow_fields.py

@@ -0,0 +1,38 @@
+# Generated by Django 4.2.10 on 2026-04-02 17:40
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("core", "0004_add_is_current_to_modelversion"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="gitrepoconfig",
+            name="pr_base_branch",
+            field=models.CharField(default="main", max_length=255),
+        ),
+        migrations.AddField(
+            model_name="gitrepoconfig",
+            name="pr_branch_prefix",
+            field=models.CharField(default="visitran/", max_length=100),
+        ),
+        migrations.AddField(
+            model_name="gitrepoconfig",
+            name="pr_workflow_enabled",
+            field=models.BooleanField(default=False),
+        ),
+        migrations.AddField(
+            model_name="modelversion",
+            name="pr_number",
+            field=models.IntegerField(blank=True, null=True),
+        ),
+        migrations.AddField(
+            model_name="modelversion",
+            name="pr_url",
+            field=models.CharField(blank=True, max_length=500, null=True),
+        ),
+    ]

backend/backend/core/migrations/0006_pr_mode_and_branch_name.py

@@ -0,0 +1,31 @@
+# Generated by Django 4.2.10 on 2026-04-02 18:34
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("core", "0005_pr_workflow_fields"),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name="gitrepoconfig",
+            name="pr_workflow_enabled",
+        ),
+        migrations.AddField(
+            model_name="gitrepoconfig",
+            name="pr_mode",
+            field=models.CharField(
+                choices=[("disabled", "Disabled"), ("auto", "Auto"), ("manual", "Manual")],
+                default="disabled",
+                max_length=20,
+            ),
+        ),
+        migrations.AddField(
+            model_name="modelversion",
+            name="git_branch_name",
+            field=models.CharField(blank=True, max_length=255, null=True),
+        ),
+    ]

backend/backend/core/models/git_repo_config.py

@@ -69,6 +69,23 @@ class GitRepoConfig(DefaultOrganizationMixin, BaseModel):
     )
     error_message = models.TextField(blank=True, default="")
 
+    # PR workflow settings
+    PR_MODE_DISABLED = "disabled"
+    PR_MODE_AUTO = "auto"
+    PR_MODE_MANUAL = "manual"
+    PR_MODE_CHOICES = [
+        (PR_MODE_DISABLED, "Disabled"),
+        (PR_MODE_AUTO, "Auto"),
+        (PR_MODE_MANUAL, "Manual"),
+    ]
+    pr_mode = models.CharField(max_length=20, choices=PR_MODE_CHOICES, default=PR_MODE_DISABLED)
+    pr_base_branch = models.CharField(max_length=255, default="main")
+    pr_branch_prefix = models.CharField(max_length=100, default="visitran/")
+
+    @property
+    def pr_workflow_enabled(self):
+        return self.pr_mode != self.PR_MODE_DISABLED
+
     is_deleted = models.BooleanField(default=False)
     created_by = models.JSONField(default=dict)
     last_modified_by = models.JSONField(default=dict)

backend/backend/core/models/model_version.py

@@ -79,6 +79,11 @@ class ModelVersion(DefaultOrganizationMixin, BaseModel):
     )
     git_commit_sha = models.CharField(max_length=40, blank=True, default="")
 
+    # PR tracking
+    git_branch_name = models.CharField(max_length=255, null=True, blank=True)
+    pr_number = models.IntegerField(null=True, blank=True)
+    pr_url = models.CharField(max_length=500, null=True, blank=True)
+
     # Denormalized search fields (extracted from model_data for indexed queries)
     extracted_model_name = models.CharField(
         max_length=200, blank=True, default="", db_index=True

backend/backend/core/routers/git_config/urls.py

@@ -2,15 +2,19 @@
 
 from backend.core.routers.git_config.views import (
     delete_git_config,
+    enable_pr_workflow,
     get_available_repos,
     get_git_config,
+    list_branches,
     save_git_config,
     test_git_connection,
 )
 
 urlpatterns = [
     path("/test", test_git_connection, name="test-git-connection"),
     path("/available-repos", get_available_repos, name="get-available-repos"),
+    path("/branches", list_branches, name="list-branches"),
+    path("/enable-pr-workflow", enable_pr_workflow, name="enable-pr-workflow"),
     path("/save", save_git_config, name="save-git-config"),
     path("/delete", delete_git_config, name="delete-git-config"),
     path("", get_git_config, name="get-git-config"),

backend/backend/core/routers/git_config/views.py

@@ -8,8 +8,10 @@
 from rest_framework.response import Response
 
 from backend.core.services import git_repo_config_service
+from backend.core.services.git_service import get_git_service
 from backend.core.utils import handle_http_request
 from backend.utils.constants import HTTPMethods
+from rbac.factory import handle_permission
 
 logger = logging.getLogger(__name__)
 
@@ -26,6 +28,7 @@ def get_git_config(request: Request, project_id: str) -> Response:
 
 @api_view([HTTPMethods.POST])
 @handle_http_request
+@handle_permission
 def save_git_config(request: Request, project_id: str) -> Response:
     """Create or update git repository configuration for a project."""
     config = git_repo_config_service.save_config(project_id=project_id, config_data=request.data)
@@ -34,6 +37,7 @@ def save_git_config(request: Request, project_id: str) -> Response:
 
 @api_view([HTTPMethods.DELETE])
 @handle_http_request
+@handle_permission
 def delete_git_config(request: Request, project_id: str) -> Response:
     """Remove git repository configuration (disable versioning)."""
     git_repo_config_service.delete_config(project_id=project_id)
@@ -45,6 +49,7 @@ def delete_git_config(request: Request, project_id: str) -> Response:
 
 @api_view([HTTPMethods.POST])
 @handle_http_request
+@handle_permission
 def test_git_connection(request: Request, project_id: str) -> Response:
     """Test connection to a git repository."""
     result = git_repo_config_service.test_connection(project_id=project_id, config_data=request.data)
@@ -57,3 +62,63 @@ def get_available_repos(request: Request, project_id: str) -> Response:
     """List repos already configured in the organization."""
     repos = git_repo_config_service.get_available_repos()
     return Response(data={"status": "success", "data": repos}, status=status.HTTP_200_OK)
+
+
+@api_view([HTTPMethods.GET])
+@handle_http_request
+def list_branches(request: Request, project_id: str) -> Response:
+    """List branches in the project's configured git repository."""
+    from backend.core.models.git_repo_config import GitRepoConfig
+
+    config = GitRepoConfig.objects.filter(
+        project_id=project_id, is_deleted=False, is_active=True,
+    ).first()
+    if not config:
+        return Response(
+            data={"status": "failed", "error_message": "No git configuration found for this project."},
+            status=status.HTTP_404_NOT_FOUND,
+        )
+    service = get_git_service(config)
+    branches = service.list_branches()
+    return Response(data={"status": "success", "data": {"branches": branches}}, status=status.HTTP_200_OK)
+
+
+@api_view([HTTPMethods.POST])
+@handle_http_request
+@handle_permission
+def enable_pr_workflow(request: Request, project_id: str) -> Response:
+    """Enable PR workflow for a project's git configuration."""
+    payload = request.data
+    pr_mode = payload.get("pr_mode", "auto")
+    pr_base_branch = payload.get("pr_base_branch", "main")
+    pr_branch_prefix = payload.get("pr_branch_prefix", "visitran/")
+
+    from backend.core.models.git_repo_config import GitRepoConfig
+
+    config = GitRepoConfig.objects.filter(
+        project_id=project_id, is_deleted=False, is_active=True,
+    ).first()
+    if not config:
+        return Response(
+            data={"status": "failed", "error_message": "No git configuration found for this project."},
+            status=status.HTTP_404_NOT_FOUND,
+        )
+
+    # Validate that the base branch exists
+    service = get_git_service(config)
+    branch_info = service.get_branch(pr_base_branch)
+    if not branch_info:
+        return Response(
+            data={"status": "failed", "error_message": f"Branch '{pr_base_branch}' not found in repository."},
+            status=status.HTTP_400_BAD_REQUEST,
+        )
+
+    updated = git_repo_config_service.save_config(
+        project_id=project_id,
+        config_data={
+            "pr_mode": pr_mode,
+            "pr_base_branch": pr_base_branch,
+            "pr_branch_prefix": pr_branch_prefix,
+        },
+    )
+    return Response(data={"status": "success", "data": updated}, status=status.HTTP_200_OK)

backend/backend/core/routers/version_history/urls.py

@@ -11,8 +11,10 @@
     get_audit_events,
     get_conflicts,
     get_draft,
+    create_version_pr,
     get_current_version,
     get_draft_status,
+    get_version_pr,
     get_version_by_id,
     get_version_detail,
     get_version_history,
@@ -45,6 +47,8 @@
     path("/audit", get_audit_events, name="get-audit-events"),
     path("/version/<int:version_number>", get_version_detail, name="get-version-detail"),
     path("/version/<int:version_number>/verify", verify_version_integrity, name="verify-version-integrity"),
+    path("/version/<int:version_number>/pr", get_version_pr, name="get-version-pr"),
+    path("/version/<int:version_number>/create-pr", create_version_pr, name="create-version-pr"),
     path("/version-id/<str:version_id>", get_version_by_id, name="get-version-by-id"),
     # Model-scoped (draft/conflict) endpoints
     path("/<str:model_name>/draft", get_draft, name="get-draft"),

backend/backend/core/routers/version_history/views.py

@@ -115,6 +115,59 @@ def get_current_version(request: Request, project_id: str) -> Response:
     return Response(data={"status": "success", "data": data}, status=status.HTTP_200_OK)
 
 
+@api_view([HTTPMethods.GET])
+@handle_http_request
+def get_version_pr(request: Request, project_id: str, version_number: int) -> Response:
+    """Get PR info associated with a version."""
+    project_instance = _get_project(project_id)
+    version = model_version_service.get_version(project_instance, version_number)
+    if not version.pr_number:
+        return Response(
+            data={"status": "failed", "error_message": "No PR associated with this version."},
+            status=status.HTTP_404_NOT_FOUND,
+        )
+    return Response(data={"status": "success", "data": {
+        "pr_number": version.pr_number,
+        "pr_url": version.pr_url or "",
+        "version_number": version.version_number,
+    }}, status=status.HTTP_200_OK)
+
+
+@api_view([HTTPMethods.POST])
+@handle_http_request
+def create_version_pr(request: Request, project_id: str, version_number: int) -> Response:
+    """Create a PR for a version that has been pushed to a branch (manual mode)."""
+    from backend.core.models.git_repo_config import GitRepoConfig
+    from backend.core.services import git_pr_service
+
+    project_instance = _get_project(project_id)
+    try:
+        version = ModelVersion.objects.get(project_instance=project_instance, version_number=version_number)
+    except ModelVersion.DoesNotExist:
+        return Response(data={"status": "failed", "error_message": f"Version {version_number} not found."}, status=status.HTTP_404_NOT_FOUND)
+
+    if version.pr_number:
+        return Response(data={"status": "failed", "data": {
+            "pr_number": version.pr_number, "pr_url": version.pr_url or "",
+            "message": "PR already exists for this version",
+        }}, status=status.HTTP_409_CONFLICT)
+
+    config = GitRepoConfig.objects.filter(project_id=project_id, is_deleted=False, is_active=True).first()
+    if not config:
+        return Response(data={"status": "failed", "error_message": "Git is not configured for this project."}, status=status.HTTP_400_BAD_REQUEST)
+
+    if config.pr_mode == "disabled":
+        return Response(data={"status": "failed", "error_message": "PR workflow is not enabled for this project."}, status=status.HTTP_400_BAD_REQUEST)
+
+    pr_result = git_pr_service.create_pr_for_version(project_instance, version, config)
+    return Response(data={"status": "success", "data": {
+        "pr_number": pr_result["pr_number"],
+        "pr_url": pr_result["pr_url"],
+        "version_number": version.version_number,
+        "message": "PR created successfully",
+    }}, status=status.HTTP_200_OK)
+
+
 @api_view([HTTPMethods.GET])
 @handle_http_request
 def compare_versions(request: Request, project_id: str) -> Response: