Merge branch 'main' into feature/district

Junyeong-An · web-flow · commit 502756eba5b2 · 2025-09-05T02:31:45.000+09:00
diff --git a/src/main/java/com/trashheroesbe/feature/disposal/api/DisposalController.java b/src/main/java/com/trashheroesbe/feature/disposal/api/DisposalController.java
@@ -0,0 +1,32 @@
+package com.trashheroesbe.feature.disposal.api;
+
+import static com.trashheroesbe.global.response.type.SuccessCode.OK;
+
+import com.trashheroesbe.feature.disposal.application.DisposalService;
+import com.trashheroesbe.feature.disposal.dto.response.DistrictTrashDisposalResponse;
+import com.trashheroesbe.global.auth.security.CustomerDetails;
+import com.trashheroesbe.global.response.ApiResponse;
+import java.util.List;
+import lombok.RequiredArgsConstructor;
+import org.springframework.security.core.annotation.AuthenticationPrincipal;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("/api/v1/disposals")
+public class DisposalController implements DisposalControllerApi {
+
+    private final DisposalService disposalService;
+
+    @Override
+    @GetMapping("/today")
+    public ApiResponse<List<DistrictTrashDisposalResponse>> getTodayTrashDisposal(
+        @AuthenticationPrincipal CustomerDetails customerDetails
+    ) {
+        List<DistrictTrashDisposalResponse> response = disposalService.getTodayTrashDisposal(
+            customerDetails.getUser().getId());
+        return ApiResponse.success(OK, response);
+    }
+}
diff --git a/src/main/java/com/trashheroesbe/feature/disposal/api/DisposalControllerApi.java b/src/main/java/com/trashheroesbe/feature/disposal/api/DisposalControllerApi.java
@@ -0,0 +1,18 @@
+package com.trashheroesbe.feature.disposal.api;
+
+import com.trashheroesbe.feature.disposal.dto.response.DistrictTrashDisposalResponse;
+import com.trashheroesbe.feature.user.dto.response.UserDistrictResponse;
+import com.trashheroesbe.global.auth.security.CustomerDetails;
+import com.trashheroesbe.global.response.ApiResponse;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import java.util.List;
+
+@Tag(name = "Disposal", description = "자치구별 배출 관련 API")
+public interface DisposalControllerApi {
+
+    @Operation(summary = "오늘의 분리수거 조회", description = "나의 등록된 자치구의 분리수거 정보를 조회 합니다.")
+    ApiResponse<List<DistrictTrashDisposalResponse>> getTodayTrashDisposal(
+        CustomerDetails customerDetails
+    );
+}
diff --git a/src/main/java/com/trashheroesbe/feature/disposal/application/DisposalService.java b/src/main/java/com/trashheroesbe/feature/disposal/application/DisposalService.java
@@ -0,0 +1,46 @@
+package com.trashheroesbe.feature.disposal.application;
+
+import static com.trashheroesbe.global.response.type.ErrorCode.NOT_FOUND_DEFAULT_USER_DISTRICTS;
+import static com.trashheroesbe.global.response.type.ErrorCode.NOT_FOUND_USER_DISTRICTS;
+
+import com.trashheroesbe.feature.disposal.domain.Disposal;
+import com.trashheroesbe.feature.disposal.dto.response.DistrictTrashDisposalResponse;
+import com.trashheroesbe.feature.disposal.infrastructure.DisposalRepository;
+import com.trashheroesbe.feature.user.domain.entity.UserDistrict;
+import com.trashheroesbe.feature.user.domain.service.UserDistrictFinder;
+import com.trashheroesbe.global.exception.BusinessException;
+import com.trashheroesbe.global.util.DateTimeUtils;
+import java.time.LocalDate;
+import java.util.List;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+@Service
+@Transactional(readOnly = true)
+@RequiredArgsConstructor
+public class DisposalService {
+
+    private final UserDistrictFinder userDistrictFinder;
+    private final DisposalRepository disposalRepository;
+
+    public List<DistrictTrashDisposalResponse> getTodayTrashDisposal(Long userId) {
+        List<UserDistrict> userDistricts = userDistrictFinder.findByUserId(userId);
+        UserDistrict defaultUserDistrict = userDistricts.stream()
+            .filter(UserDistrict::getIsDefault)
+            .findFirst()
+            .orElseThrow(() -> userDistricts.isEmpty()
+                ? new BusinessException(NOT_FOUND_USER_DISTRICTS)
+                : new BusinessException(NOT_FOUND_DEFAULT_USER_DISTRICTS)
+            );
+
+        String todayDay = DateTimeUtils.getTodayKorean();
+        LocalDate todayDate = DateTimeUtils.getTodayDate();
+        List<Disposal> disposals = disposalRepository.findAllByDistrictAndDay(
+            defaultUserDistrict.getDistrict().getId(),
+            todayDay
+        );
+
+        return DistrictTrashDisposalResponse.of(disposals, todayDay, todayDate);
+    }
+}
diff --git a/src/main/java/com/trashheroesbe/feature/disposal/domain/Disposal.java b/src/main/java/com/trashheroesbe/feature/disposal/domain/Disposal.java
@@ -12,11 +12,14 @@
 import jakarta.persistence.JoinColumn;
 import jakarta.persistence.ManyToOne;
 import jakarta.persistence.Table;
