@simitgroup/simpleapp-generator 1.0.46 → 1.0.48

package/src/type.ts

@@ -1,4 +1,4 @@
-import  { JSONSchema7, JSONSchema7Definition } from 'json-schema';
+import  { JSONSchema7,JSONSchema7Type,JSONSchema7Version, JSONSchema7TypeName,JSONSchema7Definition } from 'json-schema';
 export type ChildModels = {
   [key: string]: { 
     type: string; 
@@ -65,6 +65,7 @@ export type ModuleObject = {
   docname:string
   pagetype:string
   api:DocumentApi[]
+  schema:SimpleAppJSONSchema7
 }
 export type TypeGenerateDocumentVariable ={
 name: string
@@ -78,7 +79,7 @@ apiSchemaName: string
 typename: string
 fullApiSchemaName: string
 fullTypeName:string
-jsonschema: JSONSchema7
+jsonschema: SimpleAppJSONSchema7
 bothEndCode: string
 frontEndCode: string
 backEndCode: string
@@ -123,14 +124,14 @@ export type DocumentApi = {
   description:string //description of api
 }
 export enum IsolationType {"none"="none" , "tenant"="tenant","org"="org", "branch"="branch"}
-export type ImportLibs = {"lib":string,"as":string}
+// export type ImportLibs = {"lib":string,"as":string}
 export type Formula =  {
   "jsonpath":string  //example: "$.subtotal","$.details[*]"
   "formula":string  //example "jslib.getDocumentSubTotal(@F{$.details})"
 } 
 
 export type SchemaConfig = {
-  isolationType: IsolationType
+  isolationType: IsolationType  
   requiredRoles?:string[]
   pageType?: string  
   uniqueKey?:string  
@@ -140,7 +141,7 @@ export type SchemaConfig = {
   allStatus?:DocumentStatus[]
   additionalApis?:DocumentApi[]      
   additionalAutoCompleteFields ?: string[]
-  libs?:ImportLibs[]   // both process class and frontend client class will import same lib
+  // libs?:ImportLibs[]   // both process class and frontend client class will import same lib
   formulas?: Formula[]  
   documentType: string
   documentName: string
@@ -148,28 +149,142 @@ export type SchemaConfig = {
   foreignKeys?:MyForeignKey,
 }
 
-// export type DefaultSchemaDefinitions = {
-//   [key:string]:JSONSchema7Object
-// }
-export type ForeignKeyProperty = {'x-foreignkey' ?:string}
+
 export type SchemaFields = {
-  _id: JSONSchema7 
-  tenantId: JSONSchema7 & ForeignKeyProperty
-  orgId: JSONSchema7 & ForeignKeyProperty
-  branchId: JSONSchema7 & ForeignKeyProperty
-  created: JSONSchema7 
-  updated: JSONSchema7 
-  createdby: JSONSchema7 
-  updatedby: JSONSchema7 
-  [key:string]:JSONSchema7  & ForeignKeyProperty
+  _id: SimpleAppJSONSchema7 
+  tenantId: SimpleAppJSONSchema7
+  orgId: SimpleAppJSONSchema7
+  branchId: SimpleAppJSONSchema7
+  created: SimpleAppJSONSchema7 
+  updated: SimpleAppJSONSchema7 
+  createdby: SimpleAppJSONSchema7 
+  updatedby: SimpleAppJSONSchema7 
+  [key:string]:SimpleAppJSONSchema7 | SimpleAppJSONSchema7[] | undefined
+
 }
 
-export type AdditionalSchemaType = {     
-  "x-simpleapp-config":SchemaConfig  
-  properties: SchemaFields
+
+export type SchemaType = {
+  type:string
+  definitions?:SimpleAppJSONSchema7
+  required?:string[]
+
+  "x-simpleapp-config":SchemaConfig
+  properties:  SchemaFields
 } 
 
-export type SchemaType = JSONSchema7 & AdditionalSchemaType
 
 
 
+// modified from jsonschemas
+export type SimpleAppJSONSchema7Definition = SimpleAppJSONSchema7 | boolean;
+export interface SimpleAppJSONSchema7 {
+  
+  'x-foreignkey' ?:string
+    $id?: string | undefined;
+    $ref?: string | undefined;
+    $schema?: JSONSchema7Version | undefined;
+    $comment?: string | undefined;
+
+    /**
+     * @see https://datatracker.ietf.org/doc/html/draft-bhutton-json-schema-00#section-8.2.4
+     * @see https://datatracker.ietf.org/doc/html/draft-bhutton-json-schema-validation-00#appendix-A
+     */
+    $defs?: {
+              [key: string]: JSONSchema7Definition;
+    } | undefined;
+
+    /**
+     * @see https://tools.ietf.org/html/draft-handrews-json-schema-validation-01#section-6.1
+     */
+    type?: JSONSchema7TypeName | JSONSchema7TypeName[] | undefined;
+    enum?: JSONSchema7Type[] | undefined;
+    const?: JSONSchema7Type | undefined;
+
+    /**
+     * @see https://tools.ietf.org/html/draft-handrews-json-schema-validation-01#section-6.2
+     */
+    multipleOf?: number | undefined;
+    maximum?: number | undefined;
+    exclusiveMaximum?: number | undefined;
+    minimum?: number | undefined;
+    exclusiveMinimum?: number | undefined;
+
+    /**
+     * @see https://tools.ietf.org/html/draft-handrews-json-schema-validation-01#section-6.3
+     */
+    maxLength?: number | undefined;
+    minLength?: number | undefined;
+    pattern?: string | undefined;
+
+    /**
+     * @see https://tools.ietf.org/html/draft-handrews-json-schema-validation-01#section-6.4
+     */
+    items?: SimpleAppJSONSchema7Definition | SimpleAppJSONSchema7Definition[] | undefined;
+    additionalItems?: JSONSchema7Definition | undefined;
+    maxItems?: number | undefined;
+    minItems?: number | undefined;
+    uniqueItems?: boolean | undefined;
+    contains?: SimpleAppJSONSchema7Definition | undefined;
+
+    /**
+     * @see https://tools.ietf.org/html/draft-handrews-json-schema-validation-01#section-6.5
+     */
+    maxProperties?: number | undefined;
+    minProperties?: number | undefined;
+    required?: string[] | undefined;
+    properties?: {
+        [key: string]: SimpleAppJSONSchema7Definition;
+    } | undefined;
+    patternProperties?: {
+        [key: string]: SimpleAppJSONSchema7Definition;
+    } | undefined;
+    additionalProperties?: SimpleAppJSONSchema7Definition | undefined;
+    dependencies?: {
+        [key: string]: SimpleAppJSONSchema7Definition | string[];
+    } | undefined;
+    propertyNames?: SimpleAppJSONSchema7Definition | undefined;
+
+    /**
+     * @see https://tools.ietf.org/html/draft-handrews-json-schema-validation-01#section-6.6
+     */
+    if?: SimpleAppJSONSchema7Definition | undefined;
+    then?: SimpleAppJSONSchema7Definition | undefined;
+    else?: SimpleAppJSONSchema7Definition | undefined;
+
+    /**
+     * @see https://tools.ietf.org/html/draft-handrews-json-schema-validation-01#section-6.7
+     */
+    allOf?: SimpleAppJSONSchema7Definition[] | undefined;
+    anyOf?: SimpleAppJSONSchema7Definition[] | undefined;
+    oneOf?: SimpleAppJSONSchema7Definition[] | undefined;
+    not?: SimpleAppJSONSchema7Definition | undefined;
+
+    /**
+     * @see https://tools.ietf.org/html/draft-handrews-json-schema-validation-01#section-7
+     */
+    format?: string | undefined;
+
+    /**
+     * @see https://tools.ietf.org/html/draft-handrews-json-schema-validation-01#section-8
+     */
+    contentMediaType?: string | undefined;
+    contentEncoding?: string | undefined;
+
+    /**
+     * @see https://tools.ietf.org/html/draft-handrews-json-schema-validation-01#section-9
+     */
+    definitions?: {
+        [key: string]: JSONSchema7Definition;
+    } | undefined;
+
+    /**
+     * @see https://tools.ietf.org/html/draft-handrews-json-schema-validation-01#section-10
+     */
+    title?: string | undefined;
+    description?: string | undefined;
+    default?: JSONSchema7Type | undefined;
+    readOnly?: boolean | undefined;
+    writeOnly?: boolean | undefined;
+    examples?: JSONSchema7Type | undefined;
+}

package/templates/basic/nest/processor.ts.eta

@@ -27,12 +27,14 @@ import { <%Object.keys(it.models).forEach(function(modelname) { %>  Default<%=mo
 export class <%= it.typename %>Processor extends SimpleAppService<<%= it.typename %>>  {
   protected documentIdentityCode='<%~ it.autocompletecode %>'
   protected documentIdentityLabel='<%~ it.autocompletename %>'
-  protected withDocNumberFormat= <%= it.hasdocformat %>
+  <%if(it.jsonschema['x-simpleapp-config']['generateDocumentNumber']){%>
+  protected withDocNumberFormat = true
+  <%}%>
 
   protected foreignkeys = <%~ JSON.stringify(it.foreignkeys)%>
 
-    constructor(mydoc: Model<<%= it.typename %>>, docnogenerator:DocNumberFormatGenerator) {
-    super('<%= it.doctype.toUpperCase() %>','<%= it.name %>',mydoc,IsolationType.<%=it.isolationtype%>,docnogenerator);
+    constructor(mydoc: Model<<%= it.typename %>>) {
+    super('<%= it.doctype.toUpperCase() %>','<%= it.name %>',mydoc,IsolationType.<%=it.isolationtype%>);
     this.setSchema(<%= it.typename%>JsonSchema)
     this.setData(Default<%=it.typename%>(crypto.randomUUID()))
     <%if(it.moreAutoComplete.length>0){%>

package/templates/basic/nest/service.ts.eta

@@ -8,7 +8,6 @@ import { InjectModel } from '@nestjs/mongoose';
 import { Model } from 'mongoose';
 import { Injectable } from '@nestjs/common';
 import { UserContext } from '../generate/commons/user.context';
-import {DocNumberFormatGenerator} from '../generate/commons/docnogenerator.service'
 import { <%= it.typename %>Processor } from '../generate/processors/<%= it.doctype %>.processor';
 import { <%= it.typename %>} from '../generate/types/<%= it.doctype %>.type';
 export { <%= it.typename %>} from '../generate/types/<%= it.doctype %>.type';
@@ -18,10 +17,9 @@ export { <%= it.typename %>} from '../generate/types/<%= it.doctype %>.type';
 export class <%= it.typename %>Service extends <%= it.typename %>Processor {
 
     constructor(
-        @InjectModel('<%= it.typename %>')  mydoc: Model<<%= it.typename %>>,
-        docnogenerator:DocNumberFormatGenerator
+        @InjectModel('<%= it.typename %>')  mydoc: Model<<%= it.typename %>>        
         ){
-        super(mydoc,docnogenerator)
+        super(mydoc)
     }
 
 //    hook = async (appuser:UserContext,type: string, data?: any) => {

package/templates/basic/nuxt/pages.crud.vue.eta

@@ -125,8 +125,9 @@
                     <%let tablefields = Object.keys(obj.items.properties) %>
                     <% for(let a=0;a<tablefields.length;a++){%>
                         <%let col= tablefields[a] %>
+                        <% if(skipcolumns.includes(col)){ continue}%> 
                         <%let subobj = obj.items.properties[col] %>
-                        <column field="<%=col%>" #body="{index}" :header="camelCaseToWords('<%=col%>')">
+                        <column field="<%=col%>" #body="{index}" :header="camelCaseToWords('<%=col%>')">                            
                             <%if(subobj['x-foreignkey']){%>
                                 <SimpleAppAutocomplete v-model="data.<%=key%>[index].<%=col%>" 
                                     :setting="o.getField('#/properties/<%=key%>/items/properties/<%=col%>')" 
@@ -169,7 +170,7 @@
                         </column>                        
                     <%}%>
                     <column #body="{index}" header="Delete">
-                            <button class="btn-danger" type="button" @click="data.<%=key%>.splice(index,1)">X</button>
+                            <Button class="btn-danger" type="button" @click="data.<%=key%>.splice(index,1)">X</Button>
                         </column>
             </SimpleAppInputTable>
         <% } else{%>

package/templates/basic/nuxt/simpleapp.generate.client.ts.eta

@@ -5,7 +5,9 @@
  * last change 2023-09-23
  * Author: Ks Tan
  */
- import _ from 'lodash'
+import _ from 'lodash'
+import * as sharelibs from '../sharelibs'
+import * as jsonpath from 'jsonpath'
 import { SimpleAppClient } from "./SimpleAppClient";
 import {
   <%Object.keys(it.models).forEach(function(modelname) { %>  Default<%=modelname%>,  <%})%>
@@ -47,6 +49,9 @@ export class <%= it.typename%>Client extends SimpleAppClient<<%= it.typename%>,<
   public readonly schema= <%~ JSON.stringify(it.jsonschema) %>;
   protected documentIdentityCode='<%~ it.autocompletecode %>'
   protected documentIdentityName='<%~ it.autocompletename %>'  
+  <%if(it.jsonschema['x-simpleapp-config']['generateDocumentNumber']){%>
+  protected withDocNumberFormat = true
+  <%}%>
   constructor() {    
     const {$event,$listen,$axios}=useNuxtApp()
     let xorg = useRoute().params.xorg
@@ -137,7 +142,18 @@ export class <%= it.typename%>Client extends SimpleAppClient<<%= it.typename%>,<
   reCalculateValue(){
     console.log('trigger new recalculate')
     const data = this.getData()
+    
+    <% if(it.jsonschema['x-simpleapp-config']['formulas']){ %>
+      <%Object.keys(it.jsonschema['x-simpleapp-config']['formulas']).forEach(function(index) { %>
+        <% let fml = it.jsonschema['x-simpleapp-config']['formulas'][index] %>
+        // <%~ JSON.stringify(fml) %>
+        //const tmp = jsonpath.query(vdata,fieldpath).filter((item:string)=>item!='')
+        
+        jsonpath.apply(data, '<%~ fml.jsonpath %>', function(value) { return <%~fml.formula %> });
 
+      <%}) %>
+    <%} %>
+    /*
     <%Object.keys(it.jsonschema.properties).forEach(function(key) { %>
       <%let obj = it.jsonschema.properties[key]%>
       <%if(obj['x-compute']){%> //x-compute first level field
@@ -207,6 +223,6 @@ export class <%= it.typename%>Client extends SimpleAppClient<<%= it.typename%>,<
         <%}) %> 
         } 
       <%} /*process compute for 2nd level sub tables*/%>
-    <%}) %>
+    <%}) %> */
   }
 }

package/templates/nest/src/app.controller.ts.eta

@@ -1,3 +1,9 @@
+/**
+ * This file was automatically generated by simpleapp generator. Every
+ * MODIFICATION OVERRIDE BY GENERATEOR
+ * last change 2023-10-28
+ * Author: Ks Tan
+ */
 import { Controller, Get,Logger } from '@nestjs/common';
 import { AppService } from './app.service';
 

package/templates/nest/src/app.module.ts.eta

@@ -1,3 +1,10 @@
+/**
+ * This file was automatically generated by simpleapp generator. Every
+ * MODIFICATION OVERRIDE BY GENERATEOR
+ * last change 2023-10-28
+ * Author: Ks Tan
+ */
+ 
 import { Module, MiddlewareConsumer, NestModule } from '@nestjs/common';
 import { MongooseModule,MongooseModuleOptions } from '@nestjs/mongoose';
 import { APP_GUARD,APP_INTERCEPTOR,APP_FILTER } from '@nestjs/core';
@@ -20,7 +27,7 @@ import { AppService } from './app.service';
 import {GenerateModule} from './simpleapp/simpleapp.module'
 import { UserMongoSchema } from './simpleapp/generate/models/user.model';
 import { PermissionMongoSchema } from './simpleapp/generate/models/perm.model';
-
+import { ApiEventMongoSchema } from './simpleapp/generate/models/apievent.model';
 @Module({
   //define environment variables: MONGODB_URL='mongodb://<user>:<pass>@<host>:<port>/<db>?authMechanism=DEFAULT'
   imports: [
@@ -42,6 +49,7 @@ import { PermissionMongoSchema } from './simpleapp/generate/models/perm.model';
     MongooseModule.forFeature([
       { name: 'User', schema: UserMongoSchema },
       { name: 'Permission', schema: PermissionMongoSchema },
+      { name: 'ApiEvent', schema: ApiEventMongoSchema },
     ])
       ],
   controllers: [AppController],

package/templates/nest/src/app.service.ts.eta

@@ -1,3 +1,9 @@
+/**
+ * This file was automatically generated by simpleapp generator. Every
+ * MODIFICATION OVERRIDE BY GENERATEOR
+ * last change 2023-10-28
+ * Author: Ks Tan
+ */
 import { Injectable } from '@nestjs/common';
 // import { Workflow } from './simpleapp/generate/commons/providers/Workflow';
 @Injectable()

package/templates/nest/src/main.ts.eta

@@ -1,3 +1,10 @@
+/**
+ * This file was automatically generated by simpleapp generator. Every
+ * MODIFICATION OVERRIDE BY GENERATEOR
+ * last change 2023-10-28
+ * Author: Ks Tan
+ */
+
 import { NestFactory } from '@nestjs/core';
 import { AppModule } from './app.module';
 import { SimpleAppExceptionFilter } from './simpleapp/generate/commons/exceptions/SimpleAppExceptionFilter';

package/templates/nest/src/simpleapp/generate/apischemas/index.ts.eta

@@ -1,7 +1,11 @@
+/**
+ * This file was automatically generated by simpleapp generator. Every
+ * MODIFICATION OVERRIDE BY GENERATEOR
+ * last change 2023-10-28
+ * Author: Ks Tan
+ */
 
 import { ApiProperty } from '@nestjs/swagger';
-
-            
 export class ApiKeyValuePair {
     @ApiProperty({"type":Object,"required":false,"examples":['{"field1":"1"}'],"default":""} )
     field1: any

package/templates/nest/src/simpleapp/generate/commons/audittrail.service.ts.eta

@@ -0,0 +1,17 @@
+/**
+ * This file was automatically generated by simpleapp generator. Every
+ * MODIFICATION OVERRIDE BY GENERATEOR
+ * last change 2023-10-28
+ * Author: Ks Tan
+ */
+import { Injectable } from "@nestjs/common";
+
+@Injectable()
+export class AuditTrail {
+    constructor(){        
+    }
+
+    addEvent(data:any){
+        console.log("Add event into db:",data)
+    }
+}

package/templates/nest/src/simpleapp/generate/commons/decorators/appuser.decorator.ts.eta

@@ -1,3 +1,9 @@
+/**
+ * This file was automatically generated by simpleapp generator. Every
+ * MODIFICATION OVERRIDE BY GENERATEOR
+ * last change 2023-10-28
+ * Author: Ks Tan
+ */
 import { createParamDecorator, ExecutionContext } from '@nestjs/common';
 
 export const AppUser = createParamDecorator(

package/templates/nest/src/simpleapp/generate/commons/dicts/documents.ts.eta

@@ -0,0 +1,14 @@
+/**
+ * This file was automatically generated by simpleapp generator. Every
+ * MODIFICATION OVERRIDE BY GENERATEOR
+ * last change 2023-10-28
+ * Author: Ks Tan
+ */
+export const alldocuments:any[] = [
+    <%for(let i=0; i<it.modules.length;i++){ %>
+      <% const d = it.modules[i] %>      
+      <% const conf =  d.schema["x-simpleapp-config"] %>
+      {docName:'<%= d['docname'] %>',docType:'<%= d['doctype'].toUpperCase()%>',page: '<%=d['pagetype']%>', isolationType:'<%=conf['isolationType']%>', 
+            documentDate:'<%=conf['documentDate']??""%>', docNumber:<%=conf['generateDocumentNumber']??false%>},
+    <%}%>
+  ]

package/templates/nest/src/simpleapp/generate/commons/dicts/foreignkeys.ts.eta

@@ -1 +1,7 @@
+/**
+ * This file was automatically generated by simpleapp generator. Every
+ * MODIFICATION OVERRIDE BY GENERATEOR
+ * last change 2023-10-28
+ * Author: Ks Tan
+ */
 export const foreignkeys = <%~JSON.stringify(it.foreignkeys)%>

package/templates/nest/src/simpleapp/generate/commons/docnogenerator.service.ts.eta

@@ -1,3 +1,9 @@
+/**
+ * This file was automatically generated by simpleapp generator. Every
+ * MODIFICATION OVERRIDE BY GENERATEOR
+ * last change 2023-10-28
+ * Author: Ks Tan
+ */
 import { UserContext } from './user.context';
 import { InjectModel } from '@nestjs/mongoose';
 import { Model } from 'mongoose';
@@ -61,7 +67,7 @@ export class DocNumberFormatGenerator{
   static previewDocNo = (s: Docnoformat) => {
     try {
       const pattern = s.docNoPattern;
-      const numberReg: RegExp = /\<(.*?)\>/g;
+      const numberReg: RegExp = /\[(.*?)\]/g;
       const dateReg: RegExp = /\{(.*?)\}/g;
       let newvalue = pattern;
       const numberpattern: string[] = pattern.match(numberReg);
@@ -69,8 +75,8 @@ export class DocNumberFormatGenerator{
 
       if (numberpattern && numberpattern.length > 0) {
         const numberlength = numberpattern[0]
-          .replace('<', '')
-          .replace('>', '').length;
+          .replace('[', '')
+          .replace(']', '').length;
 
         let nextnumber = s.nextNumber.toString();
 

package/templates/nest/src/simpleapp/generate/commons/exceptions/SimpleAppExceptionFilter.ts.eta

@@ -1,3 +1,9 @@
+/**
+ * This file was automatically generated by simpleapp generator. Every
+ * MODIFICATION OVERRIDE BY GENERATEOR
+ * last change 2023-10-28
+ * Author: Ks Tan
+ */
 import {
   ExceptionFilter,
   Catch,
@@ -9,7 +15,8 @@ import { HttpAdapterHost } from '@nestjs/core';
 import { ClientSession } from 'mongoose';
 @Catch()
 export class SimpleAppExceptionFilter implements ExceptionFilter {
-  constructor(private readonly httpAdapterHost: HttpAdapterHost) {}
+  constructor(
+    private readonly httpAdapterHost: HttpAdapterHost) {}
 
   catch(exception, host: ArgumentsHost): void {
     // In certain situations `httpAdapter` might not be available in the
@@ -17,6 +24,7 @@ export class SimpleAppExceptionFilter implements ExceptionFilter {
     const { httpAdapter } = this.httpAdapterHost;
     const ctx = host.switchToHttp();
     const request = ctx.getRequest<Request>();
+    
     if(request['sessionuser']){
       const session:ClientSession = request['sessionuser'].getDBSession()
       if(session.inTransaction())session.abortTransaction()      
@@ -32,8 +40,20 @@ export class SimpleAppExceptionFilter implements ExceptionFilter {
     // console.log("exception properties", Object.getOwnPropertyNames(exception),exception.options)
    
     // console.log("exception.responseexception.response",exception)
-
+    const finalstatus =  exception.response.status??exception.status
+    const eventObj = request['eventObj']
+    if(eventObj){    
+      eventObj.statusCode=finalstatus
+      eventObj.errMsg=responseBody.message
+      const endtime =new Date()
+      eventObj.updated = endtime.toISOString()
+      eventObj.data = request.body
+      eventObj.errData = responseBody.error
+      eventObj.status="NG"
+      eventObj.duration =  endtime.getTime() - new Date(eventObj.created).getTime()
+      eventObj.save()
+    }
     
-    httpAdapter.reply(ctx.getResponse(), responseBody, exception.response.status??exception.status);
+    httpAdapter.reply(ctx.getResponse(), responseBody,finalstatus);
   }
 }

package/templates/nest/src/simpleapp/generate/commons/interceptors/response.interceptor.ts.eta

@@ -1,30 +1,72 @@
-
+/**
+ * This file was automatically generated by simpleapp generator. Every
+ * MODIFICATION OVERRIDE BY GENERATEOR
+ * last change 2023-10-28
+ * Author: Ks Tan
+ */
 import { Injectable, NestInterceptor, ExecutionContext, CallHandler } from '@nestjs/common';
 import { Observable } from 'rxjs';
 import { tap } from 'rxjs/operators';
 import { Model,Connection, ClientSession } from 'mongoose';
-import { InjectConnection } from '@nestjs/mongoose';
+import { InjectConnection,InjectModel } from '@nestjs/mongoose';
 import { UserContext } from '../user.context';
+import { ApiEvent } from '../../types/apievent.type';
 @Injectable()
 export class ResponseInterceptor implements NestInterceptor {
   
-    constructor(@InjectConnection() private readonly connection: Connection,){
+    constructor(
+      @InjectConnection() private readonly connection: Connection,
+      @InjectModel('ApiEvent') private apieventmodel: Model<ApiEvent>,
+      ){
      
       
     }
-  intercept(context: ExecutionContext, next: CallHandler): Observable<any> {
-    const req = context.switchToHttp().getRequest()
-    
+  async intercept(context: ExecutionContext, next: CallHandler): Promise<Observable<any>> {
+    const req = context.switchToHttp().getRequest()    
+    const resp = context.switchToHttp().getResponse()
     const usersession:UserContext = req['sessionuser']
+    const method = req['method']
+    const headers = {...req['headers']}
+    const ip = req['ip']
+    const url = req['url']
+    // let { url, method, headers, body } 
     const session:ClientSession =   usersession.getDBSession()
-    // session.startTransaction()
-      // console.log("sessionuser exists!!")
+    const logid:string = crypto.randomUUID()    
+    const starttime =new Date()
+
+    //authorization no need
+    delete headers['authorization']//='--removed--'
+    const data:ApiEvent = {
+      _id: logid,
+      created: starttime.toISOString(),
+      duration : 0,
+      createdby: usersession.getUid(),
+      path: url,
+      method: method,
+      headers: headers,
+      ip:ip,
+      // data: req.body,
+      statusCode:0,
+      status:'D'
+    }
+    const eventmodel = new this.apieventmodel(data)      
+    
+    const eventObj = await eventmodel.save()
     
-    const now = Date.now();
+    req['eventObj']=eventObj
     return next
       .handle()
       .pipe(
-        tap(() => {
+        tap(async () => {
+          
+          const endtime =new Date()
+          eventObj.isNew=false
+          eventObj.statusCode=resp['statusCode']
+          eventObj.updated = endtime.toISOString()
+          eventObj.status="OK"
+          eventObj.duration =  endtime.getTime() - starttime.getTime()
+          const result = await eventObj.save()//({_id:logid},{statusCode:resp['statusCode']})
+          // console.log("result===",logid,result)
           
           if(process.env.DRYRUN=='true'){
             console.warn("--------dryrun! roll back everything-----------")

package/templates/nest/src/simpleapp/generate/commons/middlewares/tenant.middleware.ts.eta

@@ -1,3 +1,9 @@
+/**
+ * This file was automatically generated by simpleapp generator. Every
+ * MODIFICATION OVERRIDE BY GENERATEOR
+ * last change 2023-10-28
+ * Author: Ks Tan
+ */
 import { Injectable, NestMiddleware, Logger,Scope,Inject } from '@nestjs/common';
 import { Request, Response, NextFunction } from 'express';
 import { InjectModel } from '@nestjs/mongoose';

package/templates/nest/src/simpleapp/generate/commons/providers/workflow.provider.ts.etax

@@ -1,3 +1,9 @@
+/**
+ * This file was automatically generated by simpleapp generator. Every
+ * MODIFICATION OVERRIDE BY GENERATEOR
+ * last change 2023-10-28
+ * Author: Ks Tan
+ */
 import { BPMNClient } from "bpmn-client";
 import { UserContext } from './user.context';
 import { Injectable,Scope } from '@nestjs/common';

package/templates/nest/src/simpleapp/generate/commons/roles/roles.decorator.ts.eta

@@ -1,4 +1,9 @@
-
+/**
+ * This file was automatically generated by simpleapp generator. Every
+ * MODIFICATION OVERRIDE BY GENERATEOR
+ * last change 2023-10-28
+ * Author: Ks Tan
+ */
 import { SetMetadata } from '@nestjs/common';
 import { Role } from './roles.enum';
 

package/templates/nest/src/simpleapp/generate/commons/roles/roles.enum.ts.eta

@@ -1,3 +1,9 @@
+/**
+ * This file was automatically generated by simpleapp generator. Every
+ * MODIFICATION OVERRIDE BY GENERATEOR
+ * last change 2023-10-28
+ * Author: Ks Tan
+ */
 export enum Role {
     Unknown = 'unknown',    // unuse yet
     Everyone = 'everyone',       //everyone

package/templates/nest/src/simpleapp/generate/commons/roles/roles.group.ts.eta

@@ -1,3 +1,9 @@
+/**
+ * This file was automatically generated by simpleapp generator. Every
+ * MODIFICATION OVERRIDE BY GENERATEOR
+ * last change 2023-10-28
+ * Author: Ks Tan
+ */
 import {Role} from './roles.enum'
 
 <% Object.getOwnPropertyNames(it.allroles).forEach((key)=>{ %>