fix: return empty list when no niscode found for postal code on stree…

…tname list
Informatievlaanderen · Oct 10, 2023 · 29a766a · 29a766a
1 parent 8cad687
commit 29a766a
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 4 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -999,7 +999,6 @@ jobs:
           , 'streetname-registry-producer-snapshot-oslo'
           , 'streetname-registry-projections-backoffice'
           , 'streetname-registry-snapshot-verifier'
-          , 'streetname-registry-consumer-read-postal'
         ]
 
     steps:

diff --git a/src/StreetNameRegistry.Api.Legacy/StreetName/List/ListHandler.cs b/src/StreetNameRegistry.Api.Legacy/StreetName/List/ListHandler.cs
@@ -20,7 +20,7 @@ public sealed class ListHandler : ListHandlerBase
     {
         private readonly LegacyContext _legacyContext;
         private readonly SyndicationContext _syndicationContext;
-        private readonly ConsumerPostalContext _PostalContext;
+        private readonly ConsumerPostalContext _postalContext;
         private readonly IOptions<ResponseOptions> _responseOptions;
 
         public ListHandler(
@@ -31,13 +31,13 @@ public ListHandler(
         {
             _legacyContext = legacyContext;
             _syndicationContext = syndicationContext;
-            _PostalContext = postalContext;
+            _postalContext = postalContext;
             _responseOptions = responseOptions;
         }
 
         public override async Task<StreetNameListResponse> Handle(ListRequest request, CancellationToken cancellationToken)
         {
-            var streetNameQuery = new StreetNameListQuery(_legacyContext, _syndicationContext, _PostalContext)
+            var streetNameQuery = new StreetNameListQuery(_legacyContext, _syndicationContext, _postalContext)
                 .Fetch<StreetNameListItem, StreetNameListItem>(request.Filtering, request.Sorting, request.Pagination);
 
             var pagedStreetNames = await streetNameQuery

diff --git a/src/StreetNameRegistry.Api.Legacy/StreetName/Query/StreetNameListQuery.cs b/src/StreetNameRegistry.Api.Legacy/StreetName/Query/StreetNameListQuery.cs
@@ -99,6 +99,10 @@ protected override IQueryable<StreetNameListItem> Filter(FilteringHeader<StreetN
                 {
                     streetNames = streetNames.Where(m => m.NisCode == postalConsumerItem.NisCode);
                 }
+                else
+                {
+                    streetNames = streetNames.Where(m => m.NisCode == "-1");
+                }
             }
 
             return streetNames;

diff --git a/src/StreetNameRegistry.Api.Legacy/StreetName/Query/StreetNameListQueryV2.cs b/src/StreetNameRegistry.Api.Legacy/StreetName/Query/StreetNameListQueryV2.cs
@@ -118,6 +118,10 @@ protected override IQueryable<StreetNameListItemV2> Filter(FilteringHeader<Stree
                 {
                     streetNames = streetNames.Where(m => m.NisCode == postalConsumerItem.NisCode);
                 }
+                else
+                {
+                    streetNames = streetNames.Where(m => m.NisCode == "-1");
+                }
             }
 
             return streetNames;

diff --git a/src/StreetNameRegistry.Api.Oslo/StreetName/Query/StreetNameListOsloQuery.cs b/src/StreetNameRegistry.Api.Oslo/StreetName/Query/StreetNameListOsloQuery.cs
@@ -107,6 +107,10 @@ protected override IQueryable<StreetNameListItem> Filter(FilteringHeader<StreetN
                 {
                     streetNames = streetNames.Where(m => m.NisCode == postalConsumerItem.NisCode);
                 }
+                else
+                {
+                    streetNames = streetNames.Where(m => m.NisCode == "-1");
+                }
             }
 
             return streetNames;

diff --git a/src/StreetNameRegistry.Api.Oslo/StreetName/Query/StreetNameListOsloQueryV2.cs b/src/StreetNameRegistry.Api.Oslo/StreetName/Query/StreetNameListOsloQueryV2.cs
@@ -127,6 +127,10 @@ protected override IQueryable<StreetNameListItemV2> Filter(FilteringHeader<Stree
                 {
                     streetNames = streetNames.Where(m => m.NisCode == postalConsumerItem.NisCode);
                 }
+                else
+                {
+                    streetNames = streetNames.Where(m => m.NisCode == "-1");
+                }
             }
 
             return streetNames;
-Original file line number
+Diff line change
@@ Expand Up @@
                     {
                         streetNames = streetNames.Where(m => m.NisCode == postalConsumerItem.NisCode);
                     }
+                    else
+                    {
+                        streetNames = streetNames.Where(m => m.NisCode == "-1");
+                    }
                 }
                 return streetNames;
@@ Expand Down @@