From 5d16cda5404a9ad730faffd392620099dbd61d81 Mon Sep 17 00:00:00 2001 From: Seokjin Jeon Date: Wed, 17 Apr 2024 23:28:21 +0900 Subject: [PATCH 1/2] =?UTF-8?q?[BE]=20fix:=20ArtistBookmarkInfoV1Response?= =?UTF-8?q?=EC=97=90=20=EC=95=84=ED=8B=B0=EC=8A=A4=ED=8A=B8=20=EC=8B=9D?= =?UTF-8?q?=EB=B3=84=EC=9E=90=20=EC=B6=94=EA=B0=80=20(#869)=20(#872)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * fix: 누락된 아티스트 식별자 추가 * chore: memberid -> memberId 수정 --- .../bookmark/application/ArtistBookmarkV1QueryService.java | 4 ++-- .../festago/bookmark/dto/v1/ArtistBookmarkInfoV1Response.java | 1 + .../repository/v1/ArtistBookmarkV1QueryDslRepository.java | 1 + 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/backend/src/main/java/com/festago/bookmark/application/ArtistBookmarkV1QueryService.java b/backend/src/main/java/com/festago/bookmark/application/ArtistBookmarkV1QueryService.java index 106b62fbb..5b6e01783 100644 --- a/backend/src/main/java/com/festago/bookmark/application/ArtistBookmarkV1QueryService.java +++ b/backend/src/main/java/com/festago/bookmark/application/ArtistBookmarkV1QueryService.java @@ -14,7 +14,7 @@ public class ArtistBookmarkV1QueryService { private final ArtistBookmarkV1QueryDslRepository artistBookmarkV1QueryDslRepository; - public List findArtistBookmarksByMemberId(Long memberid){ - return artistBookmarkV1QueryDslRepository.findByMemberId(memberid); + public List findArtistBookmarksByMemberId(Long memberId){ + return artistBookmarkV1QueryDslRepository.findByMemberId(memberId); } } diff --git a/backend/src/main/java/com/festago/bookmark/dto/v1/ArtistBookmarkInfoV1Response.java b/backend/src/main/java/com/festago/bookmark/dto/v1/ArtistBookmarkInfoV1Response.java index 4f10b8827..80dda8835 100644 --- a/backend/src/main/java/com/festago/bookmark/dto/v1/ArtistBookmarkInfoV1Response.java +++ b/backend/src/main/java/com/festago/bookmark/dto/v1/ArtistBookmarkInfoV1Response.java @@ -3,6 +3,7 @@ import com.querydsl.core.annotations.QueryProjection; public record ArtistBookmarkInfoV1Response( + Long id, String name, String profileImageUrl ) { diff --git a/backend/src/main/java/com/festago/bookmark/repository/v1/ArtistBookmarkV1QueryDslRepository.java b/backend/src/main/java/com/festago/bookmark/repository/v1/ArtistBookmarkV1QueryDslRepository.java index 83d043112..62c64f4a4 100644 --- a/backend/src/main/java/com/festago/bookmark/repository/v1/ArtistBookmarkV1QueryDslRepository.java +++ b/backend/src/main/java/com/festago/bookmark/repository/v1/ArtistBookmarkV1QueryDslRepository.java @@ -23,6 +23,7 @@ public List findByMemberId(Long memberId) { return select( new QArtistBookmarkV1Response( new QArtistBookmarkInfoV1Response( + artist.id, artist.name, artist.profileImage ), From 7a9ada4199088ec398304e58bd3f376eaae29297 Mon Sep 17 00:00:00 2001 From: Seokjin Jeon Date: Thu, 18 Apr 2024 21:12:19 +0900 Subject: [PATCH 2/2] =?UTF-8?q?[BE]=20Spring=20Actuator,=20Prometheus=20?= =?UTF-8?q?=EC=9D=98=EC=A1=B4=EC=84=B1=20=EC=B6=94=EA=B0=80=20(#873)=20(#8?= =?UTF-8?q?74)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * build: Spring Actuator, Prometheus 의존성 추가 * build: 서브모듈 업데이트 --- backend/build.gradle.kts | 4 ++++ backend/src/main/resources/config | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/backend/build.gradle.kts b/backend/build.gradle.kts index 3cf8f4742..8fc465a7f 100644 --- a/backend/build.gradle.kts +++ b/backend/build.gradle.kts @@ -36,6 +36,7 @@ dependencies { implementation("org.springframework.boot:spring-boot-starter-web") implementation("org.springframework.boot:spring-boot-starter-thymeleaf") implementation("org.springframework.boot:spring-boot-starter-mail") + implementation("org.springframework.boot:spring-boot-starter-actuator") implementation("org.springdoc:springdoc-openapi-starter-webmvc-ui:${swaggerVersion}") // Spring Security @@ -79,6 +80,9 @@ dependencies { annotationProcessor("org.projectlombok:lombok") testCompileOnly("org.projectlombok:lombok") testAnnotationProcessor("org.projectlombok:lombok") + + // Micrometer + runtimeOnly("io.micrometer:micrometer-registry-prometheus") } tasks.test { diff --git a/backend/src/main/resources/config b/backend/src/main/resources/config index 3cace868f..73c3c51a0 160000 --- a/backend/src/main/resources/config +++ b/backend/src/main/resources/config @@ -1 +1 @@ -Subproject commit 3cace868f2465d5d39118605fbbe576960039dbe +Subproject commit 73c3c51a0b3b1cdb63c750ee18e9ad33973d4d86