Merge pull request #31 from thejaviertc/dev

v.1.2.0

Author: thejaviertc

.github/workflows/cd.yml

@@ -16,24 +16,21 @@ jobs:
       - name: 📘 Setup .NET
         uses: actions/setup-dotnet@v4
         with:
-          dotnet-version: 8.x.x
+          dotnet-version: 9.x.x
 
       - name: 🔄 Restore dependencies
         run: dotnet restore
 
       - name: 🔨 Build Project
         run: dotnet build --no-restore
 
-      - name: 🧪 Test Project
-        run: dotnet test --no-build --verbosity normal
-
       - name: 🔎 SonarCloud Scan
-        uses: highbyte/sonarscan-dotnet@v2.3.2
+        uses: highbyte/sonarscan-dotnet@v2.4.2
         with:
           sonarProjectKey: thejaviertc_sws-api
           sonarProjectName: thejaviertc_sws-api
           sonarOrganization: thejaviertc
-          sonarBeginArguments: /d:sonar.qualitygate.wait=true
+          sonarBeginArguments: /d:sonar.qualitygate.wait=false
           dotnetDisableTests: true
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/ci.yml

@@ -16,25 +16,10 @@ jobs:
       - name: 📘 Setup .NET
         uses: actions/setup-dotnet@v4
         with:
-          dotnet-version: 8.x.x
+          dotnet-version: 9.x.x
 
       - name: 🔄 Restore dependencies
         run: dotnet restore
 
       - name: 🔨 Build Project
         run: dotnet build --no-restore
-
-      - name: 🧪 Test Project
-        run: dotnet test --no-build --verbosity normal
-
-      - name: 🔎 SonarCloud Scan
-        uses: highbyte/sonarscan-dotnet@v2.3.2
-        with:
-          sonarProjectKey: thejaviertc_sws-api
-          sonarProjectName: thejaviertc_sws-api
-          sonarOrganization: thejaviertc
-          sonarBeginArguments: /d:sonar.qualitygate.wait=true
-          dotnetDisableTests: true
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}

Dockerfile

@@ -1,21 +1,21 @@
-FROM mcr.microsoft.com/dotnet/aspnet:8.0 AS base
+FROM mcr.microsoft.com/dotnet/aspnet:9.0 AS base
 WORKDIR /app
 EXPOSE 80
 EXPOSE 443
 
 USER app
-FROM --platform=$BUILDPLATFORM mcr.microsoft.com/dotnet/sdk:8.0 AS build
+FROM --platform=$BUILDPLATFORM mcr.microsoft.com/dotnet/sdk:9.0 AS build
 ARG configuration=Release
 WORKDIR /src
-COPY src/SteamWorkshopStats.csproj src/
-RUN dotnet restore "src/SteamWorkshopStats.csproj"
+COPY SteamWorkshopStats/SteamWorkshopStats.csproj SteamWorkshopStats/
+RUN dotnet restore "SteamWorkshopStats/SteamWorkshopStats.csproj"
 COPY . .
 WORKDIR "/src"
-RUN dotnet build "src/SteamWorkshopStats.csproj" -c "$configuration" -o /app/build
+RUN dotnet build "SteamWorkshopStats/SteamWorkshopStats.csproj" -c "$configuration" -o /app/build
 
 FROM build AS publish
 ARG configuration=Release
-RUN dotnet publish "src/SteamWorkshopStats.csproj" -c "$configuration" -o /app/publish /p:UseAppHost=false
+RUN dotnet publish "SteamWorkshopStats/SteamWorkshopStats.csproj" -c "$configuration" -o /app/publish /p:UseAppHost=false
 
 FROM base AS final
 WORKDIR /app

SteamWorkshopStats.sln

@@ -3,9 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
 VisualStudioVersion = 17.8.34330.188
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SteamWorkshopStats", "src\SteamWorkshopStats.csproj", "{37662DF4-08F8-4519-91CA-D7C8C8116A86}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SteamWorkshopStats.Tests", "tests\SteamWorkshopStats.Tests.csproj", "{3328B8FE-4D2A-4F5A-BF28-EE1FFE7DC893}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SteamWorkshopStats", "SteamWorkshopStats\SteamWorkshopStats.csproj", "{37662DF4-08F8-4519-91CA-D7C8C8116A86}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -17,10 +15,6 @@ Global
 		{37662DF4-08F8-4519-91CA-D7C8C8116A86}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{37662DF4-08F8-4519-91CA-D7C8C8116A86}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{37662DF4-08F8-4519-91CA-D7C8C8116A86}.Release|Any CPU.Build.0 = Release|Any CPU
