fix

Altinn · Jan 14, 2025 · a6518b8 · a6518b8
1 parent 8f442cf
commit a6518b8
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/src/Digdir.Domain.Dialogporten.GraphQL/EndUser/SearchDialogs/SearchDialogInputValidator.cs b/src/Digdir.Domain.Dialogporten.GraphQL/EndUser/SearchDialogs/SearchDialogInputValidator.cs
@@ -12,7 +12,9 @@ public SearchDialogInputValidator()
             .When(x => x.OrderBy != null);
 
         RuleForEach(x => x.OrderBy)
-            .Must(order => order.CreatedAt.HasValue ^ order.UpdatedAt.HasValue ^ order.DueAt.HasValue)
+            .Must(order =>
+                new[] { order.CreatedAt.HasValue, order.UpdatedAt.HasValue, order.DueAt.HasValue }
+                    .Count(x => x) == 1)
             .WithMessage("Exactly one property must be set on each OrderBy object.");
     }
 }
diff --git a/...igdir.Domain.Dialogporten.GraphQL/EndUser/SearchDialogs/SearchDialogSortTypeExtensions.cs b/...igdir.Domain.Dialogporten.GraphQL/EndUser/SearchDialogs/SearchDialogSortTypeExtensions.cs
@@ -12,12 +12,14 @@ public static List<SearchDialogSortType> ToSearchDialogSortTypeList(
     {
         List<SearchDialogSortType> searchDialogSortTypes = [];
 
-        orderBy = orderBy
+        var orderByParts = orderBy
             .ToLower(CultureInfo.InvariantCulture)
-            .Replace("id_desc", "", StringComparison.OrdinalIgnoreCase)
-            .Replace("id_asc", "", StringComparison.OrdinalIgnoreCase);
+            .Split(',', StringSplitOptions.RemoveEmptyEntries)
+            .Where(part => !part.Equals("id_desc", StringComparison.OrdinalIgnoreCase) &&
+                           !part.Equals("id_asc", StringComparison.OrdinalIgnoreCase))
+            .ToList();
 
-        foreach (var orderByPart in orderBy.Split(','))
+        foreach (var orderByPart in orderByParts)
         {
             var parts = orderByPart.Split('_');
             if (parts.Length != 2)
@@ -55,11 +57,13 @@ public static bool TryToOrderSet(this List<SearchDialogSortType> searchDialogSor
                 stringBuilder.Append(CultureInfo.InvariantCulture, $"createdAt_{orderBy.CreatedAt},");
                 continue;
             }
+
             if (orderBy.UpdatedAt != null)
             {
                 stringBuilder.Append(CultureInfo.InvariantCulture, $"updatedAt_{orderBy.UpdatedAt},");
                 continue;
             }
+
             if (orderBy.DueAt != null)
             {
                 stringBuilder.Append(CultureInfo.InvariantCulture, $"dueAt_{orderBy.DueAt},");