refactor(server): pattern: properly use module dependency clients (#464)

judgels-backends/judgels-server-app/src/main/java/judgels/jerahmeel/chapter/lesson/ChapterLessonResource.java

@@ -30,9 +30,9 @@
 import judgels.jerahmeel.api.chapter.lesson.ChapterLessonsResponse;
 import judgels.jerahmeel.chapter.ChapterStore;
 import judgels.jerahmeel.role.RoleChecker;
+import judgels.sandalphon.SandalphonClient;
 import judgels.sandalphon.api.lesson.LessonInfo;
 import judgels.sandalphon.api.lesson.LessonStatement;
-import judgels.sandalphon.lesson.LessonClient;
 import judgels.service.actor.ActorChecker;
 import judgels.service.api.actor.AuthHeader;
 
@@ -42,7 +42,7 @@ public class ChapterLessonResource {
     @Inject protected RoleChecker roleChecker;
     @Inject protected ChapterStore chapterStore;
     @Inject protected ChapterLessonStore lessonStore;
-    @Inject protected LessonClient lessonClient;
+    @Inject protected SandalphonClient sandalphonClient;
 
     @Inject public ChapterLessonResource() {}
 
@@ -65,7 +65,7 @@ public void setLessons(
         checkArgument(aliases.size() == data.size(), "Lesson aliases must be unique");
         checkArgument(slugs.size() == data.size(), "Lesson slugs must be unique");
 
-        Map<String, String> slugToJidMap = lessonClient.translateAllowedSlugsToJids(actorJid, slugs);
+        Map<String, String> slugToJidMap = sandalphonClient.translateAllowedLessonSlugsToJids(actorJid, slugs);
 
         List<ChapterLesson> setData = data.stream().filter(cp -> slugToJidMap.containsKey(cp.getSlug())).map(lesson ->
                 new ChapterLesson.Builder()
@@ -89,7 +89,7 @@ public ChapterLessonsResponse getLessons(
 
         List<ChapterLesson> lessons = lessonStore.getLessons(chapterJid);
         Set<String> lessonJids = lessons.stream().map(ChapterLesson::getLessonJid).collect(Collectors.toSet());
-        Map<String, LessonInfo> lessonsMap = lessonClient.getLessons(lessonJids);
+        Map<String, LessonInfo> lessonsMap = sandalphonClient.getLessons(lessonJids);
 
         return new ChapterLessonsResponse.Builder()
                 .data(lessons)
@@ -114,8 +114,8 @@ public ChapterLessonStatement getLessonStatement(
 
         ChapterLesson lesson = checkFound(lessonStore.getLessonByAlias(chapterJid, lessonAlias));
         String lessonJid = lesson.getLessonJid();
-        LessonInfo lessonInfo = lessonClient.getLesson(lessonJid);
-        LessonStatement statement = lessonClient.getLessonStatement(req, uriInfo, lesson.getLessonJid(), language);
+        LessonInfo lessonInfo = sandalphonClient.getLesson(lessonJid);
+        LessonStatement statement = sandalphonClient.getLessonStatement(req, uriInfo, lesson.getLessonJid(), language);
 
         return new ChapterLessonStatement.Builder()
                 .defaultLanguage(lessonInfo.getDefaultLanguage())

judgels-backends/judgels-server-app/src/main/java/judgels/jerahmeel/chapter/problem/ChapterProblemResource.java

@@ -32,9 +32,9 @@
 import judgels.jerahmeel.chapter.ChapterStore;
 import judgels.jerahmeel.role.RoleChecker;
 import judgels.jerahmeel.stats.StatsStore;
+import judgels.sandalphon.SandalphonClient;
 import judgels.sandalphon.api.problem.ProblemInfo;
 import judgels.sandalphon.api.problem.ProblemType;
-import judgels.sandalphon.problem.ProblemClient;
 import judgels.service.actor.ActorChecker;
 import judgels.service.api.actor.AuthHeader;
 
@@ -44,8 +44,8 @@ public class ChapterProblemResource {
     @Inject protected RoleChecker roleChecker;
     @Inject protected ChapterStore chapterStore;
     @Inject protected ChapterProblemStore problemStore;
-    @Inject protected ProblemClient problemClient;
     @Inject protected StatsStore statsStore;
+    @Inject protected SandalphonClient sandalphonClient;
 
     @Inject public ChapterProblemResource() {}
 
@@ -68,7 +68,7 @@ public void setProblems(
         checkArgument(aliases.size() == data.size(), "Problem aliases must be unique");
         checkArgument(slugs.size() == data.size(), "Problem slugs must be unique");
 
-        Map<String, String> slugToJidMap = problemClient.translateAllowedSlugsToJids(actorJid, slugs);
+        Map<String, String> slugToJidMap = sandalphonClient.translateAllowedProblemSlugsToJids(actorJid, slugs);
 
         List<ChapterProblem> setData = data.stream().filter(cp -> slugToJidMap.containsKey(cp.getSlug())).map(problem ->
                 new ChapterProblem.Builder()
@@ -93,7 +93,7 @@ public ChapterProblemsResponse getProblems(
 
         List<ChapterProblem> problems = problemStore.getProblems(chapterJid);
         Set<String> problemJids = problems.stream().map(ChapterProblem::getProblemJid).collect(Collectors.toSet());
-        Map<String, ProblemInfo> problemsMap = problemClient.getProblems(problemJids);
+        Map<String, ProblemInfo> problemsMap = sandalphonClient.getProblems(problemJids);
         Map<String, ProblemProgress> problemProgressesMap = statsStore.getProblemProgressesMap(actorJid, problemJids);
 
         return new ChapterProblemsResponse.Builder()
@@ -120,7 +120,7 @@ public ChapterProblemWorksheet getProblemWorksheet(
 
         ChapterProblem problem = checkFound(problemStore.getProblemByAlias(chapterJid, problemAlias));
         String problemJid = problem.getProblemJid();
-        ProblemInfo problemInfo = problemClient.getProblem(problemJid);
+        ProblemInfo problemInfo = sandalphonClient.getProblem(problemJid);
 
         Optional<String> reasonNotAllowedToSubmit = authHeader.isPresent()
                 ? Optional.empty()
@@ -132,7 +132,7 @@ public ChapterProblemWorksheet getProblemWorksheet(
                     .languages(problemInfo.getTitlesByLanguage().keySet())
                     .problem(problem)
                     .worksheet(new judgels.sandalphon.api.problem.programming.ProblemWorksheet.Builder()
-                            .from(problemClient.getProgrammingProblemWorksheet(req, uriInfo, problemJid, language))
+                            .from(sandalphonClient.getProgrammingProblemWorksheet(req, uriInfo, problemJid, language))
                             .reasonNotAllowedToSubmit(reasonNotAllowedToSubmit)
                             .build())
                     .build();
@@ -142,7 +142,7 @@ public ChapterProblemWorksheet getProblemWorksheet(
                     .languages(problemInfo.getTitlesByLanguage().keySet())
                     .problem(problem)
                     .worksheet(new judgels.sandalphon.api.problem.bundle.ProblemWorksheet.Builder()
-                            .from(problemClient.getBundleProblemWorksheetWithoutAnswerKey(req, uriInfo, problemJid, language))
+                            .from(sandalphonClient.getBundleProblemWorksheetWithoutAnswerKey(req, uriInfo, problemJid, language))
                             .reasonNotAllowedToSubmit(reasonNotAllowedToSubmit)
                             .build())
                     .build();

judgels-backends/judgels-server-app/src/main/java/judgels/jerahmeel/course/chapter/CourseChapterResource.java

@@ -39,7 +39,7 @@
 import judgels.jerahmeel.course.CourseStore;
 import judgels.jerahmeel.role.RoleChecker;
 import judgels.jerahmeel.stats.StatsStore;
-import judgels.jophiel.user.UserClient;
+import judgels.jophiel.JophielClient;
 import judgels.service.actor.ActorChecker;
 import judgels.service.api.actor.AuthHeader;
 
@@ -52,7 +52,7 @@ public class CourseChapterResource {
     @Inject protected ChapterStore chapterStore;
     @Inject protected ChapterLessonStore chapterLessonStore;
     @Inject protected StatsStore statsStore;
-    @Inject protected UserClient userClient;
+    @Inject protected JophielClient jophielClient;
 
     @Inject public CourseChapterResource() {}
 
@@ -146,7 +146,7 @@ public CourseChapterUserProgressesResponse getChapterUserProgresses(
                 .collect(toList());
 
         Map<String, String> usernameToJidsMap =
-                userClient.translateUsernamesToJids(ImmutableSet.copyOf(data.getUsernames()));
+                jophielClient.translateUsernamesToJids(ImmutableSet.copyOf(data.getUsernames()));
         Map<String, Map<String, Integer>> userSolvedProblemsMap = statsStore.getUserChapterSolvedProblemsMap(
                     ImmutableSet.copyOf(usernameToJidsMap.values()),
                     chapterJids);

judgels-backends/judgels-server-app/src/main/java/judgels/jerahmeel/problem/ProblemResource.java

@@ -19,7 +19,7 @@
 import judgels.jerahmeel.difficulty.ProblemDifficultyStore;
 import judgels.jerahmeel.stats.StatsStore;
 import judgels.persistence.api.Page;
-import judgels.sandalphon.problem.ProblemClient;
+import judgels.sandalphon.SandalphonClient;
 import judgels.service.actor.ActorChecker;
 import judgels.service.api.actor.AuthHeader;
 
@@ -31,7 +31,7 @@ public class ProblemResource {
     @Inject protected ProblemStore problemStore;
     @Inject protected StatsStore statsStore;
     @Inject protected ProblemDifficultyStore difficultyStore;
-    @Inject protected ProblemClient problemClient;
+    @Inject protected SandalphonClient sandalphonClient;
 
     @Inject public ProblemResource() {}
 
@@ -47,7 +47,7 @@ public ProblemsResponse getProblems(
 
         Set<String> allowedProblemJids = null;
         if (!tags.isEmpty()) {
-            allowedProblemJids = problemClient.getProblemJidsByTags(tags);
+            allowedProblemJids = sandalphonClient.getProblemJidsByTags(tags);
         }
 
         Page<ProblemSetProblemInfo> problems = problemStore.getProblems(allowedProblemJids, pageNumber, PAGE_SIZE);
@@ -57,8 +57,8 @@ public ProblemsResponse getProblems(
 
         return new ProblemsResponse.Builder()
                 .data(problems)
-                .problemsMap(problemClient.getProblems(problemJids))
-                .problemMetadatasMap(problemClient.getProblemMetadatas(problemJids))
+                .problemsMap(sandalphonClient.getProblems(problemJids))
+                .problemMetadatasMap(sandalphonClient.getProblemMetadatas(problemJids))
                 .problemDifficultiesMap(difficultyStore.getProblemDifficultiesMap(problemJids))
                 .problemProgressesMap(statsStore.getProblemProgressesMap(actorJid, problemJids))
                 .build();

judgels-backends/judgels-server-app/src/main/java/judgels/jerahmeel/problemset/ProblemSetResource.java

@@ -41,8 +41,8 @@
 import judgels.jerahmeel.problemset.problem.ProblemSetProblemStore;
 import judgels.jerahmeel.role.RoleChecker;
 import judgels.jerahmeel.stats.StatsStore;
+import judgels.jophiel.JophielClient;
 import judgels.jophiel.api.profile.Profile;
-import judgels.jophiel.user.UserClient;
 import judgels.persistence.api.Page;
 import judgels.service.actor.ActorChecker;
 import judgels.service.api.actor.AuthHeader;
@@ -57,7 +57,7 @@ public class ProblemSetResource {
     @Inject protected ProblemSetProblemStore problemSetProblemStore;
     @Inject protected ArchiveStore archiveStore;
     @Inject protected StatsStore statsStore;
-    @Inject protected UserClient userClient;
+    @Inject protected JophielClient jophielClient;
 
     @Inject public ProblemSetResource() {}
 
@@ -94,7 +94,7 @@ public ProblemSetsResponse getProblemSets(
         for (ProblemSet problemSet : problemSets.getPage()) {
             descriptions = descriptions.concat(problemSet.getDescription());
         }
-        Map<String, Profile> profilesMap = userClient.parseProfiles(descriptions);
+        Map<String, Profile> profilesMap = jophielClient.parseProfiles(descriptions);
 
         return new ProblemSetsResponse.Builder()
                 .data(problemSets)
@@ -190,7 +190,7 @@ public ProblemSetUserProgressesResponse getProblemSetUserProgresses(ProblemSetUs
         Map<String, List<ProblemSetProblem>> problemsMap = problemSetProblemStore.getProblems(problemSetJids);
 
         Set<String> usernames = ImmutableSet.copyOf(data.getUsernames());
-        Map<String, String> usernameToJidsMap = userClient.translateUsernamesToJids(usernames);
+        Map<String, String> usernameToJidsMap = jophielClient.translateUsernamesToJids(usernames);
 
         Set<String> userJids = ImmutableSet.copyOf(usernameToJidsMap.values());
         Set<String> problemJids = problemsMap

judgels-backends/judgels-server-app/src/main/java/judgels/jerahmeel/problemset/problem/ProblemSetProblemResource.java

@@ -41,16 +41,16 @@
 import judgels.jerahmeel.problemset.ProblemSetStore;
 import judgels.jerahmeel.role.RoleChecker;
 import judgels.jerahmeel.stats.StatsStore;
-import judgels.jerahmeel.uriel.ContestClient;
+import judgels.jophiel.JophielClient;
 import judgels.jophiel.api.profile.Profile;
-import judgels.jophiel.user.UserClient;
+import judgels.sandalphon.SandalphonClient;
 import judgels.sandalphon.api.problem.ProblemEditorialInfo;
 import judgels.sandalphon.api.problem.ProblemInfo;
 import judgels.sandalphon.api.problem.ProblemMetadata;
 import judgels.sandalphon.api.problem.ProblemType;
-import judgels.sandalphon.problem.ProblemClient;
 import judgels.service.actor.ActorChecker;
 import judgels.service.api.actor.AuthHeader;
+import judgels.uriel.UrielClient;
 import judgels.uriel.api.contest.ContestInfo;
 
 @Path("/api/v2/problemsets/{problemSetJid}/problems")
@@ -60,10 +60,10 @@ public class ProblemSetProblemResource {
     @Inject protected ProblemSetStore problemSetStore;
     @Inject protected ProblemSetProblemStore problemStore;
     @Inject protected ProblemDifficultyStore difficultyStore;
-    @Inject protected UserClient userClient;
-    @Inject protected ProblemClient problemClient;
-    @Inject protected ContestClient contestClient;
     @Inject protected StatsStore statsStore;
+    @Inject protected JophielClient jophielClient;
+    @Inject protected SandalphonClient sandalphonClient;
+    @Inject protected UrielClient urielClient;
 
     @Inject public ProblemSetProblemResource() {}
 
@@ -86,14 +86,14 @@ public void setProblems(
         checkArgument(aliases.size() == data.size(), "Problem aliases must be unique");
         checkArgument(slugs.size() == data.size(), "Problem slugs must be unique");
 
-        Map<String, String> slugToJidMap = problemClient.translateAllowedSlugsToJids(actorJid, slugs);
+        Map<String, String> slugToJidMap = sandalphonClient.translateAllowedProblemSlugsToJids(actorJid, slugs);
 
         Set<String> contestSlugs = data.stream()
                 .map(ProblemSetProblemData::getContestSlugs)
                 .flatMap(List::stream)
                 .collect(Collectors.toSet());
 
-        Map<String, String> contestSlugToJidMap = contestClient.translateSlugsToJids(contestSlugs);
+        Map<String, String> contestSlugToJidMap = urielClient.translateContestSlugsToJids(contestSlugs);
 
         Set<String> notAllowedContestSlugs = data.stream()
                 .map(ProblemSetProblemData::getContestSlugs)
@@ -118,7 +118,7 @@ public void setProblems(
                 .collect(Collectors.toList());
 
         Map<String, Boolean> problemVisibilitiesMap = problemStore.setProblems(problemSetJid, setData);
-        problemClient.setProblemVisibilityTagsByJids(problemVisibilitiesMap);
+        sandalphonClient.setProblemVisibilityTagsByJids(problemVisibilitiesMap);
     }
 
     @GET
@@ -142,12 +142,12 @@ public ProblemSetProblemsResponse getProblems(
 
         return new ProblemSetProblemsResponse.Builder()
                 .data(problems)
-                .problemsMap(problemClient.getProblems(problemJids))
-                .problemMetadatasMap(problemClient.getProblemMetadatas(problemJids))
+                .problemsMap(sandalphonClient.getProblems(problemJids))
+                .problemMetadatasMap(sandalphonClient.getProblemMetadatas(problemJids))
                 .problemDifficultiesMap(difficultyStore.getProblemDifficultiesMap(problemJids))
                 .problemProgressesMap(statsStore.getProblemProgressesMap(actorJid, problemJids))
                 .contestsMap(roleChecker.isAdmin(actorJid)
-                        ? contestClient.getContestsByJids(contestJids)
+                        ? urielClient.getContestsByJids(contestJids)
                         : ImmutableMap.of())
                 .build();
     }
@@ -184,7 +184,7 @@ public ProblemSetProblemWorksheet getProblemWorksheet(
 
         ProblemSetProblem problem = checkFound(problemStore.getProblemByAlias(problemSetJid, problemAlias));
         String problemJid = problem.getProblemJid();
-        ProblemInfo problemInfo = problemClient.getProblem(problemJid);
+        ProblemInfo problemInfo = sandalphonClient.getProblem(problemJid);
 
         Optional<String> reasonNotAllowedToSubmit = authHeader.isPresent()
                 ? Optional.empty()
@@ -196,7 +196,7 @@ public ProblemSetProblemWorksheet getProblemWorksheet(
                     .languages(problemInfo.getTitlesByLanguage().keySet())
                     .problem(problem)
                     .worksheet(new judgels.sandalphon.api.problem.programming.ProblemWorksheet.Builder()
-                            .from(problemClient.getProgrammingProblemWorksheet(req, uriInfo, problemJid, language))
+                            .from(sandalphonClient.getProgrammingProblemWorksheet(req, uriInfo, problemJid, language))
                             .reasonNotAllowedToSubmit(reasonNotAllowedToSubmit)
                             .build())
                     .build();
@@ -206,7 +206,7 @@ public ProblemSetProblemWorksheet getProblemWorksheet(
                     .languages(problemInfo.getTitlesByLanguage().keySet())
                     .problem(problem)
                     .worksheet(new judgels.sandalphon.api.problem.bundle.ProblemWorksheet.Builder()
-                            .from(problemClient.getBundleProblemWorksheetWithoutAnswerKey(req, uriInfo, problemJid, language))
+                            .from(sandalphonClient.getBundleProblemWorksheetWithoutAnswerKey(req, uriInfo, problemJid, language))
                             .reasonNotAllowedToSubmit(reasonNotAllowedToSubmit)
                             .build())
                     .build();
@@ -229,12 +229,12 @@ public ProblemReportResponse getProblemReport(
         String problemJid = problem.getProblemJid();
         Set<String> problemJids = ImmutableSet.of(problemJid);
 
-        ProblemMetadata metadata = problemClient.getProblemMetadata(problem.getProblemJid());
+        ProblemMetadata metadata = sandalphonClient.getProblemMetadata(problem.getProblemJid());
         ProblemDifficulty difficulty = difficultyStore.getProblemDifficultiesMap(problemJids).get(problemJid);
         ProblemTopStats topStats = statsStore.getProblemTopStats(problemJid);
         ProblemProgress progress = statsStore.getProblemProgressesMap(actorJid, problemJids).get(problemJid);
 
-        Map<String, ContestInfo> contestsMap = contestClient.getContestsByJids(ImmutableSet.copyOf(problem.getContestJids()));
+        Map<String, ContestInfo> contestsMap = urielClient.getContestsByJids(ImmutableSet.copyOf(problem.getContestJids()));
         List<ContestInfo> contests = problem.getContestJids().stream()
                 .filter(contestsMap::containsKey)
                 .map(contestsMap::get)
@@ -245,7 +245,7 @@ public ProblemReportResponse getProblemReport(
         topStats.getTopUsersByScore().forEach(e -> userJids.add(e.getUserJid()));
         topStats.getTopUsersByTime().forEach(e -> userJids.add(e.getUserJid()));
         topStats.getTopUsersByMemory().forEach(e -> userJids.add(e.getUserJid()));
-        Map<String, Profile> profilesMap = userClient.getProfiles(userJids);
+        Map<String, Profile> profilesMap = jophielClient.getProfiles(userJids);
 
         return new ProblemReportResponse.Builder()
                 .metadata(metadata)
@@ -270,7 +270,7 @@ public ProblemEditorialResponse getProblemEditorial(
         checkFound(problemSetStore.getProblemSetByJid(problemSetJid));
 
         ProblemSetProblem problem = checkFound(problemStore.getProblemByAlias(problemSetJid, problemAlias));
-        ProblemEditorialInfo editorial = checkFound(problemClient.getProblemEditorial(problem.getProblemJid(), uriInfo.getBaseUri(), language));
+        ProblemEditorialInfo editorial = checkFound(sandalphonClient.getProblemEditorial(problem.getProblemJid(), uriInfo.getBaseUri(), language));
         return new ProblemEditorialResponse.Builder()
                 .editorial(editorial)
                 .build();