@simitgroup/simpleapp-generator 1.0.47 → 1.0.48

package/src/framework.ts

@@ -126,6 +126,14 @@ export const prepareProject =  async (callback)=>{
             // log.info(fullfilename+"====>>"+tofilename)
             // console.log(txt)
             writeFileSync(tofilename,txt)            
+        }else if(filename.includes('._eta')){    
+            const tofilename =targetfolder + filename.replace('._eta','')        
+            log.info(tofilename,"Render file")
+            const txt = eta.render(fullfilename,vars)
+            if(!existsSync(tofilename)){
+                writeFileSync(tofilename,txt)            
+            }
+            
         }else if(filename.includes('.md')){
             const tofilename =dir + filename.replace('.eta','')        
             log.info(tofilename,"Copy")            
@@ -149,10 +157,10 @@ export const prepareNuxt = (callback:Function)=>{
     const targetfolder = config.frontendFolder
     if(!fs.existsSync(`${targetfolder}/.env`)){
         //asume no environment. prepare now
-        exec(`cd ${targetfolder};pnpm install;pnpm install -D @nuxtjs/tailwindcss @sidebase/nuxt-auth @nuxt/ui @types/node @vueuse/nuxt @sidebase/nuxt-auth @vueuse/core nuxt-security prettier `, (error, stdout, stderr)=>{                
+        exec(`cd ${targetfolder};pnpm install;pnpm install -D nuxt-primevue @nuxtjs/tailwindcss @sidebase/nuxt-auth @nuxt/ui @types/node @vueuse/nuxt @sidebase/nuxt-auth @vueuse/core  prettier `, (error, stdout, stderr)=>{                
             //;pnpm install    
             console.log(error, stdout, stderr)
-                exec(`cd ${targetfolder};pnpm install --save  jsonpath pinia @pinia/nuxt @nuxt/kit lodash @types/lodash @darkwolf/base64url next-auth@4.21.1 @darkwolf/base64url @nuxt/ui ajv ajv-formats ajv-errors dotenv @fullcalendar/core @fullcalendar/vue3 quill primeflex primeicons prettier primevue axios json-schema mitt @simitgroup/simpleapp-vue-component@latest`, (error, stdout, stderr)=>{                
+                exec(`cd ${targetfolder};pnpm install --save  primeicons moment memory-cache jsonpath pinia @pinia/nuxt @nuxt/kit lodash @types/lodash @darkwolf/base64url next-auth@4.21.1 @darkwolf/base64url @nuxt/ui ajv ajv-formats ajv-errors dotenv @fullcalendar/core @fullcalendar/vue3 quill prettier axios json-schema mitt `, (error, stdout, stderr)=>{                
                 console.log(error, stdout, stderr)
                 
                 // fs.mkdirSync(`${targetfolder}/assets/css/`,{recursive:true})

package/src/generate.ts

@@ -92,15 +92,15 @@ export const run =  async (paraconfigs:any,genFor:string[],callback:Function) =>
     await processSchema(file.replace('.json',''),jsonschema)    
   }
   // //generate groups
-  // const systemgroups = readdirSync(`${groupFolder}`)
-  // for(let g = 0; g< systemgroups.length;g++){
-  //   const groupfile = systemgroups[g]
-  //   const groupjsonstr = readFileSync(`${groupFolder}/${groupfile}`, 'utf-8');      
-  //   const groupdata = JSON.parse(groupjsonstr);
-  //   const documentname = groupfile.split('.')[0]
-  //   const roles = prepareRoles(groupdata)
-  //   allroles[documentname]=roles
-  // }
+  const systemgroups = readdirSync(`${groupFolder}`)
+  for(let g = 0; g< systemgroups.length;g++){
+    const groupfile = systemgroups[g]
+    const groupjsonstr = readFileSync(`${groupFolder}/${groupfile}`, 'utf-8');      
+    const groupdata = JSON.parse(groupjsonstr);
+    const documentname = groupfile.split('.')[0]
+    const roles = prepareRoles(groupdata)
+    allroles[documentname]=roles
+  }
   finalize(activatemodules)
   callback()
 }
@@ -128,6 +128,7 @@ const processSchema= async (schemaname:string,jsondata:JSONSchema7)=>{
       // const jsondata = JSON.parse(jsonstring);    
       const  rendertype = 'basic';
       jsonschemas[docname] = jsondata;
+      const copyofjsonschema = {...jsondata}
       const allmodels:ChildModels =  await readJsonSchemaBuilder(docname, jsondata);
       // log.error("allmodels",docname,schemaname)
       generateSchema(docname, doctype, rendertype, allmodels);        
@@ -135,7 +136,8 @@ const processSchema= async (schemaname:string,jsondata:JSONSchema7)=>{
         doctype:doctype,
         docname:capitalizeFirstLetter(docname),
         pagetype: config.pageType??'',
-        api:config.additionalApis
+        api:config.additionalApis,
+        schema : copyofjsonschema
       })
     // } else {
       // log.warn(`Load `+clc.yellow(file) + ` but it is not supported`)
@@ -339,15 +341,26 @@ const finalize=(modules:ModuleObject[])=>{
         const arrfilename:string[] = filename.split('.')
         // log.info("check longfilename:::",longfilename,"become====",arrfilename)
         //only process .eta
-        if(_.last(arrfilename)=='eta'){                    
+        if(_.last(arrfilename)=='eta'|| _.last(arrfilename)=='_eta'){                    
           const relativepath = longfilename.includes('/') ? longfilename.replace(`/${filename}`,'') : ''
           const foldername = `${frameworkpath}/${relativepath}`
-          const shortfilename = filename.replace('.eta','')
+          const shortfilename = filename.replace('.eta','').replace('._eta','')
           const targetfilename = `${foldername}/${shortfilename}`
+          let forceoverride=true
+          if(filename.includes('._eta')){
+            forceoverride=false
+          }
+          // log.warn("Process=== ",targetfilename)
+          if(existsSync(targetfilename) &&  forceoverride == false){
+            log.info("file exists, skip: ",targetfilename)
+            continue;
+          }
+
+          
           if(!existsSync(foldername)){
             mkdirSync(foldername,{recursive:true})
           }
-          const templatename = `${frameworkfolder}/${longfilename}`.replace(".eta","")
+          // const templatename = `${frameworkfolder}/${longfilename}`.replace(".eta","").replace('._eta','')
           log.info("Write template:",targetfilename)
           const txt = eta.render(longfilename, renderProperties)
           writeFileSync(targetfilename,txt)

package/src/index.ts

@@ -82,7 +82,7 @@ if(continueexecute){
   const reGenFrontend = async()=>{
     fw.setConfiguration(configs)
     generate.run(configs,['nuxt'],()=>{
-      fw.prettyNuxt()                                      
+      // fw.prettyNuxt()                                      
     })  
   }
   const reGenBackend = async()=>{

package/src/type.ts

@@ -65,6 +65,7 @@ export type ModuleObject = {
   docname:string
   pagetype:string
   api:DocumentApi[]
+  schema:SimpleAppJSONSchema7
 }
 export type TypeGenerateDocumentVariable ={
 name: string

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

@@ -33,8 +33,8 @@ export class <%= it.typename %>Processor extends SimpleAppService<<%= it.typenam
 
   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

@@ -170,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/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)=>{ %>

package/templates/nest/src/simpleapp/generate/commons/roles/roles.guard.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 { Injectable, Inject, CanActivate, ExecutionContext, Scope } from '@nestjs/common';
 import { Reflector } from '@nestjs/core';
 import { Role } from './roles.enum'

package/templates/nest/src/simpleapp/generate/commons/user.context.ts.eta

@@ -1,10 +1,9 @@
 /**
- * todo
- * 1.base on xorg get current role and group
- * 2. get profile want to obtain branchlist and invitation list
- * 3. xorglist to user shall display appropriate tenant/org/branch name
+ * This file was automatically generated by simpleapp generator. Every
+ * MODIFICATION OVERRIDE BY GENERATEOR
+ * last change 2023-10-28
+ * Author: Ks Tan
  */
-
 import { Injectable, Scope,Inject,Logger, BadRequestException } from '@nestjs/common';
 import { Model, model, connect, PipelineStage } from 'mongoose';
 import _ from 'lodash'
@@ -39,6 +38,8 @@ export class UserContext {
   protected group: string = '';
   protected branchCode: string = '';
   protected branchName: string = '';  
+  protected orgCode: string = '';
+  protected orgName: string = '';  
   protected branches: any[] = []
   protected invites: any[] = []  //User + field tenant:Tenant[]
   protected roles: string[] = [];
@@ -133,7 +134,8 @@ export class UserContext {
             orgId:this.orgId,
             branchId:this.branchId,            
           }},
-          {$lookup:{from: 'branch',localField: 'branchId',foreignField:'branchId',as: 'currentbranch'}}
+          {$lookup:{from: 'branch',localField: 'branchId',foreignField:'branchId',as: 'currentbranch'}},
+          {$lookup:{from: 'organization',localField: 'orgId',foreignField:'orgId',as: 'currentorg'}}
         ]
     }}
 
@@ -160,6 +162,8 @@ export class UserContext {
           userinfo.roles = rolegroups[userinfo.group]   
           userinfo.branchCode = myperm.currentbranch[0].branchCode
           userinfo.branchName = myperm.currentbranch[0].branchName          
+          userinfo.orgCode = myperm.currentorg[0].orgCode
+          userinfo.orgName = myperm.currentorg[0].orgName
         }    
       }else{        
         userinfo.group = '' 
@@ -192,6 +196,8 @@ export class UserContext {
       this._id = userinfo._id.toString()
       this.branchCode = userinfo['branchCode'] ?? ''
       this.branchName = userinfo['branchName'] ?? ''
+      this.orgCode = userinfo['orgCode'] ?? ''
+      this.orgName = userinfo['orgName'] ?? ''
       this.group = userinfo['group'] ?? ''
       this.roles = userinfo['roles'] ?? [Role.Everyone,Role.User]
     }else{
@@ -199,7 +205,7 @@ export class UserContext {
       // this.group = ''
       // this.tenantId=0
       // this.orgId=0
-      // this.branchId=0
+      // this.orgCode=0
       this.roles = [Role.Everyone,Role.Unknown]
     }
     this.logger.debug(`${this.uid} have _id (${this.getId()}), group (${this.group}) and role (${this.getRoles()})` )   
@@ -289,6 +295,8 @@ export class UserContext {
       branchId: this.getBranchId(),
       branchCode: this.branchCode,
       branchName: this.branchName,
+      orgCode:this.orgCode,
+      orgName:this.orgName,
       email: this.getEmail(),
       uid: this.getUid(),
       fullName: this.getFullname(),

package/templates/nest/src/simpleapp/generate/controllers/simpleapp.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,

package/templates/nest/src/simpleapp/generate/models/apievent.model.ts.eta

@@ -0,0 +1,27 @@
+/**
+ * This file was automatically generated by simpleapp generator. Every
+ * MODIFICATION OVERRIDE BY GENERATEOR
+ * last change 2023-10-28
+ * Author: Ks Tan
+ */
+
+import { Schema } from 'mongoose';
+import {  BranchOrganization,  Branch,  }  from '../types/branch.type';
+const schemasetting = {  
+          _id: {type:String},
+          created: {type: String},  
+          updated: {type: String},  
+          duration:{type: Number},
+          createdby: {type: String},  
+          path:{type:String},
+          ip:{type:String},
+          method:{type:String},
+          headers:{type: Object},
+          data: {type: Object},
+          statusCode: {type: Number},
+          status:{type:String},
+          errMsg:{type:String},
+          errData: {type: Object},                
+      };
+
+export const ApiEventMongoSchema = new Schema(schemasetting,{collection: 'apievent'})

package/templates/nest/src/simpleapp/generate/models/perm.model.ts.eta

@@ -1,8 +1,7 @@
 /**
- * This file was automatically generated by simpleapp generator.
- * DO NOT MODIFY IT BY HAND. Instead, modify the source JSONSchema file,
- * and regenerate this file.
- * last change 2023-09-09
+ * This file was automatically generated by simpleapp generator. Every
+ * MODIFICATION OVERRIDE BY GENERATEOR
+ * last change 2023-10-28
  * Author: Ks Tan
  */