Merge pull request #132 from Wedit-project/refactor/#126-전체-리팩토링

dyk-im · web-flow · commit c779ad828f41 · 2025-02-18T07:51:30.000+09:00
[refactor] 전체 리팩토링
diff --git a/src/main/java/com/wedit/weditapp/domain/bankAccount/domain/BankAccount.java b/src/main/java/com/wedit/weditapp/domain/bankAccount/domain/BankAccount.java
@@ -1,4 +1,4 @@
-package com.wedit.weditapp.domain.bankAccounts.domain;
+package com.wedit.weditapp.domain.bankAccount.domain;
 
 import com.wedit.weditapp.domain.invitation.domain.Invitation;
 import com.wedit.weditapp.domain.shared.AccountSide;
diff --git a/src/main/java/com/wedit/weditapp/domain/bankAccount/domain/repository/BankAccountRepository.java b/src/main/java/com/wedit/weditapp/domain/bankAccount/domain/repository/BankAccountRepository.java
@@ -1,9 +1,9 @@
-package com.wedit.weditapp.domain.bankAccounts.domain.repository;
+package com.wedit.weditapp.domain.bankAccount.domain.repository;
 
 import java.util.List;
 
 import org.springframework.data.jpa.repository.JpaRepository;
-import com.wedit.weditapp.domain.bankAccounts.domain.BankAccount;
+import com.wedit.weditapp.domain.bankAccount.domain.BankAccount;
 import com.wedit.weditapp.domain.invitation.domain.Invitation;
 import com.wedit.weditapp.domain.shared.AccountSide;
 
diff --git a/src/main/java/com/wedit/weditapp/domain/bankAccount/dto/BankAccountDto.java b/src/main/java/com/wedit/weditapp/domain/bankAccount/dto/BankAccountDto.java
@@ -1,6 +1,6 @@
-package com.wedit.weditapp.domain.bankAccounts.dto;
+package com.wedit.weditapp.domain.bankAccount.dto;
 
-import com.wedit.weditapp.domain.bankAccounts.domain.BankAccount;
+import com.wedit.weditapp.domain.bankAccount.domain.BankAccount;
 import com.wedit.weditapp.domain.shared.AccountSide;
 
 import jakarta.validation.constraints.NotBlank;
@@ -11,6 +11,7 @@
 @Getter
 @NoArgsConstructor
 public class BankAccountDto {
+
 	@NotBlank(message = "side cannot be blank")
 	private AccountSide side;  // 신랑/신부 구분
 
diff --git a/src/main/java/com/wedit/weditapp/domain/bankAccount/service/BankAccountService.java b/src/main/java/com/wedit/weditapp/domain/bankAccount/service/BankAccountService.java
@@ -1,13 +1,13 @@
-package com.wedit.weditapp.domain.bankAccounts.service;
+package com.wedit.weditapp.domain.bankAccount.service;
 
 import java.util.List;
 import java.util.stream.Collectors;
 
 import org.springframework.stereotype.Service;
 
-import com.wedit.weditapp.domain.bankAccounts.domain.BankAccount;
-import com.wedit.weditapp.domain.bankAccounts.domain.repository.BankAccountRepository;
-import com.wedit.weditapp.domain.bankAccounts.dto.BankAccountDto;
+import com.wedit.weditapp.domain.bankAccount.domain.BankAccount;
+import com.wedit.weditapp.domain.bankAccount.domain.repository.BankAccountRepository;
+import com.wedit.weditapp.domain.bankAccount.dto.BankAccountDto;
 import com.wedit.weditapp.domain.invitation.domain.Invitation;
 import com.wedit.weditapp.global.error.ErrorCode;
 import com.wedit.weditapp.global.error.exception.CommonException;
diff --git a/src/main/java/com/wedit/weditapp/domain/comment/controller/CommentController.java b/src/main/java/com/wedit/weditapp/domain/comment/controller/CommentController.java
@@ -34,6 +34,7 @@ public ResponseEntity<GlobalResponseDto<PagedCommentResponseDto>> findAllComment
             @RequestParam(defaultValue = "1") int page){
 
         PagedCommentResponseDto response = commentService.findAllCommentsByInvitationId(invitationId, page);
+
         return ResponseEntity.status(HttpStatus.OK).body(GlobalResponseDto.success(response));
     }
 
