Reject no-op profile change requests

Signed-off-by: yoshifuminakamura <nakamura@riken.jp>

Author: yoshifuminakamura

result_server/routes/admin.py

@@ -200,6 +200,33 @@ def _profile_request_note_metadata(
     }
 
 
+def _profile_request_followup_metadata(
+    source_profile: dict,
+    *,
+    note: str,
+    desired_schedule: str = "",
+    desired_watch_target: str = "",
+    preserve_profile_metadata: bool = False,
+) -> dict:
+    source_metadata = source_profile.get("metadata_json") or {}
+    metadata = (
+        dict(source_metadata)
+        if preserve_profile_metadata and isinstance(source_metadata, dict)
+        else {}
+    )
+    metadata.pop("request_note", None)
+    desired_schedule = desired_schedule.strip()
+    desired_watch_target = desired_watch_target.strip()
+    if desired_schedule:
+        metadata["desired_schedule"] = desired_schedule
+    if desired_watch_target:
+        metadata["desired_watch_target"] = desired_watch_target
+    request_note = note.strip()
+    if request_note:
+        metadata["request_note"] = request_note
+    return metadata
+
+
 def _parse_trigger_definition_form():
     """Return a raw trigger definition object from the submitted admin form."""
     actor = session.get("user_email", "")
@@ -401,7 +428,6 @@ def _profile_request_change_rows(profile_request, source_profile):
     metadata_specs = [
         ("Desired Schedule", "desired_schedule"),
         ("Desired Watch Target", "desired_watch_target"),
-        ("Note", "note"),
     ]
     for label, key in metadata_specs:
         current = current_metadata.get(key)
@@ -415,6 +441,18 @@ def _profile_request_change_rows(profile_request, source_profile):
     return rows
 
 
+def _profile_request_has_effective_changes(requested_profile, source_profile):
+    return bool(
+        _profile_request_change_rows(
+            {
+                "request_type": "change_profile",
+                "requested_profile": requested_profile,
+            },
+            source_profile,
+        )
+    )
+
+
 def _profile_request_diff_key(value):
     if isinstance(value, (list, tuple)):
         return tuple(str(item).strip() for item in value if str(item).strip())
@@ -920,14 +958,23 @@ def submit_execution_profile_followup_request():
 
     requested_profile = dict(source_profile)
     requested_profile["status"] = "draft"
