From 0d97d7c38f9e76f3321f5ebb51717572ac358e2a Mon Sep 17 00:00:00 2001
From: lemaitre-aneo <flemaitre@aneo.fr>
Date: Fri, 19 Jul 2024 12:17:53 +0200
Subject: [PATCH] Expose PayloadID

---
 Common/src/gRPC/Convertors/TaskDataHolderExt.cs            | 2 ++
 Common/src/gRPC/EnumFieldExt.cs                            | 1 +
 Common/src/gRPC/Services/GrpcTasksService.cs               | 4 +++-
 .../gRPC/Validators/EventSubscriptionRequestValidator.cs   | 1 +
 Common/tests/ListTasksRequestExt/ToTaskDataFieldTest.cs    | 2 ++
 Common/tests/ListTasksRequestExt/ToTaskDataFilterTest.cs   | 7 +++++++
 Common/tests/TestBase/TaskTableTestBase.cs                 | 7 +++++++
 .../Validators/EventSubscriptionRequestValidatorTest.cs    | 3 +++
 8 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/Common/src/gRPC/Convertors/TaskDataHolderExt.cs b/Common/src/gRPC/Convertors/TaskDataHolderExt.cs
index b6dafb7ee..d38a1d655 100644
--- a/Common/src/gRPC/Convertors/TaskDataHolderExt.cs
+++ b/Common/src/gRPC/Convertors/TaskDataHolderExt.cs
@@ -37,6 +37,7 @@ public static TaskDetailed ToTaskDetailed(this TaskDataHolder taskData)
     => new()
        {
          SessionId = taskData.SessionId,
+         PayloadId = taskData.PayloadId,
          Status    = taskData.Status.ToGrpcStatus(),
          Output = taskData.Output is not null
                     ? new TaskDetailed.Types.Output
@@ -117,6 +118,7 @@ public static TaskSummary ToTaskSummary(this TaskDataHolder taskDataSummary)
     => new()
        {
          SessionId  = taskDataSummary.SessionId,
+         PayloadId  = taskDataSummary.PayloadId,
          Status     = taskDataSummary.Status.ToGrpcStatus(),
          OwnerPodId = taskDataSummary.OwnerPodId,
          Options    = taskDataSummary.Options?.ToGrpcTaskOptions(),
diff --git a/Common/src/gRPC/EnumFieldExt.cs b/Common/src/gRPC/EnumFieldExt.cs
index 54d1d98aa..2e0906f83 100644
--- a/Common/src/gRPC/EnumFieldExt.cs
+++ b/Common/src/gRPC/EnumFieldExt.cs
@@ -58,6 +58,7 @@ public static class EnumFieldExt
        {
          TaskSummaryEnumField.TaskId                  => data => data.TaskId,
          TaskSummaryEnumField.SessionId               => data => data.SessionId,
+         TaskSummaryEnumField.PayloadId               => data => data.PayloadId,
          TaskSummaryEnumField.OwnerPodId              => data => data.OwnerPodId,
          TaskSummaryEnumField.InitialTaskId           => data => data.InitialTaskId,
          TaskSummaryEnumField.Status                  => data => data.Status,
diff --git a/Common/src/gRPC/Services/GrpcTasksService.cs b/Common/src/gRPC/Services/GrpcTasksService.cs
index 43494878e..8fd76ac7d 100644
--- a/Common/src/gRPC/Services/GrpcTasksService.cs
+++ b/Common/src/gRPC/Services/GrpcTasksService.cs
@@ -106,6 +106,7 @@ public GrpcTasksService(ITaskTable                                 taskTable,
                                         {
                                           TaskDataFields.SessionId,
                                           TaskDataFields.TaskId,
+                                          TaskDataFields.PayloadId,
                                           TaskDataFields.Status,
                                           TaskDataFields.InitialTaskId,
                                           TaskDataFields.Output,
@@ -481,7 +482,8 @@ await TaskLifeCycleHelper.FinalizeTaskCreation(taskTable_,
                                                               {
                                                                 creationRequest.ExpectedOutputKeys,
                                                               },
-                                                              TaskId = creationRequest.TaskId,
+                                                              TaskId    = creationRequest.TaskId,
+                                                              PayloadId = creationRequest.PayloadId,
                                                             }),
                },
              };
diff --git a/Common/src/gRPC/Validators/EventSubscriptionRequestValidator.cs b/Common/src/gRPC/Validators/EventSubscriptionRequestValidator.cs
index 2f90463d7..2d2aba475 100644
--- a/Common/src/gRPC/Validators/EventSubscriptionRequestValidator.cs
+++ b/Common/src/gRPC/Validators/EventSubscriptionRequestValidator.cs
@@ -93,6 +93,7 @@ public override ValidationResult Validate(ValidationContext<EventSubscriptionReq
               {
                 case TaskSummaryEnumField.TaskId:
                 case TaskSummaryEnumField.SessionId:
+                case TaskSummaryEnumField.PayloadId:
                 case TaskSummaryEnumField.OwnerPodId:
                 case TaskSummaryEnumField.InitialTaskId:
                 case TaskSummaryEnumField.PodHostname:
diff --git a/Common/tests/ListTasksRequestExt/ToTaskDataFieldTest.cs b/Common/tests/ListTasksRequestExt/ToTaskDataFieldTest.cs
index 141c4bdac..134f8bbad 100644
--- a/Common/tests/ListTasksRequestExt/ToTaskDataFieldTest.cs
+++ b/Common/tests/ListTasksRequestExt/ToTaskDataFieldTest.cs
@@ -94,6 +94,8 @@ TestCaseData CaseSummary(TaskSummaryEnumField field,
                              TaskData.TaskId);
     yield return CaseSummary(TaskSummaryEnumField.SessionId,
                              TaskData.SessionId);
+    yield return CaseSummary(TaskSummaryEnumField.PayloadId,
+                             TaskData.PayloadId);
     yield return CaseSummary(TaskSummaryEnumField.Status,
                              TaskData.Status);
     yield return CaseSummary(TaskSummaryEnumField.CreatedAt,
diff --git a/Common/tests/ListTasksRequestExt/ToTaskDataFilterTest.cs b/Common/tests/ListTasksRequestExt/ToTaskDataFilterTest.cs
index b46f727d9..6c308ded2 100644
--- a/Common/tests/ListTasksRequestExt/ToTaskDataFilterTest.cs
+++ b/Common/tests/ListTasksRequestExt/ToTaskDataFilterTest.cs
@@ -208,6 +208,13 @@ TestCaseData CaseFalse(FilterField filterField)
                                                                        FilterStringOperator.Equal,
                                                                        "BadPartitionId"));
 
+    yield return CaseTrue(ListTasksHelper.CreateListTasksFilterString(TaskSummaryEnumField.PayloadId,
+                                                                      FilterStringOperator.Equal,
+                                                                      "PayloadId"));
+    yield return CaseFalse(ListTasksHelper.CreateListTasksFilterString(TaskSummaryEnumField.PayloadId,
+                                                                       FilterStringOperator.Equal,
+                                                                       "BadPayloadId"));
+
     yield return CaseTrue(ListTasksHelper.CreateListTasksFilterStatus(TaskSummaryEnumField.Status,
                                                                       FilterStatusOperator.Equal,
                                                                       Api.gRPC.V1.TaskStatus.Completed));
diff --git a/Common/tests/TestBase/TaskTableTestBase.cs b/Common/tests/TestBase/TaskTableTestBase.cs
index 5b97b6e4e..f15a0dec0 100644
--- a/Common/tests/TestBase/TaskTableTestBase.cs
+++ b/Common/tests/TestBase/TaskTableTestBase.cs
@@ -1892,6 +1892,13 @@ TestCaseData CaseFalse(Api.gRPC.V1.Tasks.FilterField filterField)
                                                                        FilterStringOperator.Equal,
                                                                        "BadSessionId"));
 
+    yield return CaseTrue(ListTasksHelper.CreateListTasksFilterString(TaskSummaryEnumField.PayloadId,
+                                                                      FilterStringOperator.Equal,
+                                                                      "PayloadId"));
+    yield return CaseFalse(ListTasksHelper.CreateListTasksFilterString(TaskSummaryEnumField.PayloadId,
+                                                                       FilterStringOperator.Equal,
+                                                                       "BadPayloadId"));
+
     yield return CaseTrue(ListTasksHelper.CreateListTasksFilterString("key1",
                                                                       FilterStringOperator.Equal,
                                                                       "val1"));
diff --git a/Common/tests/Validators/EventSubscriptionRequestValidatorTest.cs b/Common/tests/Validators/EventSubscriptionRequestValidatorTest.cs
index a1a174bc6..aeea177be 100644
--- a/Common/tests/Validators/EventSubscriptionRequestValidatorTest.cs
+++ b/Common/tests/Validators/EventSubscriptionRequestValidatorTest.cs
@@ -119,6 +119,9 @@ TestCaseData CaseFalse(FilterField filterField)
     yield return CaseTrue(ListTasksHelper.CreateListTasksFilterString(TaskSummaryEnumField.SessionId,
                                                                       FilterStringOperator.Equal,
                                                                       string.Empty));
+    yield return CaseTrue(ListTasksHelper.CreateListTasksFilterString(TaskSummaryEnumField.PayloadId,
+                                                                      FilterStringOperator.Equal,
+                                                                      string.Empty));
     yield return CaseTrue(ListTasksHelper.CreateListTasksFilterString(TaskSummaryEnumField.PodHostname,
                                                                       FilterStringOperator.Equal,
                                                                       string.Empty));