Merge d9b6524 into 0ba1ae9

cloud/wfm-rest-api/README.md

@@ -82,7 +82,7 @@ Example `/workorders/B1r71fOBr`
 
 ### Update object
 
-> PUT {object}/
+> PUT {object}/:objectId
 
 ### Delete object
 

cloud/wfm-rest-api/src/impl/ApiController.ts

@@ -95,7 +95,16 @@ export class ApiController<T> {
       return Bluebird.reject(error);
     }
 
-    return this.repository.update(req.body);
+    const data = req.body;
+    const id = req.params.id;
+    if (!id) {
+      const error = new ApiError(errorCodes.CLIENT_ERROR, 'Missing entity id for update', 204);
+      return Bluebird.reject(error);
+    }
+
+    data.id = id;
+
+    return this.repository.update(data);
   }
 
   public buildExpressHandler(handlerFn: (this: this, req: Request) => Bluebird<T | T[] | undefined>): RequestHandler {
@@ -117,11 +126,11 @@ export class ApiController<T> {
 
     router.route('/')
       .get(this.buildExpressHandler(this.listHandler))
-      .post(this.buildExpressHandler(this.postHandler))
-      .put(this.buildExpressHandler(this.putHandler));
+      .post(this.buildExpressHandler(this.postHandler));
     router.route('/:id')
       .get(this.buildExpressHandler(this.getHandler))
-      .delete(this.buildExpressHandler(this.deleteHandler));
+      .delete(this.buildExpressHandler(this.deleteHandler))
+      .put(this.buildExpressHandler(this.putHandler));
 
     return router;
   }

cloud/wfm-rest-api/src/impl/MongoDbRepository.ts

@@ -1,5 +1,6 @@
 import * as Bluebird from 'bluebird';
 import { Collection, Cursor, CursorCommentOptions, Db } from 'mongodb';
+import { ObjectID } from 'mongodb';
 import { generate } from 'shortid';
 import { ApiError } from '../data-api/ApiError';
 import { defaultPaginationEngine } from '../data-api/MongoPaginationEngine';
@@ -13,7 +14,10 @@ const dbError: ApiError = new ApiError(errorCodes.DB_ERROR, 'MongoDbRepository d
 /**
  * Service for performing data operations on mongodb database
  */
-export class MongoDbRepository<T extends { id: string }> implements PagingDataRepository<T> {
+export class MongoDbRepository<T extends {
+  id: string,
+  _id?: string | ObjectID
+}> implements PagingDataRepository<T> {
 
   public db: Db;
   protected collection: Collection<T>;
@@ -53,6 +57,8 @@ export class MongoDbRepository<T extends { id: string }> implements PagingDataRe
     if (!this.db) {
       return Bluebird.reject(dbError);
     }
+    // Find update target by id, do not ask mongo to update the ObjectID
+    delete object._id;
     const id = object.id;
     return Bluebird.resolve(this.collection.updateOne({ id }, object))
       .then(() => this.get(object.id));

cloud/wfm-rest-api/test/ApiControllerTest.ts

@@ -100,7 +100,8 @@ describe('FeedHenry ApiController Tests', function() {
     });
 
     it('verify put middleware success', function() {
-      return expect(testSubject.putHandler({ body: testObj } as Request)).to.eventually.equal(testObj);
+      const request = { params: { id: 1 }, body: testObj };
+      return expect(testSubject.putHandler(request as Request)).to.eventually.equal(testObj);
     });
 
     it('verify delete middleware success', function() {

demo/server/config-dev.json

@@ -1,13 +1,13 @@
 {
-  "morganOptions": null,
+  "morganOptions": "dev",
   "logStackTraces": true,
+  "seedDemoData": true,
   "security": {
     "apiRole": "admin",
     "syncRole": "user"
   },
   "sync": {
-    "customDataHandlers": true,
-    "seedDemoData": true
+    "customDataHandlers": true
   },
   "bunyanConfig": {
     "name": "Demo application",

demo/server/config-prod.json

@@ -2,7 +2,6 @@
   "morganOptions": null,
   "logStackTraces": false,
   "sync": {
-    "customDataHandlers": true,
     "seedDemoData": true
   },
   "security": {

demo/server/nodemon.json

@@ -0,0 +1,9 @@
+{
+  "watch": [
+    "src/**/*.ts"
+  ],
+  "ignore": [
+    "test/**/*.ts"
+  ],
+  "exec": "ts-node ./src/index.ts"
+}

demo/server/package.json

@@ -10,6 +10,7 @@
     "clean": "del coverage_report src/*.js src/**/*.js src/*.map src/**/*.map test/**/*.js test/**/*.map",
     "build": "tsc",
     "start": "ts-node src/index.ts",
+    "watch": "nodemon",
     "test": "nyc mocha"
   },
   "nyc": {
@@ -33,25 +34,26 @@
     "branches": 70
   },
   "devDependencies": {
-    "@types/mongodb": "^2.2.7",
     "@raincatcher/logger": "1.0.0",
     "@types/bluebird": "^3.5.5",
-    "@types/lodash": "^4.14.66",
     "@types/body-parser": "^1.16.3",
     "@types/cookie-parser": "^1.3.30",
+    "@types/cors": "^2.8.1",
     "@types/express": "^4.0.35",
     "@types/express-handlebars": "0.0.29",
+    "@types/lodash": "^4.14.66",
     "@types/mocha": "^2.2.41",
+    "@types/mongodb": "^2.2.7",
     "@types/morgan": "^1.7.32",
-    "@types/serve-favicon": "^2.2.28",
-    "@types/cors": "^2.8.1",
     "@types/node": "^8.0.7",
+    "@types/serve-favicon": "^2.2.28",
     "del-cli": "^1.0.0",
     "grunt": "^1.0.1",
     "grunt-contrib-watch": "^1.0.0",
     "grunt-env": "^0.4.4",
     "grunt-exec": "^2.0.0",
     "mocha": "^3.4.2",
+    "nodemon": "^1.11.0",
     "nyc": "^11.0.1",
     "source-map-support": "^0.4.15",
     "ts-node": "^3.0.4",

demo/server/src/app.ts

@@ -1,11 +1,12 @@
 'use strict';
 
+import { getLogger } from '@raincatcher/logger';
 import * as bodyParser from 'body-parser';
 import * as cookieParser from 'cookie-parser';
 import * as cors from 'cors';
 import * as express from 'express';
 import * as expressHbs from 'express-handlebars';
-import * as logger from 'morgan';
+import * as morgan from 'morgan';
 import * as path from 'path';
 import * as favicon from 'serve-favicon';
 import { securityMiddleware, setupModules } from './modules';
@@ -37,7 +38,7 @@ function getCorsConfig() {
 }
 
 if (config.morganOptions) {
-  app.use(logger(config.morganOptions));
+  app.use(morgan(config.morganOptions));
 }
 app.use(bodyParser.json());
 app.use(bodyParser.urlencoded({ extended: false }));
@@ -62,6 +63,7 @@ let errHandler: express.ErrorRequestHandler;
 
 errHandler = (err: any, req: express.Request, res: express.Response, next: () => void) => {
   res.status(err.status || 500);
+  getLogger().error(err);
   res.json({
     title: 'error',
     message: err.message,