2.0

.config/dotnet-tools.json

@@ -0,0 +1,13 @@
+{
+  "version": 1,
+  "isRoot": true,
+  "tools": {
+    "dotnet-ef": {
+      "version": "9.0.6",
+      "commands": [
+        "dotnet-ef"
+      ],
+      "rollForward": false
+    }
+  }
+}

.drone.yml

@@ -9,7 +9,7 @@ trigger:
     - release
 steps:
   - name: run tests
-    image: mcr.microsoft.com/dotnet/sdk:7.0
+    image: mcr.microsoft.com/dotnet/sdk:9.0
     commands:
     - dotnet test
 ---
@@ -91,4 +91,6 @@ steps:
       PASSWORD:
         from_secret: REGISTRY_PASSWORD
       POSTGRES_PASSWORD:
-        from_secret: POSTGRES_PASSWORD
+        from_secret: POSTGRES_PASSWORD
+      API_KEY:
+        from_secret: API_KEY

.github/workflows/main.yml

@@ -1,31 +1,53 @@
 name: Deploy to GitHub Pages
 on:
   push:
-    branches: [ main ]
+    branches: [ "main" ]
+  workflow_dispatch:
+
+permissions:
+  contents: read
+  pages: write
+  id-token: write
+
+# Allow only one concurrent deployment, skipping runs queued between the run in-progress and latest queued.
+# However, do NOT cancel in-progress runs as we want to allow these production deployments to complete.
+concurrency:
+  group: "pages"
+  cancel-in-progress: false
+
 jobs:
-  deploy-to-github-pages:
-    # use ubuntu-latest image to run steps on
+  deploy:
+#TODO
+#    environment:
+#      name: github-pages
+#      url: ${{ steps.deployment.outputs.page_url }}
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
-
-    - name: Setup .NET Core SDK
-      uses: actions/setup-dotnet@v1
-      with:
-        dotnet-version: 7.0.100
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Setup .NET
+        uses: actions/setup-dotnet@v4
+        with:
+          dotnet-version: 9.0.x
+
+      - name: Tests
+        run: dotnet test
+
+      - name: Publish .NET Core Project
+        run: dotnet publish src/Web/Web.csproj -c Debug -o release --nologo
+
+      - name: Add .nojekyll file
+        run: touch release/wwwroot/.nojekyll
 
-    - name: Tests
-      run: dotnet test
+      - name: Setup Pages
+        uses: actions/configure-pages@v5
 
-    - name: Publish .NET Core Project
-      run: dotnet publish src/Web/Web.csproj -c Debug -o release --nologo
-
-    - name: Add .nojekyll file
-      run: touch release/wwwroot/.nojekyll
-
-    - name: Commit wwwroot to GitHub Pages
-      uses: JamesIves/github-pages-deploy-action@3.7.1
-      with:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        BRANCH: gh-pages
-        FOLDER: release/wwwroot
+      - name: Upload artifact
+        uses: actions/upload-pages-artifact@v3
+        with:
+          path: 'release/wwwroot'
+
+      - name: Deploy to GitHub Pages
+        id: deployment
+        uses: actions/deploy-pages@v4

.github/workflows/test.yml

@@ -1,25 +1,27 @@
 name: Test
 
-on:
-  push:
-    branches: [ "*" ]
-  pull_request:
-    branches: [ "*" ]
-
+on: [ pull_request ]
 jobs:
   build:
 
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v3
-    - name: Setup .NET
-      uses: actions/setup-dotnet@v3
-      with:
-        dotnet-version: 7.0.x
-    - name: Restore dependencies
-      run: dotnet restore
-    - name: Build
-      run: dotnet build --no-restore
-    - name: Test
-      run: dotnet test --no-build --verbosity normal
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: Setup .NET
+        uses: actions/setup-dotnet@v4
+        with:
+          dotnet-version: 9.0.x
+
+      - name: Restore dependencies
+        run: dotnet restore
+
+      - name: Build
+        run: dotnet build --no-restore
+
+      - name: Test
+        run: dotnet test --no-build --verbosity normal

.gitignore

@@ -350,4 +350,4 @@ MigrationBackup/
 
 **/.idea/
 
-# test commit
+**/wwwroot/js/bundle.js*

Directory.Build.props

@@ -0,0 +1,8 @@
+<Project>
+    <PropertyGroup>
+        <RootNamespace>PoEGamblingHelper.$(MSBuildProjectName)</RootNamespace>
+        <Nullable>enable</Nullable>
+        <ImplicitUsings>enable</ImplicitUsings>
+        <InvariantGlobalization>true</InvariantGlobalization>
+    </PropertyGroup>
+</Project>

