Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(server): fix contest clarification widget for contestants #563

Merged
merged 1 commit into from
Dec 16, 2023
Merged

fix(server): fix contest clarification widget for contestants #563

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
56 changes: 56 additions & 0 deletions ...udgels-server-app/src/integTest/java/judgels/uriel/api/ContestWebApiIntegrationTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,24 +16,32 @@
import java.util.LinkedHashMap;
import java.util.Map;
import java.util.Set;
import judgels.uriel.ContestClarificationClient;
import judgels.uriel.ContestWebClient;
import judgels.uriel.api.contest.Contest;
import judgels.uriel.api.contest.clarification.ContestClarification;
import judgels.uriel.api.contest.clarification.ContestClarificationAnswerData;
import judgels.uriel.api.contest.clarification.ContestClarificationData;
import judgels.uriel.api.contest.clarification.ContestClarificationStatus;
import judgels.uriel.api.contest.module.ContestModuleType;
import judgels.uriel.api.contest.role.ContestRole;
import judgels.uriel.api.contest.supervisor.SupervisorManagementPermission;
import judgels.uriel.api.contest.web.ContestState;
import judgels.uriel.api.contest.web.ContestTab;
import judgels.uriel.api.contest.web.ContestWebConfig;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;

class ContestWebApiIntegrationTests extends BaseUrielApiIntegrationTests {
private final ContestWebClient webClient = createClient(ContestWebClient.class);
private final ContestClarificationClient clarificationClient = createClient(ContestClarificationClient.class);

private Contest contest;

@BeforeEach
void before() {
contest = buildContestWithRoles()
.contestants(CONTESTANT, CONTESTANT_A, CONTESTANT_B)
.supervisorWithManagementPermissions(SUPERVISOR_A, SupervisorManagementPermission.ALL)
.supervisors(SUPERVISOR_B)
.modules(ContestModuleType.REGISTRATION)
Expand Down Expand Up @@ -244,4 +252,52 @@ void get_web_config__state__virtual() {
assertThat(webClient.getWebConfig(contestantToken, contest.getJid()).getState())
.isEqualTo(ContestState.FINISHED);
}

@Test
void get_web_config__clarifications() {
enableModule(contest, ContestModuleType.CLARIFICATION);
beginContest(contest);

ContestWebConfig config = webClient.getWebConfig(contestantAToken, contest.getJid());
assertThat(config.getClarificationStatus()).isEqualTo(ContestClarificationStatus.ANSWERED);
assertThat(config.getClarificationCount()).isEqualTo(0);

config = webClient.getWebConfig(contestantBToken, contest.getJid());
assertThat(config.getClarificationStatus()).isEqualTo(ContestClarificationStatus.ANSWERED);
assertThat(config.getClarificationCount()).isEqualTo(0);

config = webClient.getWebConfig(supervisorAToken, contest.getJid());
assertThat(config.getClarificationStatus()).isEqualTo(ContestClarificationStatus.ASKED);
assertThat(config.getClarificationCount()).isEqualTo(0);

ContestClarificationData data = new ContestClarificationData.Builder()
.topicJid(contest.getJid())
.title("title")
.question("question")
.build();

ContestClarification c1 = clarificationClient.createClarification(contestantAToken, contest.getJid(), data);
clarificationClient.createClarification(contestantAToken, contest.getJid(), data);
clarificationClient.createClarification(contestantBToken, contest.getJid(), data);

assertThat(webClient.getWebConfig(contestantAToken, contest.getJid()).getClarificationCount())
.isEqualTo(0);
assertThat(webClient.getWebConfig(contestantBToken, contest.getJid()).getClarificationCount())
.isEqualTo(0);
assertThat(webClient.getWebConfig(supervisorAToken, contest.getJid()).getClarificationCount())
.isEqualTo(3);

ContestClarificationAnswerData answerData = new ContestClarificationAnswerData.Builder()
.answer("answer")
.build();

clarificationClient.answerClarification(managerToken, contest.getJid(), c1.getJid(), answerData);

assertThat(webClient.getWebConfig(contestantAToken, contest.getJid()).getClarificationCount())
.isEqualTo(1);
assertThat(webClient.getWebConfig(contestantBToken, contest.getJid()).getClarificationCount())
.isEqualTo(0);
assertThat(webClient.getWebConfig(supervisorAToken, contest.getJid()).getClarificationCount())
.isEqualTo(2);
}
}
29 changes: 16 additions & 13 deletions ...s/judgels-server-app/src/main/java/judgels/uriel/contest/web/ContestWebConfigFetcher.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,21 +157,24 @@ public ContestWebConfig fetchConfig(String userJid, Contest contest) {
}
}

ContestClarificationStatus clarificationStatus;
if (clarificationRoleChecker.canSupervise(userJid, contest)) {
clarificationStatus = ContestClarificationStatus.ASKED;
} else {
clarificationStatus = ContestClarificationStatus.ANSWERED;
}

int clarificationCount = 0;

// TODO(fushar): remove this try block and fix the test so that it doesn't use mock for clarificationDao
ContestClarificationStatus clarificationStatus = ContestClarificationStatus.ASKED;
try {
clarificationDao
.selectByContestJid(contestJid)
.whereStatusIs(clarificationStatus.name())
.count();
// TODO(fushar): remove this try block and fix the test so that it doesn't use mock for clarificationDao
if (clarificationRoleChecker.canManage(userJid, contest)) {
clarificationStatus = ContestClarificationStatus.ASKED;
clarificationCount = clarificationDao
.selectByContestJid(contestJid)
.whereStatusIs(clarificationStatus.name())
.count();
} else {
clarificationStatus = ContestClarificationStatus.ANSWERED;
clarificationCount = clarificationDao
.selectByContestJid(contestJid)
.whereUserIsAsker(userJid)
.whereStatusIs(clarificationStatus.name())
.count();
}
} catch (NullPointerException e) {
// skip; for test only
}
Expand Down