Convert resource links to svn links (#1609)

Closes
SoftUni-Internal/exam-systems-issues#1701

**Summary of the changes made**:
1. {Describe your changes in the list}
2.

Author: gogo4ds

Servers/UI/OJS.Servers.Ui/Extensions/ServiceCollectionExtensions.cs

@@ -39,6 +39,7 @@ public static void ConfigureServices(
                 .AddOptionsWithValidation<ApplicationUrlsConfig>()
                 .AddOptionsWithValidation<EmailServiceConfig>()
                 .AddOptionsWithValidation<MentorConfig>()
+                .AddOptionsWithValidation<SvnConfig>()
                 .AddControllers();
     }
 }

Services/Infrastructure/OJS.Services.Infrastructure/Configurations/SvnConfig.cs

@@ -1,5 +1,6 @@
 namespace OJS.Services.Infrastructure.Configurations;
 
+using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 
 public class SvnConfig : BaseConfig
@@ -14,4 +15,6 @@ public class SvnConfig : BaseConfig
 
     [Required]
     public string Password { get; set; } = default!;
+
+    public IEnumerable<string>? AlternativeBaseUrls { get; set; }
 }

Services/Infrastructure/OJS.Services.Infrastructure/Constants/LoggerMessageDefinitions.cs

@@ -86,24 +86,33 @@ public static partial class LoggerMessageDefinitions
     [LoggerMessage(302, LogLevel.Information, "Truncated {PercentageOfMessageContentTruncated:F2}% of a message's content to comply with token limits for problem #{ProblemId}.")]
     public static partial void LogPercentageOfMessageContentTruncated(this ILogger logger, double percentageOfMessageContentTruncated, int problemId);
 
-    [LoggerMessage(303, LogLevel.Error, "The downloaded file from {Link} for problem #{ProblemId} in contest #{ContestId} is not in the expected format.", SkipEnabledCheck = true)]
+    [LoggerMessage(303, LogLevel.Information, "Link: {OriginalLink} successfully converted to SVN link: {newLink}")]
+    public static partial void LogLinkSuccessfullyConvertedToSvnLink(this ILogger logger, string originalLink, string newLink);
+
+    [LoggerMessage(340, LogLevel.Error, "The downloaded file from {Link} for problem #{ProblemId} in contest #{ContestId} is not in the expected format.", SkipEnabledCheck = true)]
     public static partial void LogInvalidDocumentFormat(this ILogger logger, int problemId, int contestId, string link);
 
-    [LoggerMessage(304, LogLevel.Error, "The downloaded file from {Link} for problem #{ProblemId} in contest #{ContestId} is either empty or does not exist.", SkipEnabledCheck = true)]
+    [LoggerMessage(341, LogLevel.Error, "The downloaded file from {Link} for problem #{ProblemId} in contest #{ContestId} is either empty or does not exist.", SkipEnabledCheck = true)]
     public static partial void LogFileNotFoundOrEmpty(this ILogger logger, int problemId, int contestId, string link);
 
-    [LoggerMessage(305, LogLevel.Error, "Failed to download the file from {Link} for problem #{ProblemId} in contest #{ContestId} with status code {StatusCode} and response message: {ResponseMessage}.", SkipEnabledCheck = true)]
+    [LoggerMessage(342, LogLevel.Error, "Failed to download the file from {Link} for problem #{ProblemId} in contest #{ContestId} with status code {StatusCode} and response message: {ResponseMessage}.", SkipEnabledCheck = true)]
     public static partial void LogHttpRequestFailure(this ILogger logger, int problemId, int contestId, HttpStatusCode statusCode, string link, string? responseMessage);
 
-    [LoggerMessage(306, LogLevel.Error, "Failed to download the file from {Link} for problem #{ProblemId} in contest #{ContestId}.", SkipEnabledCheck = true)]
+    [LoggerMessage(343, LogLevel.Error, "Failed to download the file from {Link} for problem #{ProblemId} in contest #{ContestId}.", SkipEnabledCheck = true)]
     public static partial void LogResourceDownloadFailure(this ILogger logger, int problemId, int contestId, string link, Exception ex);
 
