From 2d4c3af9e04672b2497be32c5eb97c35d62e4627 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: Fri, 22 Jun 2018 20:58:24 +0900
Subject: [PATCH] Add: Real server

---
 src/web/server/app/how_to_play.php             |  2 --
 src/web/server/app/menu_active_app_list.php    |  2 --
 .../menu_active_typing_practice_app_list.php   |  2 --
 .../app/menu_active_typing_test_app_list.php   |  2 --
 src/web/server/record/history_record.php       |  2 --
 src/web/server/record/ranking_record_day.php   |  2 --
 src/web/server/record/ranking_record_hour.php  |  2 --
 src/web/server/record/ranking_record_month.php |  2 --
 src/web/server/record/request_best_record.php  |  2 --
 src/web/server/record/update_best_record.php   | 18 ++++++++----------
 src/web/server/setup/connect_db.php            |  4 ++--
 src/web/server/user/login.php                  |  2 --
 src/web/sql/make_db.sql                        |  6 ++++--
 13 files changed, 14 insertions(+), 34 deletions(-)

diff --git a/src/web/server/app/how_to_play.php b/src/web/server/app/how_to_play.php
index a6fcf63..e8c019f 100644
--- a/src/web/server/app/how_to_play.php
+++ b/src/web/server/app/how_to_play.php
@@ -1,8 +1,6 @@
 <?php
 header('Content-Type: application/json');
 
-include "./../send_error_code.php";
-
 $app_id = $_POST["AppID"];
 
 include "./../setup/connect_db.php";
diff --git a/src/web/server/app/menu_active_app_list.php b/src/web/server/app/menu_active_app_list.php
index 79c82d9..16110c8 100644
--- a/src/web/server/app/menu_active_app_list.php
+++ b/src/web/server/app/menu_active_app_list.php
@@ -1,8 +1,6 @@
 <?php
 header("Content-Type: application/json");
 
-include "./../send_error_code.php";
-
 $maestro_id = $_POST["maestro_id"];
 
 include "./../setup/connect_db.php";
diff --git a/src/web/server/app/menu_active_typing_practice_app_list.php b/src/web/server/app/menu_active_typing_practice_app_list.php
index 9449628..12e837a 100644
--- a/src/web/server/app/menu_active_typing_practice_app_list.php
+++ b/src/web/server/app/menu_active_typing_practice_app_list.php
@@ -1,8 +1,6 @@
 <?php
 header('Content-Type: application/json');
 
-include "./../send_error_code.php";
-
 $maestro_id = $_POST["maestro_id"];
 
 include "./../setup/connect_db.php";
diff --git a/src/web/server/app/menu_active_typing_test_app_list.php b/src/web/server/app/menu_active_typing_test_app_list.php
index 658937c..d1200b4 100644
--- a/src/web/server/app/menu_active_typing_test_app_list.php
+++ b/src/web/server/app/menu_active_typing_test_app_list.php
@@ -1,8 +1,6 @@
 <?php
 header('Content-Type: application/json');
 
-include "./../send_error_code.php";
-
 $maestro_id = $_POST["maestro_id"];
 
 include "./../setup/connect_db.php";
diff --git a/src/web/server/record/history_record.php b/src/web/server/record/history_record.php
index 61ca2df..582be95 100644
--- a/src/web/server/record/history_record.php
+++ b/src/web/server/record/history_record.php
@@ -1,8 +1,6 @@
 <?php
 header('Content-Type: application/json');
 
-include "./../send_error_code.php";
-
 $maestro_id = $_POST["MaestroID"];
 $app_id = $_POST["AppID"];
 $user_id = $_POST["UserID"];
diff --git a/src/web/server/record/ranking_record_day.php b/src/web/server/record/ranking_record_day.php
index 6a30a1e..4ce554c 100644
--- a/src/web/server/record/ranking_record_day.php
+++ b/src/web/server/record/ranking_record_day.php
@@ -1,8 +1,6 @@
 <?php
 header('Content-Type: application/json');
 
-include "./../lib/send_error_code.php";
-
 $maestro_id = $_POST["MaestroID"];
 $app_id = $_POST["AppID"];
 $date = $_POST["Date"];
diff --git a/src/web/server/record/ranking_record_hour.php b/src/web/server/record/ranking_record_hour.php
index 42c0c54..a488f62 100644
--- a/src/web/server/record/ranking_record_hour.php
+++ b/src/web/server/record/ranking_record_hour.php
@@ -1,8 +1,6 @@
 <?php
 header('Content-Type: application/json');
 
-include "./../lib/send_error_code.php";
-
 $maestro_id = $_POST["MaestroID"];
 $app_id = $_POST["AppID"];
 $date = $_POST["Date"];
diff --git a/src/web/server/record/ranking_record_month.php b/src/web/server/record/ranking_record_month.php
index f3c4cc1..672b5ba 100644
--- a/src/web/server/record/ranking_record_month.php
+++ b/src/web/server/record/ranking_record_month.php
@@ -1,8 +1,6 @@
 <?php
 header('Content-Type: application/json');
 
-include "./../lib/send_error_code.php";
-
 $maestro_id = $_POST["MaestroID"];
 $app_id = $_POST["AppID"];
 $date = $_POST["Date"];