add-migration.ps1

@@ -1,4 +1,3 @@
-$Name = Read-Host -Prompt 'Name of the migration'
-dotnet ef migrations add $Name --project src/Infrastructure -s src/Api
-
-#TODO automate major minor version updates
+$Name = $args[0]
+If ([string]::IsNullOrEmpty($Name)) { $Name = Read-Host -Prompt 'Name of the migration' }
+dotnet ef migrations add $Name --project src/Infrastructure -s src/Api

docker-compose.yml

@@ -11,6 +11,7 @@ services:
     environment:
       DOTNET_SYSTEM_GLOBALIZATION_INVARIANT: true
       POSTGRES_PASSWORD: $POSTGRES_PASSWORD
+      ApiKey: $API_KEY
     restart: unless-stopped
     deploy:
       mode: replicated

src/Api/Api.csproj

@@ -1,24 +1,24 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
     <PropertyGroup>
-        <TargetFramework>net7.0</TargetFramework>
+        <TargetFramework>net9.0</TargetFramework>
         <Nullable>enable</Nullable>
         <ImplicitUsings>enable</ImplicitUsings>
         <DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="7.0.3"/>
-        <PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0"/>
-        <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="7.0.3">
+        <PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="9.0.6"/>
+        <PackageReference Include="Swashbuckle.AspNetCore" Version="9.0.1"/>
+        <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="9.0.6">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
     </ItemGroup>
 
     <ItemGroup>
-        <ProjectReference Include="..\Application\Application.csproj"/>
-        <ProjectReference Include="..\Infrastructure\Infrastructure.csproj"/>
+        <ProjectReference Include="..\Application\Application.csproj" />
+        <ProjectReference Include="..\Infrastructure\Infrastructure.csproj" />
     </ItemGroup>
 
 </Project>

src/Api/ConfigureCache.cs → src/Api/Configuration/ConfigureCache.cs