-    [LoggerMessage(307, LogLevel.Error, "Failed to parse the content of the downloaded file for problem #{ProblemId} in contest #{ContestId}.", SkipEnabledCheck = true)]
+    [LoggerMessage(344, LogLevel.Error, "Failed to parse the content of the downloaded file for problem #{ProblemId} in contest #{ContestId}.", SkipEnabledCheck = true)]
     public static partial void LogFileParsingFailure(this ILogger logger, int problemId, int contestId);
 
-    [LoggerMessage(308, LogLevel.Error, "Problem description resource not found for problem #{ProblemId} in contest #{ContestId}. Verify that the problem or the first problem in the contest has a valid description resource.", SkipEnabledCheck = true)]
+    [LoggerMessage(345, LogLevel.Error, "Problem description resource not found for problem #{ProblemId} in contest #{ContestId}. Verify that the problem or the first problem in the contest has a valid description resource.", SkipEnabledCheck = true)]
     public static partial void LogProblemDescriptionResourceNotFound(this ILogger logger, int problemId, int contestId);
 
+    [LoggerMessage(356, LogLevel.Error, "The SVN BaseUrl provided in settings is not valid. Expected valid absolute URL, but got: {SvnBaseUrl}", SkipEnabledCheck = true)]
+    public static partial void LogSvnBaseUrlNotValid(this ILogger logger, string svnBaseUrl);
+
+    [LoggerMessage(380, LogLevel.Warning, "Couldn't find a valid alternative SVN base url in settings for link: {Link}.")]
+    public static partial void LogAlternativeBaseUrlNotFoundForLink(this ILogger logger, string link);
+
     // Submissions
     [LoggerMessage(1010, LogLevel.Error, "Exception in publishing submission #{SubmissionId}", SkipEnabledCheck = true)]
     public static partial void LogExceptionPublishingSubmission(this ILogger logger, int submissionId, Exception ex);

Services/Mentor/OJS.Services.Mentor.Business/Implementations/MentorBusinessService.cs

@@ -21,6 +21,7 @@
 using OJS.Services.Infrastructure.Extensions;
 using OJS.Services.Mentor.Business;
 using OJS.Services.Mentor.Models;
+using OJS.Services.Ui.Business;
 using OJS.Services.Ui.Data;
 using OpenAI;
 using OpenAI.Chat;
@@ -29,42 +30,23 @@
 using Table = DocumentFormat.OpenXml.Wordprocessing.Table;
 using static OJS.Common.GlobalConstants.Settings;
 