diff --git a/src/web/server/record/request_best_record.php b/src/web/server/record/request_best_record.php
index 610624a..4942e6c 100644
--- a/src/web/server/record/request_best_record.php
+++ b/src/web/server/record/request_best_record.php
@@ -1,8 +1,6 @@
 <?php
 header('Content-Type: application/json');
 
-include "./../send_error_code.php";
-
 $maestro_id = $_POST["MaestroID"];
 $user_id = $_POST["UserID"];
 $app_id = $_POST["AppID"];
diff --git a/src/web/server/record/update_best_record.php b/src/web/server/record/update_best_record.php
index bd86733..cc10a9a 100644
--- a/src/web/server/record/update_best_record.php
+++ b/src/web/server/record/update_best_record.php
@@ -1,13 +1,11 @@
 <?php
 header('Content-Type: application/json');
 
-include "./../send_error_code.php";
-
 $maestro_id = $_POST["MaestroID"];
 $user_id = $_POST["UserID"];
 $app_id = $_POST["AppID"];
 $best_record = $_POST["BestRecord"];
-echo $best_record." / ";
+// echo $best_record." / ";
 
 include "./../setup/connect_db.php";
 
@@ -15,15 +13,15 @@ $prev_best_record_id = -1;
 $prev_best_record = 0;
 
 $prev_best_record_id = get_best_record($maestro_id, $app_id, $user_id);
-// echo $prev_best_record_id." ".$prev_best_record;
+// echo "id : ".$prev_best_record_id." ".$prev_best_record;
 
-if($prev_best_record_id == "") {
-	echo "insert";
+if($prev_best_record_id < 0) {
+	// echo "insert";
 	insert_best_record($maestro_id, $app_id, $user_id, $best_record);
 } else {
-	echo $best_record." ".$prev_best_record;
+	// echo $best_record." ".$prev_best_record;
 	if($best_record > $prev_best_record) {
-		echo "update";
+		// echo "update";
 		update_best_record($prev_best_record_id, $best_record);
 	}
 }
@@ -62,7 +60,7 @@ function insert_best_record($maestro_id, $app_id, $user_id, $best_record) {
 		VALUES (?, ?, ?, ?, NOW());
 	";
 	$stmt = $db_conn->prepare($query);
-	$stmt->bind_param('iiii', $maestro_id, $user_id, $app_id, $best_record);
+	$stmt->bind_param('iiid', $maestro_id, $user_id, $app_id, $best_record);
 	$stmt->execute();
 }
 
@@ -75,7 +73,7 @@ function update_best_record($prev_best_record_id, $best_record) {
 		WHERE BestRecordID = ? AND DATE(RecordDateTime) = DATE(NOW()) AND HOUR(RecordDateTime) = HOUR(NOW())
 	";
 	$stmt = $db_conn->prepare($query);
-	$stmt->bind_param('ii', $best_record, $prev_best_record_id);
+	$stmt->bind_param('di', $best_record, $prev_best_record_id);
 	$stmt->execute();
 }
 
diff --git a/src/web/server/setup/connect_db.php b/src/web/server/setup/connect_db.php
index 1fa5e9e..b04c293 100644
--- a/src/web/server/setup/connect_db.php
+++ b/src/web/server/setup/connect_db.php
@@ -1,9 +1,9 @@
 <?php
 
-$hasServiceDBSetting = file_exists("./service_db_setting.php");
+$hasServiceDBSetting = file_exists("./../setup/service_db_setting.php");
 
 if($hasServiceDBSetting == true) {
-	include("./service_db_setting.php");
+	include("./../setup/service_db_setting.php");
 } else {
 	$db_host = "localhost";
 	$db_user = "afterschool";
diff --git a/src/web/server/user/login.php b/src/web/server/user/login.php
index 50dc803..2c75bef 100644
--- a/src/web/server/user/login.php
+++ b/src/web/server/user/login.php
@@ -1,8 +1,6 @@
 <?php
 header('Content-Type: application/json');
 
-include "./../send_error_code.php";
-
 $maestro_name = $_POST["maestro_name"];
 $name = $_POST["name"];
 $enterCode = $_POST["enter_code"];
diff --git a/src/web/sql/make_db.sql b/src/web/sql/make_db.sql
index d6de831..65158b8 100644
--- a/src/web/sql/make_db.sql
+++ b/src/web/sql/make_db.sql
@@ -14,7 +14,7 @@ CREATE TABLE moty_user (
 	UserID INT UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY,
 	MaestroID INT UNSIGNED NOT NULL,
 	Name CHAR(50) NOT NULL,
-	EnterCode CHAR(6) NOT NULL
+	EnterCode CHAR(6) NOT NULL,
 
 	FOREIGN KEY (MaestroID) REFERENCES moty_maestro(MaestroID)
 );
@@ -24,7 +24,9 @@ CREATE TABLE moty_user (
 CREATE TABLE moty_app (
 	AppID INT UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY,
 	AppName CHAR(40) NOT NULL,
-	AppType INT UNSIGNED NOT NULL
+	KoreanName CHAR(40) NOT NULL,
+	AppType INT UNSIGNED NOT NULL,
+	HowToPlay TEXT NOT NULL
 );
 
 CREATE TABLE moty_active_app (