CSCTTV-3771 result ordering

aspnetcore/src/ElasticService/ElasticSearchQueryGenerators/FundingCallQueryGenerator.cs

@@ -131,4 +131,11 @@ private static IEnumerable<Func<QueryContainerDescriptor<FundingCall>, QueryCont
 
         return filters;
     }
+
+    protected override Func<SortDescriptor<FundingCall>, IPromise<IList<ISort>>> GenerateSortForSearch(FundingCallSearchParameters parameters)
+    {
+        // Sort funding calls
+        return sortDescriptor => sortDescriptor
+            .Field(f => f.CallProgrammeDueDate, SortOrder.Ascending);
+    }
 }

aspnetcore/src/ElasticService/ElasticSearchQueryGenerators/FundingDecisionQueryGenerator.cs

@@ -174,4 +174,11 @@ private static IEnumerable<Func<QueryContainerDescriptor<FundingDecision>, Query
 
         return filters;
     }
+
+    protected override Func<SortDescriptor<FundingDecision>, IPromise<IList<ISort>>> GenerateSortForSearch(FundingDecisionSearchParameters parameters)
+    {
+        // Sort funding decisions
+        return sortDescriptor => sortDescriptor
+            .Field(f => f.FundingStartDate, SortOrder.Descending);
+    }
 }

aspnetcore/src/ElasticService/ElasticSearchQueryGenerators/InfrastructureQueryGenerator.cs

@@ -38,4 +38,10 @@ protected override Func<QueryContainerDescriptor<Infrastructure>, QueryContainer
     {
         throw new NotImplementedException();
     }
+
+    protected override Func<SortDescriptor<Infrastructure>, IPromise<IList<ISort>>> GenerateSortForSearch(InfrastructureSearchParameters parameters)
+    {
+        // Sort infrastructures
+        return sortDescriptor => sortDescriptor;
+    }
 }

aspnetcore/src/ElasticService/ElasticSearchQueryGenerators/OrganizationQueryGenerator.cs

@@ -38,4 +38,10 @@ protected override Func<QueryContainerDescriptor<Organization>, QueryContainer>
     {
         throw new NotImplementedException();
     }
+
+    protected override Func<SortDescriptor<Organization>, IPromise<IList<ISort>>> GenerateSortForSearch(OrganizationSearchParameters parameters)
+    {
+        // Sort organizations
+        return sortDescriptor => sortDescriptor;
+    }
 }

aspnetcore/src/ElasticService/ElasticSearchQueryGenerators/PublicationQueryGenerator.cs

@@ -288,4 +288,11 @@ protected override Func<QueryContainerDescriptor<Publication>, QueryContainer> G
     {
         return queryContainerDescriptor => queryContainerDescriptor.Term(query => query.Field(f => f.Id).Value(id));
     }
+
+    protected override Func<SortDescriptor<Publication>, IPromise<IList<ISort>>> GenerateSortForSearch(PublicationSearchParameters parameters)
+    {
+        // Sort publications
+        return sortDescriptor => sortDescriptor
+            .Field(f => f.PublicationYear, SortOrder.Descending);
+    }
 }

aspnetcore/src/ElasticService/ElasticSearchQueryGenerators/QueryGeneratorBase.cs

@@ -18,6 +18,7 @@ public Func<SearchDescriptor<TOut>, ISearchRequest> GenerateQuery(TIn searchPara
             .Index(indexName)
             .Skip((pageNumber - 1) * pageSize)
             .Take(pageSize)
+            .Sort(GenerateSortForSearch(searchParameters))
             .Query(GenerateQueryForSearch(searchParameters));
     }
 
@@ -30,6 +31,8 @@ public Func<SearchDescriptor<TOut>, ISearchRequest> GenerateSingleQuery(string i
     }
 
     protected abstract Func<QueryContainerDescriptor<TOut>, QueryContainer> GenerateQueryForSearch(TIn parameters);
-    
+
     protected abstract Func<QueryContainerDescriptor<TOut>,QueryContainer> GenerateQueryForSingle(string id);
+
+    protected abstract Func<SortDescriptor<TOut>, IPromise<IList<ISort>>> GenerateSortForSearch(TIn parameters);
 }

aspnetcore/src/ElasticService/ElasticSearchQueryGenerators/ResearchDatasetQueryGenerator.cs

@@ -202,4 +202,11 @@ private static IEnumerable<Func<QueryContainerDescriptor<ResearchDataset>, Query
 
         return filters;
     }
+
+    protected override Func<SortDescriptor<ResearchDataset>, IPromise<IList<ISort>>> GenerateSortForSearch(ResearchDatasetSearchParameters parameters)
+    {
+        // Sort research datasets
+        return sortDescriptor => sortDescriptor
+            .Field(f => f.Created, SortOrder.Descending);
+    }
 }