Moved temp controller logic to minimal API

Author: gogo4ds

Servers/Administration/OJS.Servers.Administration/Extensions/WebApplicationExtensions.cs

@@ -1,11 +1,15 @@
 namespace OJS.Servers.Administration.Extensions;
 
 using Microsoft.AspNetCore.Builder;
+using Microsoft.AspNetCore.Http;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
+using OJS.Common;
 using OJS.Data;
 using OJS.Servers.Administration.Middleware;
 using OJS.Servers.Infrastructure.Extensions;
+using OJS.Services.Administration.Business.Contests;
+using System;
 using static OJS.Common.GlobalConstants.Roles;
 
 internal static class WebApplicationExtensions
@@ -26,6 +30,24 @@ public static WebApplication ConfigureWebApplication(this WebApplication app, IC
             .MapHealthChecksUI()
             .RequireAuthorization(auth => auth.RequireRole(Administrator));
 
+        app.MapGet("/api/temp/ImportContestsFromCategory", async (
+                IContestsImportBusinessService contestsImportBusinessService,
+                int sourceContestCategoryId,
+                int destinationContestCategoryId,
+                bool dryRun = true) =>
+            {
+                var result = await contestsImportBusinessService.ImportContestsFromCategory(
+                    sourceContestCategoryId,
+                    destinationContestCategoryId,
+                    dryRun);
+
+                return result.IsError
+                    ? Results.BadRequest(result.Error)
+                    : Results.Content(result.Data, GlobalConstants.MimeTypes.TextHtml);
+            })
+            .RequireAuthorization(auth => auth.RequireRole(Administrator))
+            .WithRequestTimeout(TimeSpan.FromMinutes(5));
+
         return app
             .UseAndMapHangfireDashboard();
     }

Servers/Administration/OJS.Servers.Administration/Controllers/TempController.cs renamed to Services/Administration/OJS.Services.Administration.Business/Contests/ContestsImportBusinessService.cs

@@ -1,23 +1,20 @@
-namespace OJS.Servers.Administration.Controllers;
+namespace OJS.Services.Administration.Business.Contests;
 
 using FluentExtensions.Extensions;
-using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Options;
-using OJS.Common;
 using OJS.Common.Enumerations;
 using OJS.Data.Models;
 using OJS.Data.Models.Checkers;
 using OJS.Data.Models.Contests;
 using OJS.Data.Models.Problems;
 using OJS.Data.Models.Submissions;
 using OJS.Data.Models.Tests;
-using OJS.Servers.Infrastructure.Controllers;
 using OJS.Services.Administration.Business.ProblemGroups;
 using OJS.Services.Administration.Business.Problems;
 using OJS.Services.Administration.Data;
 using OJS.Services.Administration.Models.Contests;
+using OJS.Services.Common.Models;
 using OJS.Services.Infrastructure.Configurations;
 using System;
 using System.Collections.Generic;
@@ -28,8 +25,7 @@ namespace OJS.Servers.Administration.Controllers;
 using System.Text;
 using System.Threading.Tasks;
 
-[Authorize(Roles = GlobalConstants.Roles.Administrator)]
-public class TempController(
+public class ContestsImportBusinessService(
     IHttpClientFactory httpClientFactory,
     IOptions<ApplicationUrlsConfig> urlsConfig,
     IContestsDataService contestsData,
@@ -38,31 +34,31 @@ public class TempController(
     ISubmissionTypesDataService submissionTypesData,
     ITestRunsDataService testRunsData,
     IProblemsBusinessService problemsBusiness,
-    IProblemGroupsBusinessService problemGroupsBusiness)
-    : BaseApiController
+    IProblemGroupsBusinessService problemGroupsBusiness) : IContestsImportBusinessService
 {
     private readonly HttpClient httpClient = httpClientFactory.CreateClient();
     private readonly ApplicationUrlsConfig urls = urlsConfig.Value;
 
-    public async Task<IActionResult> ImportContestsFromCategory(int sourceContestCategoryId, int destinationContestCategoryId, bool dryRun = true)
+    public async Task<ServiceResult<string>> ImportContestsFromCategory(int sourceContestCategoryId, int destinationContestCategoryId,
+        bool dryRun = true)
     {
         if (sourceContestCategoryId == 0 || destinationContestCategoryId == 0)
         {
-            return this.BadRequest("Invalid contest category ids.");
+            return new ServiceResult<string>("Invalid contest category ids.");
         }
 
         var contestIds = await this.httpClient.GetFromJsonAsync<int[]>($"{this.urls.LegacyJudgeUrl}/api/Contests/GetExistingIdsForCategory?contestCategoryId={sourceContestCategoryId}&apiKey={this.urls.LegacyJudgeApiKey}");
 
         if (contestIds == null)
         {
-            return this.BadRequest("Failed to get contest IDs.");
+            return new ServiceResult<string>("Failed to get contest IDs.");
         }
 
         var destinationContestCategory = await contestCategoriesData.OneById(destinationContestCategoryId);
 
         if (destinationContestCategory == null)
         {
-            return this.BadRequest($"Destination contest category with id {destinationContestCategoryId} does not exist.");
+            return new ServiceResult<string>($"Destination contest category with id {destinationContestCategoryId} does not exist.");
         }
 
         var result = new StringBuilder();
@@ -129,7 +125,7 @@ public async Task<IActionResult> ImportContestsFromCategory(int sourceContestCat
             : "<p>Import completed.</p>");
         result.AppendLine("<hr>");
 
-        return this.Content(result.ToString(), GlobalConstants.MimeTypes.TextHtml);
+        return ServiceResult<string>.Success(result.ToString());
     }
 
     private static DateTime? ConvertTimeToUtc(DateTime? dateTime)

Services/Administration/OJS.Services.Administration.Business/Contests/IContestsImportBusinessService.cs

@@ -0,0 +1,10 @@
+namespace OJS.Services.Administration.Business.Contests;
+
+using OJS.Services.Common.Models;
+using OJS.Services.Infrastructure;
+using System.Threading.Tasks;
+
+public interface IContestsImportBusinessService : IService
+{
+    Task<ServiceResult<string>> ImportContestsFromCategory(int sourceContestCategoryId, int destinationContestCategoryId, bool dryRun = true);
+}