From 6c5ada53a74efd8394b941bc5f2014bdb15df723 Mon Sep 17 00:00:00 2001
From: Rebwon <msolo021015@naver.com>
Date: Sat, 25 Sep 2021 12:21:33 +0900
Subject: [PATCH] Add member db schema

- add member db schema
- rename queryMapper
- extract ddl, dml script
---
 .../com/yam/app/account/domain/Account.java   |  1 +
 .../configuration/DatabaseConfiguration.java  |  1 +
 .../com/yam/app/member/application/empty.txt  |  0
 .../java/com/yam/app/member/domain/empty.txt  |  0
 .../yam/app/member/infrastructure/empty.txt   |  0
 .../com/yam/app/member/presentation/empty.txt |  0
 ...eaderMapper.xml => AccountQueryMapper.xml} |  6 ------
 src/main/resources/sql/ddl.sql                | 20 ++++++++++++-------
 src/main/resources/sql/dml.sql                |  7 +++++++
 .../domain/RegisterAccountProcessorTest.java  |  3 ++-
 10 files changed, 24 insertions(+), 14 deletions(-)
 create mode 100644 src/main/java/com/yam/app/member/application/empty.txt
 create mode 100644 src/main/java/com/yam/app/member/domain/empty.txt
 create mode 100644 src/main/java/com/yam/app/member/infrastructure/empty.txt
 create mode 100644 src/main/java/com/yam/app/member/presentation/empty.txt
 rename src/main/resources/mapper/xml/{AccountReaderMapper.xml => AccountQueryMapper.xml} (76%)
 create mode 100644 src/main/resources/sql/dml.sql

diff --git a/src/main/java/com/yam/app/account/domain/Account.java b/src/main/java/com/yam/app/account/domain/Account.java
index 6b90b78..09c753c 100644
--- a/src/main/java/com/yam/app/account/domain/Account.java
+++ b/src/main/java/com/yam/app/account/domain/Account.java
@@ -10,6 +10,7 @@ import lombok.ToString;
 public final class Account {
 
     private Long id;
+    private Long memberId;
     private String email;
     private String password;
     private String emailCheckToken;
diff --git a/src/main/java/com/yam/app/common/configuration/DatabaseConfiguration.java b/src/main/java/com/yam/app/common/configuration/DatabaseConfiguration.java
index 9b3fb47..5db3564 100644
--- a/src/main/java/com/yam/app/common/configuration/DatabaseConfiguration.java
+++ b/src/main/java/com/yam/app/common/configuration/DatabaseConfiguration.java
@@ -17,6 +17,7 @@ public class DatabaseConfiguration {
         return new EmbeddedDatabaseBuilder()
             .setType(EmbeddedDatabaseType.H2)
             .addScript("classpath:sql/ddl.sql")
+            .addScript("classpath:sql/dml.sql")
             .build();
     }
 
diff --git a/src/main/java/com/yam/app/member/application/empty.txt b/src/main/java/com/yam/app/member/application/empty.txt
new file mode 100644
index 0000000..e69de29
diff --git a/src/main/java/com/yam/app/member/domain/empty.txt b/src/main/java/com/yam/app/member/domain/empty.txt
new file mode 100644
index 0000000..e69de29
diff --git a/src/main/java/com/yam/app/member/infrastructure/empty.txt b/src/main/java/com/yam/app/member/infrastructure/empty.txt
new file mode 100644
index 0000000..e69de29
diff --git a/src/main/java/com/yam/app/member/presentation/empty.txt b/src/main/java/com/yam/app/member/presentation/empty.txt
new file mode 100644
index 0000000..e69de29
diff --git a/src/main/resources/mapper/xml/AccountReaderMapper.xml b/src/main/resources/mapper/xml/AccountQueryMapper.xml
similarity index 76%
rename from src/main/resources/mapper/xml/AccountReaderMapper.xml
rename to src/main/resources/mapper/xml/AccountQueryMapper.xml
index 9f8579f..f6342dc 100644
--- a/src/main/resources/mapper/xml/AccountReaderMapper.xml
+++ b/src/main/resources/mapper/xml/AccountQueryMapper.xml
@@ -9,12 +9,6 @@
     WHERE email = #{email}
   </select>
 
-  <select id="existsByNickname" parameterType="String" resultType="boolean">
-    SELECT COUNT(nickname)
-    FROM ACCOUNT
-    WHERE nickname = #{nickname}
-  </select>
-
   <select id="findByEmail" parameterType="String"
     resultType="com.yam.app.account.domain.Account">
     SELECT * FROM ACCOUNT WHERE email = #{email}
diff --git a/src/main/resources/sql/ddl.sql b/src/main/resources/sql/ddl.sql
index a0e4fb2..6b04553 100644
--- a/src/main/resources/sql/ddl.sql
+++ b/src/main/resources/sql/ddl.sql
@@ -11,16 +11,22 @@ create table account
     password                       varchar(255) not null,
     withdraw                       boolean      not null,
     withdrawal_at                  timestamp,
+    member_id                      bigint,
+    primary key (id)
+);
+
+create table member(
+    id                             bigint generated by default as identity,
+    nickname                       varchar(255) not null,
+    image                          varchar(255) not null,
     primary key (id)
 );
 
 alter table account
     add constraint UK_q0uja26qgu1atulenwup9rxyr unique (email);
 
