입출금 패키지 모델 생성

src/main/java/com/totopia/server/modules/info/entity/ReplyEntity.java

@@ -0,0 +1,36 @@
+package com.totopia.server.modules.info.entity;
+
+import com.totopia.server.commons.data.entity.UserDateAuditEntity;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.SuperBuilder;
+
+import javax.persistence.*;
+
+@Entity
+@Table(name = "reply")
+@Data
+@SuperBuilder
+@NoArgsConstructor
+@AllArgsConstructor
+@Builder
+public class ReplyEntity extends UserDateAuditEntity {
+  @Id
+  @GeneratedValue(generator = "reply_generator")
+  @SequenceGenerator(name = "reply_generator", sequenceName = "reply_sequence", initialValue = 1)
+  private Long id;
+
+  @Basic
+  @Column(name = "free_board_id", nullable = false)
+  private Long freeBoard;
+
+  @Basic
+  @Column(name = "title", nullable = true, length = 200)
+  private String title;
+
+  @Basic
+  @Column(name = "contents", nullable = true, length = 2000)
+  private String contents;
+}

src/main/java/com/totopia/server/modules/moneys/entity/BankEntity.java

@@ -1,4 +1,4 @@
-package com.totopia.server.modules.user.entity;
+package com.totopia.server.modules.moneys.entity;
 
 import com.totopia.server.commons.data.entity.DateAuditEntity;
 import com.totopia.server.modules.user.type.StatusName;

src/main/java/com/totopia/server/modules/moneys/entity/DepositEntity.java

@@ -1,7 +1,8 @@
-package com.totopia.server.modules.user.entity;
+package com.totopia.server.modules.moneys.entity;
 
 import com.totopia.server.commons.data.entity.DateAuditEntity;
-import com.totopia.server.modules.user.type.BankingName;
+import com.totopia.server.commons.data.entity.UserDateAuditEntity;
+import com.totopia.server.modules.moneys.type.BankingName;
 import lombok.*;
 import lombok.experimental.SuperBuilder;
 
@@ -17,7 +18,11 @@ import java.io.Serializable;
 @ToString
 @Data
 @Builder
