1723-fix-object-reference-not-set-to-an-instance-of-an-object-in-getusersubmissionsbyproblem

Common/OJS.Common/Constants/ServiceConstants.cs

@@ -111,5 +111,12 @@ public static class ExecutionStrategyNames
                 public const string PlainText = "plaintext";
             }
         }
+
+        public static class ErrorCodes
+        {
+            public const string NotFound = "NotFound";
+            public const string AccessDenied = "AccessDenied";
+            public const string BusinessRuleViolation = "BusinessRuleViolation";
+        }
     }
 }

Servers/Administration/OJS.Servers.Administration/Controllers/ProblemsController.cs

@@ -133,9 +133,9 @@ public async Task<IActionResult> CopyAll(CopyAllToContestViewModel model)
         var result = await this.problemGroupsBusinessService
             .CopyAllToContestBySourceAndDestinationContest(model.SourceContestId, model.DestinationContestId);
 
-        if (result.IsError)
+        if (!result.IsSuccess)
         {
-            return this.BadRequest($"Copy failed due to an unexpected error: {result.Error}");
+            return this.BadRequest($"Copy failed due to an unexpected error: {result.ErrorMessage}");
         }
 
         return this.Ok("Problems successfully copied.");
@@ -171,9 +171,9 @@ public async Task<IActionResult> Copy(CopyProblemRequestModel model)
             model.DestinationContestId,
             model.ProblemGroupId);
 
-        if (result.IsError)
+        if (!result.IsSuccess)
         {
-            return this.BadRequest(result.Error);
+            return this.BadRequest(result.ErrorMessage);
         }
 
         return this.Ok("Successfully copied problem");

Servers/Infrastructure/OJS.Servers.Infrastructure/Extensions/ControllerResultExtensions.cs

@@ -0,0 +1,89 @@
+namespace OJS.Servers.Infrastructure.Extensions;
+
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.Extensions.Logging;
+using OJS.Services.Infrastructure.Constants;
+using OJS.Services.Infrastructure.Models;
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Threading.Tasks;
+using static OJS.Common.Constants.ServiceConstants;
+
+public static class ControllerResultExtensions
+{
+    public static async Task<IActionResult> ToActionResult<T>(this Task<ServiceResult<T>> resultTask, ILogger logger)
+    {
+        var result = await resultTask;
+        return result.ToActionResult(logger);
+    }
+
+    public static IActionResult ToActionResult<T>(this ServiceResult<T> result, ILogger logger)
+    {
+        if (result.IsSuccess)
+        {
+            return new OkObjectResult(result.Data);
+        }
+
+        var activity = Activity.Current;
+        activity?.SetStatus(ActivityStatusCode.Error, result.ErrorMessage);
+        activity?.SetTag("service_result.instance_id", result.InstanceId);
+        activity?.SetTag("service_result.error_code", result.ErrorCode);
+        activity?.SetTag("service_result.error_context", result.ErrorContext);
+
+        var traceId = activity?.TraceId.ToString();
+
+        using (logger.BeginScope(new Dictionary<string, object?>
+        {
+            [nameof(result.ErrorCode)] = result.ErrorCode ?? "Unknown",
+            [nameof(result.ErrorContext)] = result.ErrorContext ?? "null",
+            ["TraceId"] = traceId ?? "null",
+        }))
+        {
+            return result.ErrorCode switch
+            {
+                ErrorCodes.AccessDenied => CreateResponse("Access denied", StatusCodes.Status403Forbidden, () =>
+                    logger.LogServiceResultAccessDenied(result.InstanceId, result.ErrorMessage)),
+
+                ErrorCodes.NotFound => CreateResponse("Not found", StatusCodes.Status404NotFound, () =>
+                    logger.LogServiceResultNotFound(result.InstanceId, result.ErrorMessage)),
+
+                ErrorCodes.BusinessRuleViolation => CreateResponse("Business rule violation", StatusCodes.Status422UnprocessableEntity, () =>
+                    logger.LogServiceResultBusinessRuleViolation(result.InstanceId, result.ErrorMessage)),
+
+                _ => CreateResponse("Bad request", StatusCodes.Status400BadRequest, () =>
+                    logger.LogServiceResultError(result.InstanceId, result.ErrorMessage)),
+            };
+        }
+
+        IActionResult CreateResponse(string title, int statusCode, Action logAction)
+        {
+            var details = result.Errors is { Count: > 0 }
+                ? new ValidationProblemDetails()
+                : new ProblemDetails();
+
+            details.Title = title;
+            details.Status = statusCode;
+            details.Detail = result.ErrorMessage;
+            details.Instance = result.InstanceId;
+            details.Extensions.Add("errorCode", result.ErrorCode);
+            details.Extensions.Add("errorContext", result.ErrorContext);
+            details.Extensions.Add("traceId", traceId);
+
+            if (details is ValidationProblemDetails vpd && result.Errors != null)
+            {
+                vpd.Errors = result.Errors;
+            }
+
+            logAction();
+
+            return statusCode switch
+            {
+                StatusCodes.Status404NotFound => new NotFoundObjectResult(details),
+                StatusCodes.Status400BadRequest => new BadRequestObjectResult(details),
+                _ => new ObjectResult(details) { StatusCode = statusCode },
+            };
+        }
+    }
+}

