Merge pull request #1568 from leotsarev/bug/schedule-api-repair

Repair some small bugs in scheduler API
joinrpg · Oct 16, 2021 · 28603e7 · 28603e7
2 parents b760557 + 8b6cda0
commit 28603e7
Show file tree

Hide file tree

Showing 7 changed files with 42 additions and 13 deletions.
diff --git a/src/JoinRpg.Dal.Impl/Repositories/ProjectRepository.cs b/src/JoinRpg.Dal.Impl/Repositories/ProjectRepository.cs
@@ -84,7 +84,7 @@ public Task<Project> GetProjectWithDetailsAsync(int project)
             .Include(p => p.ProjectAcls.Select(a => a.User))
             .SingleOrDefaultAsync(p => p.ProjectId == project);
 
-        public Task<Project> GetProjectWithFieldsAsync(int project)
+        public Task<Project?> GetProjectWithFieldsAsync(int project)
           => AllProjects
             .Include(p => p.Details)
             .Include(p => p.ProjectAcls.Select(a => a.User))

diff --git a/src/JoinRpg.Data.Interfaces/IProjectRepository.cs b/src/JoinRpg.Data.Interfaces/IProjectRepository.cs
@@ -25,7 +25,7 @@ Task<IReadOnlyCollection<ProjectWithClaimCount>> GetArchivedProjectsWithClaimCou
         Task<IEnumerable<Project>> GetActiveProjectsWithSchedule();
         Task<Project> GetProjectAsync(int project);
         Task<Project> GetProjectWithDetailsAsync(int project);
-        Task<Project> GetProjectWithFieldsAsync(int project);
+        Task<Project?> GetProjectWithFieldsAsync(int project);
 
         [NotNull, ItemCanBeNull]
         Task<CharacterGroup> GetGroupAsync(int projectId, int characterGroupId);

diff --git a/src/JoinRpg.Portal.Test/Infrastructure/ProjectIdExtractorTest.cs b/src/JoinRpg.Portal.Test/Infrastructure/ProjectIdExtractorTest.cs
@@ -10,6 +10,15 @@ public class ProjectIdExtractorTest
         [Fact]
         public void ShouldParsePath() => new PathString("/100/dfsfdfsd").TryExtractFromPath().ShouldBe(100);
 
+        [Fact]
+        public void ShouldFindIfApi() => new PathString("/x-game-api/100/dfsfdfsd").TryExtractFromPath().ShouldBe(100);
+
+        [Fact]
+        public void ShouldNotFoundAfterAnything() => new PathString("/something/100/dfsfdfsd").TryExtractFromPath().ShouldBeNull();
+
+        [Fact]
+        public void ShouldIgnoreGarbageAfterApi() => new PathString("/x-game-api/x100/dfsfdfsd").TryExtractFromPath().ShouldBeNull();
+
         [Fact]
         public void ShouldIgnoreEmpty() => new PathString("").TryExtractFromPath().ShouldBeNull();
 

diff --git a/src/JoinRpg.Portal/Controllers/XGameApi/ProjectScheduleController.cs b/src/JoinRpg.Portal/Controllers/XGameApi/ProjectScheduleController.cs
@@ -23,21 +23,31 @@ public class ProjectScheduleController : XGameApiController
 
         [HttpGet]
         [Route("all")]