diff --git a/src/main/java/com/wedit/weditapp/domain/comment/domain/Comment.java b/src/main/java/com/wedit/weditapp/domain/comment/domain/Comment.java
@@ -42,5 +42,4 @@ public static Comment createComment(String name, String content, Invitation invi
                 .invitation(invitation)
                 .build();
     }
-
 }
diff --git a/src/main/java/com/wedit/weditapp/domain/comment/domain/repository/CommentRepository.java b/src/main/java/com/wedit/weditapp/domain/comment/domain/repository/CommentRepository.java
@@ -3,7 +3,6 @@
 import java.util.List;
 
 import com.wedit.weditapp.domain.comment.domain.Comment;
-import com.wedit.weditapp.domain.image.domain.Image;
 import com.wedit.weditapp.domain.invitation.domain.Invitation;
 
 import org.springframework.data.domain.Page;
diff --git a/src/main/java/com/wedit/weditapp/domain/comment/service/CommentService.java b/src/main/java/com/wedit/weditapp/domain/comment/service/CommentService.java
@@ -61,8 +61,6 @@ public PagedCommentResponseDto findAllCommentsByInvitationId(Long invitationId,
 
         // 필요한 정보만으로 DTO 생성
         return PagedCommentResponseDto.of(commentDTOPage, commentPage.isLast(), page);
-
-
     }
 
     // 방명록 등록
diff --git a/src/main/java/com/wedit/weditapp/domain/decision/domain/repository/DecisionRepository.java b/src/main/java/com/wedit/weditapp/domain/decision/domain/repository/DecisionRepository.java
@@ -6,7 +6,6 @@
 import com.wedit.weditapp.domain.invitation.domain.Invitation;
 
 import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.jpa.repository.Modifying;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.data.repository.query.Param;
 
