From 78153786072a4a5a185881eb8d27f18c3fd11405 Mon Sep 17 00:00:00 2001
From: Kijin Sung <kijin@kijinsung.com>
Date: Sat, 27 Jul 2019 23:58:44 +0900
Subject: [PATCH] Separate phone number field into number, country, and type

---
 modules/member/member.class.php               | 27 ++++++++++++++++++-
 .../queries/getMemberInfoByPhoneNumber.xml    | 12 +++++++++
 modules/member/queries/insertMember.xml       |  6 +++--
 modules/member/queries/updateMember.xml       |  4 ++-
 .../queries/updateMemberPhoneNumber.xml       |  4 ++-
 modules/member/schemas/member.xml             |  8 +++---
 6 files changed, 53 insertions(+), 8 deletions(-)
 create mode 100644 modules/member/queries/getMemberInfoByPhoneNumber.xml

diff --git a/modules/member/member.class.php b/modules/member/member.class.php
index a5bc2711f..b364de8e4 100644
--- a/modules/member/member.class.php
+++ b/modules/member/member.class.php
@@ -200,8 +200,15 @@ class member extends ModuleObject {
 		if(!$oDB->isColumnExists("member", "find_account_question")) return true;
 		if(!$oDB->isColumnExists("member", "find_account_answer")) return true;
 
+		// Add columns for phone number
 		if(!$oDB->isColumnExists("member", "phone_number")) return true;
 		if(!$oDB->isIndexExists("member","idx_phone_number")) return true;
+		if(!$oDB->isColumnExists("member", "phone_country")) return true;
+		if(!$oDB->isIndexExists("member","idx_phone_country")) return true;
+		if(!$oDB->isColumnExists("member", "phone_type")) return true;
+		if(!$oDB->isIndexExists("member","idx_phone_type")) return true;
+		
+		// Add column for list order
 		if(!$oDB->isColumnExists("member", "list_order")) return true;
 		if(!$oDB->isIndexExists("member","idx_list_order")) return true;
 		
@@ -327,15 +334,33 @@ class member extends ModuleObject {
 			$oDB->addColumn("member", "find_account_answer", "varchar", 250);
 		}
 		
+		// Add columns for phone number
 		if(!$oDB->isColumnExists("member", "phone_number"))
 		{
-			$oDB->addColumn("member", "phone_number", "varchar", 80, null, false, 'email_address');
+			$oDB->addColumn("member", "phone_number", "varchar", 80, null, false, 'email_host');
+		}
+		if(!$oDB->isColumnExists("member", "phone_country"))
+		{
+			$oDB->addColumn("member", "phone_country", "varchar", 10, null, false, 'phone_number');
+		}
+		if(!$oDB->isColumnExists("member", "phone_type"))
+		{
+			$oDB->addColumn("member", "phone_type", "varchar", 10, null, false, 'phone_country');
 		}
 		if(!$oDB->isIndexExists("member","idx_phone_number"))
 		{
 			$oDB->addIndex("member","idx_phone_number", array("phone_number"));
 		}
+		if(!$oDB->isIndexExists("member","idx_phone_country"))
+		{
+			$oDB->addIndex("member","idx_phone_country", array("phone_country"));
+		}
+		if(!$oDB->isIndexExists("member","idx_phone_type"))
+		{
+			$oDB->addIndex("member","idx_phone_type", array("phone_type"));
+		}
 
+		// Add column for list order
 		if(!$oDB->isColumnExists("member", "list_order"))
 		{
 			$oDB->addColumn("member", "list_order", "number", 11);
diff --git a/modules/member/queries/getMemberInfoByPhoneNumber.xml b/modules/member/queries/getMemberInfoByPhoneNumber.xml
new file mode 100644
index 000000000..6ec83bb96
--- /dev/null
+++ b/modules/member/queries/getMemberInfoByPhoneNumber.xml
@@ -0,0 +1,12 @@
+<query id="getMemberInfoByPhoneNumber" action="select">
+    <tables>
+        <table name="member" />
+    </tables>
+    <columns>
+        <column name="*" />
+    </columns>
+    <conditions>
+        <condition operation="equal" column="phone_number" var="phone_number" notnull="notnull" />
+		<condition operation="equal" column="phone_country" var="phone_country" pipe="and" />
+    </conditions>
+</query>
diff --git a/modules/member/queries/insertMember.xml b/modules/member/queries/insertMember.xml
index e1eea9c6d..8b07282cc 100644
--- a/modules/member/queries/insertMember.xml
+++ b/modules/member/queries/insertMember.xml
@@ -5,11 +5,13 @@
     <columns>
         <column name="member_srl" var="member_srl" filter="number" notnull="notnull" />
         <column name="user_id" var="user_id" filter="userid" notnull="notnull" />
-        <column name="email_address" var="email_address" filter="email" notnull="notnull" />
-		<column name="phone_number" var="phone_number" />
         <column name="password" var="password" notnull="notnull" />
+        <column name="email_address" var="email_address" filter="email" notnull="notnull" />
         <column name="email_id" var="email_id" notnull="notnull" />
         <column name="email_host" var="email_host" notnull="notnull" />
+		<column name="phone_number" var="phone_number" />
+		<column name="phone_country" var="phone_country" />
+		<column name="phone_type" var="phone_type" />
         <column name="user_name" var="user_name" notnull="notnull" minlength="1" maxlength="40" />
         <column name="nick_name" var="nick_name" notnull="notnull" minlength="1" maxlength="40" />
         <column name="find_account_question" var="find_account_question" />
diff --git a/modules/member/queries/updateMember.xml b/modules/member/queries/updateMember.xml
index d8e80cf9d..77224c0a4 100644
--- a/modules/member/queries/updateMember.xml
+++ b/modules/member/queries/updateMember.xml
@@ -8,9 +8,11 @@
         <column name="nick_name" var="nick_name" notnull="notnull" minlength="2" maxlength="40" />
         <column name="user_id" var="user_id" notnull="notnull" />
 		<column name="email_address" var="email_address" notnull="notnull" />
-		<column name="phone_number" var="phone_number" />
 		<column name="email_id" var="email_id" />
 		<column name="email_host" var="email_host" />
+		<column name="phone_number" var="phone_number" />
+		<column name="phone_country" var="phone_country" />
+		<column name="phone_type" var="phone_type" />
         <column name="find_account_question" var="find_account_question" />
         <column name="find_account_answer" var="find_account_answer" default="" />
         <column name="homepage" var="homepage" default="" />
diff --git a/modules/member/queries/updateMemberPhoneNumber.xml b/modules/member/queries/updateMemberPhoneNumber.xml
index e96092a9b..ed4b961f6 100644
--- a/modules/member/queries/updateMemberPhoneNumber.xml
+++ b/modules/member/queries/updateMemberPhoneNumber.xml
@@ -3,7 +3,9 @@
         <table name="member" />
     </tables>
     <columns>
-        <column name="phone_number" var="phone_number" notnull="notnull" />
+        <column name="phone_number" var="phone_number" />
+		<column name="phone_country" var="phone_country" />
+		<column name="phone_type" var="phone_type" />
     </columns>
     <conditions>
         <condition operation="equal" column="member_srl" var="member_srl" notnull="notnull" filter="number" />
diff --git a/modules/member/schemas/member.xml b/modules/member/schemas/member.xml
index c312dfecd..a2881691a 100644
--- a/modules/member/schemas/member.xml
+++ b/modules/member/schemas/member.xml
@@ -1,11 +1,13 @@
 <table name="member">
     <column name="member_srl" type="number" size="11" notnull="notnull" primary_key="primary_key" />
     <column name="user_id" type="varchar" size="80" notnull="notnull" unique="unique_user_id" />
-    <column name="email_address" type="varchar" size="80" notnull="notnull" unique="unique_email_address" />
-	<column name="phone_number" type="varchar" size="80" index="idx_phone_number" />
     <column name="password" type="varchar" size="60" notnull="notnull" />
+    <column name="email_address" type="varchar" size="80" notnull="notnull" unique="unique_email_address" />
     <column name="email_id" type="varchar" size="80" notnull="notnull" />
-    <column name="email_host" type="varchar" size="160" index="idx_email_host" />
+    <column name="email_host" type="varchar" size="80" index="idx_email_host" />
+	<column name="phone_number" type="varchar" size="80" index="idx_phone_number" />
+	<column name="phone_country" type="varchar" size="10" index="idx_phone_country" />
+	<column name="phone_type" type="varchar" size="10" index="idx_phone_type" />
     <column name="user_name" type="varchar" size="40" notnull="notnull" />
     <column name="nick_name" type="varchar" size="40" notnull="notnull" index="idx_nick_name" />
     <column name="find_account_question" type="number" size="11" />