+import java.util.List;
 import lombok.AccessLevel;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
+import org.hibernate.annotations.JdbcTypeCode;
+import org.hibernate.type.SqlTypes;
 
 @Getter
 @Entity
@@ -42,6 +45,7 @@ public class Disposal extends BaseTimeEntity {
     @Column(name = "method_detail", columnDefinition = "TEXT")
     private String methodDetail;
 
+    @JdbcTypeCode(SqlTypes.JSON)
     @Column(name = "days", columnDefinition = "JSON")
-    private String days;
+    private List<String> days;
 }
diff --git a/src/main/java/com/trashheroesbe/feature/disposal/dto/response/DistrictTrashDisposalResponse.java b/src/main/java/com/trashheroesbe/feature/disposal/dto/response/DistrictTrashDisposalResponse.java
@@ -0,0 +1,71 @@
+package com.trashheroesbe.feature.disposal.dto.response;
+
+import com.trashheroesbe.feature.disposal.domain.Disposal;
+import com.trashheroesbe.feature.trash.domain.Type;
+import java.time.LocalDate;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+import lombok.Builder;
+
+@Builder
+public record DistrictTrashDisposalResponse(
+    String categoryName,
+    List<String> trashTypes,
+    String location,
+    String todayDay,
+    LocalDate todayDate
+) {
+
+    public static List<DistrictTrashDisposalResponse> of(
+        List<Disposal> disposals,
+        String todayDay,
+        LocalDate todayDate
+    ) {
+        if (disposals.isEmpty()) {
+            return List.of();
+        }
+
+        String location = disposals.getFirst().getDistrict().getSigungu();
+
+        // 카테고리별로 그룹핑
+        Map<String, List<String>> grouped = disposals.stream()
+            .collect(Collectors.groupingBy(
+                disposal -> getCategoryName(disposal.getTrashType().getType()),
+                Collectors.mapping(
+                    disposal -> disposal.getTrashType().getType().getNameKo(),
+                    Collectors.toList()
+                )
+            ));
+
+        return grouped.entrySet().stream()
+            .map(entry -> DistrictTrashDisposalResponse.builder()
+                .categoryName(entry.getKey())
+                .trashTypes(entry.getValue())
+                .location(location)
+                .todayDay(todayDay)
+                .todayDate(todayDate)
+                .build())
+            .sorted((a, b) -> getCategoryOrder(a.categoryName) - getCategoryOrder(b.categoryName))
+            .toList();
+    }
+
+    private static String getCategoryName(Type type) {
+        return switch (type) {
+            case NON_RECYCLABLE, FOOD_WASTE -> "일반쓰레기/음식물쓰레기";
+            case PET, VINYL_FILM -> "투명페트병/비닐류";
+            case PAPER, PAPER_PACK, PLASTIC, STYROFOAM, GLASS, METAL, TEXTILES,
+                 E_WASTE, HAZARDOUS_SMALL_WASTE -> "그외 재활용품";
+            default -> "기타";
+        };
+    }
+
+    private static int getCategoryOrder(String categoryName) {
+        return switch (categoryName) {
+            case "일반쓰레기/음식물쓰레기" -> 1;
+            case "투명페트병/비닐류" -> 2;
+            case "그외 재활용품" -> 3;
+            default -> 4;
+        };
+    }
+}
diff --git a/src/main/java/com/trashheroesbe/feature/user/api/UserController.java b/src/main/java/com/trashheroesbe/feature/user/api/UserController.java
@@ -2,7 +2,6 @@
 
 import static com.trashheroesbe.global.response.type.SuccessCode.OK;
 
