Hotfix: Move sorting from Mongo Queries

SkillsFundingAgency · Jun 6, 2018 · fda74e9 · fda74e9
1 parent bbab9d4
commit fda74e9
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 12 deletions.
diff --git a/src/Shared/Recruit.Vacancies.Client/Infrastructure/QueryStore/MongoQueryStore.cs b/src/Shared/Recruit.Vacancies.Client/Infrastructure/QueryStore/MongoQueryStore.cs
@@ -37,7 +37,7 @@ async Task<IEnumerable<T>> IQueryStore.GetAllByTypeAsync<T>(string typeName)
             var filter = Builders<T>.Filter.Eq(d => d.Type, typeName);
 
             var collection = GetCollection<T>();
-            var result = await RetryPolicy.ExecuteAsync(context => collection.FindAsync(filter),  new Context(nameof(IQueryStore.GetAllByTypeAsync)));
+            var result = await RetryPolicy.ExecuteAsync(context => collection.FindAsync(filter), new Context(nameof(IQueryStore.GetAllByTypeAsync)));
 
             return result?.ToEnumerable();
         }

diff --git a/src/Shared/Recruit.Vacancies.Client/Infrastructure/Repositories/MongoDbVacancyRepository.cs b/src/Shared/Recruit.Vacancies.Client/Infrastructure/Repositories/MongoDbVacancyRepository.cs
@@ -12,14 +12,14 @@
 using Esfa.Recruit.Vacancies.Client.Infrastructure.Exceptions;
 using Microsoft.Extensions.Logging;
 using Polly;
+using System.Linq;
 
 namespace Esfa.Recruit.Vacancies.Client.Infrastructure.Repositories
 {
     internal sealed class MongoDbVacancyRepository : MongoDbCollectionBase, IVacancyRepository
     {
         private const string Database = "recruit";
         private const string Collection = "vacancies";
-
         private const string EmployerAccountId = "employerAccountId";
 
         public MongoDbVacancyRepository(ILogger<MongoDbVacancyRepository> logger, IOptions<MongoDbConnectionDetails> details) 
@@ -81,15 +81,13 @@ public async Task<Vacancy> GetSingleVacancyForPostcode(string postcode)
                          builder.Ne(v => v.EmployerLocation.Latitude, null) &
                          builder.Ne(v => v.EmployerLocation.Longitude, null);
 
-            var options = new FindOptions<Vacancy>
-            {
-                Sort = Builders<Vacancy>.Sort.Descending(v => v.VacancyReference),
-                Limit = 1
-            };
-
             var collection = GetCollection<Vacancy>();
-            var result = await RetryPolicy.ExecuteAsync(context => collection.FindAsync(filter, options), new Context(nameof(GetSingleVacancyForPostcode)));
-            return result.SingleOrDefault();
+            var result = await RetryPolicy.ExecuteAsync(context => collection.FindAsync(filter), new Context(nameof(GetSingleVacancyForPostcode)));
+
+            return result
+                        .ToList()
+                        .OrderByDescending(x => x.VacancyReference)
+                        .SingleOrDefault();
         }
 
         public async Task UpdateAsync(Vacancy vacancy)

diff --git a/...ed/Recruit.Vacancies.Client/Infrastructure/Repositories/MongoDbVacancyReviewRepository.cs b/...ed/Recruit.Vacancies.Client/Infrastructure/Repositories/MongoDbVacancyReviewRepository.cs
@@ -42,10 +42,9 @@ public async Task<IEnumerable<VacancyReview>> GetAllAsync()
             var collection = GetCollection<VacancyReview>();
             var result = await RetryPolicy.ExecuteAsync(context => collection
                                     .Find(FilterDefinition<VacancyReview>.Empty)
-                                    .Sort(Builders<VacancyReview>.Sort.Descending(r => r.CreatedDate))
                                     .ToListAsync(), new Context(nameof(GetAllAsync)));
 
-            return result;
+            return result.OrderByDescending(x => x.CreatedDate);
         }
 
         public Task UpdateAsync(VacancyReview review)