Modify sort criteria

CSCfi · Apr 5, 2024 · 156e2b4 · 156e2b4
1 parent f7a4cd5
commit 156e2b4
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 6 deletions.
diff --git a/aspnetcore/src/ElasticService/ElasticSearchQueryGenerators/FundingCallQueryGenerator.cs b/aspnetcore/src/ElasticService/ElasticSearchQueryGenerators/FundingCallQueryGenerator.cs
@@ -136,6 +136,6 @@ protected override Func<SortDescriptor<FundingCall>, IPromise<IList<ISort>>> Gen
     {
         // Sort funding calls
         return sortDescriptor => sortDescriptor
-            .Field(f => f.CallProgrammeOpenDate, SortOrder.Descending);
+            .Field(f => f.CallProgrammeDueDate, SortOrder.Ascending);
     }
 }
diff --git a/aspnetcore/src/ElasticService/ElasticSearchQueryGenerators/InfrastructureQueryGenerator.cs b/aspnetcore/src/ElasticService/ElasticSearchQueryGenerators/InfrastructureQueryGenerator.cs
@@ -42,7 +42,6 @@ protected override Func<QueryContainerDescriptor<Infrastructure>, QueryContainer
     protected override Func<SortDescriptor<Infrastructure>, IPromise<IList<ISort>>> GenerateSortForSearch(InfrastructureSearchParameters parameters)
     {
         // Sort infrastructures
-        return sortDescriptor => sortDescriptor
-            .Field(f => f.NameFi, SortOrder.Ascending);
+        return sortDescriptor => sortDescriptor;
     }
 }
diff --git a/aspnetcore/src/ElasticService/ElasticSearchQueryGenerators/OrganizationQueryGenerator.cs b/aspnetcore/src/ElasticService/ElasticSearchQueryGenerators/OrganizationQueryGenerator.cs
@@ -42,7 +42,6 @@ protected override Func<QueryContainerDescriptor<Organization>, QueryContainer>
     protected override Func<SortDescriptor<Organization>, IPromise<IList<ISort>>> GenerateSortForSearch(OrganizationSearchParameters parameters)
     {
         // Sort organizations
-        return sortDescriptor => sortDescriptor
-            .Field(f => f.NameFi, SortOrder.Ascending);
+        return sortDescriptor => sortDescriptor;
     }
 }
diff --git a/aspnetcore/src/ElasticService/ElasticSearchQueryGenerators/ResearchDatasetQueryGenerator.cs b/aspnetcore/src/ElasticService/ElasticSearchQueryGenerators/ResearchDatasetQueryGenerator.cs
@@ -207,6 +207,6 @@ protected override Func<SortDescriptor<ResearchDataset>, IPromise<IList<ISort>>>
     {
         // Sort research datasets
         return sortDescriptor => sortDescriptor
-            .Field(f => f.NameFi, SortOrder.Ascending);
+            .Field(f => f.Created, SortOrder.Descending);
     }
 }