AS1024/GeoFeed
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: AS1024:0c3edd64f344721cf1db4e3511173dff34d6cf87
Branches Tags
AS1024:master AS1024:compartmentalization
AS1024:no-cache
...
compare: AS1024:e0189381f173e6203048047f4923b203e83708b4
Branches Tags
AS1024:master AS1024:compartmentalization
AS1024:no-cache

2 Commits
0c3edd64f3 ... e0189381f1

Author SHA1 Message Date
Jeff Leung
e0189381f1 Rename the GetGeofeed Method to Async 2024-01-18 16:15:41 -08:00
Jeff Leung
3a56e2426e Move geofeed web logic to a seperate project as core lib as asp.net core project is causing weird issues 2024-01-18 16:15:04 -08:00
14 changed files with 46 additions and 16 deletions
Expand all files Collapse all files

14
AS1024.GeoFeed.Core.WebLogic/AS1024.GeoFeed.Core.WebLogic.csproj Normal file
View File

@@ -0,0 +1,14 @@
<Project Sdk="Microsoft.NET.Sdk.Web">
<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<OutputType>Library</OutputType>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\AS1024.GeoFeed.Core\AS1024.GeoFeed.Core.csproj" />
</ItemGroup>
</Project>

4
AS1024.GeoFeed.Core/GeoFeedLogic/GeoFeedReturn.cs → AS1024.GeoFeed.Core.WebLogic/GeoFeedRetrurn.cs
View File

