[fix] #15 - Account 부분 수정

Wedit-project · Jan 20, 2025 · 04a772b · 04a772b
1 parent 58fd730
commit 04a772b
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 19 deletions.
diff --git a/src/main/java/com/wedit/weditapp/domain/bankAccounts/domain/BankAccounts.java b/src/main/java/com/wedit/weditapp/domain/bankAccounts/domain/BankAccounts.java
@@ -1,5 +1,6 @@
 package com.wedit.weditapp.domain.bankAccounts.domain;
 
+import com.wedit.weditapp.domain.invitation.domain.Invitation;
 import com.wedit.weditapp.domain.shared.AccountSide;
 import com.wedit.weditapp.domain.shared.BaseTimeEntity;
 import jakarta.persistence.*;
@@ -31,25 +32,27 @@ public class BankAccounts extends BaseTimeEntity {
     @Column(nullable = false)
     private String accountHolder;
 
-//    @ManyToOne(fetch = FetchType.LAZY)
-//    @JoinColumn(name = "invitation_id", nullable = false)
-//    private Invitations invitations;
+    @ManyToOne(fetch = FetchType.LAZY)
+    @JoinColumn(name = "invitation_id", nullable = false)
+    private Invitation invitation;
 
     @Builder
-    private BankAccounts(AccountSide side, String accountNumber, String bankName, String accountHolder){
+    private BankAccounts(AccountSide side, String accountNumber, String bankName, String accountHolder, Invitation invitation) {
         this.side = side;
         this.accountNumber = accountNumber;
         this.bankName = bankName;
         this.accountHolder = accountHolder;
+        this.invitation = invitation;
     }
 
-    public static BankAccounts createBankAccount(AccountSide side, String accountNumber, String bankName, String accountHolder){
+    public static BankAccounts createBankAccount(AccountSide side, String accountNumber, String bankName, String accountHolder, Invitation invitation) {
         return BankAccounts.builder()
-                .side(side)
-                .accountNumber(accountNumber)
-                .bankName(bankName)
-                .accountHolder(accountHolder)
-                .build();
+            .side(side)
+            .accountNumber(accountNumber)
+            .bankName(bankName)
+            .accountHolder(accountHolder)
+            .invitation(invitation)
+            .build();
     }
 
 }
diff --git a/src/main/java/com/wedit/weditapp/domain/bankAccounts/dto/BankAccountDTO.java b/src/main/java/com/wedit/weditapp/domain/bankAccounts/dto/BankAccountDTO.java
@@ -1,6 +1,7 @@
 package com.wedit.weditapp.domain.bankAccounts.dto;
 
 import com.wedit.weditapp.domain.bankAccounts.domain.BankAccounts;
+import com.wedit.weditapp.domain.shared.AccountSide;
 
 import jakarta.validation.constraints.NotBlank;
 import lombok.Builder;
@@ -11,7 +12,7 @@
 @NoArgsConstructor
 public class BankAccountDTO {
 	@NotBlank(message = "side cannot be blank")
-	private String side;  // 신랑/신부 구분
+	private AccountSide side;  // 신랑/신부 구분
 
 	@NotBlank(message = "accountNumber cannot be blank")
 	private String accountNumber; // 계좌 번호
@@ -23,7 +24,7 @@ public class BankAccountDTO {
 	private String accountHolder; // 예금주 이름
 
 	@Builder
-	private BankAccountDTO(String side, String accountNumber, String bankName, String accountHolder) {
+	private BankAccountDTO(AccountSide side, String accountNumber, String bankName, String accountHolder) {
 		this.side = side;
 		this.accountNumber = accountNumber;
 		this.bankName = bankName;
@@ -32,7 +33,7 @@ private BankAccountDTO(String side, String accountNumber, String bankName, Strin
 
 	public static BankAccountDTO from(BankAccounts bankAccount) {
 		return BankAccountDTO.builder()
-			.side(bankAccount.getSide().name())
+			.side(bankAccount.getSide())
 			.accountNumber(bankAccount.getAccountNumber())
 			.bankName(bankAccount.getBankName())
 			.accountHolder(bankAccount.getAccountHolder())

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
@@ -2,6 +2,8 @@
 
 import com.wedit.weditapp.domain.bankAccounts.dto.BankAccountDTO;
 import com.wedit.weditapp.domain.invitation.domain.Invitation;
+import com.wedit.weditapp.domain.shared.Theme;
+
 import jakarta.validation.constraints.NotBlank;
 import lombok.Builder;
 import lombok.Getter;
@@ -36,7 +38,7 @@ public class InvitationResponseDTO {
     private LocalDate date; // 결혼식 날짜
 
     @NotBlank(message = "theme cannot be blank")
-    private String theme; // 테마 (Enum → String)
+    private Theme theme; // 테마
 
     private String distribution; // 청첩장 URL
 
@@ -52,7 +54,7 @@ public class InvitationResponseDTO {
     //private List<GuestbookResponseDTO> guestbooks; // 방명록 리스트
 
     @Builder
-    private InvitationResponseDTO(String groom, String bride, String groomF, String groomM, String brideF, String brideM, String address, String extraAddress, LocalDate date, String theme, String distribution, boolean guestBookOption, boolean decisionOption, boolean accountOption, List<BankAccountDTO> bankAccounts
+    private InvitationResponseDTO(String groom, String bride, String groomF, String groomM, String brideF, String brideM, String address, String extraAddress, LocalDate date, Theme theme, String distribution, boolean guestBookOption, boolean decisionOption, boolean accountOption, List<BankAccountDTO> bankAccounts
             //, List<GuestbookResponseDTO> guestbooks
     ) {
         this.groom = groom;
@@ -86,7 +88,7 @@ public static InvitationResponseDTO from(Invitation invitation, List<BankAccount
                 .address(invitation.getAddress())
                 .extraAddress(invitation.getExtraAddress())
                 .date(invitation.getDate())
-                .theme(invitation.getTheme().name())
+                .theme(invitation.getTheme())
                 .distribution(invitation.getDistribution())
                 .guestBookOption(invitation.isGuestBookOption())
                 .decisionOption(invitation.isDecisionOption())

diff --git a/src/main/java/com/wedit/weditapp/domain/shared/Theme.java b/src/main/java/com/wedit/weditapp/domain/shared/Theme.java
@@ -7,9 +7,9 @@ public enum Theme {
     TRADITIONAL("전통형"),
     BASIC("일반형");
 
-    private final String themeType;
+    private final String theme;
 
-    Theme(String themeType) {
-        this.themeType = themeType;
+    Theme(String theme) {
+        this.theme = theme;
     }
 }