From a8fe0172d41314d717890e220bf2e638783f0e3a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E1=84=8B=E1=85=A2=E1=84=91=E1=85=B3=E1=86=AF=20=E1=84=82?=
 =?UTF-8?q?=E1=85=A9=E1=84=90=E1=85=B3=E1=84=87=E1=85=AE=E1=86=A8?=
 <jisangs@gmail.com>
Date: Wed, 18 Jul 2018 22:36:33 +0900
Subject: [PATCH] Add: moty_player - AccountType 0:player, 1:maestro

---
 src/web/server/maestro/delete_test_player_record.php | 12 ++++++++++--
 src/web/server/maestro/maestro_test_player.php       |  6 +++++-
 src/web/server/player/registered_player_count.php    |  6 +++++-
 src/web/server/player/registered_player_list.php     |  2 +-
 src/web/server/player/search_player_count.php        |  6 +++++-
 src/web/server/player/search_player_list.php         |  2 +-
 src/web/sql/make_db.sql                              |  1 +
 7 files changed, 28 insertions(+), 7 deletions(-)

diff --git a/src/web/server/maestro/delete_test_player_record.php b/src/web/server/maestro/delete_test_player_record.php
index f5b4eff..0e23617 100644
--- a/src/web/server/maestro/delete_test_player_record.php
+++ b/src/web/server/maestro/delete_test_player_record.php
@@ -25,7 +25,11 @@ exit;
 function get_maestro_test_player_id($maestro_id) {
 	global $db_conn;
 
-	$query = "SELECT MaestroTestID FROM moty_maestro WHERE MaestroID=?";
+	$query = "
+		SELECT MaestroTestID
+		FROM moty_maestro
+		WHERE MaestroID = ?
+	";
 	$stmt = $db_conn->prepare($query);
 	$stmt->bind_param('i', $maestro_id);
 	$stmt->execute();
@@ -42,7 +46,11 @@ function get_maestro_test_player_id($maestro_id) {
 function delete_maestro_test_player_record($player_id) {
 	global $db_conn;
 
-	$query = "DELETE FROM moty_best_record WHERE PlayerID=?;";
+	$query = "
+		DELETE
+		FROM moty_best_record
+		WHERE PlayerID = ?
+	";
 	$stmt = $db_conn->prepare($query);
 	$stmt->bind_param('i', $player_id);
 	$stmt->execute();
diff --git a/src/web/server/maestro/maestro_test_player.php b/src/web/server/maestro/maestro_test_player.php
index 780e9c0..2f079f7 100644
--- a/src/web/server/maestro/maestro_test_player.php
+++ b/src/web/server/maestro/maestro_test_player.php
@@ -26,7 +26,11 @@ exit;
 function get_maestro_test_player_id($maestro_id) {
 	global $db_conn;
 
-	$query = "SELECT MaestroTestID FROM moty_maestro WHERE MaestroID=?";
+	$query = "
+		SELECT MaestroTestID
+		FROM moty_maestro
+		WHERE MaestroID = ?
+	";
 	$stmt = $db_conn->prepare($query);
 	$stmt->bind_param("i", $maestro_id);
 	$stmt->execute();
diff --git a/src/web/server/player/registered_player_count.php b/src/web/server/player/registered_player_count.php
index 3d58d57..4664b44 100644
--- a/src/web/server/player/registered_player_count.php
+++ b/src/web/server/player/registered_player_count.php
@@ -22,7 +22,11 @@ exit;
 function getPlayerCount($maestroID) {
 	global $db_conn;
 
-	$query = "SELECT COUNT(PlayerID) FROM moty_player WHERE MaestroID=?";
+	$query = "
+		SELECT COUNT(PlayerID)
+		FROM moty_player
+		WHERE MaestroID = ? AND AccountType <> 1
+	";
 	$stmt = $db_conn->prepare($query);
 	$stmt->bind_param("i", $maestroID);
 	$stmt->execute();
diff --git a/src/web/server/player/registered_player_list.php b/src/web/server/player/registered_player_list.php
index 9ee09ed..696dcb3 100644
--- a/src/web/server/player/registered_player_list.php
+++ b/src/web/server/player/registered_player_list.php
@@ -26,7 +26,7 @@ function get_player_list_page($maestroID, $startNo, $endNo) {
 
 	$query = "
 		SELECT PlayerID, Name, EnterCode FROM moty_player
-		WHERE MaestroID=?
+		WHERE MaestroID = ? AND AccountType <> 1
 		ORDER BY PlayerID DESC
 		LIMIT ?, 10;
 	";
diff --git a/src/web/server/player/search_player_count.php b/src/web/server/player/search_player_count.php
index 567b74e..eebc992 100644
--- a/src/web/server/player/search_player_count.php
+++ b/src/web/server/player/search_player_count.php
@@ -22,7 +22,11 @@ exit;
 function getPlayerCount($maestroID, $playerName) {
 	global $db_conn;
 
-	$query = "SELECT COUNT(PlayerID) FROM moty_player WHERE MaestroID = ? AND Name LIKE CONCAT('%', ?, '%')";
+	$query = "
+		SELECT COUNT(PlayerID)
+		FROM moty_player
+		WHERE MaestroID = ? AND AccountType <> 1 AND Name LIKE CONCAT('%', ?, '%')
+	";
 	$stmt = $db_conn->prepare($query);
 	$stmt->bind_param("is", $maestroID, $playerName);
 	$stmt->execute();
diff --git a/src/web/server/player/search_player_list.php b/src/web/server/player/search_player_list.php
index 580d2a7..6d50cc5 100644
--- a/src/web/server/player/search_player_list.php
+++ b/src/web/server/player/search_player_list.php
@@ -27,7 +27,7 @@ function get_player_list_page($maestroID, $playerName, $startNo, $endNo) {
 
 	$query = "
 		SELECT PlayerID, Name, EnterCode FROM moty_player
-		WHERE MaestroID = ? AND Name LIKE CONCAT('%', ?, '%')
+		WHERE MaestroID = ? AND AccountType <> 1 AND Name LIKE CONCAT('%', ?, '%')
 		ORDER BY PlayerID DESC
 		LIMIT ?, 10;
 	";
diff --git a/src/web/sql/make_db.sql b/src/web/sql/make_db.sql
index 97a8901..7acd9f8 100644
--- a/src/web/sql/make_db.sql
+++ b/src/web/sql/make_db.sql
@@ -15,6 +15,7 @@ CREATE TABLE moty_player (
 	MaestroID INT UNSIGNED NOT NULL,
 	Name CHAR(50) NOT NULL,
 	EnterCode CHAR(6) NOT NULL,
+	AccountType INT UNSIGNED NOT NULL,
 
 	FOREIGN KEY (MaestroID) REFERENCES moty_maestro(MaestroID)
 );