@@ -4,7 +4,7 @@ using AS1024.GeoFeed.Core.Tools;
using AS1024.GeoFeed.Models; using AS1024.GeoFeed.Models;
using Microsoft.Extensions.Caching.Memory; using Microsoft.Extensions.Caching.Memory;
namespace AS1024.GeoFeed.Core.GeoFeedLogic namespace AS1024.GeoFeed.Core.WebLogic
{ {
public class GeoFeedReturn public class GeoFeedReturn
{ {
@@ -36,7 +36,7 @@ namespace AS1024.GeoFeed.Core.GeoFeedLogic
if (!memoryCache.TryGetValue(GeoFeedCacheKey, out List<IPGeoFeed>? feed)) if (!memoryCache.TryGetValue(GeoFeedCacheKey, out List<IPGeoFeed>? feed))
{ {
isCached = false; isCached = false;
feed = await provider.GetGeoFeedData(); feed = await provider.GetGeoFeedDataAsync();
if (environment.IsProduction()) if (environment.IsProduction())
{ {
MemoryCacheEntryOptions cacheEntryOptions = new MemoryCacheEntryOptions() MemoryCacheEntryOptions cacheEntryOptions = new MemoryCacheEntryOptions()

12
AS1024.GeoFeed.Core.WebLogic/Properties/launchSettings.json Normal file
View File

@@ -0,0 +1,12 @@
{
"profiles": {
"AS1024.GeoFeed.Core.WebLogic": {
"commandName": "Project",
"launchBrowser": true,
"environmentVariables": {
"ASPNETCORE_ENVIRONMENT": "Development"
},
"applicationUrl": "https://localhost:54455;http://localhost:54456"
}
}
}

2
AS1024.GeoFeed.Core/AS1024.GeoFeed.Core.csproj
View File

@@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk.Web"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFramework>net8.0</TargetFramework> <TargetFramework>net8.0</TargetFramework>

2
AS1024.GeoFeed.Core/CacheService/GeoFeedCacheService.cs
View File

@@ -42,7 +42,7 @@ namespace AS1024.GeoFeed.Core.CacheService
var persistentCacheProvider = var persistentCacheProvider =
scope.ServiceProvider.GetRequiredService<IGeoFeedPersistentCacheProvider>(); scope.ServiceProvider.GetRequiredService<IGeoFeedPersistentCacheProvider>();
var results = await feedProvider.GetGeoFeedData(); var results = await feedProvider.GetGeoFeedDataAsync();
await persistentCacheProvider.CacheGeoFeed(results); await persistentCacheProvider.CacheGeoFeed(results);
} }
catch (Exception) catch (Exception)

2
AS1024.GeoFeed.Core/GeoFeedPreloader/PreloadGeoFeed.cs
View File

@@ -41,7 +41,7 @@ namespace AS1024.GeoFeed.Core.GeoFeedPreloader
private async Task StartPreLoad() private async Task StartPreLoad()
{ {
logger.LogInformation("Preloading GeoFeed data in memory..."); logger.LogInformation("Preloading GeoFeed data in memory...");
List<IPGeoFeed> feed = await provider.GetGeoFeedData(); List<IPGeoFeed> feed = await provider.GetGeoFeedDataAsync();
MemoryCacheEntryOptions cacheEntryOptions = new MemoryCacheEntryOptions().SetAbsoluteExpiration(TimeSpan.FromMinutes(45)); MemoryCacheEntryOptions cacheEntryOptions = new MemoryCacheEntryOptions().SetAbsoluteExpiration(TimeSpan.FromMinutes(45));
memoryCache.Set(GeoFeedCacheKey, feed, cacheEntryOptions); memoryCache.Set(GeoFeedCacheKey, feed, cacheEntryOptions);
} }

2
AS1024.GeoFeed.Core/GeoFeedProviders/NetBoxGeoFeedProviderBase.cs
View File

@@ -31,7 +31,7 @@ namespace AS1024.GeoFeed.Core.GeoFeedProviders
this.httpClientFactory = httpClientFactory; this.httpClientFactory = httpClientFactory;
} }
public async Task<List<IPGeoFeed>> GetGeoFeedData() public async Task<List<IPGeoFeed>> GetGeoFeedDataAsync()
{ {
List<IPGeoFeed> geoFeed = []; List<IPGeoFeed> geoFeed = [];
using HttpClient client = httpClientFactory.CreateClient(); using HttpClient client = httpClientFactory.CreateClient();

2
AS1024.GeoFeed.Core/Interfaces/IGeoFeedProvider.cs
View File

@@ -5,6 +5,6 @@ namespace AS1024.GeoFeed.Core.Interfaces
public interface IGeoFeedProvider public interface IGeoFeedProvider
{ {
public string GeoFeedProviderName { get; } public string GeoFeedProviderName { get; }
public Task<List<IPGeoFeed>> GetGeoFeedData(); public Task<List<IPGeoFeed>> GetGeoFeedDataAsync();
} }
} }

1
AS1024.GeoFeed.MinimalAPI/AS1024.GeoFeed.MinimalAPI.csproj
View File

@@ -14,6 +14,7 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\AS1024.GeoFeed.Core.WebLogic\AS1024.GeoFeed.Core.WebLogic.csproj" />
<ProjectReference Include="..\AS1024.GeoFeed.Core\AS1024.GeoFeed.Core.csproj" /> <ProjectReference Include="..\AS1024.GeoFeed.Core\AS1024.GeoFeed.Core.csproj" />
</ItemGroup> </ItemGroup>

6
AS1024.GeoFeed.MinimalAPI/Program.cs
View File

@@ -1,11 +1,7 @@
using AS1024.GeoFeed.Core.CacheService; using AS1024.GeoFeed.Core.CacheService;
using AS1024.GeoFeed.Core.GeoFeedLogic;
using AS1024.GeoFeed.Core.GeoFeedPreloader; using AS1024.GeoFeed.Core.GeoFeedPreloader;
using AS1024.GeoFeed.Core.Interfaces; using AS1024.GeoFeed.Core.Interfaces;
using AS1024.GeoFeed.Core.Tools; using AS1024.GeoFeed.Core.WebLogic;
using AS1024.GeoFeed.Models;
using Microsoft.Extensions.Caching.Memory;
using System.Text;
namespace AS1024.GeoFeed.MinimalAPI namespace AS1024.GeoFeed.MinimalAPI
{ {

8
AS1024.GeoFeed.sln
View File

@@ -14,7 +14,9 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AS1024.GeoFeed.Core", "AS10
EndProject EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AS1024.GeoFeed.MinimalAPI", "AS1024.GeoFeed.MinimalAPI\AS1024.GeoFeed.MinimalAPI.csproj", "{36F2958C-8D0E-463B-9BF3-D6E55E6FC0B8}" Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AS1024.GeoFeed.MinimalAPI", "AS1024.GeoFeed.MinimalAPI\AS1024.GeoFeed.MinimalAPI.csproj", "{36F2958C-8D0E-463B-9BF3-D6E55E6FC0B8}"
EndProject EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AS1024.GeoFeed.Core.SqliteGeoFeedCache", "AS1024.GeoFeed.Core.SqliteGeoFeedCache\AS1024.GeoFeed.Core.SqliteGeoFeedCache.csproj", "{3459BB31-FA7A-44D1-872D-C5338ACFBF80}" Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AS1024.GeoFeed.Core.SqliteGeoFeedCache", "AS1024.GeoFeed.Core.SqliteGeoFeedCache\AS1024.GeoFeed.Core.SqliteGeoFeedCache.csproj", "{3459BB31-FA7A-44D1-872D-C5338ACFBF80}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AS1024.GeoFeed.Core.WebLogic", "AS1024.GeoFeed.Core.WebLogic\AS1024.GeoFeed.Core.WebLogic.csproj", "{58BDCE89-FCC0-478F-BBDE-B89833712AAB}"
EndProject EndProject
Global Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -42,6 +44,10 @@ Global
{3459BB31-FA7A-44D1-872D-C5338ACFBF80}.Debug|Any CPU.Build.0 = Debug|Any CPU {3459BB31-FA7A-44D1-872D-C5338ACFBF80}.Debug|Any CPU.Build.0 = Debug|Any CPU
{3459BB31-FA7A-44D1-872D-C5338ACFBF80}.Release|Any CPU.ActiveCfg = Release|Any CPU {3459BB31-FA7A-44D1-872D-C5338ACFBF80}.Release|Any CPU.ActiveCfg = Release|Any CPU
{3459BB31-FA7A-44D1-872D-C5338ACFBF80}.Release|Any CPU.Build.0 = Release|Any CPU {3459BB31-FA7A-44D1-872D-C5338ACFBF80}.Release|Any CPU.Build.0 = Release|Any CPU
{58BDCE89-FCC0-478F-BBDE-B89833712AAB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{58BDCE89-FCC0-478F-BBDE-B89833712AAB}.Debug|Any CPU.Build.0 = Debug|Any CPU
{58BDCE89-FCC0-478F-BBDE-B89833712AAB}.Release|Any CPU.ActiveCfg = Release|Any CPU
{58BDCE89-FCC0-478F-BBDE-B89833712AAB}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection EndGlobalSection
GlobalSection(SolutionProperties) = preSolution GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE HideSolutionNode = FALSE

1
AS1024.GeoFeed/AS1024.GeoFeed.csproj
View File

@@ -23,6 +23,7 @@
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\AS1024.GeoFeed.Core.SqliteGeoFeedCache\AS1024.GeoFeed.Core.SqliteGeoFeedCache.csproj" /> <ProjectReference Include="..\AS1024.GeoFeed.Core.SqliteGeoFeedCache\AS1024.GeoFeed.Core.SqliteGeoFeedCache.csproj" />
<ProjectReference Include="..\AS1024.GeoFeed.Core.WebLogic\AS1024.GeoFeed.Core.WebLogic.csproj" />
<ProjectReference Include="..\AS1024.GeoFeed.Core\AS1024.GeoFeed.Core.csproj" /> <ProjectReference Include="..\AS1024.GeoFeed.Core\AS1024.GeoFeed.Core.csproj" />
<ProjectReference Include="..\AS1024.GeoFeed.Models\AS1024.GeoFeed.Models.csproj" /> <ProjectReference Include="..\AS1024.GeoFeed.Models\AS1024.GeoFeed.Models.csproj" />
</ItemGroup> </ItemGroup>

2
AS1024.GeoFeed/Controllers/GeofeedController.cs
View File

@@ -1,5 +1,5 @@
using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc;
using AS1024.GeoFeed.Core.GeoFeedLogic; using AS1024.GeoFeed.Core.WebLogic;
namespace AS1024.GeoFeed.Controllers namespace AS1024.GeoFeed.Controllers
{ {

2
AS1024.GeoFeed/Program.cs
View File

@@ -4,7 +4,7 @@ using AS1024.GeoFeed.Core.GeoFeedProviders;
using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore;
using AS1024.GeoFeed.Core.GeoFeedSqliteLocalCache; using AS1024.GeoFeed.Core.GeoFeedSqliteLocalCache;
using AS1024.GeoFeed.Core.CacheService; using AS1024.GeoFeed.Core.CacheService;
using AS1024.GeoFeed.Core.GeoFeedLogic; using AS1024.GeoFeed.Core.WebLogic;
namespace AS1024.GeoFeed namespace AS1024.GeoFeed
{ {