@@ -1,4 +1,4 @@
-namespace Api;
+namespace PoEGamblingHelper.Api.Configuration;
 
 public static class ConfigureCache
 {

src/Api/ConfigureRateLimiter.cs → src/Api/Configuration/ConfigureRateLimiter.cs

@@ -2,7 +2,7 @@
 using System.Net;
 using System.Threading.RateLimiting;
 
-namespace Api;
+namespace PoEGamblingHelper.Api.Configuration;
 
 public static class ConfigureRateLimiter
 {
@@ -62,7 +62,8 @@ private static RateLimitPartition<string> GetGlobalRateLimiter(IConfiguration co
     }
 
     private static RateLimitPartition<IPAddress> GetIpAddressRateLimiter(
-        IConfiguration configuration, HttpContext context)
+        IConfiguration configuration,
+        HttpContext context)
     {
         var remoteIpAddress = context.Connection.RemoteIpAddress;
         if (IPAddress.IsLoopback(remoteIpAddress!)) return RateLimitPartition.GetNoLimiter(IPAddress.Loopback);

src/Api/Controllers/AnalyticsController.cs

@@ -0,0 +1,55 @@
+using System.Security.Claims;
+using Microsoft.AspNetCore.Authentication;
+using Microsoft.AspNetCore.Authentication.Cookies;
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Mvc;
+using PoEGamblingHelper.Application.Repositories;
+using PoEGamblingHelper.Application.Services;
+using PoEGamblingHelper.Domain.Entity.Analytics;
+
+namespace PoEGamblingHelper.Api.Controllers;
+
+public class AnalyticsController(IAnalyticsDayRepository analyticsRepository, IConfiguration configuration, IDateTimeService dateTimeService)
+    : ApiControllerBase
+{
+    [HttpGet]
+    [Authorize]
+    public IAsyncEnumerable<AnalyticsDay> Get([FromQuery] DateOnly? start, [FromQuery] DateOnly? end)
+    {
+        if (start is null || end is null) return analyticsRepository.GetAll();
+
+        return analyticsRepository.Get(start.Value, end.Value);
+    }
+
+    [HttpGet("check")]
+    [Authorize]
+    public IActionResult Check()
+    {
+        return Ok();
+    }
+
+    [HttpGet("login")]
+    public async Task<IActionResult> Login([FromHeader(Name = "Authorization")] string apiKey)
+    {
+        var apiKeySolution = configuration.GetValue<string>("ApiKey");
+        if (apiKey.Length <= "Bearer ".Length || !string.Equals(apiKey["Bearer ".Length..], apiKeySolution)) return Unauthorized();
+
+        var claimsIdentity = new ClaimsIdentity(
+            [new Claim(ClaimTypes.Name, "ApiKeyUser")],
+            CookieAuthenticationDefaults.AuthenticationScheme);
+
+        var authProperties = new AuthenticationProperties
+        {
+            IsPersistent = true,
+            ExpiresUtc = dateTimeService.UtcNow().AddDays(30),
+            AllowRefresh = true
+        };
+
+        await HttpContext.SignInAsync(
+            CookieAuthenticationDefaults.AuthenticationScheme,
+            new ClaimsPrincipal(claimsIdentity),
+            authProperties);
+
+        return Ok();
+    }
+}

src/Api/Controllers/ApiControllerBase.cs

@@ -1,9 +1,5 @@
 using Microsoft.AspNetCore.Mvc;
 
-namespace Api.Controllers;
+namespace PoEGamblingHelper.Api.Controllers;
 
-[ApiController]
-[Route("[controller]")]
-public abstract class ApiControllerBase : ControllerBase
-{
-}
+[ApiController] [Route("[controller]")] public abstract class ApiControllerBase : ControllerBase;

src/Api/Controllers/CurrencyController.cs

@@ -1,29 +1,17 @@
-using Application.Services;
-using Domain.Entity;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.OutputCaching;
+using PoEGamblingHelper.Application.Repositories;
+using PoEGamblingHelper.Domain.Entity;
+using PoEGamblingHelper.Infrastructure;
 
-namespace Api.Controllers;
+namespace PoEGamblingHelper.Api.Controllers;
 
-public class CurrencyController : ApiControllerBase
+public class CurrencyController(ICurrencyRepository currencyRepository) : ApiControllerBase
 {
-    private readonly IAnalyticsService _analyticsService;
-    private readonly IApplicationDbContextFactory _applicationDbContextFactory;
-
-    public CurrencyController(IApplicationDbContextFactory applicationDbContextFactory,
-                              IAnalyticsService analyticsService)
-    {
-        _applicationDbContextFactory = applicationDbContextFactory;
-        _analyticsService = analyticsService;
-    }
-
     [HttpGet]
-    [OutputCache(PolicyName = "FetchData")]
-    public async IAsyncEnumerable<Currency> GetAll()
+    [OutputCache(PolicyName = Constants.DataFetcherCacheTag)]
+    public IAsyncEnumerable<Currency> GetAll([FromQuery] string league)
     {
-        await _analyticsService.AddView(Request.GetRealIpAddress());
-        using var applicationDbContext = _applicationDbContextFactory.CreateDbContext();
-        await foreach (var item in applicationDbContext.Currency.AsAsyncEnumerable().ConfigureAwait(false))
-            yield return item;
+        return currencyRepository.GetAll(league);
     }
 }

src/Api/Controllers/GemController.cs

@@ -1,27 +1,18 @@
-using Application.Services;
-using Domain.Entity.Gem;
-using Domain.QueryParameters;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.OutputCaching;
+using PoEGamblingHelper.Application.QueryParameters;
+using PoEGamblingHelper.Application.Repositories;
+using PoEGamblingHelper.Domain.Entity.Gem;
+using PoEGamblingHelper.Infrastructure;
 
-namespace Api.Controllers;
+namespace PoEGamblingHelper.Api.Controllers;
 
-public class GemController : ApiControllerBase
+public class GemController(IGemRepository gemRepository) : ApiControllerBase
 {
-    private readonly IAnalyticsService _analyticsService;
-    private readonly IGemService _gemService;
-
-    public GemController(IGemService gemService, IAnalyticsService analyticsService)
-    {
-        _gemService = gemService;
-        _analyticsService = analyticsService;
-    }
-
     [HttpGet]
-    [OutputCache(PolicyName = "FetchData")]
-    public async Task<Page<GemData>> GetAll([FromQuery] GemDataQuery? query, [FromQuery] PageRequest page)
+    [OutputCache(PolicyName = Constants.DataFetcherCacheTag)]
+    public Page<GemData> GetAll([FromQuery] GemDataQuery? query, [FromQuery] PageRequest page)
     {
-        await _analyticsService.AddView(Request.GetRealIpAddress());
-        return await _gemService.GetAll(query, page);
+        return gemRepository.Search(query, page);
     }
 }