Minor refactor + added ability to lookup list of LGAs

Author: robertjf

PostCodeSearch/Controllers/PostCodeLookupController.cs

@@ -34,8 +34,16 @@ public async Task<ActionResult<IEnumerable<PostCodeLookup>>> GetPostCodes(string
         [ProducesResponseType(StatusCodes.Status200OK)]
         public async Task<ActionResult<IEnumerable<PostCodeLookup>>> GetByLocalGovernmentArea(string search)
         {
-            var postCodes = await postCodeService.FindByLGA(search);
+            var postCodes = await postCodeService.FindByRegion(search);
             return Ok(postCodes);
         }
+
+        [HttpGet("getLocalGovernmentAreas/{search:string}")]
+        [ProducesResponseType(StatusCodes.Status200OK)]
+        public async Task<ActionResult<IEnumerable<RegionLookup>>> GetLocalGovernmentAreas(string search)
+        {
+            var regions = await postCodeService.FindRegions(search);
+            return Ok(regions);
+        }
     }
 }

PostCodeSearch/Models/Persistence/IPostCodeRepository.cs

@@ -8,7 +8,8 @@ public interface IPostCodeRepository
         void ClearTable();
         Task<bool> ContainsData();
         Task<IEnumerable<PostCodes>> Find(string filter);
-        Task<IEnumerable<PostCodes>> FindByLGA(string filter);
+        Task<IEnumerable<PostCodes>> FindByRegion(string filter);
+        Task<IEnumerable<RegionLookup>> FindRegions(string filter);
         Task InsertBatch(IEnumerable<PostCodes> data);
         void SavePostCode(PostCodes postCode);
     }

PostCodeSearch/Models/Persistence/PostCodeRepository.cs

@@ -22,18 +22,51 @@ public async Task<IEnumerable<PostCodes>> Find(string filter)
                 return Enumerable.Empty<PostCodes>();
             }
 
-            return await Database.FetchAsync<PostCodes>(Database.SqlContext.Sql().Where("PostCode like @0 + '%' OR Locality LIKE @0 + '%'", filter.Trim()));
+            return await Database.FetchAsync<PostCodes>(
+                Database.SqlContext.Sql()
+                        .Select<PostCodes>()
+                        .From<PostCodes>()
+                        .Where<PostCodes>(p =>
+                                p.PostCode.Contains(cleanFilter) ||
+                                p.Locality.Contains(cleanFilter)));
+
+            //return await Database.FetchAsync<PostCodes>(Database.SqlContext.Sql().Where("PostCode like @0 + '%' OR Locality LIKE @0 + '%'", filter.Trim()));
         }
 
-        public async Task<IEnumerable<PostCodes>> FindByLGA(string filter)
+        public async Task<IEnumerable<PostCodes>> FindByRegion(string filter)
         {
             var cleanFilter = filter.Trim();
             if (cleanFilter.IsNullOrWhiteSpace())
             {
                 return Enumerable.Empty<PostCodes>();
             }
 
-            return await Database.FetchAsync<PostCodes>(Database.SqlContext.Sql().Where("Region like @0 + '%' OR Electorate LIKE @0 + '%'", filter.Trim()));
+            return await Database.FetchAsync<PostCodes>(
+                Database.SqlContext.Sql()
+                        .Select<PostCodes>()
+                        .From<PostCodes>()
+                        .Where<PostCodes>(p =>
+                                p.Region.Contains(cleanFilter) ||
+                                p.Electorate.Contains(cleanFilter)));
+
+            //return await Database.FetchAsync<PostCodes>(Database.SqlContext.Sql().Where("Region like @0 + '%' OR Electorate LIKE @0 + '%'", filter.Trim()));
+        }
+
+        public async Task<IEnumerable<RegionLookup>> FindRegions(string filter)
+        {
+            var cleanFilter = filter.Trim();
+            if (cleanFilter.IsNullOrWhiteSpace())
+            {
+                return Enumerable.Empty<RegionLookup>();
+            }
+
+            return await Database.FetchAsync<RegionLookup>(
+                Database.SqlContext.Sql()
+                        .SelectDistinct<RegionLookup>()
+                        .From<PostCodes>()
+                        .Where<PostCodes>(p =>
+                                p.Region.Contains(cleanFilter) ||
+                                p.Electorate.Contains(cleanFilter)));
         }
 
         public async Task<bool> ContainsData()

