From 4f98c1e49489fca827ea8e0057e70908a1945e7c Mon Sep 17 00:00:00 2001 From: Oh YoungJe <139232765+GulSauce@users.noreply.github.com> Date: Mon, 4 May 2026 15:04:34 +0900 Subject: [PATCH 1/2] =?UTF-8?q?null=20=ED=95=84=ED=84=B0=EB=A1=9C=20?= =?UTF-8?q?=EC=A1=B4=EC=9E=AC=ED=95=98=EC=A7=80=20=EC=95=8A=EB=8A=94=20pro?= =?UTF-8?q?blemSet=20=EC=B0=B8=EC=A1=B0=20=ED=95=B4=EA=B2=B0=20(#209)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gradle/gradle-daemon-jvm.properties | 12 ++++++++++++ .../service/QuizHistoryQueryServiceImpl.java | 8 ++++++-- settings.gradle | 8 ++++++++ 3 files changed, 26 insertions(+), 2 deletions(-) create mode 100644 gradle/gradle-daemon-jvm.properties diff --git a/gradle/gradle-daemon-jvm.properties b/gradle/gradle-daemon-jvm.properties new file mode 100644 index 00000000..16c0c7b1 --- /dev/null +++ b/gradle/gradle-daemon-jvm.properties @@ -0,0 +1,12 @@ +#This file is generated by updateDaemonJvm +toolchainUrl.FREE_BSD.AARCH64=https\://api.foojay.io/disco/v3.0/ids/402983f310a88ac68b3e883c7c91c760/redirect +toolchainUrl.FREE_BSD.X86_64=https\://api.foojay.io/disco/v3.0/ids/e50b80b5a11d194a898bc3e6211b7c4b/redirect +toolchainUrl.LINUX.AARCH64=https\://api.foojay.io/disco/v3.0/ids/402983f310a88ac68b3e883c7c91c760/redirect +toolchainUrl.LINUX.X86_64=https\://api.foojay.io/disco/v3.0/ids/e50b80b5a11d194a898bc3e6211b7c4b/redirect +toolchainUrl.MAC_OS.AARCH64=https\://api.foojay.io/disco/v3.0/ids/f257be9f04bfdf169051808541767806/redirect +toolchainUrl.MAC_OS.X86_64=https\://api.foojay.io/disco/v3.0/ids/1dcbacacca32618bd21ec5465779ade1/redirect +toolchainUrl.UNIX.AARCH64=https\://api.foojay.io/disco/v3.0/ids/402983f310a88ac68b3e883c7c91c760/redirect +toolchainUrl.UNIX.X86_64=https\://api.foojay.io/disco/v3.0/ids/e50b80b5a11d194a898bc3e6211b7c4b/redirect +toolchainUrl.WINDOWS.AARCH64=https\://api.foojay.io/disco/v3.0/ids/1e91f45234d88a64dafb961c93ddc75a/redirect +toolchainUrl.WINDOWS.X86_64=https\://api.foojay.io/disco/v3.0/ids/5a88b04b5e582b332d2e6bc12b45f1b9/redirect +toolchainVersion=21 diff --git a/modules/quiz-history/impl/src/main/java/com/icc/qasker/quizhistory/service/QuizHistoryQueryServiceImpl.java b/modules/quiz-history/impl/src/main/java/com/icc/qasker/quizhistory/service/QuizHistoryQueryServiceImpl.java index 5961894c..513b17a0 100644 --- a/modules/quiz-history/impl/src/main/java/com/icc/qasker/quizhistory/service/QuizHistoryQueryServiceImpl.java +++ b/modules/quiz-history/impl/src/main/java/com/icc/qasker/quizhistory/service/QuizHistoryQueryServiceImpl.java @@ -27,6 +27,7 @@ import com.icc.qasker.quizset.dto.readonly.SelectionDetail; import java.util.List; import java.util.Map; +import java.util.Objects; import java.util.function.Function; import java.util.stream.Collectors; import java.util.stream.IntStream; @@ -76,8 +77,11 @@ public HistoryPageResponse getHistoryList(String userId, int page, int size) { histories.stream() .map( history -> - quizHistoryMapper.toSummary( - history, problemSetMap.get(history.getProblemSetId()))) + problemSetMap.get(history.getProblemSetId()) == null + ? null + : quizHistoryMapper.toSummary( + history, problemSetMap.get(history.getProblemSetId()))) + .filter(Objects::nonNull) .toList(); return new HistoryPageResponse( diff --git a/settings.gradle b/settings.gradle index 64c4c6a6..a3020897 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,3 +1,11 @@ +// Foojay 툴체인 리졸버 +// 예: Gradle Daemon JVM Criteria(toolchain-version)와 자바 toolchain이 요구하는 JDK가 +// 로컬에 없을 때 https://api.foojay.io 에서 자동으로 적합한 JDK를 다운로드하여 사용 +// (별도 설치 없이 프로젝트가 요구하는 JDK 버전을 보장) +plugins { + id 'org.gradle.toolchains.foojay-resolver-convention' version '0.8.0' +} + rootProject.name = 'q-asker' include ':app', ':global', ':admin', From 3bb3f1d97d6de4ff63c5642a1152bdaf67456099 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" Date: Mon, 4 May 2026 06:05:36 +0000 Subject: [PATCH 2/2] chore: bump version to 3.0.3 --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index f917d6cb..d098a762 100644 --- a/build.gradle +++ b/build.gradle @@ -22,7 +22,7 @@ plugins { group = "com.icc.qasker" // 프로젝트 버전 (Docker 이미지 태그, 배포 아티팩트 버전에 사용) // 예: jib으로 빌드하면 Docker 이미지에 "1.7.0" 태그가 붙음 -version = "3.0.2" +version = "3.0.3" // Git hooks 경로를 .githooks/로 자동 설정 // 예: ./gradlew build 실행 시 자동으로 git config core.hooksPath .githooks 적용