-public class DepositEntity extends DateAuditEntity implements Serializable {
+@AttributeOverrides({
+    @AttributeOverride(name = "updatedBy", column = @Column(name = "approve_admin_id")),
+    @AttributeOverride(name = "updatedAt", column = @Column(name = "confirm_date")),
+})
+public class DepositEntity extends UserDateAuditEntity implements Serializable {
 
     @Id
     @GeneratedValue(generator = "deposit_generator")
@@ -29,16 +34,16 @@ public class DepositEntity extends DateAuditEntity implements Serializable {
     private Integer price;
 
     @Basic
-    @Column(name = "approve_user_id", nullable = false)
+    @Column(name = "bonus", nullable = false)
-    private Long approveUser;
+    private Integer bonus;
 
     @Basic
     @Column(name = "bank_id", nullable = false)
     private Long bank;
 
     @Basic
-    @Column(name = "deposit_account", nullable = false)
+    @Column(name = "bank_accounts_id", nullable = false)
-    private String depositAccount;
+    private Short bankAccounts;
 
     @Basic
     @Enumerated(EnumType.STRING)

src/main/java/com/totopia/server/modules/moneys/entity/PayDoneEntity.java

@@ -1,4 +1,4 @@
-package com.totopia.server.modules.user.entity;
+package com.totopia.server.modules.moneys.entity;
 
 import com.totopia.server.commons.data.entity.UserDateAuditEntity;
 import lombok.*;

src/main/java/com/totopia/server/modules/moneys/entity/PayEntity.java

@@ -1,7 +1,7 @@
-package com.totopia.server.modules.user.entity;
+package com.totopia.server.modules.moneys.entity;
 
 import com.totopia.server.commons.data.entity.UserDateAuditEntity;
-import com.totopia.server.modules.user.type.BankingName;
+import com.totopia.server.modules.moneys.type.BankingName;
 import lombok.*;
 import lombok.experimental.SuperBuilder;
 

src/main/java/com/totopia/server/modules/moneys/entity/WithdrawEntity.java

@@ -1,7 +1,7 @@
-package com.totopia.server.modules.user.entity;
+package com.totopia.server.modules.moneys.entity;
 
-import com.totopia.server.commons.data.entity.DateAuditEntity;
+import com.totopia.server.commons.data.entity.UserDateAuditEntity;
-import com.totopia.server.modules.user.type.BankingName;
+import com.totopia.server.modules.moneys.type.BankingName;
 import lombok.*;
 import lombok.experimental.SuperBuilder;
 
@@ -17,7 +17,11 @@ import java.io.Serializable;
 @ToString
 @Data
 @Builder
-public class WithdrawEntity extends DateAuditEntity implements Serializable {
+@AttributeOverrides({
+    @AttributeOverride(name = "updatedBy", column = @Column(name = "approve_admin_id")),
+    @AttributeOverride(name = "updatedAt", column = @Column(name = "confirm_date")),
+})
+public class WithdrawEntity extends UserDateAuditEntity implements Serializable {
     @Id
     @GeneratedValue(generator = "withdraw_generator")
     @SequenceGenerator(name = "withdraw_generator", sequenceName = "withdraw_sequence", initialValue = 1)
@@ -27,10 +31,6 @@ public class WithdrawEntity extends DateAuditEntity implements Serializable {
     @Column(name = "price", nullable = false)
     private Integer price;
 
-    @Basic
-    @Column(name = "approve_user_id", nullable = false)
-    private Long approveUser;
-
     @Basic
     @Column(name = "bank_id", nullable = false)
     private Long bank;

src/main/java/com/totopia/server/modules/moneys/repository/BankRepository.java

@@ -1,6 +1,6 @@
-package com.totopia.server.modules.user.repository;
+package com.totopia.server.modules.moneys.repository;
 
-import com.totopia.server.modules.user.entity.BankEntity;
+import com.totopia.server.modules.moneys.entity.BankEntity;
 import org.springframework.data.jpa.repository.JpaRepository;
 
 public interface BankRepository extends JpaRepository<BankEntity, Long> {

src/main/java/com/totopia/server/modules/moneys/repository/DepositRepository.java

@@ -1,6 +1,6 @@
-package com.totopia.server.modules.user.repository;
+package com.totopia.server.modules.moneys.repository;
 
-import com.totopia.server.modules.user.entity.DepositEntity;
+import com.totopia.server.modules.moneys.entity.DepositEntity;
 import org.springframework.data.jpa.repository.JpaRepository;
 
 public interface DepositRepository extends JpaRepository<DepositEntity, Long> {

src/main/java/com/totopia/server/modules/moneys/repository/WithdrawRepository.java

@@ -1,6 +1,6 @@
-package com.totopia.server.modules.user.repository;
+package com.totopia.server.modules.moneys.repository;
 
-import com.totopia.server.modules.user.entity.WithdrawEntity;
+import com.totopia.server.modules.moneys.entity.WithdrawEntity;
 import org.springframework.data.jpa.repository.JpaRepository;
 
 public interface WithdrawRepository extends JpaRepository<WithdrawEntity, Long> {

src/main/java/com/totopia/server/modules/moneys/type/BankingName.java

@@ -1,4 +1,4 @@
-package com.totopia.server.modules.user.type;
+package com.totopia.server.modules.moneys.type;
 
 public enum BankingName {
     BANKING_WAITING, BANKING_HOLD, BANKING_COMPLETE, BANKING_DEPOSIT, BANKING_WITHDRAW

src/main/java/com/totopia/server/modules/user/type/CommissionName.java

@@ -1,7 +1,7 @@
 package com.totopia.server.modules.user.type;
 
 public enum CommissionName {
-  COMMISSION_BANKING,     // 충환 방식
+  BANKING,     // 충환 방식
-  COMMISSION_BETTING,     // 베팅 방식
+  BETTING,     // 베팅 방식
-  COMMISSION_RAFFLE       // 낙첨 방식
+  RAFFLE       // 낙첨 방식
 }

src/test/java/com/totopia/server/modules/user/repository/BankRepositoryTest.java

@@ -1,6 +1,7 @@
 package com.totopia.server.modules.user.repository;
 
-import com.totopia.server.modules.user.entity.BankEntity;
+import com.totopia.server.modules.moneys.entity.BankEntity;
+import com.totopia.server.modules.moneys.repository.BankRepository;
 import com.totopia.server.modules.user.entity.UserEntity;
 import org.junit.Before;
 import org.junit.Ignore;

src/test/java/com/totopia/server/modules/user/repository/DepositRepositoryTest.java

@@ -1,9 +1,11 @@
 package com.totopia.server.modules.user.repository;
 
-import com.totopia.server.modules.user.entity.BankEntity;
+import com.totopia.server.modules.moneys.entity.BankEntity;
-import com.totopia.server.modules.user.entity.DepositEntity;
+import com.totopia.server.modules.moneys.entity.DepositEntity;
+import com.totopia.server.modules.moneys.repository.BankRepository;
+import com.totopia.server.modules.moneys.repository.DepositRepository;
 import com.totopia.server.modules.user.entity.UserEntity;
-import com.totopia.server.modules.user.type.BankingName;
+import com.totopia.server.modules.moneys.type.BankingName;
 import org.junit.Before;
 import org.junit.Ignore;
 import org.junit.Test;

src/test/java/com/totopia/server/modules/user/repository/WithdrawRepositoryTest.java

@@ -1,9 +1,11 @@
 package com.totopia.server.modules.user.repository;
 
-import com.totopia.server.modules.user.entity.BankEntity;
+import com.totopia.server.modules.moneys.entity.BankEntity;
+import com.totopia.server.modules.moneys.repository.BankRepository;
+import com.totopia.server.modules.moneys.repository.WithdrawRepository;
 import com.totopia.server.modules.user.entity.UserEntity;
-import com.totopia.server.modules.user.entity.WithdrawEntity;
+import com.totopia.server.modules.moneys.entity.WithdrawEntity;
-import com.totopia.server.modules.user.type.BankingName;
+import com.totopia.server.modules.moneys.type.BankingName;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;