-    requested_profile["metadata_json"] = {
-        **(source_profile.get("metadata_json") or {}),
-        **_profile_request_note_metadata(
-            note,
-            desired_schedule=desired_schedule,
-            desired_watch_target=desired_watch_target,
-        ),
-    }
+    requested_profile["metadata_json"] = _profile_request_followup_metadata(
+        source_profile,
+        note=note,
+        desired_schedule=desired_schedule,
+        desired_watch_target=desired_watch_target,
+        preserve_profile_metadata=request_type == "change_profile",
+    )
+    if request_type == "change_profile" and not _profile_request_has_effective_changes(
+        requested_profile,
+        source_profile,
+    ):
+        flash(
+            "Execution profile follow-up request was not created: "
+            "change request needs a schedule, watch target, or profile field change; "
+            "note-only changes are not actionable"
+        )
+        return redirect(url_for("profile_requests.profile_requests"))
     try:
         request_id = store.create_profile_request(
             requested_profile=requested_profile,
@@ -975,6 +1022,44 @@ def resubmit_execution_profile_request(request_id):
         return redirect(url_for("profile_requests.profile_requests"))
 
     raw_profile, errors = _parse_execution_profile_request_form()
+    source_profile = None
+    source_profile_id = profile_request.get("source_profile_id") or ""
+    if source_profile_id:
+        source_profile = next(
+            (
+                profile
+                for profile in store.list_profiles()
+                if profile["id"] == source_profile_id
+            ),
+            None,
+        )
+    if not errors and source_profile and profile_request.get("request_type") in {
+        "change_profile",
+        "pause_profile",
+        "resume_profile",
+        "retire_profile",
+    }:
+        submitted_metadata = raw_profile.get("metadata_json")
+        submitted_metadata = submitted_metadata if isinstance(submitted_metadata, dict) else {}
+        raw_profile["metadata_json"] = _profile_request_followup_metadata(
+            source_profile,
+            note=str(
+                submitted_metadata.get("note")
+                or submitted_metadata.get("request_note")
+                or ""
+            ),
+            desired_schedule=str(submitted_metadata.get("desired_schedule") or ""),
+            desired_watch_target=str(submitted_metadata.get("desired_watch_target") or ""),
+            preserve_profile_metadata=profile_request.get("request_type") == "change_profile",
+        )
+    if not errors and profile_request.get("request_type") == "change_profile":
+        if not source_profile:
+            errors.append("source profile was not found")
+        elif not _profile_request_has_effective_changes(raw_profile, source_profile):
+            errors.append(
+                "change request needs a schedule, watch target, or profile field change; "
+                "note-only changes are not actionable"
+            )
     if errors:
         ok = False
     else:

result_server/templates/admin_execution_profile_requests.html

@@ -480,6 +480,7 @@ <h2 class="section-title">{% if review_mode %}Review Queue{% else %}My Requests{
             {% for item in profile_requests %}
                 {% set profile = item.requested_profile %}
                 {% set metadata = profile.metadata_json if profile.metadata_json is mapping else {} %}
+                {% set request_note = metadata.request_note or metadata.note %}
                 {% set link = profile_links.get(item.id, {}) if profile_links is mapping else {} %}
                 {% set linked_profile = link.profile if link.profile is mapping else none %}
                 {% set request_type_label = {
@@ -524,8 +525,8 @@ <h2 class="section-title">{% if review_mode %}Review Queue{% else %}My Requests{
                         <span class="request-subline">watch {{ metadata.desired_watch_target }}</span>
                         {% endif %}
                         <span class="request-subline">{{ profile.activity or '-' }}</span>
-                        {% if metadata.note %}
-                        <span class="request-subline">{{ metadata.note }}</span>
+                        {% if request_note %}
+                        <span class="request-subline">{{ request_note }}</span>
                         {% endif %}
                         {% if item.request_type == 'change_profile' %}
                         {% set requested_changes = link.requested_changes or [] %}
@@ -711,7 +712,7 @@ <h2 class="section-title">{% if review_mode %}Review Queue{% else %}My Requests{
                                     </label>
                                     <label>
                                         Note
-                                        <textarea name="note" rows="2">{{ metadata.note }}</textarea>
+                                        <textarea name="note" rows="2">{{ request_note }}</textarea>
                                     </label>
                                     <button type="submit" class="btn btn-primary">Revise and Resubmit</button>
                                 </form>

result_server/tests/test_execution_profiles.py

@@ -1710,11 +1710,14 @@ def test_execution_profile_requests_keep_available_linked_profile_history(tmp_pa
 def test_admin_execution_profile_requests_show_followup_target_and_note(tmp_path):
     db_path = tmp_path / "cx_portal.sqlite3"
     store = ExecutionProfileStore(str(db_path))
-    source_profile = _profile()
+    source_profile = _profile(metadata_json={"note": "profile note"})
     store.upsert_profile(source_profile, actor="admin@test.com")
     requested_profile = dict(source_profile)
     requested_profile["system"] = ["SourceSystem", "PeerSystem"]
-    requested_profile["metadata_json"] = {"note": "change requested in note"}
+    requested_profile["metadata_json"] = {
+        "note": "profile note",
+        "request_note": "change requested in note",
+    }
     store.create_profile_request(
         requested_profile=requested_profile,
         requester_email="applicant@test.com",
@@ -1737,9 +1740,60 @@ def test_admin_execution_profile_requests_show_followup_target_and_note(tmp_path
         assert "System" in html
         assert "current SourceSystem" in html
         assert "requested SourceSystem, PeerSystem" in html
-        assert "Note" in html
-        assert "current -" in html
-        assert "requested change requested in note" in html
+        assert "requested change requested in note" not in html
+    finally:
+        _cleanup(temp_dirs)
+
+
+def test_execution_profile_change_followup_requires_effective_change(tmp_path):
+    db_path = tmp_path / "cx_portal.sqlite3"
+    store = ExecutionProfileStore(str(db_path))
+    source_profile = _profile(
+        id="demoapp-demosystem-request",
+        metadata_json={"note": "profile note"},
+    )
+    store.upsert_profile(source_profile, actor="admin@test.com")
+    app, temp_dirs = _admin_app(db_path)
+    try:
+        with app.test_client() as client:
+            _login_admin(client)
+            note_only_resp = client.post(
+                "/execution-profile-requests/follow-up",
+                data={
+                    "source_profile_id": "demoapp-demosystem-request",
+                    "request_type": "change_profile",
+                    "note": "please change this",
+                },
+                follow_redirects=True,
+            )
+            schedule_resp = client.post(
+                "/execution-profile-requests/follow-up",
+                data={
+                    "source_profile_id": "demoapp-demosystem-request",
+                    "request_type": "change_profile",
+                    "desired_schedule": "15 14 * * * / Asia/Tokyo",
+                    "note": "please change cadence",
+                },
+                follow_redirects=True,
+            )
+            review_resp = client.post(
+                "/admin/execution-profile-requests/1/review",
+                data={"action": "approve", "review_comment": "approved"},
+                follow_redirects=True,
+            )
+
+        assert note_only_resp.status_code == 200
+        assert b"note-only changes are not actionable" in note_only_resp.data
+        assert schedule_resp.status_code == 200
+        assert b"Execution profile follow-up request #1 submitted." in schedule_resp.data
+        request_row = ExecutionProfileStore(str(db_path)).get_profile_request(1)
+        metadata = request_row["requested_profile"]["metadata_json"]
+        assert metadata["note"] == "profile note"
+        assert metadata["request_note"] == "please change cadence"
+        assert review_resp.status_code == 200
+        result = load_execution_profiles(str(db_path))
+        assert result.profiles[0]["metadata_json"]["note"] == "profile note"
+        assert "request_note" not in result.profiles[0]["metadata_json"]
     finally:
         _cleanup(temp_dirs)
 

result_server/utils/execution_profiles.py

@@ -1735,6 +1735,14 @@ def review_profile_request(
                         payload["status"] = "approved"
                     payload["approved_by"] = ""
                     payload["approved_at"] = ""
+                    if request_type == "change_profile":
+                        metadata = payload.get("metadata_json")
+                        if isinstance(metadata, dict):
+                            payload["metadata_json"] = {
+                                key: value
+                                for key, value in metadata.items()
+                                if key != "request_note"
+                            }
                     allocation_project_id = str(payload.get("allocation_project_id") or "").strip()
                     systems = _as_text_list(payload.get("system"))
                     if allocation_project_id and len(systems) != 1: