Show other submissions of solved chapter problems correctly

ia-toki · Aug 15, 2024 · 5dbd63b · 5dbd63b
1 parent 70f75a2
commit 5dbd63b
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 4 deletions.
diff --git a/.../judgels-server-app/src/main/java/judgels/jerahmeel/submission/SubmissionRoleChecker.java b/.../judgels-server-app/src/main/java/judgels/jerahmeel/submission/SubmissionRoleChecker.java
@@ -1,23 +1,42 @@
 package judgels.jerahmeel.submission;
 
 import javax.inject.Inject;
+import judgels.gabriel.api.Verdict;
+import judgels.gabriel.api.Verdicts;
+import judgels.jerahmeel.persistence.StatsUserProblemDao;
+import judgels.jerahmeel.persistence.StatsUserProblemModel;
 import judgels.jerahmeel.role.RoleChecker;
+import java.util.Optional;
 
 public class SubmissionRoleChecker {
     private final RoleChecker roleChecker;
+    private final StatsUserProblemDao statsUserProblemDao;
 
     @Inject
-    public SubmissionRoleChecker(RoleChecker roleChecker) {
+    public SubmissionRoleChecker(RoleChecker roleChecker, StatsUserProblemDao statsUserProblemDao) {
         this.roleChecker = roleChecker;
+        this.statsUserProblemDao = statsUserProblemDao;
     }
 
-    public boolean canViewSource(String userJid, String submissionUserJid) {
+    public boolean canViewProblemSetSource(String userJid, String submissionUserJid, String problemJid) {
         if (roleChecker.isAdmin(userJid)) {
             return true;
         }
         return userJid.equals(submissionUserJid);
     }
 
+    public boolean canViewChapterSource(String userJid, String submissionUserJid, String problemJid) {
+        if (roleChecker.isAdmin(userJid)) {
+            return true;
+        }
+        if (userJid.equals(submissionUserJid)) {
+            return true;
+        }
+
+        Optional<StatsUserProblemModel> model = statsUserProblemDao.selectByUserJidAndProblemJid(userJid, problemJid);
+        return model.isPresent() && Verdicts.fromCode(model.get().verdict) == Verdict.ACCEPTED;
+    }
+
     public boolean canManage(String userJid) {
         return roleChecker.isAdmin(userJid);
     }

diff --git a/...server-app/src/main/java/judgels/jerahmeel/submission/programming/SubmissionResource.java b/...server-app/src/main/java/judgels/jerahmeel/submission/programming/SubmissionResource.java
@@ -178,31 +178,35 @@ public SubmissionWithSourceResponse getSubmissionWithSourceById(
 
         String containerJid = submission.getContainerJid();
         String problemJid = submission.getProblemJid();
+        String userJid = submission.getUserJid();
 
         List<String> containerPath;
         String containerName;
         String problemAlias;
+        boolean canViewSource;
+
         if (SubmissionUtils.isProblemSet(containerJid)) {
             ProblemSet problemSet = checkFound(problemSetStore.getProblemSetByJid(containerJid));
             ProblemSetProblem problem = checkFound(problemSetProblemStore.getProblem(problemSet.getJid(), problemJid));
             containerPath = checkFound(problemSetStore.getProblemSetPathByJid(containerJid));
             containerName = problemSet.getName();
             problemAlias = problem.getAlias();
+            canViewSource = submissionRoleChecker.canViewProblemSetSource(actorJid, userJid, problemJid);
         } else {
             Chapter chapter = checkFound(chapterStore.getChapterByJid(containerJid));
             ChapterProblem problem = checkFound(chapterProblemStore.getProblem(problemJid));
             containerPath = checkFound(chapterStore.getChapterPathByJid(containerJid));
             containerName = chapter.getName();
             problemAlias = problem.getAlias();
+            canViewSource = submissionRoleChecker.canViewChapterSource(actorJid, userJid, problemJid);
         }
 
         ProblemInfo problem = sandalphonClient.getProblem(submission.getProblemJid());
 
-        String userJid = submission.getUserJid();
         Profile profile = checkFound(Optional.ofNullable(jophielClient.getProfile(userJid)));
 
         SubmissionWithSource submissionWithSource;
-        if (submissionRoleChecker.canViewSource(actorJid, submission.getUserJid())) {
+        if (canViewSource) {
             SubmissionSource source = submissionSourceBuilder.fromPastSubmission(submission.getJid(), true);
             submissionWithSource = new SubmissionWithSource.Builder()
                     .submission(submission)