From 93f1d15a48c30e72d8f5f01bac9c8d2a4f3dfe8c Mon Sep 17 00:00:00 2001
From: choyeon <lcy7747@gmail.com>
Date: Mon, 22 Jun 2020 10:29:40 +0900
Subject: [PATCH] =?UTF-8?q?member=5Fdevices=20=EC=8A=A4=ED=82=A4=EB=A7=88?=
 =?UTF-8?q?=20=EC=88=98=EC=A0=95,=20ProcMemberLogingWithDevice=20=EC=97=90?=
 =?UTF-8?q?=EC=84=9C=EB=8F=84=20=EC=9C=A0=EC=A0=80=20=EC=A0=95=EB=B3=B4=20?=
 =?UTF-8?q?=EB=B0=98=ED=99=98,=20getDeviceTokens()=EC=97=90=EC=84=9C=20?=
 =?UTF-8?q?=EC=BF=BC=EB=A6=AC=ED=95=A0=20=EB=95=8C=20device=5Ftype=20?=
 =?UTF-8?q?=EC=A1=B0=EA=B1=B4=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 modules/member/member.controller.php                        | 6 ++++++
 modules/member/queries/getMemberDeviceTokensByMemberSrl.xml | 1 +
 modules/member/schemas/member_devices.xml                   | 6 +++---
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/modules/member/member.controller.php b/modules/member/member.controller.php
index 57db59fae..20654ba37 100644
--- a/modules/member/member.controller.php
+++ b/modules/member/member.controller.php
@@ -209,6 +209,12 @@ class memberController extends member
 		{
 			return new BaseObject(-1, 'LOGIN_FAILED');
 		}
+
+		$logged_info = Context::get('logged_info');
+		$this->add('member_srl', $logged_info->member_srl);
+		$this->add('user_id', $logged_info->user_id);
+		$this->add('user_name', $logged_info->user_name);
+		$this->add('nick_name', $logged_info->nick_name);
 	}
 
 	/**
diff --git a/modules/member/queries/getMemberDeviceTokensByMemberSrl.xml b/modules/member/queries/getMemberDeviceTokensByMemberSrl.xml
index 96e5c7656..fa4ea6b5f 100644
--- a/modules/member/queries/getMemberDeviceTokensByMemberSrl.xml
+++ b/modules/member/queries/getMemberDeviceTokensByMemberSrl.xml
@@ -8,5 +8,6 @@
     </columns>
     <conditions>
         <condition operation="in" column="member_srl" var="member_srl" notnull="notnull" />
+        <condition operation="in" column="device_type" var="device_type" notnull="notnull" />
     </conditions>
 </query>
diff --git a/modules/member/schemas/member_devices.xml b/modules/member/schemas/member_devices.xml
index f41eb1a6f..141881c79 100644
--- a/modules/member/schemas/member_devices.xml
+++ b/modules/member/schemas/member_devices.xml
@@ -1,12 +1,12 @@
 <table name="member_devices">
 	<column name="device_srl" type="number" notnull="notnull" primary_key="primary_key" />
 	<column name="member_srl" type="number" notnull="notnull" index="idx_member_srl" />
-	<column name="device_token" type="varchar" size="200" notnull="notnull" />
+	<column name="device_token" type="varchar" size="200" notnull="notnull" index="idx_device_token" />
 	<column name="device_key" type="char" size="64" notnull="notnull" />
-	<column name="device_type" type="date" notnull="notnull" index="idx_device_type" />
+	<column name="device_type" type="char" size="1" notnull="notnull" index="idx_device_type" />
 	<column name="device_version" type="varchar" size="20" notnull="notnull" />
 	<column name="device_model" type="varchar" size="40" notnull="notnull" />
 	<column name="device_description" type="varchar" size="200" />
-	<column name="regdate" type="varchar" size="14" notnull="notnull" index="idx_regdate" />
+	<column name="regdate" type="date" notnull="notnull" index="idx_regdate" />
 	<column name="ipaddress" type="varchar" size="120" notnull="notnull" />
 </table>