-insert into account(email, email_check_token, email_check_token_generated_at, email_verified,
-                    joined_at, last_modified_at, password, withdraw, role)
-values ('jiwonDev@gmail.com', 'emailchecktoken', now(), false, now(), now(), 'password!',
-        false, 'DEFAULT'),
-       ('loginCheck@gmail.com', 'emailchecktoken1', now(), true, now(), now(),
-        '$2a$10$EqbMbYB0vcZnuA5CClqa9uiLDnjA6pCjxn208ZchzA2q3ofqnkhcq',
-        false, 'DEFAULT');
+alter table member
+    add constraint UK_hh9kg6jti4n1eoiertn2k6qsc unique (nickname);
+
+alter table account
+    add constraint FKr5j0huynd7nsv1s7e9vb8qvwo foreign key (member_id) references member;
diff --git a/src/main/resources/sql/dml.sql b/src/main/resources/sql/dml.sql
new file mode 100644
index 0000000..903bd75
--- /dev/null
+++ b/src/main/resources/sql/dml.sql
@@ -0,0 +1,7 @@
+insert into account(email, email_check_token, email_check_token_generated_at, email_verified,
+                    joined_at, last_modified_at, password, withdraw, role)
+values ('jiwonDev@gmail.com', 'emailchecktoken', now(), false, now(), now(), 'password!',
+        false, 'DEFAULT'),
+       ('loginCheck@gmail.com', 'emailchecktoken1', now(), true, now(), now(),
+        '$2a$10$EqbMbYB0vcZnuA5CClqa9uiLDnjA6pCjxn208ZchzA2q3ofqnkhcq',
+        false, 'DEFAULT');
diff --git a/src/test/java/com/yam/app/account/domain/RegisterAccountProcessorTest.java b/src/test/java/com/yam/app/account/domain/RegisterAccountProcessorTest.java
index 03e46b6..85c668d 100644
--- a/src/test/java/com/yam/app/account/domain/RegisterAccountProcessorTest.java
+++ b/src/test/java/com/yam/app/account/domain/RegisterAccountProcessorTest.java
@@ -24,7 +24,8 @@ final class RegisterAccountProcessorTest {
         return Arrays.asList(
             DynamicTest.dynamicTest("회원가입에 성공한다.", () -> {
                 // Act
-                var account = processor.register("rebwon@gmail.com", "password!");
+                processor.register("rebwon@gmail.com", "password!");
+                var account = reader.findByEmail("rebwon@gmail.com").get();
 
                 // Assert
                 assertThat(account.getId()).isEqualTo(1L);