add error for cont. token parse error

Altinn · Jan 14, 2025 · 9c7dfd7 · 9c7dfd7
1 parent a6518b8
commit 9c7dfd7
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 2 deletions.
diff --git a/docs/schema/V1/schema.verified.graphql b/docs/schema/V1/schema.verified.graphql
@@ -211,6 +211,10 @@ type SearchDialog {
   seenSinceLastUpdate: [SeenLog!]!
 }
 
+type SearchDialogContinuationTokenParsingError implements SearchDialogError {
+  message: String!
+}
+
 type SearchDialogForbidden implements SearchDialogError {
   message: String!
 }

diff --git a/src/Digdir.Domain.Dialogporten.GraphQL/EndUser/DialogQueries.cs b/src/Digdir.Domain.Dialogporten.GraphQL/EndUser/DialogQueries.cs
@@ -36,12 +36,17 @@ public async Task<SearchDialogsPayload> SearchDialogs(
     {
         var searchDialogQuery = mapper.Map<SearchDialogQuery>(input);
 
-        if (ContinuationTokenSet<SearchDialogQueryOrderDefinition, IntermediateDialogDto>.TryParse(
+        if (!ContinuationTokenSet<SearchDialogQueryOrderDefinition, IntermediateDialogDto>.TryParse(
                 input.ContinuationToken, out var continuationTokenSet))
         {
-            searchDialogQuery.ContinuationToken = continuationTokenSet;
+            return new SearchDialogsPayload
+            {
+                Errors = [new SearchDialogContinuationTokenParsingError()]
+            };
         }
 
+        searchDialogQuery.ContinuationToken = continuationTokenSet;
+
         OrderSet<SearchDialogQueryOrderDefinition, IntermediateDialogDto>? orderSet = null;
         if (input.OrderBy != null && !input.OrderBy.TryToOrderSet(out orderSet))
         {

diff --git a/src/Digdir.Domain.Dialogporten.GraphQL/EndUser/SearchDialogs/ObjectTypes.cs b/src/Digdir.Domain.Dialogporten.GraphQL/EndUser/SearchDialogs/ObjectTypes.cs
@@ -9,6 +9,11 @@ public interface ISearchDialogError
     public string Message { get; set; }
 }
 
+public sealed class SearchDialogContinuationTokenParsingError : ISearchDialogError
+{
+    public string Message { get; set; } = "An error occurred while parsing the ContinuationToken parameter";
+}
+
 public sealed class SearchDialogOrderByParsingError : ISearchDialogError
 {
     public string Message { get; set; } = "An error occurred while parsing the OrderBy parameter";

diff --git a/src/Digdir.Domain.Dialogporten.GraphQL/EndUser/SearchDialogs/SearchDialogInputValidator.cs b/src/Digdir.Domain.Dialogporten.GraphQL/EndUser/SearchDialogs/SearchDialogInputValidator.cs
@@ -7,6 +7,16 @@ public class SearchDialogInputValidator : AbstractValidator<SearchDialogInput>
 {
     public SearchDialogInputValidator()
     {
+        RuleFor(x => x.OrderBy)
+            .NotNull()
+            .When(x => x.ContinuationToken != null)
+            .WithMessage("OrderBy must be set when ContinuationToken is set.");
+
+        RuleFor(x => x.ContinuationToken)
+            .NotNull()
+            .When(x => x.OrderBy != null)
+            .WithMessage("ContinuationToken must be set when OrderBy is set.");
+
         RuleFor(x => x.OrderBy)
             .NotEmpty()
             .When(x => x.OrderBy != null);

diff --git a/src/Digdir.Domain.Dialogporten.GraphQL/ServiceCollectionExtensions.cs b/src/Digdir.Domain.Dialogporten.GraphQL/ServiceCollectionExtensions.cs
@@ -28,6 +28,7 @@ public static IServiceCollection AddDialogportenGraphQl(this IServiceCollection
             .AddType<SearchDialogForbidden>()
             .AddType<SetSystemLabelEntityNotFound>()
             .AddType<SearchDialogOrderByParsingError>()
+            .AddType<SearchDialogContinuationTokenParsingError>()
             .AddMaxExecutionDepthRule(12)
             .AddInstrumentation()
             .InitializeOnStartup()