-public class MentorBusinessService : IMentorBusinessService
+public class MentorBusinessService(
+    IDataService<UserMentor> userMentorData,
+    IDataService<MentorPromptTemplate> mentorPromptTemplateData,
+    IHttpClientFactory httpClientFactory,
+    IDataService<Setting> settingData,
+    IContestsDataService contestsData,
+    ICacheService cache,
+    ILogger<MentorBusinessService> logger,
+    OpenAIClient openAiClient,
+    IProblemResourcesBusinessService problemResourcesBusinessService)
+    : IMentorBusinessService
 {
     private const string DocumentNotFoundOrEmpty = "Judge was unable to find the problem's description. Please contact an administrator and report the problem.";
 
-    private readonly IDataService<UserMentor> userMentorData;
-    private readonly IDataService<MentorPromptTemplate> mentorPromptTemplateData;
-    private readonly IHttpClientFactory httpClientFactory;
-    private readonly IDataService<Setting> settingData;
-    private readonly IContestsDataService contestsData;
-    private readonly ICacheService cache;
-    private readonly ILogger<MentorBusinessService> logger;
-    private readonly OpenAIClient openAiClient;
-
-    public MentorBusinessService(
-        IDataService<UserMentor> userMentorData,
-        IDataService<MentorPromptTemplate> mentorPromptTemplateData,
-        IHttpClientFactory httpClientFactory,
-        IDataService<Setting> settingData,
-        IContestsDataService contestsData,
-        ICacheService cache,
-        ILogger<MentorBusinessService> logger,
-        OpenAIClient openAiClient)
-    {
-        this.userMentorData = userMentorData;
-        this.mentorPromptTemplateData = mentorPromptTemplateData;
-        this.httpClientFactory = httpClientFactory;
-        this.settingData = settingData;
-        this.contestsData = contestsData;
-        this.cache = cache;
-        this.logger = logger;
-        this.openAiClient = openAiClient;
-    }
-
     public async Task<ConversationResponseModel> StartConversation(ConversationRequestModel model)
     {
-        var settings = await this.settingData
+        var settings = await settingData
             .GetQuery(s => s.Name.Contains(Mentor))
             .AsNoTracking()
             .ToDictionaryAsync(k => k.Name, v => v.Value);
@@ -81,7 +63,7 @@ public async Task<ConversationResponseModel> StartConversation(ConversationReque
             throw new BusinessServiceException($"Your message exceeds the {maxUserInputLength}-character limit. Please shorten it.");
         }
 
-        var userMentor = await this.userMentorData
+        var userMentor = await userMentorData
             .GetQuery(um => um.Id == model.UserId)
             .FirstOrDefaultAsync();
 
@@ -98,8 +80,8 @@ public async Task<ConversationResponseModel> StartConversation(ConversationReque
                 QuotaResetTime = DateTime.UtcNow.AddMinutes(GetNumericValue(settings, nameof(MentorQuotaResetTimeInMinutes))),
             };
 
-            await this.userMentorData.Add(userMentor);
-            await this.userMentorData.SaveChanges();
+            await userMentorData.Add(userMentor);
+            await userMentorData.SaveChanges();
         }
 
         if (DateTime.UtcNow >= userMentor.QuotaResetTime)
@@ -127,7 +109,7 @@ public async Task<ConversationResponseModel> StartConversation(ConversationReque
 
         var messagesToSend = new List<ChatMessage>();
 
-        var systemMessage = await this.cache.Get(
+        var systemMessage = await cache.Get(
             string.Format(CultureInfo.InvariantCulture, CacheConstants.MentorSystemMessage, model.UserId, model.ProblemId),
             async () => await this.GetSystemMessage(model),
             CacheConstants.OneHourInSeconds);
@@ -172,7 +154,7 @@ public async Task<ConversationResponseModel> StartConversation(ConversationReque
 
         messagesToSend.AddRange(recentMessages.Select(m => CreateChatMessage(m.Role, m.Content)));
 
-        var chat = this.openAiClient.GetChatClient(mentorModel);
+        var chat = openAiClient.GetChatClient(mentorModel);
         var response = await chat.CompleteChatAsync(messagesToSend, new ChatCompletionOptions
         {
             MaxOutputTokenCount = GetNumericValue(settings, nameof(MentorMaxOutputTokenCount)),
@@ -205,7 +187,7 @@ public async Task<ConversationResponseModel> StartConversation(ConversationReque
 
         userMentor.RequestsMade++;
         userMentor.TotalRequestsMade++;
-        await this.userMentorData.SaveChanges();
+        await userMentorData.SaveChanges();
 
         return GetResponseModel(model, maxUserInputLength);
     }
@@ -283,7 +265,7 @@ private string ExtractSectionFromDocument(
         }
         catch (Exception)
         {
-            this.logger.LogFileParsingFailure(problemId, contestId);
+            logger.LogFileParsingFailure(problemId, contestId);
             throw new BusinessServiceException(DocumentNotFoundOrEmpty);
         }
     }
@@ -416,7 +398,7 @@ private void TruncateMessages(
             }
 
             // Log the percentage of content truncated
-            this.logger.LogPercentageOfMessageContentTruncated(percentageTruncated, problemId);
+            logger.LogPercentageOfMessageContentTruncated(percentageTruncated, problemId);
 
             // Stop if we've removed enough tokens
             if (tokensToRemove <= 0)
@@ -429,7 +411,7 @@ private void TruncateMessages(
         if (removedMessageCount > 0)
         {
             // Log the number of messages removed
-            this.logger.LogTruncatedMentorMessages(initialMessageCount, removedMessageCount, problemId);
+            logger.LogTruncatedMentorMessages(initialMessageCount, removedMessageCount, problemId);
         }
     }
 
@@ -566,12 +548,12 @@ private async Task<ConversationMessageModel> GetSystemMessage(ConversationReques
          *  .FirstOrDefaultAsync() will always return a template. This
          *  will be changed in the future.
          */
-        var template = await this.mentorPromptTemplateData
+        var template = await mentorPromptTemplateData
             .GetQuery()
             .AsNoTracking()
             .FirstOrDefaultAsync();
 
-        var problemsResources = await this.contestsData
+        var problemsResources = await contestsData
             .GetByIdQuery(model.ContestId)
             .AsNoTracking()
             .Select(c => c.ProblemGroups
@@ -596,7 +578,7 @@ private async Task<ConversationMessageModel> GetSystemMessage(ConversationReques
 
         if (problemsDescription is null)
         {
-            this.logger.LogProblemDescriptionResourceNotFound(model.ProblemId, model.ContestId);
+            logger.LogProblemDescriptionResourceNotFound(model.ProblemId, model.ContestId);
             throw new BusinessServiceException(DocumentNotFoundOrEmpty);
         }
 
@@ -628,12 +610,13 @@ private async Task<ConversationMessageModel> GetSystemMessage(ConversationReques
 
     private async Task<byte[]> DownloadDocument(string link, int problemId, int contestId)
     {
+        link = problemResourcesBusinessService.SafeConvertToSvnLink(link);
         using var client = this.CreateClientForLink(link);
         var fileBytes = await this.FetchResource(link, client, problemId, contestId);
 
         if (!IsExpectedFormat(fileBytes))
         {
-            this.logger.LogInvalidDocumentFormat(problemId, contestId, link);
+            logger.LogInvalidDocumentFormat(problemId, contestId, link);
             throw new BusinessServiceException(DocumentNotFoundOrEmpty);
         }
 
@@ -648,15 +631,15 @@ private HttpClient CreateClientForLink(string link)
         }
 
         // 1) Try the SVN client for links from the SVN server
-        var svnClient = this.httpClientFactory.CreateClient(ServiceConstants.SvnHttpClientName);
+        var svnClient = httpClientFactory.CreateClient(ServiceConstants.SvnHttpClientName);
         if (svnClient.BaseAddress != null
             && string.Equals(svnClient.BaseAddress.Host, uri.Host, StringComparison.OrdinalIgnoreCase))
         {
             return svnClient;
         }
 
         // 2) Fallback: use the default client
-        return this.httpClientFactory.CreateClient(ServiceConstants.DefaultHttpClientName);
+        return httpClientFactory.CreateClient(ServiceConstants.DefaultHttpClientName);
     }
 
     private async Task<byte[]> FetchResource(string link, HttpClient client, int problemId, int contestId)
@@ -667,7 +650,7 @@ private async Task<byte[]> FetchResource(string link, HttpClient client, int pro
 
             if (response is not { IsSuccessStatusCode: true })
             {
-                this.logger.LogHttpRequestFailure(
+                logger.LogHttpRequestFailure(
                     problemId,
                     contestId,
                     response?.StatusCode ?? HttpStatusCode.ServiceUnavailable,
@@ -680,15 +663,15 @@ private async Task<byte[]> FetchResource(string link, HttpClient client, int pro
 
             if (fileBytes.Length == 0)
             {
-                this.logger.LogFileNotFoundOrEmpty(problemId, contestId, link);
+                logger.LogFileNotFoundOrEmpty(problemId, contestId, link);
                 throw new BusinessServiceException(DocumentNotFoundOrEmpty);
             }
 
             return fileBytes;
         }
         catch (Exception ex)
         {
-            this.logger.LogResourceDownloadFailure(problemId, contestId, link, ex);
+            logger.LogResourceDownloadFailure(problemId, contestId, link, ex);
             throw new BusinessServiceException(DocumentNotFoundOrEmpty);
         }
     }

Services/Mentor/OJS.Services.Mentor.Business/OJS.Services.Mentor.Business.csproj

@@ -7,6 +7,7 @@
     </PropertyGroup>
 
     <ItemGroup>
+      <ProjectReference Include="..\..\UI\OJS.Services.Ui.Business\OJS.Services.Ui.Business.csproj" />
       <ProjectReference Include="..\..\UI\OJS.Services.Ui.Data\OJS.Services.Ui.Data.csproj" />
       <ProjectReference Include="..\OJS.Services.Mentor.Models\OJS.Services.Mentor.Models.csproj" />
     </ItemGroup>

Services/UI/OJS.Services.Ui.Business/IProblemResourcesBusinessService.cs

@@ -7,4 +7,11 @@
 public interface IProblemResourcesBusinessService : IService
 {
     Task<ProblemResourceServiceModel> GetResource(int resourceId);
+
+    /// <summary>
+    /// Converts a link to svn link, only if it is not already svn link and the link is a valid alternative, otherwise returns the same link.
+    /// </summary>
+    /// <param name="link">The link to convert.</param>
+    /// <returns></returns>
+    string SafeConvertToSvnLink(string link);
 }

Services/UI/OJS.Services.Ui.Business/Implementations/ProblemResourcesBusinessService.cs

@@ -2,19 +2,66 @@
 
 using System.Threading.Tasks;
 using Microsoft.EntityFrameworkCore;
+using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Options;
+using OJS.Services.Infrastructure.Configurations;
+using OJS.Services.Infrastructure.Constants;
 using OJS.Services.Infrastructure.Exceptions;
 using OJS.Services.Ui.Data;
 using OJS.Services.Ui.Models.Problems;
 using OJS.Services.Infrastructure.Extensions;
+using System;
+using System.Linq;
 
-public class ProblemResourcesBusinessService(IProblemResourcesDataService problemResourcesDataService)
+public class ProblemResourcesBusinessService(
+    IProblemResourcesDataService problemResourcesDataService,
+    IOptions<SvnConfig> svnConfigAccessor,
+    ILogger<ProblemResourcesBusinessService> logger)
     : IProblemResourcesBusinessService
 {
+    private readonly SvnConfig svnConfig = svnConfigAccessor.Value;
+
     public async Task<ProblemResourceServiceModel> GetResource(int resourceId)
         => await problemResourcesDataService
             .GetByIdQuery(resourceId)
             .AsNoTracking()
             .MapCollection<ProblemResourceServiceModel>()
             .FirstOrDefaultAsync()
             ?? throw new BusinessServiceException($"Problem resource with ID {resourceId} not found.");
+
+    public string SafeConvertToSvnLink(string link)
+    {
+        if (!Uri.TryCreate(link, UriKind.Absolute, out var incomingUri))
+        {
+            // Not a valid link
+            return link;
+        }
+
+        if (!Uri.TryCreate(this.svnConfig.BaseUrl, UriKind.Absolute, out var svnUri))
+        {
+            logger.LogSvnBaseUrlNotValid(this.svnConfig.BaseUrl);
+            return link;
+        }
+
+        var alternativeUri = this.svnConfig.AlternativeBaseUrls?
+            .Select(raw => Uri.TryCreate(raw, UriKind.Absolute, out var u) ? u : null)
+            .FirstOrDefault(u => u != null && u.IsBaseOf(incomingUri));
+
+        if (alternativeUri == null)
+        {
+            logger.LogAlternativeBaseUrlNotFoundForLink(link);
+            return link;
+        }
+
+        // Get the part of the path that comes after the alternative base.
+        var relativeUri = alternativeUri.MakeRelativeUri(incomingUri);
+
+        var newUri = new Uri(svnUri, relativeUri);
+
+        var newLink = newUri.ToString();
+
+        logger.LogLinkSuccessfullyConvertedToSvnLink(link, newLink);
+
+        return newLink;
+    }
 }