Merge pull request #56 from HSU-Talky/dev

Merge dev into main

Author: zzuhannn

docker-compose.yml

@@ -38,8 +38,8 @@ services:
       - TZ=Asia/Seoul
     volumes:
       - ./nginx/conf.d:/etc/nginx/conf.d
-      - /etc/letsencrypt/live/43.200.236.115.nip.io/fullchain.pem:/etc/letsencrypt/live/43.200.236.115.nip.io/fullchain.pem
-      - /etc/letsencrypt/live/43.200.236.115.nip.io/privkey.pem:/etc/letsencrypt/live/43.200.236.115.nip.io/privkey.pem
+      - /etc/letsencrypt/live/43.200.236.115.nip.io/fullchain.pem:/etc/nginx/certs/fullchain.pem
+      - /etc/letsencrypt/live/43.200.236.115.nip.io/privkey.pem:/etc/nginx/certs/privkey.pem
     restart: always
     networks:
       - talky-network

src/main/java/com/example/talky/domain/statics/service/StaticsServiceImpl.java

@@ -64,6 +64,13 @@ public StaticsRes getNormalUsersStatics(Long normalId) {
                 .filter(s -> s.getCreatedAt().toLocalDate().isEqual(LocalDateTime.now().toLocalDate()))
                 .collect(Collectors.groupingBy(Speech::getPlace, Collectors.counting()));
 
+        List<StaticsRes.Places> places = usedPlace.entrySet().stream()
+                .map(p -> new StaticsRes.Places(
+                        p.getKey(),
+                        p.getValue()
+                ))
+                .toList();
+
         // 사용한 시각과 같은 날짜의 사용 시간대를 커스텀 함수로 변환
         Map<String, Long> usedWhen = pickSpeech.stream()
                 .filter(s -> s.getCreatedAt().toLocalDate().isEqual(LocalDateTime.now().toLocalDate()))
@@ -73,6 +80,13 @@ public StaticsRes getNormalUsersStatics(Long normalId) {
                         ), Collectors.counting()
                 ));
 
+        List<StaticsRes.Times> times = usedWhen.entrySet().stream()
+                .map(t -> new StaticsRes.Times(
+                        t.getKey(),
+                        t.getValue()
+                ))
+                .toList();
+
         // 긴급호출 사용 이력을 조회
         // 단, 모든 기록을 조회할 시, 쿼리 시간이 길어짐을 생각하여 최근 7일만 조회
         List<EmergencyHistory> userEmergencyHistories = ehRepository.findAllByNormalId(normalId, LocalDateTime.now());
@@ -92,8 +106,8 @@ public StaticsRes getNormalUsersStatics(Long normalId) {
         return new StaticsRes(
                 howManyUsedCount,
                 top5Favorites,
-                usedPlace,
-                usedWhen,
+                places,
+                times,
                 parsedEmergencyHistory
         );
     }

src/main/java/com/example/talky/domain/statics/web/dto/StaticsRes.java

@@ -1,15 +1,13 @@
 package com.example.talky.domain.statics.web.dto;
 
-import com.example.talky.domain.favorites.entity.Favorite;
 
 import java.util.List;
-import java.util.Map;
 
 public record StaticsRes(
         List<UsedCount> howManyUsed,
         List<Favorites> top5Used,
-        Map<String, Long> usedPlace,
-        Map<String, Long> usedWhen,
+        List<Places> usedPlace,
+        List<Times> usedWhen,
         List<History> histories
 ) {
     public record Favorites (
@@ -21,6 +19,17 @@ public record UsedCount(
             String date,
             Long value
     ) {}
+
+    public record Places (
+        String place,
+        Long count
+    ) {}
+
+    public record Times(
+            String when,
+            Long count
+    ) {}
+
     public record History(
             String date,
             String time,