+        [ProducesResponseType(410)]
+        [ProducesResponseType(403)]
+        [ProducesResponseType(200)]
         public async Task<ActionResult<List<ProgramItemInfoApi>>> GetSchedule([FromRoute]
             int projectId)
         {
+            var project = await ProjectRepository.GetProjectWithFieldsAsync(projectId);
+
+            if (project is null)
+            {
+                return Problem(statusCode: 410);
+            }
+
             var check = await Manager.CheckScheduleConfiguration();
             if (check.Contains(ScheduleConfigProblemsViewModel.NoAccess))
             {
                 return Forbid();
             }
             if (check.Any())
             {
-                throw new Exception($"Error {check.Select(x => x.ToString()).JoinStrings(" ,")}");
+                return Problem(detail: check.Select(x => x.ToString()).JoinStrings(" ,"), statusCode: 400);
             }
 
-            var project = await ProjectRepository.GetProjectWithFieldsAsync(projectId);
             var characters = await ProjectRepository.GetCharacters(projectId);
+
             var scheduleBuilder = new ScheduleBuilder(project, characters);
             var result = scheduleBuilder.Build().AllItems.Select(slot =>
                 new ProgramItemInfoApi

diff --git a/src/JoinRpg.Portal/Infrastructure/DiscoverFilters/ProjectIdExtractor.cs b/src/JoinRpg.Portal/Infrastructure/DiscoverFilters/ProjectIdExtractor.cs
@@ -20,16 +20,20 @@ internal static class ProjectIdExtractor
 
         public static int? TryExtractFromPath(this PathString path)
         {
-            if (!path.HasValue)
+            if (path.Value is null)
             {
                 return null;
             }
             var parts = path.Value.Split('/');
-            var projectIdAsString = parts.Skip(1).FirstOrDefault();
-            if (projectIdAsString != null && int.TryParse(projectIdAsString, out var projectId))
+            var secondPart = parts.Skip(1).FirstOrDefault();
+            if (secondPart != null && int.TryParse(secondPart, out var projectId))
             {
                 return projectId;
             }
+            else if (parts.Skip(2).FirstOrDefault() is string thirdPart && secondPart == "x-game-api" && int.TryParse(thirdPart, out var projectIdSecond))
+            {
+                return projectIdSecond;
+            }
             else
             {
                 return null;

diff --git a/src/JoinRpg.WebPortal.Managers/Schedule/SchedulePageManager.cs b/src/JoinRpg.WebPortal.Managers/Schedule/SchedulePageManager.cs
@@ -193,6 +193,11 @@ public async Task<IReadOnlyCollection<ScheduleConfigProblemsViewModel>> CheckSch
         {
             var project = await Project.GetProjectWithFieldsAsync(CurrentProject.ProjectId);
 
+            if (project is null)
+            {
+                return new[] { ScheduleConfigProblemsViewModel.ProjectNotFound };
+            }
+
             bool HasAccess(ProjectField roomField)
             {
                 if (roomField.IsPublic)
@@ -249,8 +254,8 @@ IEnumerable<ScheduleConfigProblemsViewModel> Impl()
             return Impl().ToList();
         }
 
-        public IProjectRepository Project { get; }
-        public ICurrentProjectAccessor CurrentProject { get; }
-        public ICurrentUserAccessor CurrentUserAccessor { get; }
+        private IProjectRepository Project { get; }
+        private ICurrentProjectAccessor CurrentProject { get; }
+        private ICurrentUserAccessor CurrentUserAccessor { get; }
     }
 }
diff --git a/src/JoinRpg.WebPortal.Models/Schedules/ScheduleConfigProblemsViewModel.cs b/src/JoinRpg.WebPortal.Models/Schedules/ScheduleConfigProblemsViewModel.cs
@@ -4,10 +4,9 @@ namespace JoinRpg.Web.Models.Schedules
 {
     public enum ScheduleConfigProblemsViewModel
     {
-        //TODO поменять сообщение, когда сделаем настроечный экран
-        [Description("Расписание не настроено для этого проекта, обратитесь в техподдержку")]
+        [Description("Расписание не настроено для этого проекта. Вам необходимо добавить поля для помещения и расписания.")]
         FieldsNotSet,
-        [Description("У полей, привязанных к расписанию, разная видимость. Измените настройки видимости полей (публичные/игрокам/мастерам) на одинаковые")]
+        [Description("У полей, привязанных к расписанию, разная видимость. Измените настройки видимости полей (публичные/игрокам/мастерам) на одинаковые.")]
         InconsistentVisibility,
         [Description("У вас нет доступа к расписанию данного проекта")]
         NoAccess,
@@ -16,5 +15,7 @@ public enum ScheduleConfigProblemsViewModel
         NoRooms,
         [Description("Не настроено ни одного тайм-слота")]
         NoTimeSlots,
+        [Description("Проект не найден")]
+        ProjectNotFound,
     }
 }