-		{3328B8FE-4D2A-4F5A-BF28-EE1FFE7DC893}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{3328B8FE-4D2A-4F5A-BF28-EE1FFE7DC893}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3328B8FE-4D2A-4F5A-BF28-EE1FFE7DC893}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{3328B8FE-4D2A-4F5A-BF28-EE1FFE7DC893}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

src/Controllers/UserController.cs …kshopStats/Controllers/UserController.cssrc/Controllers/UserController.cs renamed to SteamWorkshopStats/Controllers/UserController.cs src/Controllers/UserController.cs renamed to SteamWorkshopStats/Controllers/UserController.cs

@@ -1,6 +1,7 @@
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.RateLimiting;
 using SteamWorkshopStats.Models;
+using SteamWorkshopStats.Models.Records;
 using SteamWorkshopStats.Services;
 
 namespace SteamWorkshopStats.Controllers;
@@ -58,14 +59,14 @@ public async Task<ActionResult<User>> GetUserBySteamId(string steamId)
 	/// <returns>An User</returns>
 	private async Task<ActionResult<User>> GetUserAsync(string steamId)
 	{
-		var profileInfo = await _steamService.GetProfileInfoAsync(steamId);
+		GetPlayerSummariesPlayer? profileInfo = await _steamService.GetProfileInfoAsync(steamId);
 
 		if (profileInfo is null)
 			return NotFound(new { Message = "This User doesn't exists (Profile info not found)" });
 
-		var addons = await _steamService.GetAddonsAsync(steamId);
+		List<Addon> addons = await _steamService.GetAddonsAsync(steamId);
 
-		var user = new User
+		User user = new User
 		{
 			SteamId = steamId,
 			Username = profileInfo.Username,
@@ -75,13 +76,11 @@ private async Task<ActionResult<User>> GetUserAsync(string steamId)
 			Favorites = addons.Sum(addon => addon.Favorites),
 			Likes = addons.Sum(addon => addon.Likes),
 			Dislikes = addons.Sum(addon => addon.Dislikes),
-			Addons = addons
+			Addons = addons,
 		};
 
 		if (_env.IsProduction())
-		{
 			_ = _discordService.LogUserAsync(user);
-		}
 
 		return user;
 	}

src/Exceptions/SteamServiceException.cs …tats/Exceptions/SteamServiceException.cssrc/Exceptions/SteamServiceException.cs renamed to SteamWorkshopStats/Exceptions/SteamServiceException.cs src/Exceptions/SteamServiceException.cs renamed to SteamWorkshopStats/Exceptions/SteamServiceException.cs

@@ -0,0 +1,40 @@
+using NLog;
+using SteamWorkshopStats.Exceptions;
+using SteamWorkshopStats.Services;
+using SteamWorkshopStats.Utils;
+
+namespace SteamWorkshopStats.Middlewares;
+
+public class ErrorLoggerMiddleware
+{
+	private static readonly Logger _logger = LogManager.GetCurrentClassLogger();
+
+	private readonly RequestDelegate _next;
+
+	private readonly IDiscordService _discordService;
+
+	public ErrorLoggerMiddleware(RequestDelegate next, IDiscordService discordService)
+	{
+		_next = next;
+		_discordService = discordService;
+	}
+
+	public async Task InvokeAsync(HttpContext context)
+	{
+		try
+		{
+			await _next(context);
+		}
+		catch (Exception ex)
+		{
+			_logger.Error(ex, "Unhandled exception:");
+			_ = _discordService.LogErrorAsync(context.Request.Path, IpUtils.GetIp(context), ex.ToString());
+
+			context.Response.StatusCode = StatusCodes.Status500InternalServerError;
+
+			await context.Response.WriteAsJsonAsync(
+				new { Message = ex is SteamServiceException ? ex.Message : "HTTP 500 Internal Server Error" }
+			);
+		}
+	}
+}