Servers/Infrastructure/OJS.Servers.Infrastructure/Extensions/WebApplicationExtensions.cs

@@ -10,21 +10,22 @@ namespace OJS.Servers.Infrastructure.Extensions
     using Microsoft.Extensions.Configuration;
     using Microsoft.Extensions.DependencyInjection;
     using OJS.Common;
+    using OJS.Common.Extensions;
     using OJS.Servers.Infrastructure.Filters;
     using OJS.Servers.Infrastructure.Middleware;
     using OJS.Services.Infrastructure;
     using Serilog;
     using Serilog.Events;
     using System;
+    using System.Diagnostics;
     using static OJS.Common.GlobalConstants.Urls;
     using static OJS.Servers.Infrastructure.ServerConstants.Authorization;
+    using static OJS.Servers.Infrastructure.Telemetry.OjsActivitySources.CommonTags;
 
     public static class WebApplicationExtensions
     {
         public static WebApplication UseDefaults(this WebApplication app)
         {
-            SetupRequestLoggingBehavior(app);
-
             // Add correlation ID middleware early in the pipeline
             app.UseMiddleware<CorrelationIdMiddleware>();
 
@@ -37,6 +38,23 @@ public static WebApplication UseDefaults(this WebApplication app)
             app.UseAuthentication();
             app.UseAuthorization();
 
+            // Add user ID to logs and traces
+            app.Use(async (context, next) =>
+            {
+                var userId = context.User.GetId();
+                if (!string.IsNullOrEmpty(userId) && Activity.Current != null)
+                {
+                    Activity.Current.SetTag(UserId, userId);
+                }
+
+                using (Serilog.Context.LogContext.PushProperty(nameof(UserId), userId ?? "anonymous"))
+                {
+                    await next();
+                }
+            });
+
+            SetupRequestLoggingBehavior(app);
+
             app.MapHealthMonitoring();
             app.MapControllers();
 

Servers/UI/OJS.Servers.Ui/ClientApp/src/pages/contests/contest-solution-submit/ContestSolutionSubmitPage.tsx

@@ -128,21 +128,6 @@ const ContestSolutionSubmitPage = () => {
     const isModalOpen = Boolean(anchorEl);
     const isCompete = useMemo(() => getParticipationType() === ContestParticipationType.Compete, [ getParticipationType ]);
 
-    const {
-        data: submissionsData,
-        error: submissionsErrorData,
-        isFetching: submissionsDataFetching,
-        isLoading: submissionsDataLoading,
-        refetch: getSubmissionsData,
-    } = useGetSubmissionResultsByProblemQuery({
-        problemId: Number(selectedContestDetailsProblem?.id),
-        isOfficial: isCompete,
-        ...queryParams,
-    }, { skip: !selectedContestDetailsProblem });
-
-    const textColorClassName = getColorClassName(themeColors.textColor);
-    const lightBackgroundClassName = getColorClassName(themeColors.baseColor100);
-
     const {
         data,
         isLoading,
@@ -163,6 +148,21 @@ const ContestSolutionSubmitPage = () => {
         allowMentor,
     } = data || {};
 
+    const {
+        data: submissionsData,
+        error: submissionsErrorData,
+        isFetching: submissionsDataFetching,
+        isLoading: submissionsDataLoading,
+        refetch: getSubmissionsData,
+    } = useGetSubmissionResultsByProblemQuery({
+        problemId: Number(selectedContestDetailsProblem?.id),
+        isOfficial: isCompete,
+        ...queryParams,
+    }, { skip: !selectedContestDetailsProblem || !isRegisteredParticipant });
+
+    const textColorClassName = getColorClassName(themeColors.textColor);
+    const lightBackgroundClassName = getColorClassName(themeColors.baseColor100);
+
     const { problems = [] } = contest || {};
 
     const {

Servers/UI/OJS.Servers.Ui/Controllers/SubmissionsController.cs

@@ -2,6 +2,7 @@
 
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
+using Microsoft.Extensions.Logging;
 using OJS.Common.Enumerations;
 using OJS.Servers.Infrastructure.Controllers;
 using OJS.Servers.Infrastructure.Extensions;
@@ -16,14 +17,15 @@
 using System.Diagnostics.CodeAnalysis;
 using System.Threading.Tasks;
 using OJS.Services.Common.Models.Pagination;
+using OJS.Services.Infrastructure.Models;
 using static OJS.Common.GlobalConstants.MimeTypes;
 using static Microsoft.AspNetCore.Http.StatusCodes;
 using static OJS.Common.GlobalConstants.Roles;
-using static OJS.Services.Common.Constants.PaginationConstants.Submissions;
 
 public class SubmissionsController(
     ISubmissionsBusinessService submissionsBusiness,
-    IFileSystemService fileSystem)
+    IFileSystemService fileSystem,
+    ILogger<SubmissionsController> logger)
     : BaseApiController
 {
     /// <summary>
@@ -80,8 +82,8 @@ public async Task<IActionResult> GetUserSubmissionsByProblem(
         [FromQuery] PaginationRequestModel requestModel)
         => await submissionsBusiness
             .GetUserSubmissionsByProblem(problemId, isOfficial, requestModel)
-            .Map<PagedResultResponse<FullDetailsPublicSubmissionsResponseModel>>()
-            .ToOkResult();
+            .Map<ServiceResult<PagedResultResponse<FullDetailsPublicSubmissionsResponseModel>>>()
+            .ToActionResult(logger);
 
     /// <summary>
     /// Gets submission details by provided submission id.

Services/Administration/OJS.Services.Administration.Business/ProblemGroups/IProblemGroupsBusinessService.cs

@@ -1,16 +1,16 @@
 namespace OJS.Services.Administration.Business.ProblemGroups
 {
     using OJS.Data.Models.Problems;
-    using OJS.Services.Common.Models;
     using System.Threading.Tasks;
     using OJS.Services.Administration.Models.ProblemGroups;
+    using OJS.Services.Infrastructure.Models;
     using System.Collections.Generic;
 
     public interface IProblemGroupsBusinessService : IAdministrationOperationService<ProblemGroup, int, ProblemGroupsAdministrationModel>
     {
-        Task<ServiceResult> DeleteById(int id);
+        Task<ServiceResult<VoidResult>> DeleteById(int id);
 
-        Task<ServiceResult> CopyAllToContestBySourceAndDestinationContest(
+        Task<ServiceResult<VoidResult>> CopyAllToContestBySourceAndDestinationContest(
             int sourceContestId,
             int destinationContestId);
 

Services/Administration/OJS.Services.Administration.Business/ProblemGroups/ProblemGroupsBusinessService.cs

@@ -3,18 +3,19 @@ namespace OJS.Services.Administration.Business.ProblemGroups
     using FluentExtensions.Extensions;
     using Microsoft.EntityFrameworkCore;
     using OJS.Data.Models;
+    using OJS.Data.Models.Contests;
     using OJS.Data.Models.Problems;
     using OJS.Data.Models.Tests;
     using OJS.Services.Administration.Data;
     using OJS.Services.Administration.Models.ProblemGroups;
-    using OJS.Services.Common.Models;
     using System.Collections.Generic;
     using System.Linq;
     using System.Threading.Tasks;
     using Resource = OJS.Common.Resources.ProblemGroupsBusiness;
     using SharedResource = OJS.Common.Resources.ContestsGeneral;
     using OJS.Services.Infrastructure.Extensions;
     using OJS.Services.Infrastructure.Exceptions;
+    using OJS.Services.Infrastructure.Models;
 
     public class ProblemGroupsBusinessService : AdministrationOperationService<ProblemGroup, int, ProblemGroupsAdministrationModel>, IProblemGroupsBusinessService
     {
@@ -100,7 +101,7 @@ public override async Task Delete(int id)
             await this.ReevaluateProblemsAndProblemGroupsOrder(contestId);
         }
 
-        public async Task<ServiceResult> DeleteById(int id)
+        public async Task<ServiceResult<VoidResult>> DeleteById(int id)
         {
             var problemGroup = await this.problemGroupsData.GetByIdQuery(id)
                 .Include(p => p.Problems)
@@ -110,7 +111,7 @@ public async Task<ServiceResult> DeleteById(int id)
             {
                 if (problemGroup.Problems.Any(p => !p.IsDeleted))
                 {
-                    return new ServiceResult(Resource.CannotDeleteProblemGroupWithProblems);
+                    return ServiceResult.BusinessRuleViolation<VoidResult>(Resource.CannotDeleteProblemGroupWithProblems);
                 }
 
                 this.problemGroupsData.Delete(problemGroup);
@@ -119,26 +120,26 @@ public async Task<ServiceResult> DeleteById(int id)
                 await this.ReevaluateProblemsAndProblemGroupsOrder(problemGroup.ContestId);
             }
 
-            return ServiceResult.Success;
+            return ServiceResult.EmptySuccess;
         }
 
-        public async Task<ServiceResult> CopyAllToContestBySourceAndDestinationContest(
+        public async Task<ServiceResult<VoidResult>> CopyAllToContestBySourceAndDestinationContest(
             int sourceContestId,
             int destinationContestId)
         {
             if (sourceContestId == destinationContestId)
             {
-                return new ServiceResult(Resource.CannotCopyProblemGroupsIntoSameContest);
+                return ServiceResult.BusinessRuleViolation<VoidResult>(Resource.CannotCopyProblemGroupsIntoSameContest);
             }
 
             if (!await this.contestsData.ExistsById(destinationContestId))
             {
-                return new ServiceResult(SharedResource.ContestNotFound);
+                return ServiceResult.NotFound<VoidResult>(nameof(Contest), SharedResource.ContestNotFound, destinationContestId);
             }
 
             if (await this.contestsData.IsActiveById(destinationContestId))
             {
-                return new ServiceResult(Resource.CannotCopyProblemGroupsIntoActiveContest);
+                return ServiceResult.BusinessRuleViolation<VoidResult>(Resource.CannotCopyProblemGroupsIntoActiveContest);
             }
 
             var sourceContestProblemGroups = await this.problemGroupsData
@@ -154,7 +155,7 @@ public async Task<ServiceResult> CopyAllToContestBySourceAndDestinationContest(
             await sourceContestProblemGroups
                 .ForEachSequential(async pg => await this.CopyProblemGroupToContest(pg, destinationContestId));
 
-            return ServiceResult.Success;
+            return ServiceResult.EmptySuccess;
         }
 
         public async Task ReevaluateProblemsAndProblemGroupsOrder(int contestId)

Services/Administration/OJS.Services.Administration.Business/Problems/IProblemsBusinessService.cs

@@ -3,7 +3,7 @@ namespace OJS.Services.Administration.Business.Problems;
 using System.IO;
 using OJS.Data.Models.Problems;
 using OJS.Services.Administration.Models.Problems;
-using OJS.Services.Common.Models;
+using OJS.Services.Infrastructure.Models;
 using System.Threading.Tasks;
 
 public interface IProblemsBusinessService : IAdministrationOperationService<Problem, int, ProblemAdministrationModel>
@@ -14,7 +14,7 @@ public interface IProblemsBusinessService : IAdministrationOperationService<Prob
 
     Task DeleteByContest(int contestId);
 
-    Task<ServiceResult> CopyToContestByIdByContestAndProblemGroup(int id, int contestId, int? problemGroupId);
+    Task<ServiceResult<VoidResult>> CopyToContestByIdByContestAndProblemGroup(int id, int contestId, int? problemGroupId);
 
     Task<(MemoryStream outputStream, string zipFileName)> DownloadAdditionalFiles(int problemId);
 }