Fixed the connection to db and the routes is now set and added a sample document for a sample product

Author: Venkatesh Katabathula

Documents/couchbase/sampleProduct.json

@@ -0,0 +1,23 @@
+{
+  "name": "Fruit & nut",
+  "Ingredients": [
+    "Fresh Dry Fruits and Nuts",
+    "ButterScotch",
+    "Lightly Salted Butter Softened",
+    "Caster Sugar ",
+    "Ground Cinnamon",
+    "Moroccan Almond Extract",
+    "Plain Flour",
+    "Ground Almonds",
+    "Glacé Cherries",
+    "Mixed Dried Fruit",
+    "Flaked Almonds"
+  ],
+  "availableSizes": [
+    2,
+    3,
+    5
+  ],
+  "measure": "kg",
+  "product_id": "buu:bakery:product:id:0512"
+}

package.json

@@ -4,7 +4,7 @@
   "description": "Sample Express js app",
   "main": "app.js",
   "scripts": {
-    "start": "nodemon src\\app.js --exec babel-node",
+    "start": "nodemon src\\app.js --exec babel-node && eslint .",
     "test": "echo \"Error: no test specified\" && exit 1"
   },
   "repository": {
@@ -20,7 +20,7 @@
   "dependencies": {
     "body-parser": "^1.17.1",
     "cors": "^2.8.3",
-    "couchbase": "^2.2.0",
+    "couchbase": "2.2.0",
     "express": "^4.15.2",
     "morgan": "^1.8.1"
   },

src/app.js

@@ -5,7 +5,7 @@ import bodyParser from 'body-parser';
 
 import config from './common/config.json';
 import logger from './common/logger';
-import ProductRouteHandler from './routes/router-config';
+import routeConfig from './routes/router-config';
 
 let app = express();
 // Setting up the default headers which we receive when a request comes from a browser
@@ -14,7 +14,7 @@ app.use(bodyParser.urlencoded({
   extended: true
 }));
 app.use(function (req, res, next) {
-  logger.log("Received Request"+req.originalUrl);
+  logger.debug("Received Request"+req.originalUrl);
   res.header('Access-Control-Allow-Origin', '*');
   res.header('Access-Control-Allow-Headers', 'Origin, X-Requested-With, Content-Type, Accept');
   next();
@@ -30,14 +30,14 @@ app.use('/', (request, response,next) => {
   //     response.end(JSON.stringify(success.value));
   //   })
   //   .catch(error => {
-  //     logger.log('Caught Error :: ' + error);
+  //     logger.debug('Caught Error :: ' + error);
   //   });
-  logger.log("Received Request on :: "+request.originalUrl);
+  logger.debug("Received Request on :: "+request.originalUrl);
   next();
 });
 
-app.use('/resouces', ProductRouteHandler);
+app.use('/resources', routeConfig);
 // Starting the server on configured port
 app.listen(config.server.port, () => {
-  logger.log('Started server on ' + config.server.port);
+  logger.debug('Started server on ' + config.server.port);
 });

src/common/config.json

@@ -4,7 +4,7 @@
     "port": 9003
   },
   "couchbase": {
-    "bucketName": "bakeryDb",
+    "bucketName": "buusBakery",
     "url": "couchbase://127.0.0.1"
   }
 }

src/common/db-connection.js

@@ -1,12 +1,11 @@
-/**
- * Created by WS33 on 4/16/2017.
- */
 'use strict';
 import couchbase from 'couchbase';
 import config from './config.json';
+import logger from './logger';
+
 let dbConnection = (new couchbase.Cluster(config.couchbase.url))
   .openBucket(config.couchbase.bucketName, null, () => {
-    console.log('Connected to localhost:8091');
+    logger.debug('Connected to localhost:8091');
   });
 
-module.exports = dbConnection;
+export default dbConnection;

src/common/db-util.js

@@ -7,19 +7,20 @@ class dbUtil {
     return new Promise((resolve, reject) => {
       dbConnection.get(documentName, (error, data) => {
         if (error) {
-          logger.console.error('Error loading Data :: ' + error);
+          logger.error('Error loading Data :: ' + error);
           reject(error);
         } else {
           resolve(data);
         }
       });
     });
   }
-  static queryDb(queryString){
-    return new Promise((resolve,reject) =>{
-      dbConnection.query(queryString, (error, data)=>{
-        if(error) {
-          logger.error("Error fetching data from db ::: "+error);
+
+  static queryDb (queryString) {
+    return new Promise((resolve, reject) => {
+      dbConnection.query(queryString, (error, data) => {
+        if (error) {
+          logger.error('Error fetching data from db ::: ' + error);
           reject(error);
         }
         else {
@@ -30,4 +31,4 @@ class dbUtil {
   }
 }
 
-module.exports = dbUtil;
+export default dbUtil;

src/data-layer/product-data.js

@@ -1,6 +1,2 @@
-import dbBucket from './../common/db-util';
-
-let productData = {
-  
-};
+let productData = {};
 export default productData;

src/routes/product-route-handler.js

@@ -1,30 +1,38 @@
 import express from 'express';
+import { N1qlQuery }from 'couchbase';
 
 import dbUtil from './../common/db-util';
 import logger from './../common/logger';
+import { couchbase } from './../common/config.json';
 
 let router = express.Router();
-router.get('/', (request, response, next) => {
-  logger.log("Received request to get all products :: ");
-  let queryString = "Select * from bakery-db where product_id like buu:bakery:product:id%";
-  dbUtil.queryDb(queryString)
+let bucket = `${couchbase.bucketName}`;
+router.get('/', (request, response) => {
+  logger.debug('Received request to get all products :: ' + request.originalUrl);
+  let queryString = 'Select * from ' + bucket + ' where product_id like \'buu:bakery:product:id%\'';
+  logger.info('query fired :: ' + queryString);
+  dbUtil.queryDb(N1qlQuery.fromString(queryString))
     .then(dbResponse => {
-      response = {
-        data: dbResponse.data,
+      // logger.info('dbResponse ::: ' + JSON.stringify(dbResponse));
+      response.json({
+        data: dbResponse,
         success: true
-      };
-      next();
+      });
+      // logger.info('Response:: ' + JSON.stringify(response));
     })
     .catch(error => {
-      response = {
+      logger.debug('Error :: ' + error);
+      response.json({
         success: false,
         message: error
-      }
+      });
+
     });
-  logger.log(response);
+  // logger.debug(response);
 });
 
 router.post('/products', (request, response) => {
-  logger.log("response :: " + response);
+  response = {success: true};
+  logger.debug('response :: ' + response);
 });
 export default router;

src/routes/router-config.js

@@ -1,9 +1,20 @@
+'use strict';
 import productRouteHandler from './product-route-handler';
 
 import express from 'express';
+let router = express.Router();
 
-let app = express();
-export default ( request, response, next ) => {
-  app.get( '/', productRouteHandler );
-  next();
-}
+router.use('/', productRouteHandler);
+export default router;
+
+/*
+ export default (request, response) => {
+ /!*app.get('/', (request, response) => {
+ logger.info('received request ::: ' + request.originalUrl);
+ response = {success: true};
+ logger.debug(response);
+
+ });*!/
+ router.get('/', productRouteHandler);
+ }
+ */