Update /search/ route

api/controllers/FlagController.js

@@ -6,6 +6,32 @@
  */
 
 module.exports = {
-	
-};
 
+  search: function(req, res) {
+    var word = req.param('query'),
+        flagQuery = Flag.find();
+
+    if (word != undefined)
+      flagQuery = Flag.find({
+        where: {
+          or: [
+            {english: {contains: word}},
+            {thai: {contains: word}},
+          ]
+        },
+        sort: {
+          thai: 1,
+          english: 1
+        }
+      });
+
+    flagQuery.limit(10).exec(function(err, flags) {
+      if (err) {
+        res.send(400);
+      } else {
+        res.send(flags);
+      }
+    });
+  }
+
+};

api/controllers/NationalityController.js

@@ -6,6 +6,32 @@
  */
 
 module.exports = {
-	
-};
 
+  search: function(req, res) {
+    var word = req.param('query'),
+        nationalityQuery = Nationality.find();
+
+    if (word != undefined)
+      nationalityQuery = Nationality.find({
+        where: {
+          or: [
+            {english: {contains: word}},
+            {thai: {contains: word}},
+          ]
+        },
+        sort: {
+          thai: 1,
+          english: 1
+        }
+      });
+
+    nationalityQuery.limit(10).exec(function(err, items) {
+      if (err) {
+        res.send(400);
+      } else {
+        res.send(items);
+      }
+    });
+  }
+
+};

api/controllers/PrefixController.js

@@ -6,6 +6,33 @@
  */
 
 module.exports = {
-	
+
+	search: function(req, res) {
+	  var word = req.param('query'),
+	      prefixQuery = Prefix.find();
+
+	  if (word != undefined)
+	    prefixQuery = Prefix.find({
+	      where: {
+	        or: [
+	          {english: {contains: word}},
+	          {thai: {contains: word}},
+	        ]
+	      },
+        sort: {
+          thai: 1,
+          english: 1
+        }
+      });
+
+	  prefixQuery.limit(10).exec(function(err, items) {
+	    if (err) {
+	      res.send(400);
+	    } else {
+	      res.send(items);
+	    }
+	  });
+	}
+
 };
 

api/models/Flag.js

@@ -9,6 +9,50 @@ module.exports = {
 
   attributes: {
 
+    english: {
+      type: 'string',
+      required: true
+    },
+
+    thai: {
+      type: 'string',
+      required: true
+    },
+
+    iso2: {
+      type: 'string',
+      required: true
+    },
+
+    iso3: {
+      type: 'string',
+      required: true
+    },
+
+    continent: {
+      type: 'string',
+      required: true
+    },
+
+    phone_code: {
+      type: 'string'
+    },
+
+    currency: {
+      type: 'string'
+    },
+
+    capital: {
+      type: 'string'
+    },
+
+    languages: {
+      type: 'array'
+    },
+
+    top_level_domain: {
+      type: 'string'
+    }
   }
 };
 

api/models/Nationality.js

@@ -9,6 +9,20 @@ module.exports = {
 
   attributes: {
 
+    thai: {
+      type: 'string',
+      required: true
+    },
+
+    code: {
+      type: 'string',
+      required: true
+    },
+
+    english: {
+      type: 'string'
+    },
+
   }
 };
 

api/models/Prefix.js

@@ -9,6 +9,16 @@ module.exports = {
 
   attributes: {
 
+    thai: {
+      type: 'string',
+      required: true
+    },
+
+    code: {
+      type: 'string',
+      required: true
+    },
+
   }
 };
 

config/connections.js

@@ -56,14 +56,7 @@ module.exports.connections = {
   * Run: npm install sails-mongo                                             *
   *                                                                          *
   ***************************************************************************/
-  someMongodbServer: {
+
-    adapter: 'sails-mongo',
-    host: '10hackintosh',
-    port: 27017,
-    // user: 'username',
-    // password: 'password',
-    // database: 'your_mongo_db_name_here'
-  },
   hackintoshMongo: {
     adapter: 'sails-mongo',
     host: '10hackintosh.vnll',
@@ -72,14 +65,6 @@ module.exports.connections = {
     // password: 'password',
     database: 'feeder',
   },
-  nj2mongo: {
-    adapter: 'sails-mongo',
-    host: 'nj2',
-    port: 27017,
-    // user: 'username',
-    // password: 'password',
-    database: 'bbSailer',
-  },
 
   /***************************************************************************
   *                                                                          *

config/cors.js

@@ -37,7 +37,7 @@ module.exports.cors = {
   *                                                                          *
   ***************************************************************************/
 
-  // allRoutes: false,
+  allRoutes: true,
 
   /***************************************************************************
   *                                                                          *
@@ -47,7 +47,7 @@ module.exports.cors = {
   *                                                                          *
   ***************************************************************************/
 
-  // origin: '*',
+  origin: '*',
 
   /***************************************************************************
   *                                                                          *
@@ -65,6 +65,7 @@ module.exports.cors = {
   ***************************************************************************/
 
   // methods: 'GET, POST, PUT, DELETE, OPTIONS, HEAD',
+  methods: 'GET, OPTIONS, HEAD',
 
   /***************************************************************************
   *                                                                          *

config/env/development.js

@@ -17,8 +17,8 @@ module.exports = {
    * environment (see config/connections.js and config/models.js )           *
    ***************************************************************************/
 
-  // models: {
+  models: {
-  //   connection: 'someMongodbServer'
+    connection: 'hackintoshMongo'
-  // }
+  }
 
 };

config/env/development/connections.js

@@ -0,0 +1,13 @@
+/*module.exports.connections = {
+
+
+  hackintoshMongo: {
+    adapter: 'sails-mongo',
+    host: '10hackintosh.vnll',
+    port: 27017,
+    // user: 'username',
+    // password: 'password',
+    database: 'feeder',
+  }
+};
+*/

config/env/production/connections.js

@@ -0,0 +1,12 @@
+module.exports.connections = {
+
+  njMongo: {
+    adapter: 'sails-mongo',
+    host: 'nj2',
+    port: 27017,
+    // user: 'username',
+    // password: 'password',
+    database: 'bbSailer',
+  }
+
+};

config/policies.js

@@ -31,16 +31,19 @@ module.exports.policies = {
     '*': 'sessionAuth',
     'index': true,
     'find': true,
+    'search': true,
   },
   'prefix': {
     '*': 'sessionAuth',
     'index': true,
     'find': true,
+    'search': true,
   },
   'flag': {
     '*': 'sessionAuth',
     'index': true,
     'find': true,
+    'search': true,
   },
 
   /***************************************************************************

config/routes.js

@@ -34,7 +34,7 @@ module.exports.routes = {
 
   '/': {
     view: 'homepage'
-  }
+  },
 
   /***************************************************************************
   *                                                                          *
@@ -45,5 +45,8 @@ module.exports.routes = {
   * for configuration options and examples.                                  *
   *                                                                          *
   ***************************************************************************/
+  'GET /nationality/search/:query': 'NationalityController.search',
+  'GET /flag/search/:query': 'FlagController.search',
+  'GET /prefix/search/:query': 'PrefixController.search',
 
 };

package.json

@@ -21,7 +21,8 @@
     "include-all": "~0.1.3",
     "rc": "~0.5.0",
     "sails": "~0.11.0",
-    "sails-disk": "~0.10.0"
+    "sails-disk": "~0.10.0",
+    "sails-mongo": "^0.11.2"
   },
   "scripts": {
     "debug": "node debug app.js",
@@ -34,4 +35,4 @@
   },
   "author": "sipp11",
   "license": ""
-}
+}