DP-1190 - Organisation search - Sort before Take to limit to the most similar results

Services/CO.CDP.OrganisationInformation.Persistence.Tests/DatabaseOrganisationRepositoryTest.cs

@@ -1,6 +1,5 @@
 using CO.CDP.Testcontainers.PostgreSql;
 using FluentAssertions;
-using Microsoft.EntityFrameworkCore;
 using static CO.CDP.OrganisationInformation.Persistence.IOrganisationRepository.OrganisationRepositoryException;
 using static CO.CDP.OrganisationInformation.Persistence.Organisation;
 using static CO.CDP.OrganisationInformation.Persistence.Tests.EntityFactory;
@@ -929,6 +928,33 @@ public async Task GetMouSignature_ShouldReturnCorrectSignatures()
         result?.SignatureGuid.Should().Be(mousignatureGuid1);
     }
 
+    [Fact]
+    public async Task SearchByName_ShouldReturnMostSimilarResults_WhenMoreResultsFoundThanFetchBatchSize()
+    {
+        using var repository = OrganisationRepository();
+        await using var context = GetDbContext();
+
+        var organisations = new List<Organisation>
+        {
+            GivenOrganisation(name: "Organisation 1"),
+            GivenOrganisation(name: "Organisation 2"),
+            GivenOrganisation(name: "Organisation 3"),
+            GivenOrganisation(name: "Organisation 4"),
+            GivenOrganisation(name: "Organisation 5"),
+            GivenOrganisation(name: "Organisation 6")
+        };
+
+        context.Organisations.AddRange(organisations);
+        context.SaveChanges();
+
+
+        var result = await repository.SearchByName("Organisation 6", null, 5, 0.5);
+
+
+        result.Should().NotBeNull();
+        result.Should().Contain(organisations[5]);
+    }
+
     private DatabaseOrganisationRepository OrganisationRepository()
         => new(GetDbContext());
 

Services/CO.CDP.OrganisationInformation.Persistence/DatabaseOrganisationRepository.cs

@@ -87,13 +87,13 @@ public async Task<IEnumerable<Organisation>> SearchByName(string name, PartyRole
             query = query.Where(t => t.Organisation.Roles.Contains(role.Value));
         }
 
+        query = query.OrderByDescending(t => t.SimilarityScore);
+
         if (limit.HasValue)
         {
             query = query.Take(limit.Value);
         }
 
-        query.OrderByDescending(t => t.SimilarityScore);
-
         return await query.Select(t => t.Organisation).ToListAsync();
     }