Fix : 파티 수정 버그 픽스

src/main/java/ita/tinybite/domain/auth/service/AuthService.java

@@ -66,16 +66,17 @@ public class AuthService {
     @Transactional
     public AuthResponse kakaoSignup(KakaoSignupRequest request) {
         // 카카오 API로 유저 정보 조회
-        KakaoUserInfo kakaoUser = kakaoApiClient.getUserInfo(request.getCode());
+//        KakaoUserInfo kakaoUser = kakaoApiClient.getUserInfo(request.getCode());
 
         // 이메일 중복 체크
-        if (userRepository.findByEmail(kakaoUser.getKakaoAccount().getEmail()).isPresent()) {
-            throw new RuntimeException("이미 가입된 이메일입니다.");
-        }
+//        if (userRepository.findByEmail(kakaoUser.getKakaoAccount().getEmail()).isPresent()) {
+//            throw new RuntimeException("이미 가입된 이메일입니다.");
+//        }
 
         // User 엔티티 생성 및 저장
         User user = User.builder()
-                .email(kakaoUser.getKakaoAccount().getEmail())
+//                .email(kakaoUser.getKakaoAccount().getEmail())
+                .email("ace312@gmail.com")
                 .nickname(request.getNickname())
                 .location(request.getLocation())
                 .type(LoginType.KAKAO)

src/main/java/ita/tinybite/domain/party/controller/PartyController.java

@@ -310,12 +310,10 @@ public ResponseEntity<PartyListResponse> getPartyList(
     @GetMapping("/{partyId}")
     public ResponseEntity<PartyDetailResponse> getPartyDetail(
             @PathVariable Long partyId,
-            @RequestHeader("Authorization") String token,
+            @Parameter(hidden = true) @AuthenticationPrincipal Long userId,
             @RequestParam(required = false) Double userLat,
             @RequestParam(required = false) Double userLon
     ) {
-        Long userId = jwtTokenProvider.getUserId(token);
-
         PartyDetailResponse response = partyService.getPartyDetail(partyId, userId,userLat,userLon);
         return ResponseEntity.ok(response);
     }

src/main/java/ita/tinybite/domain/party/dto/request/PartyUpdateRequest.java

@@ -1,5 +1,7 @@
 package ita.tinybite.domain.party.dto.request;
 
+import ita.tinybite.domain.party.entity.PickupLocation;
+import ita.tinybite.domain.party.enums.PartyCategory;
 import jakarta.validation.constraints.*;
 import lombok.*;
 
@@ -23,10 +25,9 @@ public class PartyUpdateRequest {
     private Integer maxParticipants;
 
     @Size(max = 30, message = "수령 장소는 최대 30자까지 입력 가능합니다")
-    private String pickupLocation;
+    private PickupLocation pickupLocation;
 
-    private Double latitude;
-    private Double longitude;
+    private PartyCategory category;
 
 //    @Pattern(regexp = "^(https?://)?.*", message = "올바른 URL 형식으로 입력해주세요")
     private String productLink;

src/main/java/ita/tinybite/domain/party/dto/response/PartyCardResponse.java

@@ -42,8 +42,8 @@ public static PartyCardResponse from(Party party, int currentParticipants, boole
                 .build();
     }
     private static String getThumbnailImage(Party party) {
-        if (party.getImage() != null && !party.getImage().isEmpty()) {
-            return party.getImage();
+        if (party.getImages() != null && !party.getImages().isEmpty()) {
+            return party.getImages().get(0);
         }
         return "/images/default-party-thumbnail.jpg"; // 기본 이미지
     }

src/main/java/ita/tinybite/domain/party/dto/response/PartyDetailResponse.java

@@ -39,6 +39,8 @@ public class PartyDetailResponse {
     // 설명
     private String description;
 
+    private String thumbnailImage;
+
     // 이미지 (최대 5장)
     private List<String> images;
 

src/main/java/ita/tinybite/domain/party/dto/response/ProductLink.java

@@ -6,7 +6,7 @@
 @AllArgsConstructor
 @Builder
 public class ProductLink {
-    private String thumbnailImage;
-    private String productName;
+//    private String thumbnailImage;
+//    private String productName;
     private String url;
 }

src/main/java/ita/tinybite/domain/party/entity/Party.java

@@ -36,7 +36,7 @@ public class Party {
     private String thumbnailImage; // 섬네일 이미지 URL
 
     @Column(length = 500)
-    private String image; // 이미지 URL
+    private List<String> images; // 이미지 URL
 
     @Column(nullable = false)
     private Integer price; // 가격
@@ -132,8 +132,7 @@ public String getTimeAgo() {
     }
 
     public void updateAllFields(String title, Integer price, Integer maxParticipants,
-                                PickupLocation pickupLocation, Double latitude, Double longitude,
-                                String productLink, String description, List<String> images) {
+                                PickupLocation pickupLocation, String productLink, String description, List<String> images) {
         this.title = title != null ? title : this.title;
         this.price = price != null ? price : this.price;
         this.maxParticipants = maxParticipants != null ? maxParticipants : this.maxParticipants;
@@ -150,7 +149,7 @@ public void updateAllFields(String title, Integer price, Integer maxParticipants
         this.description = description != null ? description : this.description;
 
         if (images != null && !images.isEmpty()) {
-            this.image = images.get(0);
+            this.images = images;
             this.thumbnailImage = images.get(0);
         }
     }
@@ -159,7 +158,7 @@ public void updateLimitedFields(String description, List<String> images) {
         this.description = description != null ? description : this.description;
 
         if (images != null && !images.isEmpty()) {
-            this.image = images.get(0);
+            this.images = images;
             this.thumbnailImage = images.get(0);
         }
     }

src/main/java/ita/tinybite/domain/party/repository/PartyParticipantRepository.java

@@ -44,4 +44,28 @@ int countByPartyIdAndStatus(
             @Param("status") ParticipantStatus status
     );
 
+    /**
+     * 사용자가 참여중인 파티 개수 조회 (호스트 + 참가자)
+     */
+    @Query("SELECT COUNT(DISTINCT pp.party.id) " +
+            "FROM PartyParticipant pp " +
+            "WHERE pp.user.userId = :userId " +
+            "AND pp.party.status IN :activeStatuses " +
+            "AND pp.status = :participantStatus")
+    long countActivePartiesByUserId(
+            @Param("userId") Long userId,
+            @Param("activeStatuses") List<PartyStatus> activeStatuses,
+            @Param("participantStatus") ParticipantStatus participantStatus
+    );
+
+    /**
+     * 사용자가 호스트인 활성 파티 개수
+     */
+    @Query("SELECT COUNT(p) FROM Party p " +
+            "WHERE p.host.userId = :userId " +
+            "AND p.status IN :activeStatuses")
+    long countActivePartiesByHostId(
+            @Param("userId") Long userId,
+            @Param("activeStatuses") List<PartyStatus> activeStatuses
+    );
 }

src/main/java/ita/tinybite/domain/party/service/PartyService.java

@@ -62,7 +62,7 @@ public Long createParty(Long userId, PartyCreateRequest request) {
                         .pickupLatitude(request.getPickupLocation().getPickupLatitude())
                         .pickupLongitude(request.getPickupLocation().getPickupLongitude())
                         .build())
-                .image(getImageIfPresent(request.getImages()))
+                .images(getImagesIfPresent(request.getImages()))
                 .thumbnailImage(getThumbnailIfPresent(request.getImages(), request.getCategory()))
                 .link(getLinkIfValid(request.getProductLink(), request.getCategory()))
                 .description(getDescriptionIfPresent(request.getDescription()))
@@ -299,10 +299,10 @@ private PartyDetailResponse convertToDetailResponse(Party party, double distance
         int pricePerPerson = party.getPrice() / party.getMaxParticipants();
 
         // 이미지 파싱
-        List<String> images = new ArrayList<>();
-        if (party.getImage() != null && !party.getImage().isEmpty()) {
-            images = List.of(party.getImage());
-        }
+//        List<String> images = new ArrayList<>();
+//        if (party.getImages() != null && !party.getImages().isEmpty()) {
+//            images = List.of(party.getImages());
+//        }
 
         return PartyDetailResponse.builder()
                 .partyId(party.getId())
@@ -315,6 +315,7 @@ private PartyDetailResponse convertToDetailResponse(Party party, double distance
                         .profileImage(party.getHost().getProfileImage())
                         .build())
                 .pickupLocation(party.getPickupLocation())
+                .thumbnailImage(party.getThumbnailImage())
                 .distance(formatDistanceIfExists(distance))
                 .currentParticipants(currentCount)
                 .maxParticipants(party.getMaxParticipants())
@@ -326,7 +327,7 @@ private PartyDetailResponse convertToDetailResponse(Party party, double distance
                                 .url(party.getLink())
                                 .build() : null)
                 .description(party.getDescription())
-                .images(images)
+                .images(party.getImages())
                 .isClosed(party.getIsClosed())
                 .isParticipating(isParticipating)
                 .build();
@@ -357,17 +358,39 @@ public void updateParty(Long partyId, Long userId, PartyUpdateRequest request) {
                     request.getTitle(),
                     request.getTotalPrice(),
                     request.getMaxParticipants(),
-                    new PickupLocation(request.getPickupLocation(), request.getLatitude(), request.getLongitude()),
+                    getPickUpLocationIfExists(request,party),
 //                    new PickupLocation(request.getPickupLocation()),
-                    request.getLatitude(),
-                    request.getLongitude(),
                     request.getProductLink(),
                     request.getDescription(),
                     request.getImages()
             );
         }
     }
 
+    private PickupLocation getPickUpLocationIfExists(PartyUpdateRequest request, Party currentParty) {
+        if (request.getPickupLocation() == null) {
+            return currentParty.getPickupLocation();
+        }
+        PickupLocation requestPickup = request.getPickupLocation();
+        PickupLocation currentPickup = currentParty.getPickupLocation();
+
+        // 각 필드별로 새 값이 있으면 사용, 없으면 기존 값 유지
+        String place = requestPickup.getPlace() != null
+                ? requestPickup.getPlace()
+                : (currentPickup != null ? currentPickup.getPlace() : "");
+
+        Double latitude = requestPickup.getPickupLatitude() != null
+                ? requestPickup.getPickupLatitude()
+                : (currentPickup != null ? currentPickup.getPickupLatitude() : null);
+
+        Double longitude = requestPickup.getPickupLongitude() != null
+                ? requestPickup.getPickupLongitude()
+                : (currentPickup != null ? currentPickup.getPickupLongitude() : null);
+
+        return new PickupLocation(place, latitude, longitude);
+
+    }
+
     @Transactional
     public void deleteParty(Long partyId, Long userId) {
         Party party = partyRepository.findById(partyId)
@@ -617,8 +640,8 @@ private void checkAndCloseIfFull(Party party) {
     }
 
     // 헬퍼 메서드들
-    private String getImageIfPresent(List<String> images) {
-        return (images != null && !images.isEmpty()) ? images.get(0) : null;
+    private List<String> getImagesIfPresent(List<String> images) {
+        return (images != null && !images.isEmpty()) ? images : null;
     }
 
     private String getThumbnailIfPresent(List<String> images, PartyCategory category) {

src/main/java/ita/tinybite/domain/user/controller/UserController.java

@@ -1,14 +1,17 @@
 package ita.tinybite.domain.user.controller;
 
 import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.media.ArraySchema;
 import io.swagger.v3.oas.annotations.media.Content;
 import io.swagger.v3.oas.annotations.media.Schema;
 import io.swagger.v3.oas.annotations.responses.ApiResponse;
 import io.swagger.v3.oas.annotations.responses.ApiResponses;
 import ita.tinybite.domain.party.dto.response.PartyCardResponse;
 import ita.tinybite.domain.user.dto.req.UpdateUserReqDto;
+import ita.tinybite.domain.user.dto.res.RejoinValidationResponse;
 import ita.tinybite.domain.user.dto.res.UserResDto;
+import ita.tinybite.domain.user.dto.res.WithDrawValidationResponse;
 import ita.tinybite.domain.user.service.UserService;
 import ita.tinybite.global.response.APIResponse;
 import jakarta.validation.Valid;
@@ -67,17 +70,47 @@ public APIResponse<?> updateLocation(@RequestParam(defaultValue = "37.3623504988
         return success();
     }
 
+    @Operation(
+            summary = "회원 탈퇴 가능 여부 확인",
+            description = "진행 중인 파티가 있는지 확인하여 탈퇴 가능 여부를 반환합니다."
+    )
+    @ApiResponses({
+            @ApiResponse(responseCode = "200", description = "확인 성공"),
+            @ApiResponse(responseCode = "401", description = "인증 실패")
+    })
+    @GetMapping("/me/withdrawal/validate")
+    public APIResponse<WithDrawValidationResponse> validateWithdrawal(
+            @Parameter(hidden = true) @AuthenticationPrincipal Long userId) {
+        WithDrawValidationResponse response = userService.validateWithdrawal(userId);
+        return success(response);
+    }
+
     @Operation(summary = "회원 탈퇴", description = "현재 로그인한 사용자를 삭제합니다.")
     @ApiResponses({
             @ApiResponse(responseCode = "200", description = "탈퇴 성공"),
             @ApiResponse(responseCode = "401", description = "인증 실패")
     })
     @DeleteMapping("/me")
-    public APIResponse<?> deleteUser() {
-        userService.deleteUser();
+    public APIResponse<?> deleteUser(@AuthenticationPrincipal Long userId) {
+        userService.deleteUser(userId);
         return success();
     }
 
+    @Operation(
+            summary = "재가입 가능 여부 확인",
+            description = "탈퇴 후 30일 이내인지 확인합니다."
+    )
+    @ApiResponses({
+            @ApiResponse(responseCode = "200", description = "확인 성공")
+    })
+    @GetMapping("/rejoin/validate")
+    public APIResponse<RejoinValidationResponse> validateRejoin(
+            @Parameter(description = "이메일", required = true)
+            @RequestParam String email) {
+        RejoinValidationResponse response = userService.validateRejoin(email);
+        return success(response);
+    }
+
     @Operation(summary = "활성 파티 목록 조회", description = "사용자가 참여 중인 활성 파티 목록을 조회합니다.")
     @ApiResponses({
             @ApiResponse(responseCode = "200", description = "조회 성공",

src/main/java/ita/tinybite/domain/user/dto/res/RejoinValidationResponse.java

@@ -0,0 +1,17 @@
+package ita.tinybite.domain.user.dto.res;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Getter;
+
+import java.time.LocalDateTime;
+
+@Getter
+@AllArgsConstructor
+@Builder
+public class RejoinValidationResponse {
+    private boolean canRejoin;
+    private Long daysRemaining;
+    private LocalDateTime canRejoinAt;
+    private String message;
+}

src/main/java/ita/tinybite/domain/user/dto/res/WithDrawValidationResponse.java

@@ -0,0 +1,16 @@
+package ita.tinybite.domain.user.dto.res;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Getter;
+
+@Getter
+@AllArgsConstructor
+@Builder
+public class WithDrawValidationResponse {
+    private boolean canWithdraw;
+    private long activePartyCount;
+    private long hostPartyCount;
+    private long participantPartyCount;
+    private String message;
+}

src/main/java/ita/tinybite/domain/user/entity/User.java

@@ -10,6 +10,7 @@
 import lombok.*;
 import org.hibernate.annotations.Comment;
 
+import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -49,6 +50,8 @@ public class User extends BaseEntity {
     @Column(length = 100)
     private String location;
 
+    private LocalDateTime withdrawAt;
+
     @OneToMany(mappedBy = "user", cascade = CascadeType.ALL, orphanRemoval = true)
     private List<UserTermAgreement>  agreements = new ArrayList<>();;
 
@@ -72,4 +75,16 @@ public void updateSignupInfo(GoogleAndAppleSignupRequest req, String email, Logi
     public void addTerms(List<UserTermAgreement> agreements) {
         this.agreements.addAll(agreements);
     }
+
+    public void withdraw() {
+        this.nickname = "탈퇴한 사용자";
+        this.profileImage = "/images/default-profile.jpg";
+        this.status = UserStatus.WITHDRAW;
+        this.withdrawAt = LocalDateTime.now();
+    }
+
+    // 탈퇴 여부 확인
+    public boolean isWithdrawn() {
+        return this.status == UserStatus.WITHDRAW;
+    }
 }