Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
package org.ezcode.codetest.domain.submission.dto;

import java.time.LocalDate;

public record DailyCorrectCount(
LocalDate date,
int count
) {
}
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
import java.util.List;
import java.util.Optional;

import org.ezcode.codetest.domain.submission.dto.DailyCorrectCount;
import org.ezcode.codetest.domain.submission.model.entity.UserProblemResult;
import org.springframework.data.repository.query.Param;

Expand All @@ -18,4 +19,6 @@ public interface UserProblemResultRepository {
List<Object[]> findScoresBetween(LocalDateTime start, LocalDateTime end);

Optional<Integer> sumPointByUserId(@Param("userId") Long userId);

List<DailyCorrectCount> countCorrectByUserGroupedByDate(Long userId);
}
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
import java.util.Optional;

import org.ezcode.codetest.application.submission.model.SubmissionContext;
import org.ezcode.codetest.domain.submission.dto.DailyCorrectCount;
import org.ezcode.codetest.domain.submission.dto.WeeklySolveCount;
import org.ezcode.codetest.domain.submission.model.SubmissionResult;
import org.ezcode.codetest.domain.submission.model.TestcaseEvaluationInput;
Expand Down Expand Up @@ -85,6 +86,10 @@ public List<WeeklySolveCount> getWeeklySolveCounts(
return submissionRepository.fetchWeeklySolveCounts(startDateTime, endDateTime);
}

public List<DailyCorrectCount> getSolvedHistoryByDate(Long userId) {
return userProblemResultRepository.countCorrectByUserGroupedByDate(userId);
}

private boolean evaluate(TestcaseEvaluationInput input) {
boolean isCorrect = input.isCorrect();
boolean timeEfficient = input.timeEfficient();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ private String callChatApi(Map<String, Object> requestBody) {
.bodyValue(requestBody)
.retrieve()
.bodyToMono(OpenAIResponse.class)
.timeout(Duration.ofSeconds(10))
.timeout(Duration.ofSeconds(20))
.retryWhen(
Retry.backoff(3, Duration.ofSeconds(1))
.maxBackoff(Duration.ofSeconds(5))
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,11 @@
import java.util.List;
import java.util.Optional;

import org.ezcode.codetest.domain.submission.dto.DailyCorrectCount;
import org.ezcode.codetest.domain.submission.model.entity.UserProblemResult;
import org.ezcode.codetest.domain.submission.repository.UserProblemResultRepository;
import org.ezcode.codetest.infrastructure.persistence.repository.submission.jpa.UserProblemResultJpaRepository;
import org.ezcode.codetest.infrastructure.persistence.repository.submission.query.UserProblemResultQueryRepository;
import org.springframework.stereotype.Repository;

import lombok.RequiredArgsConstructor;
Expand All @@ -16,6 +18,7 @@
public class UserProblemResultRepositoryImpl implements UserProblemResultRepository {

private final UserProblemResultJpaRepository userProblemResultJpaRepository;
private final UserProblemResultQueryRepository userProblemResultQueryRepository;

@Override
public Optional<UserProblemResult> findUserProblemResultByUserIdAndProblemId(Long userId, Long problemId) {
Expand All @@ -42,4 +45,9 @@ public Optional<Integer> sumPointByUserId(Long userId) {
return userProblemResultJpaRepository.sumScoreByUserId(userId);
}

@Override
public List<DailyCorrectCount> countCorrectByUserGroupedByDate(Long userId) {
return userProblemResultQueryRepository.countCorrectByUserGroupedByDate(userId);
}

}
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
package org.ezcode.codetest.infrastructure.persistence.repository.submission.query;

import java.util.List;

import org.ezcode.codetest.domain.submission.dto.DailyCorrectCount;

public interface UserProblemResultQueryRepository {
List<DailyCorrectCount> countCorrectByUserGroupedByDate(Long userId);
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
package org.ezcode.codetest.infrastructure.persistence.repository.submission.query;

import java.time.LocalDate;
import java.util.List;

import org.ezcode.codetest.domain.submission.dto.DailyCorrectCount;
import org.ezcode.codetest.domain.submission.model.entity.QUserProblemResult;
import org.springframework.stereotype.Repository;

import com.querydsl.core.types.Projections;
import com.querydsl.core.types.dsl.Expressions;
import com.querydsl.jpa.impl.JPAQueryFactory;

import lombok.RequiredArgsConstructor;

@Repository
@RequiredArgsConstructor
public class UserProblemResultQueryRepositoryImpl implements UserProblemResultQueryRepository{

private final JPAQueryFactory queryFactory;

@Override
public List<DailyCorrectCount> countCorrectByUserGroupedByDate(Long userId) {

QUserProblemResult upr = QUserProblemResult.userProblemResult;

var date = Expressions.dateTemplate(LocalDate .class, "DATE({0})", upr.modifiedAt);

return queryFactory
.select(Projections.constructor(DailyCorrectCount.class,
date,
upr.count()))
.from(upr)
.where(
upr.user.id.eq(userId),
upr.isCorrect.eq(true)
)
.groupBy(date)
.orderBy(date.asc())
.fetch();
}
}
2 changes: 1 addition & 1 deletion src/main/resources/templates/submit-test.html
Original file line number Diff line number Diff line change
Expand Up @@ -282,7 +282,7 @@
const d = document.getElementById(`slot-${data.seqId}`);
if (!d) return;
d.className = data.isPassed ? 'slot passed' : 'slot failed';
d.textContent = `[${data.seqId}] ${data.message} (${data.executionTime}s, ${data.memoryUsage}KB)`;
d.textContent = `[${data.seqId}] ${data.message} (${data.executionTime}ms, ${data.memoryUsage}KB)`;
}

function handleFinal(res) {
Expand Down