@simitgroup/simpleapp-generator 2.0.2-f-alpha → 2.0.2-h-alpha

package/ReleaseNote.md

@@ -1,3 +1,14 @@
+[2.0.2h-alpha]
+
+1. added error handling event for create,update,delete,setStatus
+2. improve saga document number generator check max 10 number ahead base on target document's unique key (with data isolation)
+
+
+[2.0.2g-alpha]
+
+1. fix search no header return pagination
+
+
 [2.0.2f-alpha]
 
 1. fix mini-app search condition

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@simitgroup/simpleapp-generator",
-  "version": "2.0.2f-alpha",
+  "version": "2.0.2h-alpha",
   "description": "frontend nuxtjs and backend nests code generator using jsonschema",
   "main": "dist/index.js",
   "scripts": {

package/templates/nest/src/simple-app/_core/features/document-no-format/document-no-format.service.ts.eta

@@ -1,7 +1,7 @@
 import { UserContext } from '../user-context/user.context';
 import { InjectModel } from '@nestjs/mongoose';
 import { Model, FilterQuery } from 'mongoose';
-import { DocNumberFormatResult, ForeignKey, SchemaFields } from '../../framework/schemas';
+import { DocNumberFormatResult, ForeignKey, IsolationType, SchemaFields } from '../../framework/schemas';
 import { DocumentNoFormat, DocumentNoFormatPreview } from './document-no-format.schema';
 import { Injectable, InternalServerErrorException, BadRequestException } from '@nestjs/common';
 import { alldocuments } from './document.dict';
@@ -9,6 +9,7 @@ import dayjs from 'dayjs';
 
 export class SimpleAppDocumentNoFormatService {
   constructor(@InjectModel('DocumentNoFormat') private docformat: Model<DocumentNoFormat>) {}
+  getDocumentMeta = (docType:string)=> alldocuments.find(x => x.docType === docType)
 
   async runListDocFormats(appUser: UserContext, doctype: string) {
     doctype = doctype.toUpperCase();
@@ -69,13 +70,26 @@ export class SimpleAppDocumentNoFormatService {
     const result = await this.docformat.find(filter).session(session);
     if (result && result.length > 0) {
       const d: DocumentNoFormat = result[0];
+      const initNumber = d.nextNumber
       const recordId = d._id;
-      const newdocno = SimpleAppDocumentNoFormatService.previewDocNo(d);
-      const newnextnumber = d.nextNumber + 1;
+      // const newdocno = SimpleAppDocumentNoFormatService.previewDocNo(d);
+
+      const checker = await this.documentNumberChecker(appUser,doctype,d)
+
+      if(!checker.accept){
+        d.nextNumber = initNumber
+        const errdocno = SimpleAppDocumentNoFormatService.previewDocNo(d);        
+        throw new InternalServerErrorException(`Unique Key ${errdocno} conflict`);
+      }
+
+      const newdocno = checker.newDocNo
+      const newnextnumber = initNumber + checker.offset;
       const updatedata = { nextNumber: newnextnumber } as DocumentNoFormat;
 
       const options = process.env.BlockGenerateDocNumberWithSession ? {} : { session: session };
       const updateresult = await this.docformat.findByIdAndUpdate(recordId, updatedata, options);
+      result[0].nextNumber = initNumber
+      // console.log('add transaction step for update document no',[result[0]])
       appUser.addTransactionStep('update','documentnoformat',[recordId],[result[0]])
       if (updateresult) {
         const result: DocNumberFormatResult = {
@@ -211,17 +225,27 @@ export class SimpleAppDocumentNoFormatService {
     //
     Object.assign(filter, appUser.getBranchFilter());
     const result = await this.docformat.find(filter).session(appUser.getDBSession());
+
     if (result && result.length > 0) {
       const d: DocumentNoFormat = result[0];
-      const recordId = d._id;
+      const initNumber = d.nextNumber
+      const checker = await this.documentNumberChecker(appUser,doctype,d)
 
-      for (let i = 0; i < quantity; i++) {
-        d.nextNumber++;
+      if(!checker.accept){
+        d.nextNumber = initNumber
+        const errdocno = SimpleAppDocumentNoFormatService.previewDocNo(d);        
+        throw new InternalServerErrorException(`Unique Key ${errdocno} conflict during request-multiple-number`);
+      }
+
+
+      d.nextNumber=initNumber + checker.offset - 1 //offset will return >=1, we want start from 0
+      const recordId = d._id;
+      for (let i = 0; i < quantity; i++) {        
         const newdocno = SimpleAppDocumentNoFormatService.previewDocNo(d);
         documentNumbers.push(newdocno);
+        d.nextNumber++;
       }
-      const updatedata = { nextNumber: d.nextNumber + 1 } as DocumentNoFormat;
-
+      const updatedata = { nextNumber: d.nextNumber } as DocumentNoFormat;
       const options = process.env.BlockGenerateDocNumberWithSession ? {} : { session: appUser.getDBSession(), };
       const updateresult = await this.docformat.findByIdAndUpdate(recordId, updatedata, options);
       appUser.addTransactionStep('update','documentnoformat',[recordId],[result[0]])
@@ -230,4 +254,51 @@ export class SimpleAppDocumentNoFormatService {
       throw new BadRequestException(`No active document number found for ${doctype}. Please update in Settings > Document Numbering Format`);
     }
   }
+
+  applyIsolationFilter (appUser:UserContext, filter:any, docType:string){
+    const docMeta = this.getDocumentMeta(docType)
+    if(docMeta.isolationType===IsolationType.tenant) {
+      filter['tenantId'] = appUser.tenantId
+    }
+    if(docMeta.isolationType===IsolationType.org) {
+      filter['tenantId'] = appUser.tenantId
+      filter['orgId'] = appUser.orgId
+    }
+    if(docMeta.isolationType===IsolationType.branch) {
+      filter['tenantId'] = appUser.tenantId
+      filter['orgId'] = appUser.orgId
+      filter['branchId'] = appUser.branchId
+    }
+      
+    return filter
+  }
+
+
+  async documentNumberChecker(appUser:UserContext,docType:string,docFormat:DocumentNoFormat){
+
+    const docMeta = this.getDocumentMeta(docType)
+    const collectionName = docMeta.docName.toLowerCase()
+    const collection = this.docformat.db.collection(collectionName);
+    const codeField = docMeta.uniqueKey 
+    let newdocno = ''
+    let attempt = 0;
+    let accept = false;
+    // console.log("run documentNumberChecker")
+    for (attempt = 0; attempt < 10; attempt++) {      
+      newdocno = SimpleAppDocumentNoFormatService.previewDocNo(docFormat);        
+      const tmpFilter = { [codeField]: newdocno}
+      const filter = this.applyIsolationFilter(appUser, tmpFilter,docType)
+      // console.log("filter",filter)
+      const existDoc = await collection.findOne(filter);
+      docFormat.nextNumber += 1
+      if (existDoc) {
+        continue;
+      }
+      accept=true;
+      // console.log('accepted at attempt=',attempt)
+      break;      
+    }
+    // console.log('finally attempt',attempt+1)
+    return Promise.resolve({accept:accept,offset:attempt+1, newDocNo:newdocno})
+  }
 }

package/templates/nest/src/simple-app/_core/features/document-no-format/document.dict.ts.eta

@@ -4,7 +4,8 @@
  * last change 2023-10-28
  * Author: Ks Tan
  */
-export const alldocuments:any[] = [
+import { DocumentDictEntry } from 'src/simple-app/_core/framework/schemas';
+export const alldocuments:DocumentDictEntry[] = [
     <%for(let i=0; i<it.modules.length;i++){ %>
       <% const d = it.modules[i] %>      
       <% const conf =  d.schema["x-simpleapp-config"] %>

package/templates/nest/src/simple-app/_core/features/event/interface/event-error-create.interface.ts.eta

@@ -0,0 +1,5 @@
+import { UserContext } from '../../user-context/user.context';
+import { CreatePayload } from '../event.type';
+export interface EventErrorCreate<T> {
+  errorCreate(appUser: UserContext, payload: CreatePayload<T>,err:any): Promise<void>;
+}

package/templates/nest/src/simple-app/_core/features/event/interface/event-error-delete.interface.ts.eta

@@ -0,0 +1,5 @@
+import { UserContext } from '../../user-context/user.context';
+import { DeletePayload } from '../event.type';
+export interface EventErrorDelete<T> {
+  errorDelete(appUser: UserContext, payload: DeletePayload<T>,err:any): Promise<void>;
+}

package/templates/nest/src/simple-app/_core/features/event/interface/event-error-patch.interface.ts.eta

@@ -0,0 +1,5 @@
+import { UserContext } from '../../user-context/user.context';
+import { PatchPayload } from '../event.type';
+export interface EventErrorPatch<T> {
+  errorPatch(appUser: UserContext, payload: PatchPayload<T>,err:any): Promise<void>;
+}

package/templates/nest/src/simple-app/_core/features/event/interface/event-error-set-status.interface.ts.eta

@@ -0,0 +1,5 @@
+import { UserContext } from '../../user-context/user.context';
+import { BeforeSetStatusPayload } from '../event.type';
+export interface EventErrorSetStatus<T> {
+  errorSetStatus(appUser: UserContext, payload: BeforeSetStatusPayload<T>,err:any): Promise<void>;
+}

package/templates/nest/src/simple-app/_core/features/event/interface/event-error-update.interface.ts.eta

@@ -0,0 +1,5 @@
+import { UserContext } from '../../user-context/user.context';
+import { UpdatePayload } from '../event.type';
+export interface EventErrorUpdate<T> {
+  errorUpdate(appUser: UserContext, payload: UpdatePayload<T>,err:any): Promise<void>;
+}

package/templates/nest/src/simple-app/_core/features/event/interface/index.ts.eta

@@ -6,3 +6,7 @@ export * from './event-before-delete.interface';
 export * from './event-after-delete.interface';
 export * from './event-before-set-status.interface';
 export * from './event-after-set-status.interface';
+export * from './event-error-create.interface';
+export * from './event-error-update.interface';
+export * from './event-error-delete.interface';
+export * from './event-error-set-status.interface';

package/templates/nest/src/simple-app/_core/framework/base/simple-app.controller.ts.eta

@@ -51,16 +51,13 @@ export class SimpleAppController<TService extends ServiceType, TApiSchema> {
     return this.service.fullTextSearch(appuser, body);
   }
 
-  async _search(appuser: UserContext, searchObject: SearchBody, res?: Response) {    
-    const items = await this.service.searchWithPageInfo(
-      appuser,
-      searchObject['filter'],
-      searchObject['fields'],
-      searchObject['sorts'],
-      searchObject['lookup'],
-      searchObject['pagination'],
-    );
-    
+  async _search(appuser: UserContext, searchObject: SearchBody, res?: Response) {
+    //return this.service.search(appuser, searchObject['filter'], searchObject['fields'], searchObject['sorts'], searchObject['lookup']);
+    const items = await this.service.searchWithPageInfo(appuser, searchObject['filter'], searchObject['fields'], searchObject['sorts'], searchObject['lookup'], searchObject['pagination']);
+    const total = await this.service.getTotalCount(appuser, searchObject['filter'] || {});
+    const pageSize = searchObject['pagination']?.pageSize || items.length;
+    const pageNo = searchObject['pagination']?.pageNo || 0;
+    this.service.setPaginationHeaders(res, total, { pageSize, pageNo });
     return items;
   }
 

package/templates/nest/src/simple-app/_core/framework/base/simple-app.service.ts.eta

@@ -53,7 +53,8 @@ export class SimpleAppService<T extends SchemaFields> {
   protected documentIdentityLabel = 'label';
   protected documentName = '-unknowndocname-';
   protected documentType = '-unknowndoctype-';
-  protected LIMITPERPAGE = 20;
+  protected LIMITPERPAGE = 500;
+  protected MAX_PAGE_SIZE = 100000;
   protected moreAutoCompleteField: MoreProjectionType = {};
   protected isolationtype: IsolationType = IsolationType.org;
   protected isolationFilter: any = {};
@@ -256,10 +257,9 @@ export class SimpleAppService<T extends SchemaFields> {
     projection: string[] = undefined,
     sort: any = undefined,
     lookup: { [key: string]: string } = undefined,
-     pagination?: { pageSize?: number; pageNo?: number },
+    pagination?: { pageSize?: number; pageNo?: number },
   ) {
     try {
-      
       const isolationFilter = { ...this.getIsolationFilter(appUser) };
       this.polishIsolationFilter(isolationFilter);
 
@@ -273,12 +273,12 @@ export class SimpleAppService<T extends SchemaFields> {
       if (lookup === undefined) {
         this.logger.debug('after search', newfilters);
         let query = this.doc.find(newfilters, projection, { session: appUser.getDBSession() }).sort(sort);
-        
+
         if (pagination) {
           const { pageSize, pageNo, skip } = this.buildPagination(pagination);
           query = query.skip(skip).limit(pageSize);
         }
-        
+
         searchResults = await query.exec();
       } else {
         const pipelines = this.searchToAggregate(appUser, newfilters, projection, sort, lookup, pagination);
@@ -321,7 +321,7 @@ export class SimpleAppService<T extends SchemaFields> {
       let pageSize: number;
       let pageNo: number;
       let skip: number;
-      
+
       if (pagination !== undefined) {
         const paginationResult = this.buildPagination(pagination);
         pageSize = paginationResult.pageSize;
@@ -341,25 +341,13 @@ export class SimpleAppService<T extends SchemaFields> {
         const baseQuery = this.doc.find(newfilters, projection, { session: appUser.getDBSession() }).sort(sort);
         const query = baseQuery.skip(skip).limit(pageSize);
 
-        const [rows, count] = await Promise.all([
-          query.exec(),
-          this.doc.countDocuments(newfilters).session(appUser.getDBSession()),
-        ]);
+        const [rows, count] = await Promise.all([query.exec(), this.doc.countDocuments(newfilters).session(appUser.getDBSession())]);
         items = rows;
         total = count;
       } else {
-        const pipelines = this.searchToAggregate(
-          appUser,
-          newfilters,
-          projection as any,
-          sort as any,
-          lookup as any,
-          { pageSize, pageNo },
-        );
-
-        const countPipeline: PipelineStage[] = [
-          { $match: newfilters },
-        ];
+        const pipelines = this.searchToAggregate(appUser, newfilters, projection as any, sort as any, lookup as any, { pageSize, pageNo });
+
+        const countPipeline: PipelineStage[] = [{ $match: newfilters }];
         const collections = Object.keys(lookup);
         collections.forEach((tokey: string) => {
           const toarr = tokey.split('.');
@@ -380,13 +368,10 @@ export class SimpleAppService<T extends SchemaFields> {
 
         this.logger.debug('after aggregate searchWithPageInfo', pipelines);
 
-        const [rows, countResult] = await Promise.all([
-          this.aggregate(appUser, pipelines),
-          this.aggregate(appUser, countPipeline),
-        ]);
-        
+        const [rows, countResult] = await Promise.all([this.aggregate(appUser, pipelines), this.aggregate(appUser, countPipeline)]);
+
         items = rows as T[];
-        total = countResult && countResult.length > 0 ? (countResult[0]['total'] || 0) : 0;
+        total = countResult && countResult.length > 0 ? countResult[0]['total'] || 0 : 0;
       }
 
       return items;
@@ -409,10 +394,10 @@ export class SimpleAppService<T extends SchemaFields> {
 
   setPaginationHeaders(res: Response, total?: number, pagination?: { pageSize?: number; pageNo?: number }) {
     if (!res || typeof res.setHeader !== 'function') return;
-    
+
     if (total !== undefined && total !== null && pagination) {
       const { pageSize, pageNo } = this.buildPagination(pagination);
-      const pageCount = pageSize > 0 && total > 0 ? Math.ceil(total / pageSize) : (total > 0 ? 1 : 0);
+      const pageCount = pageSize > 0 && total > 0 ? Math.ceil(total / pageSize) : total > 0 ? 1 : 0;
       res.setHeader('x-page-count', pageCount);
       res.setHeader('x-page-size', pageSize);
       res.setHeader('x-page-no', pageNo);
@@ -427,30 +412,28 @@ export class SimpleAppService<T extends SchemaFields> {
 
   buildPagination(pagination?: { pageSize?: number; pageNo?: number }) {
     let finalPageSize: number;
-    if (pagination && typeof pagination.pageSize === 'number' && pagination.pageSize > 0) {
-      finalPageSize = pagination.pageSize;
+    if (pagination && typeof pagination.pageSize === 'number') {
+      if (pagination.pageSize === 0) {
+        finalPageSize = this.MAX_PAGE_SIZE;
+      } else if (pagination.pageSize > 0) {
+        finalPageSize = Math.min(pagination.pageSize, this.MAX_PAGE_SIZE);
+      } else {
+        finalPageSize = this.MAX_PAGE_SIZE;
+      }
     } else if (pagination !== undefined) {
-      finalPageSize = 10000;
+      finalPageSize = this.MAX_PAGE_SIZE;
     } else {
       finalPageSize = this.LIMITPERPAGE;
     }
-    
+
     const rawPageNo = Number.isFinite(pagination?.pageNo) ? pagination.pageNo : 0;
     const pageNo = rawPageNo < 0 ? 0 : rawPageNo;
     const skip = pageNo * finalPageSize;
-    
-    this.logger.debug('buildPagination result:', { 
-      input: pagination, 
-      finalPageSize, 
-      pageNo, 
-      skip 
-    });
-    
+
+
     return { pageSize: finalPageSize, skip, pageNo };
   }
 
-  
-
   async fullTextSearch(appUser: UserContext, body: TextSearchBody) {
     try {
       //{filters:string[],fields:string[]}
@@ -544,9 +527,9 @@ export class SimpleAppService<T extends SchemaFields> {
 
       try {
         const result = await this.doc.insertMany(datas, { session: dbsession });
-        const allIds = datas.map(item=>item._id)
-        const allLogData = datas.map(item=>null)
-        appUser.addTransactionStep('createMany',this.documentName,allIds,allLogData);
+        const allIds = datas.map((item) => item._id);
+        const allLogData = datas.map((item) => null);
+        appUser.addTransactionStep('createMany', this.documentName, allIds, allLogData);
 
         await this.addManyAuditEvents(appUser, this.documentName, 'createMany', datas);
         for (const data of datas) {
@@ -592,28 +575,21 @@ export class SimpleAppService<T extends SchemaFields> {
     this.applyNestedDateTime(appUser, data, 'create');
 
     //new way of hook
-    await this.runEvent(appUser, this.setHookName('beforeCreate'), { data: data }, false);
+    await this.runEvent(appUser, 'beforeCreate', { data: data }, false);
 
     this.logger.debug(data, `Create Record ${this.documentName}`);
     const newdoc = new this.doc(data);
     await this.identifyForeignKeys(appUser, data);
     try {
       result = await newdoc.save({ session: dbsession });
-      appUser.addTransactionStep('create',this.documentName,[data._id],[null]);
+      appUser.addTransactionStep('create', this.documentName, [data._id], [null]);
       await this.addAuditEvent(appUser, this.documentName, result._id, 'create', data);
       appUser.addInsertedRecordId(this.documentName, result._id);
-    } catch (err) {
-      this.logger.error(err);
-      throw err;
-    }
-
-    try {
-      //new way of hook
-      await this.runEvent(appUser, this.setHookName('afterCreate'), { data: result }, false);
-
+      await this.runEvent(appUser, 'afterCreate', { data: result }, false);
       await this.callWebhook(appUser, 'create', result);
       return result as T;
     } catch (err) {
+      await this.runErrorEvent(appUser, 'errorCreate', data, err)
       throw new InternalServerErrorException(`createHook ${this.documentType} error: ${JSON.stringify(err)}`, `${this.documentType} createHook error`);
     }
   }
@@ -725,7 +701,7 @@ export class SimpleAppService<T extends SchemaFields> {
     let dependency;
     try {
       //new way of hook
-      await this.runEvent(appUser, this.setHookName('beforeDelete'), { id: id, deleteData: deletedata }, false);
+      await this.runEvent(appUser, 'beforeDelete', { id: id, deleteData: deletedata }, false);
 
       // if (this.hooks.beforeDelete) await this.hooks.beforeDelete(appUser, id, deletedata);
       this.logger.debug('delete record', this.documentName, id);
@@ -737,8 +713,7 @@ export class SimpleAppService<T extends SchemaFields> {
         filterIsolation['_id'] = id;
         this.logger.debug('delete filter', filterIsolation);
         const result = await this.doc.deleteOne(filterIsolation).session(dbsession);
-        appUser.addTransactionStep('delete',this.documentName,[id],[deletedata]);
-
+        appUser.addTransactionStep('delete', this.documentName, [id], [deletedata]);
 
         await this.addAuditEvent(appUser, this.documentName, id, 'delete', deletedata);
 
@@ -751,7 +726,7 @@ export class SimpleAppService<T extends SchemaFields> {
         // this.doc.findByIdAndDelete(id)
 
         //new way of hook
-        await this.runEvent(appUser, this.setHookName('afterDelete'), { id: id, deleteData: deletedata }, false);
+        await this.runEvent(appUser, 'afterDelete', { id: id, deleteData: deletedata }, false);
 
         await this.callWebhook(appUser, 'delete', deletedata);
         return deleteresult;
@@ -764,6 +739,7 @@ export class SimpleAppService<T extends SchemaFields> {
       if (err instanceof ForbiddenException) {
         throw new ForbiddenException(err);
       } else {
+        await this.runErrorEvent(appUser, 'errorDelete', deletedata, err)
         throw new InternalServerErrorException(err);
       } //JSON.stringify(dependency),JSON.stringify(dependency)
     }
@@ -848,7 +824,7 @@ export class SimpleAppService<T extends SchemaFields> {
       await this.identifyForeignKeys(appUser, data);
 
       //new way of hook
-      await this.runEvent(appUser, this.setHookName('beforeUpdate'), { id: id, prevData: existingdata, newData: data }, false);
+      await this.runEvent(appUser, 'beforeUpdate', { id: id, prevData: existingdata, newData: data }, false);
 
       // if (this.hooks.beforeUpdate) await this.hooks.beforeUpdate(appUser, id, existingdata, data);
 
@@ -876,16 +852,17 @@ export class SimpleAppService<T extends SchemaFields> {
         new: true,
       });
 
-      appUser.addTransactionStep('update',this.documentName,[id],[existingdata]);
+      appUser.addTransactionStep('update', this.documentName, [id], [existingdata]);
       await this.addAuditEvent(appUser, this.documentName, id, 'update', data);
 
       appUser.addUpdatedRecordId(this.documentName, data._id);
-      await this.runEvent(appUser, this.setHookName('afterUpdate'), { id: id, prevData: existingdata, newData: data }, false);
+      await this.runEvent(appUser, 'afterUpdate', { id: id, prevData: existingdata, newData: data }, false);
 
       await this.callWebhook(appUser, 'update', result);
       return result; // await this.findById(appUser, id);
     } catch (err) {
       this.logger.error(err);
+      await this.runErrorEvent(appUser, 'errorUpdate', data, err)
       throw new InternalServerErrorException(err.message);
     }
   };
@@ -909,7 +886,7 @@ export class SimpleAppService<T extends SchemaFields> {
 
       await this.identifyForeignKeys(appUser, data);
 
-      await this.runEvent(appUser, this.setHookName('beforeUpdate'), { data: data }, false);
+      await this.runEvent(appUser, 'beforeUpdate', { data: data }, false);
 
       // if (this.hooks.beforeUpdate) await this.hooks.beforeUpdate(appUser, id, existingdata, data);
 
@@ -937,10 +914,10 @@ export class SimpleAppService<T extends SchemaFields> {
         new: true,
       });
 
-      appUser.addTransactionStep('update',this.documentName,[id],[existingdata]);
+      appUser.addTransactionStep('update', this.documentName, [id], [existingdata]);
       await this.addAuditEvent(appUser, this.documentName, id, 'update', data);
 
-      await this.runEvent(appUser, this.setHookName('afterUpdate'), { id: id, prevData: existingdata, newData: result }, false);
+      await this.runEvent(appUser, 'afterUpdate', { id: id, prevData: existingdata, newData: result }, false);
       appUser.addUpdatedRecordId(this.documentName, data._id);
 
       await this.callWebhook(appUser, 'update', result);
@@ -970,7 +947,7 @@ export class SimpleAppService<T extends SchemaFields> {
 
       //patch not suitable trigger afterupdate
       // if (this.hooks.beforeUpdate) await this.hooks.beforeUpdate(appUser, id, existingdata, data);
-      await this.runEvent(appUser, this.setHookName('beforePatch'), { id: id, patchData: data, prevData: existingdata }, false);
+      await this.runEvent(appUser, 'beforePatch', { id: id, patchData: data, prevData: existingdata }, false);
       const dbsession = appUser.getDBSession();
       if (!appUser.inTransaction()) {
         appUser.startTransaction();
@@ -998,13 +975,13 @@ export class SimpleAppService<T extends SchemaFields> {
         session: dbsession,
         new: true,
       });
-      appUser.addTransactionStep('update',this.documentName,[id],[existingdata]);
+      appUser.addTransactionStep('update', this.documentName, [id], [existingdata]);
       //skip audit trail, useful when want to patch x-foreignkey code,label
       if (!skipLog) {
         await this.addAuditEvent(appUser, this.documentName, id, 'patch', data);
       }
       appUser.addUpdatedRecordId(this.documentName, data._id);
-      await this.runEvent(appUser, this.setHookName('afterPatch'), { id: id, patchData: data, prevData: existingdata }, false);
+      await this.runEvent(appUser, 'afterPatch', { id: id, patchData: data, prevData: existingdata }, false);
       return result; //await this.findById(appUser, id);
     } catch (err) {
       this.logger.error(err.message, 'findIdThenPath error');
@@ -1023,10 +1000,9 @@ export class SimpleAppService<T extends SchemaFields> {
     // const result = await this.doc.insertMany(datas, { session: dbsession });
     // const allIds = datas.map(item=>item._id)
     // const allLogData = datas.map(item=>null)
-    
 
     const result = await this.doc.deleteMany({ _id: { $in: ids } }, { session: dbsession });
-    appUser.addTransactionStep('deleteMany',this.documentName,ids,searchResult);
+    appUser.addTransactionStep('deleteMany', this.documentName, ids, searchResult);
     // console.log(`Delete ${this.documentName} ids`, ids, result);
     for (const id of ids) {
       appUser.addDeletedRecordId(this.documentName, id);
@@ -1057,7 +1033,7 @@ export class SimpleAppService<T extends SchemaFields> {
     const ids = searchResult.map((row) => row._id);
 
     const result = await this.doc.updateMany(isolationFilter, { $set: patch }, { session: dbsession });
-    appUser.addTransactionStep('updateMany',this.documentName,ids,searchResult);
+    appUser.addTransactionStep('updateMany', this.documentName, ids, searchResult);
     await this.addManyAuditEvents(appUser, this.documentName, 'patchMany', [patch]);
 
     return result;
@@ -1136,25 +1112,28 @@ export class SimpleAppService<T extends SchemaFields> {
     }
     data['documentStatus'] = docstatus;
     // await this.hook(appUser, HookType.beforeSetStatus, data);
-    await this.runEvent(appUser, this.setHookName('beforeSetStatus'), { docStatus: docstatus, prevData: existdata, newData: data }, false);
+    await this.runEvent(appUser, 'beforeSetStatus', { docStatus: docstatus, prevData: existdata, newData: data }, false);
 
     // if (this.hooks.beforeSetStatus) await this.hooks.beforeSetStatus(appUser, docstatus, data, existdata);
+    try{
+      if (data && !data['created']) {
+        const createresult = await this.create(appUser, data);
+        await this.runEvent(appUser, 'afterSetStatus', { docStatus: docstatus, data: createresult }, false);
+        // if (this.hooks.afterSetStatus) await this.hooks.afterSetStatus(appUser, docstatus, createresult);
+        await this.addAuditEvent(appUser, this.documentName, id, docstatus, data);
+
+        return createresult;
+      } else {
+        const updateresult = await this.findIdThenPatch(appUser, id, data);
+        const finaldata = await this.findById(appUser, id);
+        await this.runEvent(appUser, 'afterSetStatus', { docStatus: docstatus, data: finaldata }, false);
+        await this.addAuditEvent(appUser, this.documentName, id, docstatus, data);
 
-    if (data && !data['created']) {
-      const createresult = await this.create(appUser, data);
-      await this.runEvent(appUser, this.setHookName('afterSetStatus'), { docStatus: docstatus, data: createresult }, false);
-      // if (this.hooks.afterSetStatus) await this.hooks.afterSetStatus(appUser, docstatus, createresult);
-      await this.addAuditEvent(appUser, this.documentName, id, docstatus, data);
-
-      return createresult;
-    } else {
-      const updateresult = await this.findIdThenPatch(appUser, id, data);
-      const finaldata = await this.findById(appUser, id);
-      await this.runEvent(appUser, this.setHookName('afterSetStatus'), { docStatus: docstatus, data: finaldata }, false);
-      await this.addAuditEvent(appUser, this.documentName, id, docstatus, data);
-
-      await this.callWebhook(appUser, docstatus, finaldata);
-      return updateresult;
+        await this.callWebhook(appUser, docstatus, finaldata);
+        return updateresult;
+      }
+    }catch(e){
+      await this.runErrorEvent(appUser, 'errorSetStatus', data, e)
     }
   }
 
@@ -1187,7 +1166,8 @@ export class SimpleAppService<T extends SchemaFields> {
    * @param      {any}          data       The data
    * @return     {Promise}      { description_of_the_return_value }
    */
-  async runEvent(appUser: UserContext, eventName: string, payloads: any, enforce: boolean = true) {
+  async runEvent(appUser: UserContext, shortEventName: string, payloads: any, enforce: boolean = true) {
+    const eventName = this.setHookName(shortEventName)
     try {
       if (enforce && !this.eventEmitter.hasListeners(eventName)) {
         throw new InternalServerErrorException(`${eventName} seems no listener`);
@@ -1207,6 +1187,19 @@ export class SimpleAppService<T extends SchemaFields> {
       console.error(e);
       throw e;
     }
+  }
+
+   async runErrorEvent(appUser: UserContext, shortEventName: string, payloads: any, error:any) {
+    const eventName = this.setHookName(shortEventName)
+      try{
+        if (this.eventEmitter.hasListeners(eventName)) {
+          console.log('run eventName', eventName);
+          const res = await this.eventEmitter.emitAsync(eventName, appUser, payloads,error);
+        }
+      }catch(e){
+        //runErrorEvent wont handle more error
+      }
+
   }
   // startWorkflow(appUser: UserContext, processName: WorkflowName, workflowData: any) {
   //   return this.eventEmitter.emit('workflow.start', appUser, processName, workflowData);
@@ -1332,14 +1325,7 @@ export class SimpleAppService<T extends SchemaFields> {
     return response;
   }
 
-  searchToAggregate(
-    appUser: UserContext,
-    filter: FilterQuery<T>,
-    columns: string[],
-    sort: string[][],
-    lookup: { [key: string]: string },
-    pagination?: { pageSize?: number; pageNo?: number },
-  ) {
+  searchToAggregate(appUser: UserContext, filter: FilterQuery<T>, columns: string[], sort: string[][], lookup: { [key: string]: string }, pagination?: { pageSize?: number; pageNo?: number }) {
     const pipelines: PipelineStage[] = [];
     const projection = {};
     // console.log('sortsort', sort);
@@ -1382,13 +1368,13 @@ export class SimpleAppService<T extends SchemaFields> {
       });
       pipelines.push({ $sort: sortobj });
     }
-    
+
     if (pagination) {
       const { pageSize, skip } = this.buildPagination(pagination);
       pipelines.push({ $skip: skip });
       pipelines.push({ $limit: pageSize });
     }
-    
+
     //this.logger.warn( pipelines,'pipelinespipelinespipelines',);
 
     return pipelines;

package/templates/nest/src/simple-app/_core/framework/schemas/simple-app.schema.ts.eta

@@ -176,4 +176,16 @@ export class BranchPermission extends Permission {
   branch: ForeignKey;
 }
 
-export type StepData = {action:string,collection:string,id:string[],data:any[]}
+export type StepData = {action:string,collection:string,id:string[],data:any[]}
+
+export type DocumentDictEntry = {
+  docName: string;
+  docType: string;
+  page: string;
+  isolationType: string;
+  documentDate: string;
+  docNumber: boolean;
+  docNoPattern: string;
+  webhook?: string[];
+  uniqueKey?: string;
+};