From 89fefaf5a57c974c0af4cd8575236ab1f65768c5 Mon Sep 17 00:00:00 2001
From: Alex Yatskov <alex@foosoft.net>
Date: Wed, 11 Mar 2015 14:41:17 +0900
Subject: [PATCH] Category IDs now ints

---
 scrape/build_db.js  | 9 ++-------
 scrape/package.json | 3 +--
 server/package.json | 3 +--
 server/search.js    | 8 +++-----
 4 files changed, 7 insertions(+), 16 deletions(-)

diff --git a/scrape/build_db.js b/scrape/build_db.js
index 3f1bc49..916948e 100755
--- a/scrape/build_db.js
+++ b/scrape/build_db.js
@@ -22,7 +22,6 @@
  */
 
 var mysql = require('mysql');
-var uuid  = require('node-uuid');
 var data  = require('./data.json');
 
 var conn = mysql.createConnection({
@@ -61,7 +60,7 @@ for (var i = 0, count = data.length; i < count; ++i) {
 //
 
 conn.query('DROP TABLE IF EXISTS categories');
-conn.query('CREATE TABLE categories(description VARCHAR(200) NOT NULL, id VARCHAR(36) NOT NULL PRIMARY KEY)');
+conn.query('CREATE TABLE categories(description VARCHAR(200) NOT NULL, id INT NOT NULL AUTO_INCREMENT PRIMARY KEY)');
 
 var categories = [
     'I prefer quiet places',
@@ -70,11 +69,7 @@ var categories = [
 ];
 
 for (var i = 0, count = categories.length; i < count; ++i) {
-    conn.query(
-        'INSERT INTO categories(description, id) VALUES (?, ?)', [
-        categories[i],
-        uuid.v1()
-    ]);
+    conn.query('INSERT INTO categories(description) VALUES (?)', [categories[i]]);
 }
 
 
diff --git a/scrape/package.json b/scrape/package.json
index f90cf25..0312efd 100644
--- a/scrape/package.json
+++ b/scrape/package.json
@@ -13,7 +13,6 @@
     "mysql": "^2.5.0",
     "underscore": "~1.6.0",
     "node-geocoder": "~2.11.0",
-    "geolib": "~2.0.14",
-    "node-uuid": "~1.4.2"
+    "geolib": "~2.0.14"
   }
 }
diff --git a/server/package.json b/server/package.json
index 70ce419..386a39d 100644
--- a/server/package.json
+++ b/server/package.json
@@ -13,7 +13,6 @@
     "express": "~4.5.1",
     "mysql": "^2.5.0",
     "underscore": "^1.6.0",
-    "geolib": "~2.0.14",
-    "node-uuid": "~1.4.2"
+    "geolib": "~2.0.14"
   }
 }
diff --git a/server/search.js b/server/search.js
index b8b65c1..72158f7 100644
--- a/server/search.js
+++ b/server/search.js
@@ -26,7 +26,6 @@
 var _      = require('underscore');
 var geolib = require('geolib');
 var mysql  = require('mysql');
-var uuid   = require('node-uuid');
 var pool   = null;
 
 
@@ -224,22 +223,21 @@ function getCategories(callback) {
             return {id: row.id, description: row.description};
         });
 
-        callback(categories.reverse());
+        callback(categories);
     });
 }
 
 function addCategory(query, callback) {
     var description = query.description.trim();
-    var id          = uuid.v1();
 
     if (description) {
-        pool.query('INSERT INTO categories(description, id) VALUES(?, ?)', [description, id], function(err, rows) {
+        pool.query('INSERT INTO categories(description) VALUES(?)', [description], function(err, info) {
             if (err) {
                 throw err;
             }
 
             callback({
-                id:          id,
+                id:          info.insertId,
                 description: description,
                 success:     true
             });