-import com.trashheroesbe.feature.district.dto.response.DistrictListResponse;
 import com.trashheroesbe.feature.user.application.UserService;
 import com.trashheroesbe.feature.user.dto.request.UpdateUserRequest;
 import com.trashheroesbe.feature.user.dto.response.UserDistrictResponse;
@@ -18,7 +17,6 @@
 import org.springframework.web.bind.annotation.PatchMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestPart;
 import org.springframework.web.bind.annotation.RestController;
@@ -56,9 +54,10 @@ public ApiResponse<Void> createUserDistrict(
     @Override
     @DeleteMapping("/districts/{userDistrictId}")
     public ApiResponse<Void> deleteUserDistrict(
-        @PathVariable Long userDistrictId
+        @PathVariable Long userDistrictId,
+        @AuthenticationPrincipal CustomerDetails customerDetails
     ) {
-        userService.deleteUserDistrict(userDistrictId);
+        userService.deleteUserDistrict(userDistrictId, customerDetails.getUser().getId());
         return ApiResponse.success(OK);
     }
 
diff --git a/src/main/java/com/trashheroesbe/feature/user/api/UserControllerApi.java b/src/main/java/com/trashheroesbe/feature/user/api/UserControllerApi.java
@@ -36,11 +36,12 @@ ApiResponse<Long> updateUser(
     ApiResponse<Void> createUserDistrict(CustomerDetails customerDetails, String districtId);
 
     @Operation(summary = "유저 자치구 삭제하기", description = "유저의 자치구를 삭제합니다.")
-    ApiResponse<Void> deleteUserDistrict(Long userDistrictId);
+    ApiResponse<Void> deleteUserDistrict(Long userDistrictId, CustomerDetails customerDetails);
 
     @Operation(summary = "내 자치구 조회하기", description = "나의 등록된 자치구를 조회합니다.")
     ApiResponse<List<UserDistrictResponse>> getMyDistricts(CustomerDetails customerDetails);
 
-    @Operation(summary = "유저 대표 자치구 수정하기", description = "유저의 자치구를 수정합니다.")
-    ApiResponse<Void> updateDefaultUserDistrict(Long userDistrictId, CustomerDetails customerDetails);
+    @Operation(summary = "유저 대표(default) 자치구 수정하기", description = "유저 자치구의 default 값을 수정합니다.")
+    ApiResponse<Void> updateDefaultUserDistrict(Long userDistrictId,
+        CustomerDetails customerDetails);
 }
diff --git a/src/main/java/com/trashheroesbe/feature/user/application/UserService.java b/src/main/java/com/trashheroesbe/feature/user/application/UserService.java
@@ -96,10 +96,20 @@ public void createUserDistrict(Long userId, String districtId) {
     }
 
     @Transactional
-    public void deleteUserDistrict(Long userDistrictId) {
+    public void deleteUserDistrict(Long userDistrictId, Long userId) {
         if (!userDistrictFinder.existsByUserDistrictId(userDistrictId)) {
             throw new BusinessException(ENTITY_NOT_FOUND);
         }
+
+        List<UserDistrict> userDistricts = userDistrictFinder.findByUserId(userId);
+        if (userDistricts.size() == MAX_USER_DISTRICTS) {
+            UserDistrict userDistrict = userDistricts.stream()
+                .filter(defaultUserDistrict -> !defaultUserDistrict.getId().equals(userDistrictId))
+                .findFirst()
+                .orElseThrow(() -> new BusinessException(ENTITY_NOT_FOUND));
+            userDistrict.updateDefaultDistrict(true);
+        }
+
         userDistrictRepository.deleteById(userDistrictId);
     }
 
diff --git a/src/main/java/com/trashheroesbe/global/auth/jwt/entity/TokenType.java b/src/main/java/com/trashheroesbe/global/auth/jwt/entity/TokenType.java
@@ -6,7 +6,7 @@
 @Getter
 @RequiredArgsConstructor
 public enum TokenType {
-    ACCESS_TOKEN("access_token", 1_800_000L), // 30분
+    ACCESS_TOKEN("access_token", 10_800_000L), // 3시간
     REFRESH_TOKEN("refresh_token", 1_209_600_000L); // 2주
 
     private final String name;
diff --git a/src/main/java/com/trashheroesbe/global/response/type/ErrorCode.java b/src/main/java/com/trashheroesbe/global/response/type/ErrorCode.java
@@ -26,13 +26,16 @@ public enum ErrorCode {
     // user
     DUPLICATE_USER_DISTRICT(HttpStatus.BAD_REQUEST, "중복된 자치구 입니다."),
     MAX_USER_DISTRICTS_EXCEEDED(HttpStatus.BAD_REQUEST, "자치구는 최대 2개만 가질 수 있습니다."),
+    NOT_FOUND_USER_DISTRICTS(HttpStatus.NOT_FOUND, "자치구 등록을 하지 않으셨습니다. 등록해주세요."),
+    NOT_FOUND_DEFAULT_USER_DISTRICTS(HttpStatus.NOT_FOUND, "대표 유저 자치구를 찾을 수 없습니다."),
 
     // trash
     NOT_EXISTS_TRASH_TYPE(HttpStatus.INTERNAL_SERVER_ERROR, "쓰레기 타입이 존재하지 않습니다. 개발자에게 문의 주세요."),
     NOT_EXISTS_TRASH_ITEM(HttpStatus.INTERNAL_SERVER_ERROR, "쓰레기 품목이 존재하지 않습니다. 개발자에게 문의 주세요."),
     NOT_EXISTS_TRASH_DESCRIPTION(HttpStatus.INTERNAL_SERVER_ERROR, "쓰레기 설명이 존재하지 않습니다. 개발자에게 문의 주세요."),
     INVALID_SEARCH_KEYWORD(HttpStatus.BAD_REQUEST, "검색 키워드가 비어있습니다."),
 
+    // gpt
     ERROR_GPT_CALL(HttpStatus.BAD_GATEWAY, "GPT 호출에 실패했습니다."),
     EMPTY_GPT_RESPONSE(HttpStatus.BAD_GATEWAY, "GPT 응답이 비었습니다."),
     FAIL_PARSING_RESPONSE(HttpStatus.UNPROCESSABLE_ENTITY, "응답 파싱에 실패했습니다"),
diff --git a/src/main/java/com/trashheroesbe/global/util/DateTimeUtils.java b/src/main/java/com/trashheroesbe/global/util/DateTimeUtils.java
@@ -0,0 +1,30 @@
+package com.trashheroesbe.global.util;
+
+import java.time.DayOfWeek;
+import java.time.LocalDate;
+import java.time.ZoneId;
+
+public class DateTimeUtils {
+
+    public static final ZoneId KST = ZoneId.of("Asia/Seoul");
+
+    public static String getTodayKorean() {
+        return toKoreanDay(LocalDate.now(KST).getDayOfWeek());
+    }
+
+    public static LocalDate getTodayDate() {
+        return LocalDate.now(KST);
+    }
+
+    public static String toKoreanDay(DayOfWeek dayOfWeek) {
+        return switch (dayOfWeek) {
+            case MONDAY -> "월요일";
+            case TUESDAY -> "화요일";
+            case WEDNESDAY -> "수요일";
+            case THURSDAY -> "목요일";
+            case FRIDAY -> "금요일";
+            case SATURDAY -> "토요일";
+            case SUNDAY -> "일요일";
+        };
+    }
+}