diff --git a/src/main/java/com/wedit/weditapp/domain/decision/service/DecisionService.java b/src/main/java/com/wedit/weditapp/domain/decision/service/DecisionService.java
@@ -20,7 +20,6 @@
 public class DecisionService {
 
     private final DecisionRepository decisionRepository;
-
     private final InvitationRepository invitationRepository;
 
     // 특정 청첩장의 참석의사 누계 조회
diff --git a/src/main/java/com/wedit/weditapp/domain/image/domain/Image.java b/src/main/java/com/wedit/weditapp/domain/image/domain/Image.java
@@ -22,6 +22,7 @@
 @Getter
 @NoArgsConstructor(access = AccessLevel.PROTECTED)
 public class Image extends BaseTimeEntity {
+
 	@Id
 	@GeneratedValue(strategy = GenerationType.IDENTITY)
 	private long id;
diff --git a/src/main/java/com/wedit/weditapp/domain/image/dto/response/ImageResponseDto.java b/src/main/java/com/wedit/weditapp/domain/image/dto/response/ImageResponseDto.java
@@ -10,7 +10,6 @@
 @NoArgsConstructor
 public class ImageResponseDto {
 	private String url;
-
 	private int location;
 
 	@Builder
diff --git a/src/main/java/com/wedit/weditapp/domain/image/service/ImageService.java b/src/main/java/com/wedit/weditapp/domain/image/service/ImageService.java
@@ -75,6 +75,7 @@ public void updateImages(List<MultipartFile> newImages, Invitation invitation) {
 			} catch (Exception e) {
 				throw new CommonException(ErrorCode.IMAGE_UPLOAD_FAILED);
 			}
+
 			imageRepository.delete(image); // DB에서 이미지 삭제
 		});
 
diff --git a/src/main/java/com/wedit/weditapp/domain/invitation/controller/InvitationController.java b/src/main/java/com/wedit/weditapp/domain/invitation/controller/InvitationController.java
@@ -13,7 +13,6 @@
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RequestPart;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;
@@ -51,6 +50,7 @@ public ResponseEntity<GlobalResponseDto<Void>> createInvitation(
 	public ResponseEntity<GlobalResponseDto<InvitationResponseDto>> getInvitation(
 		@PathVariable Long invitationId,
 		@AuthenticationPrincipal UserDetails userDetail){
+
 		return ResponseEntity.status(HttpStatus.OK)
 			.body(GlobalResponseDto.success(invitationService.getInvitation(userDetail, invitationId)));
 	}
@@ -62,7 +62,9 @@ public ResponseEntity<GlobalResponseDto<Void>> updateInvitation(
 		@RequestPart("images") List<MultipartFile> newImages,
 		@Valid @RequestPart("content") InvitationUpdateRequestDto updateRequest,
 		@AuthenticationPrincipal UserDetails userDetail) {
+
 		invitationService.updateInvitation(userDetail, invitationId, updateRequest, newImages);
+
 		return ResponseEntity.status(HttpStatus.OK)
 			.body(GlobalResponseDto.success());
 	}
@@ -72,7 +74,9 @@ public ResponseEntity<GlobalResponseDto<Void>> updateInvitation(
 	public ResponseEntity<GlobalResponseDto<String>> generateInvitationUrl(
 		@PathVariable Long invitationId,
 		@AuthenticationPrincipal UserDetails userDetail) {
+
 		String url = invitationService.generateAndSaveInvitationUrl(userDetail, invitationId);
+
 		return ResponseEntity.status(HttpStatus.OK)
 			.body(GlobalResponseDto.success(url));
 	}
@@ -82,7 +86,9 @@ public ResponseEntity<GlobalResponseDto<String>> generateInvitationUrl(
 	public ResponseEntity<GlobalResponseDto<Void>> deleteInvitation(
 		@PathVariable Long invitationId,
 		@AuthenticationPrincipal UserDetails userDetail) {
+
 		invitationService.deleteInvitation(userDetail, invitationId); // 서비스 호출
+
 		return ResponseEntity.status(HttpStatus.OK) // HTTP 204 No Content
 			.body(GlobalResponseDto.success());
 	}
@@ -91,7 +97,9 @@ public ResponseEntity<GlobalResponseDto<Void>> deleteInvitation(
 	@Operation(summary = "비회원 청첩장 조회", description = "UUID 기반으로 청첩장 조회")
 	public ResponseEntity<GlobalResponseDto<InvitationResponseDto>> getInvitationForGuest(
 		@PathVariable String uniqueId) {
+
 		InvitationResponseDto response = invitationService.getInvitationForGuest(uniqueId);
+
 		return ResponseEntity.status(HttpStatus.OK)
 			.body(GlobalResponseDto.success(response));
 	}
diff --git a/src/main/java/com/wedit/weditapp/domain/invitation/domain/Invitation.java b/src/main/java/com/wedit/weditapp/domain/invitation/domain/Invitation.java
@@ -18,6 +18,7 @@
 @Getter
 @NoArgsConstructor(access = AccessLevel.PROTECTED)
 public class Invitation extends BaseTimeEntity {
+
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     private Long id;
diff --git a/src/main/java/com/wedit/weditapp/domain/invitation/dto/request/InvitationCreateRequestDto.java b/src/main/java/com/wedit/weditapp/domain/invitation/dto/request/InvitationCreateRequestDto.java
@@ -8,41 +8,36 @@
 import java.time.LocalTime;
 import java.util.List;
 
-import com.wedit.weditapp.domain.bankAccounts.dto.BankAccountDto;
+import com.wedit.weditapp.domain.bankAccount.dto.BankAccountDto;
 import com.wedit.weditapp.domain.shared.Theme;
 
 @Getter
 @NoArgsConstructor
 public class InvitationCreateRequestDto {
+
     @NotBlank(message = "groom cannot be blank")
     private String groom; // 신랑 이름
 
     @NotBlank(message = "bride cannot be blank")
     private String bride; // 신부 이름
 
     private String groomF; // 신랑 아버지 이름
-
     private String groomM;  // 신랑 어머니 이름
 
     private String brideF; // 신부 아버지 이름
-
     private String brideM; // 신부 어머니 이름
 
     @NotBlank(message = "address cannot be blank")
     private String address; // 주소
-
     private String extraAddress; // 상세 주소
 
     private LocalDate date; // 결혼식 날짜
-
     private LocalTime time;
 
     private Theme theme; // 테마
 
     private boolean guestBookOption; // 방명록 옵션
-
     private boolean decisionOption; // 참석 의사 수집 옵션
-
     private boolean accountOption; // 계좌 공개 옵션
 
     private List<BankAccountDto> bankAccounts; // 계좌 정보 리스트
diff --git a/src/main/java/com/wedit/weditapp/domain/invitation/dto/request/InvitationUpdateRequestDto.java b/src/main/java/com/wedit/weditapp/domain/invitation/dto/request/InvitationUpdateRequestDto.java
@@ -1,49 +1,43 @@
 package com.wedit.weditapp.domain.invitation.dto.request;
 
 import jakarta.validation.constraints.NotBlank;
-import jakarta.validation.constraints.NotNull;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 
 import java.time.LocalDate;
 import java.time.LocalTime;
 import java.util.List;
 
-import com.wedit.weditapp.domain.bankAccounts.dto.BankAccountDto;
+import com.wedit.weditapp.domain.bankAccount.dto.BankAccountDto;
 import com.wedit.weditapp.domain.shared.Theme;
 
 @Getter
 @NoArgsConstructor
 public class InvitationUpdateRequestDto {
+
     @NotBlank(message = "groom cannot be blank")
     private String groom; // 신랑 이름
 
     @NotBlank(message = "bride cannot be blank")
     private String bride; // 신부 이름
 
     private String groomF; // 신랑 아버지 이름
-
     private String groomM;  // 신랑 어머니 이름
 
     private String brideF; // 신부 아버지 이름
-
     private String brideM; // 신부 어머니 이름
 
     @NotBlank(message = "address cannot be blank")
     private String address; // 주소
-
     private String extraAddress; // 상세 주소
 
     private LocalDate date; // 결혼식 날짜
-
     private LocalTime time; // 결혼식 날짜
 
     private Theme theme; // 테마
 
     private boolean guestBookOption; // 방명록 옵션
-
     private boolean decisionOption; // 참석 의사 수집 옵션
-
     private boolean accountOption; // 계좌 공개 옵션
 
     private List<BankAccountDto> bankAccounts; // 계좌 정보 리스트
diff --git a/src/main/java/com/wedit/weditapp/domain/invitation/dto/response/InvitationResponseDto.java b/src/main/java/com/wedit/weditapp/domain/invitation/dto/response/InvitationResponseDto.java
@@ -1,6 +1,6 @@
 package com.wedit.weditapp.domain.invitation.dto.response;
 
-import com.wedit.weditapp.domain.bankAccounts.dto.BankAccountDto;
+import com.wedit.weditapp.domain.bankAccount.dto.BankAccountDto;
 import com.wedit.weditapp.domain.comment.dto.response.CommentResponseDto;
 import com.wedit.weditapp.domain.image.dto.response.ImageResponseDto;
 import com.wedit.weditapp.domain.invitation.domain.Invitation;
@@ -21,39 +21,27 @@ public class InvitationResponseDto {
     private Long id;
 
     private String groom; // 신랑 이름
-
     private String bride; // 신부 이름
-
     private String groomF; // 신랑 아버지 이름
-
     private String groomM; // 신랑 어머니 이름
-
     private String brideF; // 신부 아버지 이름
-
     private String brideM; // 신부 어머니 이름
 
     private String address; // 주소
-
     private String extraAddress; // 상세 주소
 
     private LocalDate date; // 결혼식 날짜
-
     private LocalTime time;
 
     private Theme theme; // 테마
-
     private String distribution; // 청첩장 URL
 
     private boolean guestBookOption; // 방명록 옵션
-
     private boolean decisionOption; // 참석 여부 옵션
-
     private boolean accountOption; // 계좌 공개 옵션
 
     private List<BankAccountDto> bankAccounts; // 계좌 정보 리스트
-
     private List<ImageResponseDto> image;
-
     private List<CommentResponseDto> comment; // 방명록 리스트
 
     @Builder
diff --git a/src/main/java/com/wedit/weditapp/domain/invitation/service/InvitationService.java b/src/main/java/com/wedit/weditapp/domain/invitation/service/InvitationService.java
diff --git a/src/main/java/com/wedit/weditapp/domain/member/controller/MemberController.java b/src/main/java/com/wedit/weditapp/domain/member/controller/MemberController.java
diff --git a/src/main/java/com/wedit/weditapp/domain/shared/S3Service.java b/src/main/java/com/wedit/weditapp/domain/shared/S3Service.java
diff --git a/src/main/java/com/wedit/weditapp/global/auth/jwt/JwtAuthenticationFilter.java b/src/main/java/com/wedit/weditapp/global/auth/jwt/JwtAuthenticationFilter.java
diff --git a/src/main/java/com/wedit/weditapp/global/auth/jwt/JwtProvider.java b/src/main/java/com/wedit/weditapp/global/auth/jwt/JwtProvider.java
diff --git a/src/main/java/com/wedit/weditapp/global/auth/login/domain/CustomOAuth2User.java b/src/main/java/com/wedit/weditapp/global/auth/login/domain/CustomOAuth2User.java
diff --git a/src/main/java/com/wedit/weditapp/global/config/swagger/SwaggerConfig.java b/src/main/java/com/wedit/weditapp/global/config/swagger/SwaggerConfig.java
diff --git a/src/main/java/com/wedit/weditapp/global/error/exception/GlobalExceptionHandler.java b/src/main/java/com/wedit/weditapp/global/error/exception/GlobalExceptionHandler.java

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package com.wedit.weditapp.domain.bankAccounts.domain;`
	`1`	`+package com.wedit.weditapp.domain.bankAccount.domain;`
`2`	`2`
`3`	`3`	`import com.wedit.weditapp.domain.invitation.domain.Invitation;`
`4`	`4`	`import com.wedit.weditapp.domain.shared.AccountSide;`
Original file line number	Diff line number	Diff line change
`@@ -34,6 +34,7 @@ public ResponseEntity<GlobalResponseDto<PagedCommentResponseDto>> findAllComment`
`34`	`34`	`@RequestParam(defaultValue = "1") int page){`
`35`	`35`
`36`	`36`	`PagedCommentResponseDto response = commentService.findAllCommentsByInvitationId(invitationId, page);`
	`37`	`+`
`37`	`38`	`return ResponseEntity.status(HttpStatus.OK).body(GlobalResponseDto.success(response));`
`38`	`39`	`}`
`39`	`40`
Original file line number	Diff line number	Diff line change
`@@ -42,5 +42,4 @@ public static Comment createComment(String name, String content, Invitation invi`
`42`	`42`	`.invitation(invitation)`
`43`	`43`	`.build();`
`44`	`44`	`}`
`45`		`-`
`46`	`45`	`}`
Original file line number	Diff line number	Diff line change
`@@ -61,8 +61,6 @@ public PagedCommentResponseDto findAllCommentsByInvitationId(Long invitationId,`
`61`	`61`
`62`	`62`	`// 필요한 정보만으로 DTO 생성`
`63`	`63`	`return PagedCommentResponseDto.of(commentDTOPage, commentPage.isLast(), page);`
`64`		`-`
`65`		`-`
`66`	`64`	`}`
`67`	`65`
`68`	`66`	`// 방명록 등록`