chore: Update namespaces to use CentralPennIncidentsFunc instead of L…

…ancoIncidentsFunc
myty · Jun 21, 2024 · 805f7cc · 805f7cc
1 parent 94672c6
commit 805f7cc
Show file tree

Hide file tree

Showing 28 changed files with 133 additions and 107 deletions.
diff --git a/apps/func/src/CentralPennIncidentsFunc/API/Incidents.cs b/apps/func/src/CentralPennIncidentsFunc/API/Incidents.cs
@@ -4,12 +4,12 @@
 using System.Text.Json;
 using System.Threading.Tasks;
 using AutoMapper;
-using LancoIncidentsFunc.Interfaces;
+using CentralPennIncidentsFunc.Interfaces;
 using Microsoft.Azure.Functions.Worker;
 using Microsoft.Azure.Functions.Worker.Http;
 using Microsoft.Extensions.Logging;
 
-namespace LancoIncidentsFunc.API
+namespace CentralPennIncidentsFunc.API
 {
     public class Incidents
     {

diff --git a/apps/func/src/CentralPennIncidentsFunc/Dtos/Incident.cs b/apps/func/src/CentralPennIncidentsFunc/Dtos/Incident.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Text.Json.Serialization;
 
-namespace LancoIncidentsFunc.Dtos
+namespace CentralPennIncidentsFunc.Dtos
 {
     public class Incident
     {

diff --git a/apps/func/src/CentralPennIncidentsFunc/Dtos/Location.cs b/apps/func/src/CentralPennIncidentsFunc/Dtos/Location.cs
@@ -1,6 +1,6 @@
 using System.Text.Json.Serialization;
 
-namespace LancoIncidentsFunc.Dtos
+namespace CentralPennIncidentsFunc.Dtos
 {
     public class Location
     {

diff --git a/apps/func/src/CentralPennIncidentsFunc/Dtos/Mappings/IncidentProfile.cs b/apps/func/src/CentralPennIncidentsFunc/Dtos/Mappings/IncidentProfile.cs
@@ -1,6 +1,6 @@
 using AutoMapper;
 
-namespace LancoIncidentsFunc.Dtos.Mappings
+namespace CentralPennIncidentsFunc.Dtos.Mappings
 {
     public class IncidentProfile : Profile
     {

diff --git a/apps/func/src/CentralPennIncidentsFunc/Dtos/Mappings/LocationProfile.cs b/apps/func/src/CentralPennIncidentsFunc/Dtos/Mappings/LocationProfile.cs
@@ -1,6 +1,6 @@
 using AutoMapper;
 
-namespace LancoIncidentsFunc.Dtos.Mappings
+namespace CentralPennIncidentsFunc.Dtos.Mappings
 {
     public class LocationProfile : Profile
     {

diff --git a/apps/func/src/CentralPennIncidentsFunc/IncidentProviders/BaseIncidentProvider.cs b/apps/func/src/CentralPennIncidentsFunc/IncidentProviders/BaseIncidentProvider.cs
@@ -2,10 +2,10 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
-using LancoIncidentsFunc.Interfaces;
-using LancoIncidentsFunc.Models;
+using CentralPennIncidentsFunc.Interfaces;
+using CentralPennIncidentsFunc.Models;
 
-namespace LancoIncidentsFunc.IncidentProviders;
+namespace CentralPennIncidentsFunc.IncidentProviders;
 
 public abstract class BaseIncidentProvider : IIncidentProvider
 {

diff --git a/apps/func/src/CentralPennIncidentsFunc/IncidentProviders/LancasterIncidentProvider.cs b/apps/func/src/CentralPennIncidentsFunc/IncidentProviders/LancasterIncidentProvider.cs
@@ -5,10 +5,10 @@
 using System.Threading;
 using System.Threading.Tasks;
 using System.Xml.Linq;
-using LancoIncidentsFunc.Interfaces;
-using LancoIncidentsFunc.Models;
+using CentralPennIncidentsFunc.Interfaces;
+using CentralPennIncidentsFunc.Models;
 
-namespace LancoIncidentsFunc.IncidentProviders;
+namespace CentralPennIncidentsFunc.IncidentProviders;
 
 public class LancasterIncidentProvider : BaseIncidentProvider
 {
@@ -41,7 +41,8 @@ public override async Task<IEnumerable<Incident>> GetIncidentsAsync()
         var cts = new CancellationTokenSource();
         var rss = await XDocument.LoadAsync(xmlStream, LoadOptions.None, cts.Token);
 
-        var incidents = rss.Root.Descendants("item")
+        var incidents = rss
+            .Root.Descendants("item")
             .Select(itm =>
             {
                 var descSplit = itm.Element("description").Value.Split(';');

diff --git a/apps/func/src/CentralPennIncidentsFunc/IncidentProviders/YorklIncidentProvider.cs b/apps/func/src/CentralPennIncidentsFunc/IncidentProviders/YorklIncidentProvider.cs
@@ -3,12 +3,12 @@
 using System.Linq;
 using System.Net.Http;
 using System.Threading.Tasks;
+using CentralPennIncidentsFunc.Interfaces;
+using CentralPennIncidentsFunc.Models;
 using HtmlAgilityPack;
-using LancoIncidentsFunc.Interfaces;
-using LancoIncidentsFunc.Models;
 using Microsoft.OData.Edm;
 
-namespace LancoIncidentsFunc.IncidentProviders;
+namespace CentralPennIncidentsFunc.IncidentProviders;
 
 public class YorklIncidentProvider : BaseIncidentProvider
 {
@@ -41,49 +41,62 @@ public override async Task<IEnumerable<Incident>> GetIncidentsAsync()
         var doc = new HtmlDocument();
         doc.LoadHtml(htmlSource);
 
-        var incidents = doc.DocumentNode.Descendants("table")
+        var incidents = doc
+            .DocumentNode.Descendants("table")
             .Where(x => x.Attributes["class"]?.Value == "incidentList")
-            .SelectMany(
-                y =>
-                    y.ChildNodes.Skip(3)
-                        .Select(
-                            tr =>
-                                tr.ChildNodes.Where(node => node.NodeType == HtmlNodeType.Element)
-                                    .ToList()
-                        )
-                        .Where(cells => cells.Count > 0)
-                        .Select(cells =>
-                        {
-                            var type = cells.FirstOrDefault()?.InnerText;
-                            var subType = cells.Skip(3).FirstOrDefault()?.InnerText;
-                            var location = cells.Skip(6).FirstOrDefault()?.InnerText;
-                            var area = cells.Skip(7).FirstOrDefault()?.InnerText;
-                            var date = cells.Skip(1)?.FirstOrDefault()?.InnerText;
-                            var id =
-                                cells
-                                    .Skip(8)
-                                    ?.FirstOrDefault()
-                                    ?.InnerHtml
-                                    .Split('?')
-                                    .Skip(1)
-                                    .FirstOrDefault()
-                                    ?.Split('"')
-                                    .FirstOrDefault() ?? $"{Guid.NewGuid()}";
+            .SelectMany(y =>
+                y.ChildNodes.Skip(2)
+                    .Select(tr =>
+                        tr.ChildNodes.Where(node => node.NodeType == HtmlNodeType.Element).ToList()
+                    )
+                    .Where(cells => cells.Count > 0)
+                    .Select(cells =>
+                    {
+                        var type = cells.FirstOrDefault()?.InnerText;
+                        var subType = cells.Skip(3).FirstOrDefault()?.InnerText;
+                        var street = cells.Skip(4).FirstOrDefault()?.InnerText;
+                        var crossStreet = cells.Skip(5).FirstOrDefault()?.InnerText;
+                        var nearestIntersection = cells.Skip(6).FirstOrDefault()?.InnerText;
+                        var area = cells.Skip(7).FirstOrDefault()?.InnerText;
+                        var date = cells.Skip(1)?.FirstOrDefault()?.InnerText;
+                        var id =
+                            cells
+                                .Skip(8)
+                                ?.FirstOrDefault()
+                                ?.InnerHtml.Split('?')
+                                .Skip(1)
+                                .FirstOrDefault()
+                                ?.Split('"')
+                                .FirstOrDefault() ?? $"{Guid.NewGuid()}";
 
-                            return new Incident(Key, id)
-                            {
-                                Type = type,
-                                SubType = subType,
-                                Area = area,
-                                Location = location,
-                                IncidentDate = Date.Parse(date)
-                            };
-                        })
+                        return new Incident(Key, id)
+                        {
+                            Type = type,
+                            SubType = subType,
+                            Area = area,
+                            Location = FormatLocation(street, crossStreet, nearestIntersection),
+                            IncidentDate = Date.Parse(date)
+                        };
+                    })
             )
             .ToList();
 
         _feedCache.SaveValue(Source, incidents);
 
         return incidents;
     }
+
+    private static string FormatLocation(
+        string street,
+        string crossStreet,
+        string nearestIntersection
+    )
+    {
+        if (!string.IsNullOrWhiteSpace(nearestIntersection))
+        {
+            return nearestIntersection;
+        }
+
+        return $"{street} / {crossStreet}";
+    }
 }
diff --git a/apps/func/src/CentralPennIncidentsFunc/Interfaces/IDataCache.cs b/apps/func/src/CentralPennIncidentsFunc/Interfaces/IDataCache.cs
@@ -1,7 +1,7 @@
 using System.Collections.Generic;
-using LancoIncidentsFunc.Models;
+using CentralPennIncidentsFunc.Models;
 
-namespace LancoIncidentsFunc.Interfaces
+namespace CentralPennIncidentsFunc.Interfaces
 {
     public interface IDataCache<TKey, TValue>
     {

diff --git a/apps/func/src/CentralPennIncidentsFunc/Interfaces/IEnvironmentProvider.cs b/apps/func/src/CentralPennIncidentsFunc/Interfaces/IEnvironmentProvider.cs
@@ -1,6 +1,6 @@
 using System;
 
-namespace LancoIncidentsFunc.Interfaces
+namespace CentralPennIncidentsFunc.Interfaces
 {
     public interface IEnvironmentProvider
     {

diff --git a/apps/func/src/CentralPennIncidentsFunc/Interfaces/IFeedService.cs b/apps/func/src/CentralPennIncidentsFunc/Interfaces/IFeedService.cs
@@ -1,8 +1,8 @@
 using System.Collections.Generic;
 using System.Threading.Tasks;
-using LancoIncidentsFunc.Models;
+using CentralPennIncidentsFunc.Models;
 
-namespace LancoIncidentsFunc.Interfaces;
+namespace CentralPennIncidentsFunc.Interfaces;
 
 public interface IFeedService
 {

diff --git a/apps/func/src/CentralPennIncidentsFunc/Interfaces/IIncidentProvider.cs b/apps/func/src/CentralPennIncidentsFunc/Interfaces/IIncidentProvider.cs
@@ -1,8 +1,8 @@
 using System.Collections.Generic;
 using System.Threading.Tasks;
-using LancoIncidentsFunc.Models;
+using CentralPennIncidentsFunc.Models;
 
-namespace LancoIncidentsFunc.Interfaces;
+namespace CentralPennIncidentsFunc.Interfaces;
 
 public interface IIncidentProvider
 {

diff --git a/apps/func/src/CentralPennIncidentsFunc/Interfaces/ILocationRepository.cs b/apps/func/src/CentralPennIncidentsFunc/Interfaces/ILocationRepository.cs
@@ -1,8 +1,8 @@
 using System.Threading.Tasks;
-using LancoIncidentsFunc.Models;
+using CentralPennIncidentsFunc.Models;
 using Microsoft.Azure.Cosmos.Table;
 
-namespace LancoIncidentsFunc.Interfaces
+namespace CentralPennIncidentsFunc.Interfaces
 {
     public interface ILocationRepository
     {

diff --git a/apps/func/src/CentralPennIncidentsFunc/Interfaces/ILocationService.cs b/apps/func/src/CentralPennIncidentsFunc/Interfaces/ILocationService.cs
@@ -1,7 +1,7 @@
 using System.Threading.Tasks;
-using LancoIncidentsFunc.Models;
+using CentralPennIncidentsFunc.Models;
 
-namespace LancoIncidentsFunc.Interfaces
+namespace CentralPennIncidentsFunc.Interfaces
 {
     public interface ILocationService
     {

diff --git a/apps/func/src/CentralPennIncidentsFunc/Models/Incident.cs b/apps/func/src/CentralPennIncidentsFunc/Models/Incident.cs
@@ -2,7 +2,7 @@
 using System.Linq;
 using System.Text;
 
-namespace LancoIncidentsFunc.Models
+namespace CentralPennIncidentsFunc.Models
 {
     public class Incident
     {

diff --git a/apps/func/src/CentralPennIncidentsFunc/Models/LocationEntity.cs b/apps/func/src/CentralPennIncidentsFunc/Models/LocationEntity.cs
@@ -1,7 +1,7 @@
 using System.Net;
 using Microsoft.Azure.Cosmos.Table;
 
-namespace LancoIncidentsFunc.Models
+namespace CentralPennIncidentsFunc.Models
 {
     public class LocationEntity : TableEntity
     {

diff --git a/apps/func/src/CentralPennIncidentsFunc/Program.cs b/apps/func/src/CentralPennIncidentsFunc/Program.cs
@@ -1,15 +1,16 @@
 using System.Collections.Generic;
 using System.Threading.Tasks;
-using LancoIncidentsFunc.IncidentProviders;
-using LancoIncidentsFunc.Interfaces;
-using LancoIncidentsFunc.Models;
-using LancoIncidentsFunc.Providers;
-using LancoIncidentsFunc.Repositories;
-using LancoIncidentsFunc.Services;
+using CentralPennIncidentsFunc.IncidentProviders;
+using CentralPennIncidentsFunc.Interfaces;
+using CentralPennIncidentsFunc.Models;
+using CentralPennIncidentsFunc.Providers;
+using CentralPennIncidentsFunc.Repositories;
+using CentralPennIncidentsFunc.Services;
+using CentralPennIncidentsFunc.Services;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
 
-namespace LancoIncidentsFunc
+namespace CentralPennIncidentsFunc
 {
     public class Program
     {

diff --git a/apps/func/src/CentralPennIncidentsFunc/Providers/EnvironmentProvider.cs b/apps/func/src/CentralPennIncidentsFunc/Providers/EnvironmentProvider.cs
@@ -1,7 +1,7 @@
 using System;
-using LancoIncidentsFunc.Interfaces;
+using CentralPennIncidentsFunc.Interfaces;
 
-namespace LancoIncidentsFunc.Providers
+namespace CentralPennIncidentsFunc.Providers
 {
     public class EnvironmentProvider : IEnvironmentProvider
     {

diff --git a/apps/func/src/CentralPennIncidentsFunc/Repositories/LocationRepository.cs b/apps/func/src/CentralPennIncidentsFunc/Repositories/LocationRepository.cs
@@ -2,11 +2,11 @@
 using System.Collections.Generic;
 using System.Net;
 using System.Threading.Tasks;
-using LancoIncidentsFunc.Interfaces;
-using LancoIncidentsFunc.Models;
+using CentralPennIncidentsFunc.Interfaces;
+using CentralPennIncidentsFunc.Models;
 using Microsoft.Azure.Cosmos.Table;
 
-namespace LancoIncidentsFunc.Repositories
+namespace CentralPennIncidentsFunc.Repositories
 {
     public class LocationRepository : ILocationRepository
     {

diff --git a/apps/func/src/CentralPennIncidentsFunc/Schedules/EndPointKeepWarm.cs b/apps/func/src/CentralPennIncidentsFunc/Schedules/EndPointKeepWarm.cs
@@ -2,11 +2,11 @@
 using System.Collections.Generic;
 using System.Net.Http;
 using System.Threading.Tasks;
-using LancoIncidentsFunc.Interfaces;
+using CentralPennIncidentsFunc.Interfaces;
 using Microsoft.Azure.Functions.Worker;
 using Microsoft.Extensions.Logging;
 
-namespace LancoIncidentsFunc.Schedules
+namespace CentralPennIncidentsFunc.Schedules
 {
     public class EndPointKeepWarm
     {

diff --git a/apps/func/src/CentralPennIncidentsFunc/Services/FeedCache.cs b/apps/func/src/CentralPennIncidentsFunc/Services/FeedCache.cs
@@ -1,10 +1,10 @@
 using System;
 using System.Collections.Generic;
-using LancoIncidentsFunc.Interfaces;
-using LancoIncidentsFunc.Models;
+using CentralPennIncidentsFunc.Interfaces;
+using CentralPennIncidentsFunc.Models;
 using Microsoft.Extensions.Caching.Memory;
 
-namespace LancoIncidentsFunc.Services
+namespace CentralPennIncidentsFunc.Services
 {
     public class FeedCache : IDataCache<string, IEnumerable<Incident>>
     {

diff --git a/apps/func/src/CentralPennIncidentsFunc/Services/FeedService.cs b/apps/func/src/CentralPennIncidentsFunc/Services/FeedService.cs
@@ -1,11 +1,11 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
-using LancoIncidentsFunc.Interfaces;
-using LancoIncidentsFunc.Models;
+using CentralPennIncidentsFunc.Interfaces;
+using CentralPennIncidentsFunc.Models;
 using Microsoft.Extensions.Logging;
 
-namespace LancoIncidentsFunc.Services;
+namespace CentralPennIncidentsFunc.Services;
 
 public class FeedService : IFeedService
 {

diff --git a/apps/func/src/CentralPennIncidentsFunc/Services/LocationCache.cs b/apps/func/src/CentralPennIncidentsFunc/Services/LocationCache.cs
@@ -1,9 +1,9 @@
 using System;
-using LancoIncidentsFunc.Interfaces;
-using LancoIncidentsFunc.Models;
+using CentralPennIncidentsFunc.Interfaces;
+using CentralPennIncidentsFunc.Models;
 using Microsoft.Extensions.Caching.Memory;
 
-namespace LancoIncidentsFunc.Services
+namespace CentralPennIncidentsFunc.Services
 {
     public class LocationCache : IDataCache<(string, string), LocationEntity>
     {