redirect to the default study chapter when the chapter id is wrong

lule75 · Jun 12, 2023 · 71188f0 · 71188f0
1 parent c134cd0
commit 71188f0
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 13 deletions.
diff --git a/app/controllers/RelayRound.scala b/app/controllers/RelayRound.scala
@@ -130,7 +130,7 @@ final class RelayRound(
             if rt.round.sync.ongoing then
               env.study.chapterRepo relaysAndTagsByStudyId rt.round.studyId flatMap { chapters =>
                 chapters.find(_.looksAlive) orElse chapters.headOption match {
-                  case Some(chapter) => env.study.api.byIdWithChapter(rt.round.studyId, chapter.id)
+                  case Some(chapter) => env.study.api.byIdWithChapterOrFallback(rt.round.studyId, chapter.id)
                   case None          => env.study.api byIdWithChapter rt.round.studyId
                 }
               }
@@ -162,9 +162,8 @@ final class RelayRound(
   }
 
   def chapter(ts: String, rs: String, id: RelayRoundId, chapterId: StudyChapterId) = Open:
-    WithRoundAndTour(ts, rs, id) { rt =>
-      env.study.api.byIdWithChapter(rt.round.studyId, chapterId) flatMapz { doShow(rt, _) }
-    }
+    WithRoundAndTour(ts, rs, id): rt =>
+      env.study.api.byIdWithChapterOrFallback(rt.round.studyId, chapterId) flatMapz { doShow(rt, _) }
 
   def push(id: RelayRoundId) = ScopedBody(parse.tolerantText)(Seq(_.Study.Write)) { ctx ?=> me =>
     env.relay.api

diff --git a/app/controllers/Study.scala b/app/controllers/Study.scala
@@ -174,8 +174,8 @@ final class Study(
                 .withCanonical(routes.Study.chapter(sc.study.id, sc.chapter.id))
                 .enableSharedArrayBuffer,
             api = _ =>
-              chatOf(sc.study).map { chatOpt =>
-                Ok(
+              chatOf(sc.study).map: chatOpt =>
+                Ok:
                   Json.obj(
                     "study" -> data.study.add("chat" -> chatOpt.map { c =>
                       lila.chat.JsonView.mobile(
@@ -185,8 +185,6 @@ final class Study(
                     }),
                     "analysis" -> data.analysis
                   )
-                )
-              }
           )
         yield res
       }(privateUnauthorizedFu(oldSc.study), privateForbiddenFu(oldSc.study))
@@ -231,7 +229,16 @@ final class Study(
   def chapter(id: StudyId, chapterId: StudyChapterId) =
     Open:
       orRelay(id, chapterId.some):
-        showQuery(env.study.api.byIdWithChapter(id, chapterId))
+        env.study.api
+          .byIdWithChapter(id, chapterId)
+          .flatMap:
+            case None =>
+              env.study.studyRepo
+                .exists(id)
+                .flatMap:
+                  if _ then Redirect(routes.Study.show(id)).toFuccess
+                  else showQuery(fuccess(none))
+            case sc => showQuery(fuccess(sc))
 
   def chapterMeta(id: StudyId, chapterId: StudyChapterId) = Open:
     env.study.chapterRepo.byId(chapterId).map {
@@ -326,7 +333,7 @@ final class Study(
   def embed(id: StudyId, chapterId: StudyChapterId) = Anon:
     val studyWithChapter =
       if (chapterId.value == "autochap") env.study.api.byIdWithChapter(id)
-      else env.study.api.byIdWithChapter(id, chapterId)
+      else env.study.api.byIdWithChapterOrFallback(id, chapterId)
     studyWithChapter.map(_.filterNot(_.study.isPrivate)) flatMap {
       _.fold(embedNotFound) { case WithChapter(study, chapter) =>
         for

diff --git a/modules/practice/src/main/PracticeApi.scala b/modules/practice/src/main/PracticeApi.scala
@@ -27,7 +27,7 @@ final class PracticeApi(
     chapters <- studyApi.chapterMetadatas(studyId)
     chapter = up.progress firstOngoingIn chapters
     studyOption <- chapter.fold(studyApi byIdWithFirstChapter studyId) { chapter =>
-      studyApi.byIdWithChapter(studyId, chapter.id)
+      studyApi.byIdWithChapterOrFallback(studyId, chapter.id)
     }
   yield makeUserStudy(studyOption, up, chapters)
 
@@ -38,7 +38,7 @@ final class PracticeApi(
   ): Fu[Option[UserStudy]] = for
     up          <- get(user)
     chapters    <- studyApi.chapterMetadatas(studyId)
-    studyOption <- studyApi.byIdWithChapter(studyId, chapterId)
+    studyOption <- studyApi.byIdWithChapterOrFallback(studyId, chapterId)
   yield makeUserStudy(studyOption, up, chapters)
 
   private def makeUserStudy(

diff --git a/modules/study/src/main/StudyApi.scala b/modules/study/src/main/StudyApi.scala
@@ -64,7 +64,10 @@ final class StudyApi(
       }
 
   def byIdWithChapter(id: StudyId, chapterId: StudyChapterId): Fu[Option[Study.WithChapter]] =
-    studyRepo.byIdWithChapter(chapterRepo.coll)(id, chapterId) orElse byIdWithChapter(id)
+    studyRepo.byIdWithChapter(chapterRepo.coll)(id, chapterId)
+
+  def byIdWithChapterOrFallback(id: StudyId, chapterId: StudyChapterId): Fu[Option[Study.WithChapter]] =
+    byIdWithChapter(id, chapterId) orElse byIdWithChapter(id)
 
   def byIdWithFirstChapter(id: StudyId): Fu[Option[Study.WithChapter]] =
     byIdWithChapterFinder(id, chapterRepo firstByStudy id)