fix: normalize legacy recognizer feedback review payloads

openmetadata-service/src/main/java/org/openmetadata/service/jdbi3/TaskRepository.java

@@ -24,6 +24,9 @@
 import static org.openmetadata.service.governance.workflows.WorkflowVariableHandler.getNamespacedVariableName;
 import static org.openmetadata.service.governance.workflows.elements.TriggerFactory.getTriggerWorkflowId;
 
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.node.ObjectNode;
 import jakarta.json.JsonPatch;
 import jakarta.ws.rs.core.SecurityContext;
 import jakarta.ws.rs.core.UriInfo;
@@ -273,6 +276,7 @@ private String intersectDomainIds(String requestedDomainId, String allowedDomain
 
   @Override
   public void setFields(Task task, Fields fields, RelationIncludes relationIncludes) {
+    normalizeDataQualityReviewPayload(task);
     task.setAssignees(fields.contains(FIELD_ASSIGNEES) ? getAssignees(task) : task.getAssignees());
     task.setReviewers(
         fields.contains(FIELD_REVIEWERS) ? getTaskReviewers(task) : task.getReviewers());
@@ -284,6 +288,46 @@ public void setFields(Task task, Fields fields, RelationIncludes relationInclude
         fields.contains(FIELD_CREATED_BY) ? getTaskCreatedBy(task) : task.getCreatedBy());
   }
 
+  private void normalizeDataQualityReviewPayload(Task task) {
+    if (task == null || task.getType() != TaskEntityType.DataQualityReview) {
+      return;
+    }
+
+    Object payload = task.getPayload();
+    if (payload == null) {
+      return;
+    }
+
+    JsonNode payloadNode = JsonUtils.valueToTree(payload);
+    if (!payloadNode.isObject()) {
+      return;
+    }
+
+    ObjectNode normalizedPayload = ((ObjectNode) payloadNode).deepCopy();
+    boolean updated = false;
+
+    if (!normalizedPayload.has("feedback")
+        && normalizedPayload.has("data")
+        && !normalizedPayload.get("data").isNull()) {
+      normalizedPayload.set("feedback", normalizedPayload.get("data"));
+      updated = true;
+    }
+
+    JsonNode metadataNode = normalizedPayload.get("metadata");
+    if (!normalizedPayload.has("recognizer")
+        && metadataNode != null
+        && metadataNode.has("recognizer")
+        && !metadataNode.get("recognizer").isNull()) {
+      normalizedPayload.set("recognizer", metadataNode.get("recognizer"));
+      updated = true;
+    }
+
+    if (updated) {
+      task.setPayload(
+          JsonUtils.convertValue(normalizedPayload, new TypeReference<Map<String, Object>>() {}));
+    }
+  }
+
   @Override
   public void setFieldsInBulk(Fields fields, java.util.List<Task> entities) {
     if (entities == null || entities.isEmpty()) {

openmetadata-service/src/main/java/org/openmetadata/service/migration/utils/v200/MigrationUtil.java

@@ -839,12 +839,10 @@ private static ObjectNode buildThreadTaskPayload(
       case "RecognizerFeedbackApproval" -> {
         ObjectNode payload = JsonUtils.getObjectNode();
         if (taskDetails.has("feedback") && !taskDetails.get("feedback").isNull()) {
-          payload.set("data", taskDetails.get("feedback"));
+          payload.set("feedback", taskDetails.get("feedback"));
         }
         if (taskDetails.has("recognizer") && !taskDetails.get("recognizer").isNull()) {
-          ObjectNode metadata = JsonUtils.getObjectNode();
-          metadata.set("recognizer", taskDetails.get("recognizer"));
-          payload.set("metadata", metadata);
+          payload.set("recognizer", taskDetails.get("recognizer"));
         }
         yield payload;
       }

openmetadata-service/src/main/java/org/openmetadata/service/tasks/TaskFormExecutionResolver.java

@@ -14,6 +14,7 @@
 
 package org.openmetadata.service.tasks;
 
+import com.fasterxml.jackson.databind.JsonNode;
 import java.util.List;
 import java.util.Map;
 import lombok.extern.slf4j.Slf4j;
@@ -345,7 +346,12 @@ private static TaskExecutionPlan merge(TaskExecutionPlan defaults, TaskExecution
   }
 
   private static boolean hasFeedbackPayload(Task task) {
-    return task.getPayload() != null && JsonUtils.valueToTree(task.getPayload()).has("feedback");
+    if (task.getPayload() == null) {
+      return false;
+    }
+
+    JsonNode payload = JsonUtils.valueToTree(task.getPayload());
+    return payload.has("feedback") || payload.has("data");
   }
 
   private static String stringValue(Object value) {

openmetadata-service/src/test/java/org/openmetadata/service/migration/utils/v200/MigrationUtilTest.java

@@ -352,6 +352,37 @@ void buildThreadTaskPayloadMapsTagSuggestionList() throws Exception {
     assertEquals("User", payload.get("source").asText());
   }
 
+  @Test
+  void buildThreadTaskPayloadMapsRecognizerFeedbackPayloadToModernKeys() throws Exception {
+    JsonNode taskDetails =
+        JsonUtilsHolder.readTree(
+            """
+            {
+              "feedback": {
+                "feedbackType": "FalsePositive"
+              },
+              "recognizer": {
+                "id": "pii-recognizer"
+              }
+            }
+            """);
+
+    ObjectNode payload =
+        (ObjectNode)
+            invokePrivateStatic(
+                "buildThreadTaskPayload",
+                new Class[] {String.class, JsonNode.class, MessageParser.EntityLink.class},
+                "RecognizerFeedbackApproval",
+                taskDetails,
+                null);
+
+    assertNotNull(payload);
+    assertEquals("FalsePositive", payload.get("feedback").get("feedbackType").asText());
+    assertEquals("pii-recognizer", payload.get("recognizer").get("id").asText());
+    assertNull(payload.get("data"));
+    assertNull(payload.get("metadata"));
+  }
+
   @Test
   void buildActivityEventFromLegacyThreadMapsDescriptionUpdate() throws Exception {
     UUID threadId = UUID.randomUUID();

openmetadata-service/src/test/java/org/openmetadata/service/tasks/TaskFormExecutionResolverTest.java

@@ -273,6 +273,39 @@ void resolveTreatsReviewFeedbackTasksAsFeedbackApproval() {
     }
   }
 
+  @Test
+  void resolveTreatsLegacyReviewFeedbackPayloadAsFeedbackApproval() {
+    Task task =
+        new Task()
+            .withId(UUID.randomUUID())
+            .withType(TaskEntityType.DataQualityReview)
+            .withCategory(TaskCategory.Review)
+            .withPayload(
+                Map.of(
+                    "data",
+                    Map.of("feedbackType", "FalsePositive"),
+                    "metadata",
+                    Map.of("recognizer", "PII")));
+    TaskFormSchemaRepository repository = mock(TaskFormSchemaRepository.class);
+
+    try (MockedStatic<Entity> entityMock = Mockito.mockStatic(Entity.class)) {
+      entityMock
+          .when(() -> Entity.getEntityRepository(Entity.TASK_FORM_SCHEMA))
+          .thenReturn(repository);
+      when(repository.resolve(
+              TaskEntityType.DataQualityReview.value(),
+              TaskCategory.Review.value(),
+              task.getPayload()))
+          .thenReturn(Optional.empty());
+
+      TaskExecutionBinding binding = TaskFormExecutionResolver.resolve(task);
+
+      assertEquals(HandlerType.FEEDBACK_APPROVAL, binding.handlerType());
+      assertEquals(MetadataOperation.EDIT_ALL, binding.permissionOperation());
+      assertNull(binding.fieldPathField());
+    }
+  }
+
   @Test
   void resolveDisambiguatesSuggestionSchemasUsingPayloadType() {
     Task task =