Merge branch 'ohsehun' into 'master'

Ohsehun



See merge request !8

 var express = require('express');
 var express = require('express');
 const request = require('request');
 const request = require('request');
 const TARGET_URL = 'https://api.line.me/v2/bot/message/reply'
 const TARGET_URL = 'https://api.line.me/v2/bot/message/reply'
-const TOKEN = ''
+const TOKEN = 'zVAczqoJ+L9oykqhEj7HoP7f6Nyb+R3T1TntHXQhYihI+KIxH4SZDGpKu0jKsMXMHKBVXpmbybA+oaV8u/dfLppKe3NHXU9AdBVypy9NgfWiFPLlcwm3GdkVPAZGoS4nvOCXWDKUb+ixPKWjlbnChAdB04t89/1O/w1cDnyilFU='
 const fs = require('fs');
 const fs = require('fs');
 const path = require('path');
 const path = require('path');
 const HTTPS = require('https');
 const HTTPS = require('https');
@@ -19,34 +19,8 @@ app.post('/hook', function (req, res) {
     var source = eventObj.source;
     var source = eventObj.source;
     var message = eventObj.message;
     var message = eventObj.message;
 
 
-    // request log
-    console.log('======================', new Date(), '======================');
-    // mwsql
-    var mysql = require('mysql');
-    var db = mysql.createConnection({
-        host: 'chatbot.c7fzgftc3yrm.us-east-1.rds.amazonaws.com',
-        user: 'chatbot',
-        password: '',
-        database: 'chatbot',
-        port: '3306'
-    });
-
-    db.connect();
-
-    db.query('SELECT * FROM data', function (error, results, fields) {
-        if (error) {
-            console.log(error);
-        }
-        var arr = new Array();
-        var input_ingredients_list = message.text.split(" ");
-        for (var i = 0; i < results.length; i++) {
-            var ingredients_list = results[i].ingredients.split(", ");
-            if (ingredients_list.filter(x => input_ingredients_list.includes(x)).length === input_ingredients_list.length) {
-                arr.push(i);
-            }
-        }
-        if (arr.length != 0) {
-            var num = arr[Math.floor(Math.random() * arr.length)];
+    function output_message(results, list) {
+        var num = list[Math.floor(Math.random() * list.length)];
         request.post(
         request.post(
             {
             {
                 url: TARGET_URL,
                 url: TARGET_URL,
@@ -62,7 +36,7 @@ app.post('/hook', function (req, res) {
                         },
                         },
                         {
                         {
                             "type": "text",
                             "type": "text",
-                                "text": `필요한 재료는\n\n"${results[[num]].ingredients}"\n\n입니다.`
+                            "text": `필요한 재료는\n\n"${results[[num]].ingrediant}"\n\n입니다.`
                         },
                         },
                         {
                         {
                             "type": "text",
                             "type": "text",
@@ -74,6 +48,52 @@ app.post('/hook', function (req, res) {
                 console.log(body)
                 console.log(body)
             });
             });
     }
     }
+
+    // request log
+    console.log('======================', new Date(), '======================');
+    // mwsql
+    var mysql = require('mysql');
+    var db = mysql.createConnection({
+        host: 'chatbot.c7fzgftc3yrm.us-east-1.rds.amazonaws.com',
+        user: 'chatbot',
+        password: '11111111',
+        database: 'chatbot',
+        port: '3306'
+    });
+
+    db.connect();
+
+    var max = 0;
+
+    db.query('SELECT * FROM recipe', function (error, results, fields) {
+        if (error) {
+            console.log(error);
+        }
+        var arr1 = new Array();
+        var input_ingredients_list = message.text.split(" ");
+        console.log(input_ingredients_list);
+        for (var i = 0; i < results.length; i++) {
+            var ingredients_list = results[i].ingrediant.split(",");
+            var count = ingredients_list.filter(x => input_ingredients_list.includes(x)).length;
+            if (count > max) {
+                max = count;
+                var arr2 = new Array();
+            }
+            if (count === input_ingredients_list.length) {
+                arr1.push(i);
+            }
+            else if (arr1.length === 0 && count != 0 && count === max) {
+                arr2.push(i);
+            }
+        }
+
+        if (arr1.length != 0) {
+            output_message(results, arr1);
+        }
+
+        else if (arr2.length != 0) {
+            output_message(results, arr2);
+        }
         else {
         else {
             request.post(
             request.post(
                 {
                 {
@@ -94,9 +114,11 @@ app.post('/hook', function (req, res) {
                     console.log(body)
                     console.log(body)
                 });
                 });
         }
         }
+
     });
     });
 
 
     db.end();
     db.end();
+
     res.sendStatus(200);
     res.sendStatus(200);
 });
 });
 
 
@@ -114,4 +136,3 @@ try {
     console.log('[HTTPS] HTTPS 오류가 발생하였습니다. HTTPS 서버는 실행되지 않습니다.');
     console.log('[HTTPS] HTTPS 오류가 발생하였습니다. HTTPS 서버는 실행되지 않습니다.');
     console.log(error);
     console.log(error);
 }
 }
\ No newline at end of file
-