…odeSearch/Models/Persistence/PostCode.cs …deSearch/Models/Persistence/PostCodes.csPostCodeSearch/Models/Persistence/PostCode.cs renamed to PostCodeSearch/Models/Persistence/PostCodes.cs PostCodeSearch/Models/Persistence/PostCode.cs renamed to PostCodeSearch/Models/Persistence/PostCodes.cs

@@ -18,6 +18,9 @@ public class PostCodes
         [Column("PostCode")]
         public string PostCode { get; set; }
 
+        [Column("State")]
+        public string State { get; set; }
+
         [Column("Locality")]
         public string Locality { get; set; }
 

PostCodeSearch/Models/PostCodeLookup.cs

@@ -8,6 +8,7 @@ public class PostCodeLookup
         public double? Latitude { get; set; }
         public double? Longitude { get; set; }
         public string Region { get; set; }
+        public string State { get; set; }
         public string Electorate { get; set; }
         public string ElectorateRating { get; set; }
     }

PostCodeSearch/Models/RegionLookup.cs

@@ -0,0 +1,10 @@
+namespace PostCodeSearch.Models
+{
+    public class RegionLookup
+    {
+        public string Region { get; set; }
+        public string State { get; set; }
+        public string Electorate { get; set; }
+        public string ElectorateRating { get; set; }
+    }
+}

PostCodeSearch/PostCodeSearch.csproj

@@ -16,7 +16,7 @@
 		<PackageRequireLicenseAcceptance>True</PackageRequireLicenseAcceptance>
 		<PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
 		<PackageReadmeFile>README.nuget.md</PackageReadmeFile>
-		<Version>0.1.0-rc1</Version>
+		<Version>0.1.0-rc2</Version>
 		<Nullable>enable</Nullable>
     </PropertyGroup>
     <ItemGroup>

PostCodeSearch/Services/IPostCodeService.cs

@@ -6,8 +6,9 @@ namespace PostCodeSearch.Services
 {
     public interface IPostCodeService
     {
-        Task<IEnumerable<PostCodeLookup>> FindByLGA(string search);
+        Task<IEnumerable<PostCodeLookup>> FindByRegion(string search);
         Task<IEnumerable<PostCodeLookup>> FindPostCodes(string search);
+        Task<IEnumerable<RegionLookup>> FindRegions(string search);
         Task<bool> PostCodesInitialised();
         Task<long> RefreshPostCodes();
     }

PostCodeSearch/Services/PostCodeService.cs

@@ -44,6 +44,7 @@ public async Task<IEnumerable<PostCodeLookup>> FindPostCodes(string search)
                         Id = p.Id,
                         Postcode = p.PostCode,
                         Locality = p.Locality,
+                        State = p.State,
                         Latitude = p.Lat,
                         Longitude = p.Long,
                         Region = p.Region,
@@ -55,15 +56,14 @@ public async Task<IEnumerable<PostCodeLookup>> FindPostCodes(string search)
             return Enumerable.Empty<PostCodeLookup>();
         }
 
-
         /// <inheritdoc/>
-        public async Task<IEnumerable<PostCodeLookup>> FindByLGA(string search)
+        public async Task<IEnumerable<PostCodeLookup>> FindByRegion(string search)
         {
             if (search?.Length > 2)
             {
                 using (ScopeProvider.CreateScope(autoComplete: true))
                 {
-                    var postcodes = await postCodeRepository.FindByLGA(search);
+                    var postcodes = await postCodeRepository.FindByRegion(search);
                     return postcodes.Select(p => new PostCodeLookup
                     {
                         Id = p.Id,
@@ -80,6 +80,19 @@ public async Task<IEnumerable<PostCodeLookup>> FindByLGA(string search)
             return Enumerable.Empty<PostCodeLookup>();
         }
 
+        /// <inheritdoc/>
+        public async Task<IEnumerable<RegionLookup>> FindRegions(string search)
+        {
+            if (search?.Length > 2)
+            {
+                using (ScopeProvider.CreateScope(autoComplete: true))
+                {
+                    return await postCodeRepository.FindRegions(search);
+                }
+            }
+            return Enumerable.Empty<RegionLookup>();
+        }
+
         public async Task<bool> PostCodesInitialised()
         {
             using (ScopeProvider.CreateScope(autoComplete: true))
@@ -122,6 +135,7 @@ await postCodeRepository.InsertBatch(batch.Select(p =>
                                 PostCode = p.PostCode,
                                 Locality = p.Locality,
                                 Region = p.LgaRegion,
+                                State = p.State,
                                 Electorate = p.Electorate,
                                 ElectorateRating = p.ElectorateRating,
                                 Lat = lat,