express-ext 0.1.21 → 0.1.22

package/lib/GenericController.js

@@ -20,10 +20,11 @@ var resources_1 = require("./resources");
 var view_1 = require("./view");
 var GenericController = (function (_super) {
   __extends(GenericController, _super);
-  function GenericController(log, service, status, validate) {
+  function GenericController(log, service, status, validate, build) {
     var _this = _super.call(this, log, service) || this;
     _this.service = service;
     _this.validate = validate;
+    _this.build = build;
     _this.status = edit_1.initializeStatus(status);
     if (service.metadata) {
       var m = service.metadata();
@@ -46,18 +47,18 @@ var GenericController = (function (_super) {
     return this.insert(req, res);
   };
   GenericController.prototype.insert = function (req, res) {
-    validateAndCreate(req, res, this.status, this.service.insert, this.log, this.validate);
+    validateAndCreate(req, res, this.status, this.service.insert, this.log, this.validate, this.build);
   };
   GenericController.prototype.update = function (req, res) {
     var id = buildAndCheckIdWithBody(req, res, this.keys, this.service.update);
     if (id) {
-      validateAndUpdate(res, this.status, req.body, false, this.service.update, this.log, this.validate);
+      validateAndUpdate(res, this.status, req.body, false, this.service.update, this.log, this.validate, this.build);
     }
   };
   GenericController.prototype.patch = function (req, res) {
     var id = buildAndCheckIdWithBody(req, res, this.keys, this.service.patch);
     if (id && this.service.patch) {
-      validateAndUpdate(res, this.status, req.body, true, this.service.patch, this.log, this.validate);
+      validateAndUpdate(res, this.status, req.body, true, this.service.patch, this.log, this.validate, this.build);
     }
   };
   GenericController.prototype.delete = function (req, res) {
@@ -77,7 +78,7 @@ var GenericController = (function (_super) {
   return GenericController;
 }(LoadController_1.LoadController));
 exports.GenericController = GenericController;
-function validateAndCreate(req, res, status, save, log, validate) {
+function validateAndCreate(req, res, status, save, log, validate, build) {
   var obj = req.body;
   if (!obj || obj === '') {
     res.status(400).end('The request body cannot be empty.');
@@ -90,6 +91,9 @@ function validateAndCreate(req, res, status, save, log, validate) {
           res.status(getStatusCode(errors)).json(r).end();
         }
         else {
+          if (build) {
+            build(res, obj, true);
+          }
           edit_1.create(res, status, obj, save, log);
         }
       }).catch(function (err) { return http_1.handleError(err, res, log); });
@@ -100,7 +104,7 @@ function validateAndCreate(req, res, status, save, log, validate) {
   }
 }
 exports.validateAndCreate = validateAndCreate;
-function validateAndUpdate(res, status, obj, isPatch, save, log, validate) {
+function validateAndUpdate(res, status, obj, isPatch, save, log, validate, build) {
   if (validate) {
     validate(obj, isPatch).then(function (errors) {
       if (errors && errors.length > 0) {
@@ -108,6 +112,9 @@ function validateAndUpdate(res, status, obj, isPatch, save, log, validate) {
         res.status(getStatusCode(errors)).json(r).end();
       }
       else {
+        if (build) {
+          build(res, obj, false, isPatch);
+        }
         edit_1.update(res, status, obj, save, log);
       }
     }).catch(function (err) { return http_1.handleError(err, res, log); });
@@ -156,3 +163,69 @@ function getStatusCode(errs) {
   return (edit_1.isTypeError(errs) ? 400 : 422);
 }
 exports.getStatusCode = getStatusCode;
+function useBuild(c, generate) {
+  var b = new Builder(generate, c.id ? c.id : '', c.payload ? c.payload : '', c.user ? c.user : '', c.updatedBy ? c.updatedBy : '', c.updatedAt ? c.updatedAt : '', c.createdBy ? c.createdBy : '', c.createdAt ? c.createdAt : '');
+  return b.build;
+}
+exports.useBuild = useBuild;
+var Builder = (function () {
+  function Builder(generate, id, payload, user, updatedBy, updatedAt, createdBy, createdAt) {
+    this.generate = generate;
+    this.id = id;
+    this.payload = payload;
+    this.user = user;
+    this.updatedBy = updatedBy;
+    this.updatedAt = updatedAt;
+    this.createdBy = createdBy;
+    this.createdAt = createdAt;
+    this.build = this.build.bind(this);
+  }
+  Builder.prototype.build = function (res, obj, isCreate, isPatch) {
+    var o = obj;
+    var usr = '';
+    if (this.user.length > 0) {
+      if (this.payload.length > 0) {
+        var payload = res.locals[this.payload];
+        if (payload) {
+          usr = payload[this.user];
+        }
+      }
+      else {
+        usr = res.locals[this.user];
+      }
+    }
+    if (!usr) {
+      usr = '';
+    }
+    var now = new Date();
+    if (isCreate) {
+      if (this.generate && this.id.length > 0) {
+        o[this.id] = this.generate();
+      }
+      if (usr.length > 0) {
+        if (this.createdAt.length > 0) {
+          o[this.createdAt] = now;
+        }
+        if (this.createdBy.length > 0) {
+          o[this.createdBy] = usr;
+        }
+      }
+    }
+    else if (isPatch) {
+      var keys = Object.keys(o);
+      if (keys.length === 0) {
+        return;
+      }
+    }
+    if (usr.length > 0) {
+      if (this.updatedAt.length > 0) {
+        o[this.updatedAt] = now;
+      }
+      if (this.updatedBy.length > 0) {
+        o[this.updatedBy] = usr;
+      }
+    }
+  };
+  return Builder;
+}());
+exports.Builder = Builder;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "express-ext",
-  "version": "0.1.21",
+  "version": "0.1.22",
   "description": "express-ext",
   "main": "./lib/index.js",
   "types": "./src/index.ts",

package/src/GenericController.ts

@@ -6,18 +6,21 @@ import {Attribute, Attributes, ErrorMessage} from './metadata';
 import {resources} from './resources';
 import {buildAndCheckId, buildId} from './view';
 
+export type Build<T> = (res: Response, obj: T, isCreate?: boolean, isPatch?: boolean) => void;
+export type Validate<T> = (obj: T, patch?: boolean) => Promise<ErrorMessage[]>;
+export type Save<T> = (obj: T, ctx?: any) => Promise<number|ResultInfo<T>>;
 export interface GenericService<T, ID, R> {
   metadata?(): Attributes|undefined;
   load(id: ID, ctx?: any): Promise<T|null>;
   insert(obj: T, ctx?: any): Promise<R>;
   update(obj: T, ctx?: any): Promise<R>;
-  patch?(obj: T, ctx?: any): Promise<R>;
+  patch?(obj: Partial<T>, ctx?: any): Promise<R>;
   delete?(id: ID, ctx?: any): Promise<number>;
 }
 export class GenericController<T, ID> extends LoadController<T, ID> {
   status: StatusConfig;
   metadata?: Attributes;
-  constructor(log: Log, public service: GenericService<T, ID, number|ResultInfo<T>>, status?: StatusConfig, public validate?: (obj: T, patch?: boolean) => Promise<ErrorMessage[]>) {
+  constructor(log: Log, public service: GenericService<T, ID, number|ResultInfo<T>>, status?: StatusConfig, public validate?: Validate<T>, public build?: Build<T>) {
     super(log, service);
     this.status = initializeStatus(status);
     if (service.metadata) {
@@ -40,18 +43,18 @@ export class GenericController<T, ID> extends LoadController<T, ID> {
     return this.insert(req, res);
   }
   insert(req: Request, res: Response): void {
-    validateAndCreate(req, res, this.status, this.service.insert, this.log, this.validate);
+    validateAndCreate(req, res, this.status, this.service.insert, this.log, this.validate, this.build);
   }
   update(req: Request, res: Response): void {
     const id = buildAndCheckIdWithBody<T, ID, any>(req, res, this.keys, this.service.update);
     if (id) {
-      validateAndUpdate(res, this.status, req.body, false, this.service.update, this.log, this.validate);
+      validateAndUpdate(res, this.status, req.body, false, this.service.update, this.log, this.validate, this.build);
     }
   }
   patch(req: Request, res: Response): void {
     const id = buildAndCheckIdWithBody<T, ID, any>(req, res, this.keys, this.service.patch);
     if (id && this.service.patch) {
-      validateAndUpdate(res, this.status, req.body, true, this.service.patch, this.log, this.validate);
+      validateAndUpdate(res, this.status, req.body, true, this.service.patch, this.log, this.validate, this.build);
     }
   }
   delete(req: Request, res: Response): void {
@@ -67,7 +70,7 @@ export class GenericController<T, ID> extends LoadController<T, ID> {
     }
   }
 }
-export function validateAndCreate<T>(req: Request, res: Response, status: StatusConfig, save: (obj: T, ctx?: any) => Promise<number|ResultInfo<T>>, log: Log, validate?: (obj: T, patch?: boolean) => Promise<ErrorMessage[]>): void {
+export function validateAndCreate<T>(req: Request, res: Response, status: StatusConfig, save: Save<T>, log: Log, validate?: Validate<T>, build?: Build<T>): void {
   const obj = req.body;
   if (!obj || obj === '') {
     res.status(400).end('The request body cannot be empty.');
@@ -78,6 +81,9 @@ export function validateAndCreate<T>(req: Request, res: Response, status: Status
           const r: ResultInfo<T> = {status: status.validation_error, errors};
           res.status(getStatusCode(errors)).json(r).end();
         } else {
+          if (build) {
+            build(res, obj, true);
+          }
           create(res, status, obj, save, log);
         }
       }).catch(err => handleError(err, res, log));
@@ -86,13 +92,16 @@ export function validateAndCreate<T>(req: Request, res: Response, status: Status
     }
   }
 }
-export function validateAndUpdate<T>(res: Response, status: StatusConfig, obj: T, isPatch: boolean, save: (obj: T, ctx?: any) => Promise<number|ResultInfo<T>>, log: Log, validate?: (obj: T, patch?: boolean) => Promise<ErrorMessage[]>):  void {
+export function validateAndUpdate<T>(res: Response, status: StatusConfig, obj: T, isPatch: boolean, save: Save<T>, log: Log, validate?: Validate<T>, build?: Build<T>):  void {
   if (validate) {
     validate(obj, isPatch).then(errors => {
       if (errors && errors.length > 0) {
         const r: ResultInfo<T> = {status: status.validation_error, errors};
         res.status(getStatusCode(errors)).json(r).end();
       } else {
+        if (build) {
+          build(res, obj, false, isPatch);
+        }
         update(res, status, obj, save, log);
       }
     }).catch(err => handleError(err, res, log));
@@ -134,3 +143,65 @@ export function getDeleteStatus(count: number): number {
 export function getStatusCode(errs: ErrorMessage[]): number {
   return (isTypeError(errs) ? 400 : 422);
 }
+export interface ModelConfig {
+  id?: string;
+  payload?: string;
+  user?: string;
+  updatedBy?: string;
+  updatedAt?: string;
+  createdBy?: string;
+  createdAt?: string;
+}
+export function useBuild<T>(c: ModelConfig, generate?: (() => string)): Build<T> {
+  const b = new Builder<T>(generate, c.id ? c.id : '', c.payload ? c.payload : '', c.user ? c.user : '', c.updatedBy ? c.updatedBy : '', c.updatedAt ? c.updatedAt : '', c.createdBy ? c.createdBy : '', c.createdAt ? c.createdAt : '');
+  return b.build;
+}
+export class Builder<T> {
+  constructor(public generate: (() => string)|undefined, public id: string, public payload: string, public user: string, public updatedBy: string, public updatedAt: string, public createdBy: string, public createdAt: string) {
+    this.build = this.build.bind(this);
+  }
+  build(res: Response, obj: T, isCreate?: boolean, isPatch?: boolean): void {
+    let o: any = obj;
+    let usr = '';
+    if (this.user.length > 0) {
+      if (this.payload.length > 0) {
+        const payload = res.locals[this.payload];
+        if (payload) {
+          usr = payload[this.user];
+        }
+      } else {
+        usr = res.locals[this.user];
+      }
+    }
+    if (!usr) {
+      usr = '';
+    }
+    const now = new Date();
+    if (isCreate) {
+      if (this.generate && this.id.length > 0) {
+        o[this.id] = this.generate();
+      }
+      if (usr.length > 0) {
+        if (this.createdAt.length > 0) {
+          o[this.createdAt] = now;
+        }
+        if (this.createdBy.length > 0) {
+          o[this.createdBy] = usr;
+        }
+      }
+    } else if (isPatch) {
+      const keys = Object.keys(o);
+      if (keys.length === 0) {
+        return;
+      }
+    }
+    if (usr.length > 0) {
+      if (this.updatedAt.length > 0) {
+        o[this.updatedAt] = now;
+      }
+      if (this.updatedBy.length > 0) {
+        o[this.updatedBy] = usr;
+      }
+    }
+  }
+}

package/src/LoadController.ts

@@ -7,6 +7,7 @@ export interface ViewService<T, ID> {
   metadata?(): Attributes|undefined;
   load(id: ID, ctx?: any): Promise<T|null>;
 }
+export type Load<T, ID> = ((id: ID, ctx?: any) => Promise<T|null>);
 function getViewFunc<T, ID>(viewService: ViewService<T, ID> | ((id: ID, ctx?: any) => Promise<T|null>)): (id: ID, ctx?: any) => Promise<T|null> {
   if (typeof viewService === 'function') {
     return viewService;
@@ -38,8 +39,8 @@ function getKeysFunc<T, ID>(viewService: ViewService<T, ID> | ((id: ID, ctx?: an
 }
 export class LoadController<T, ID> {
   protected keys?: Attribute[];
-  protected view: (id: ID, ctx?: any) => Promise<T|null>;
-  constructor(protected log: Log, viewService: ViewService<T, ID> | ((id: ID, ctx?: any) => Promise<T|null>), keys?: Attributes|Attribute[]|string[]) {
+  protected view: Load<T, ID>;
+  constructor(protected log: Log, viewService: ViewService<T, ID> | Load<T, ID>, keys?: Attributes|Attribute[]|string[]) {
     this.load = this.load.bind(this);
     this.view = getViewFunc(viewService);
     this.keys = getKeysFunc(viewService, keys);