Merge branch 'dev' into feat/#863

woowacourse-teams · Apr 18, 2024 · 415228a · 415228a
2 parents 81ec948 + 7a9ada4
commit 415228a
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 3 deletions.
diff --git a/backend/build.gradle.kts b/backend/build.gradle.kts
@@ -37,6 +37,7 @@ dependencies {
     implementation("org.springframework.boot:spring-boot-starter-thymeleaf")
     implementation("org.springframework.boot:spring-boot-starter-mail")
     implementation("org.springframework.boot:spring-boot-starter-cache")
+    implementation("org.springframework.boot:spring-boot-starter-actuator")
     implementation("org.springdoc:springdoc-openapi-starter-webmvc-ui:${swaggerVersion}")
 
     // Spring Security
@@ -83,6 +84,9 @@ dependencies {
 
     // Caffeine
     implementation("com.github.ben-manes.caffeine:caffeine")
+
+    // Micrometer
+    runtimeOnly("io.micrometer:micrometer-registry-prometheus")
 }
 
 tasks.test {

diff --git 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<ArtistBookmarkV1Response> findArtistBookmarksByMemberId(Long memberid){
-        return artistBookmarkV1QueryDslRepository.findByMemberId(memberid);
+    public List<ArtistBookmarkV1Response> 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
@@ -3,6 +3,7 @@
 import com.querydsl.core.annotations.QueryProjection;
 
 public record ArtistBookmarkInfoV1Response(
+    Long id,
     String name,
     String profileImageUrl
 ) {

diff --git a/.../src/main/java/com/festago/bookmark/repository/v1/ArtistBookmarkV1QueryDslRepository.java b/.../src/main/java/com/festago/bookmark/repository/v1/ArtistBookmarkV1QueryDslRepository.java
@@ -23,6 +23,7 @@ public List<ArtistBookmarkV1Response> findByMemberId(Long memberId) {
         return select(
             new QArtistBookmarkV1Response(
                 new QArtistBookmarkInfoV1Response(
+                    artist.id,
                     artist.name,
                     artist.profileImage
                 ),

diff --git a/backend/src/main/resources/config b/backend/src/main/resources/config