@simitgroup/simpleapp-generator 1.6.3-alpha → 1.6.4-alpha

package/src/buildinschemas/changehistories.ts

@@ -0,0 +1,33 @@
+import {SchemaType,RESTMethods,IsolationType} from '../type'
+
+export const permission:SchemaType ={
+    type: "object",
+    "x-simpleapp-config":{
+        documentType:'hist',
+        documentName:'histories',        
+        isolationType:IsolationType.tenant               
+    },
+    required:["document"],
+    properties: {
+        _id:{type:'string'},
+        created:{type:'string'},
+        updated:{type:'string'},
+        createdBy:{type:'string'},
+        updatedBy:{type:'string'},
+        tenantId: {type:'integer',default:1,minimum:0},
+        orgId: {type:'integer',default:1,minimum:0 },
+        branchId: {type:'integer',default:1,minimum:0 },
+        document:{type:'string',minLength:3},
+        histories:{
+            type:"array",
+            items:{
+                type:"object",
+                properties:{
+                    datetime:{type:"string",format:"datetime"},
+                    uid:{type:"string",format:"uuid"},
+                    action:{type:"string",minLength:3},
+                }
+            }
+        }
+      }
+}

package/src/buildinschemas/index.ts

@@ -6,4 +6,5 @@ export {permission} from './permission'
 export {autoincreament} from './autoincreament'
 export {docnoformat} from './docnoformat'
 export {systemmessage} from './systemmessage'
-export {keyvaluepair} from './keyvaluepair'
+export {keyvaluepair} from './keyvaluepair'
+export {webhook} from './webhook'

package/src/buildinschemas/organization.ts

@@ -14,14 +14,14 @@ export const organization:SchemaType ={
         additionalApis:[{
             "action":"getlogo",
             "entryPoint":"logo",
-            "requiredRole":[],
+            "requiredRole":["User"],
             "method":RESTMethods.get,
             "responseType":"String",
             "description":"obtain avatar base64 jpg image"
           },{
             "action":"uploadlogo",
             "entryPoint":"logo",
-            "requiredRole":[],
+            "requiredRole":["Admin"],
             "method":RESTMethods.post,
             "schema":"KeyValue",
             "responseType":"String",

package/src/buildinschemas/user.ts

@@ -47,6 +47,10 @@ export const user:SchemaType ={
         email: {type: "string",minLength:10,format: "email"},
         active: {type: "boolean",default:true},
         description: {type:"string"},
-        lastActivity: {type: "string",description:"capture ISO8601 last api call"}
+        lastActivity: {type: "string",description:"capture ISO8601 last api call"},
+        completedTours: {
+          type: "array",
+          items: { "type": "string", "examples": ["mainpage"] }
+        }
       }
 }

package/src/buildinschemas/webhook.ts

@@ -0,0 +1,31 @@
+import {SchemaType,RESTMethods,IsolationType} from '../type'
+
+export const webhook:SchemaType = {
+    type: "object",
+    "x-simpleapp-config":{
+      documentType:'webhook',
+      documentName:'webhook',
+      isolationType:IsolationType.tenant,      
+      uniqueKey:'documentName',
+      documentTitle:'documentName',
+      pageType:"crud",      
+    },        
+    required:["documentName","url"],
+    properties: {     
+      _id:{type:'string'},
+      created:{type:'string'},
+      updated:{type:'string'},
+      createdBy:{type:'string'},
+      updatedBy:{type:'string'},
+      tenantId: {type:'integer',default:1,minimum:0 },
+      orgId: {type:'integer',default:1,minimum:0 },
+      branchId: {type:'integer',default:1,minimum:0 },
+      documentName:{type:"string",minLength:3,},
+      url: {type: "string", format:'uri'},      
+      secret: {type: "string"},
+      description: {type: "string",format:"text"},
+      active: {type: "boolean", default:true},
+      setting:{type:"string",format:"text"}
+    }
+}
+

package/src/framework.ts

@@ -16,6 +16,7 @@ let config = {
     "mongoConnectStr":'mongodb://127.0.0.1:27017/simpleapp',
     "mongoDbName":'simpleapp',
     "frontendFolder":"./frontend",
+    "splitMobilePage":false,
     "frontendPort":"8080",
     "printFormatDir":"./printformats",
     "additionalNestModules":["cloudapi","printapi"],
@@ -163,10 +164,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/apollo@next dayjs-nuxt @nuxtjs/device @nuxtjs/color-mode @types/json-schema @nuxtjs/i18n@next nuxt-primevue @nuxtjs/tailwindcss @types/jsonpath @sidebase/nuxt-auth @types/node @vueuse/nuxt @sidebase/nuxt-auth @vueuse/core  prettier `, (error, stdout, stderr)=>{                
+        exec(`cd ${targetfolder};pnpm install;pnpm install -D @nuxtjs/apollo@next dayjs-nuxt @nuxtjs/device @nuxtjs/color-mode @types/json-schema @nuxtjs/i18n@next nuxt-primevue@latest @nuxtjs/tailwindcss @types/jsonpath @sidebase/nuxt-auth @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  vue-pdf-embed dayjs pusher-js country-code-dateformat chart.js tailwind-merge @iconify-json/heroicons  json-schema @vueuse/core ts-md5 primeicons 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)=>{                
+                exec(`cd ${targetfolder};pnpm install --save vue-camera-lib vue-pdf-embed dayjs pusher-js country-code-dateformat chart.js tailwind-merge @iconify-json/heroicons  json-schema @vueuse/core ts-md5 primeicons 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

@@ -237,6 +237,9 @@ const generateSchema = ( docname: string,
           // log.warn("skip file: ",filename)
           continue;
         }
+      
+        // no turn on split mobile url, skip create mobile page
+        if(!configs?.splitMobilePage && filename.includes('mobile.')) continue
         if(foldertype=='nest'){
           const arrfilename:string[] = filename.split('.')
           const filecategory = arrfilename[0]
@@ -315,7 +318,16 @@ const generateSchema = ( docname: string,
               as: `Form${_.upperFirst(docname)}.vue`,
               validate: validateWritePage
             },
-          
+            'pages.mobile.[id].vue.eta': { 
+              to:`pages/[xorg]/mobile/${docname}`, 
+              as:'[id].vue',
+              validate: validateWritePage
+            },
+            'pages.mobile.landing.vue.eta':{ 
+              to:`pages/[xorg]/mobile/${docname}`, 
+              as:`index.vue`,
+              validate: validateWritePage
+            },
             'component.select.vue.eta': { 
               to:'components/select', 
               as: `Select${_.upperFirst(docname)}.vue`,
@@ -336,16 +348,7 @@ const generateSchema = ( docname: string,
               as:`../${docname}.vue`,
               validate: validateWritePage
             }, 
-            'pages.mobile.[id].vue.eta': { 
-              to:`pages/[xorg]/mobile/${docname}`, 
-              as:'[id].vue',
-              validate: validateWritePage
-            },
-            'pages.mobile.landing.vue.eta': { 
-              to:`pages/[xorg]/mobile/${docname}`, 
-              as:`index.vue`,
-              validate: validateWritePage
-            },            
+                     
             'simpleapp.doc.ts.eta': { 
               to:`simpleapp/docs`, 
               as:`${capname}Doc.ts`,
@@ -367,25 +370,42 @@ const generateSchema = ( docname: string,
               }
             },
           }
+
+
+            // if(configs?.splitMobilePage){
+            //   mapfiles['pages.mobile.[id].vue.eta'] = { 
+            //     to:`pages/[xorg]/mobile/${docname}`, 
+            //     as:'[id].vue',
+            //     validate: validateWritePage
+            //   }
+            //   mapfiles['pages.mobile.landing.vue.eta'] =  { 
+            //     to:`pages/[xorg]/mobile/${docname}`, 
+            //     as:`index.vue`,
+            //     validate: validateWritePage
+            //   }
+            // }
             
-            const target = mapfiles[filename]            
+            const target = mapfiles[filename]   
+            console.log(target);
             const targetfolder = `${generateTypes[foldertype]}/${target.to}`
             const targetfile = `${targetfolder}/${target.as}`
-
+            
+            console.log("targetfile",targetfile);
             if(jsonschemas[docname][X_SIMPLEAPP_CONFIG]['pageType'] && !existsSync(targetfolder)){
+              console.log("Mkdir",targetfolder)
               mkdirSync(targetfolder,{recursive:true})              
             }
 
 
             const isexists = existsSync(targetfile)
             const iswrite:boolean = target.validate(targetfile,isexists)
-            log.info("process: ",targetfile)
+            log.info("iswrite: ",iswrite)
             
             if(iswrite){
               const filecontent = eta.render(templatepath, variables)     
               writeFileSync(targetfile,filecontent);
             }
-            
+            console.log("complete, go to next file")
             
             
 

package/src/processors/jsonschemabuilder.ts

@@ -42,6 +42,10 @@ export const readJsonSchemaBuilder = async (docname: string,orijsondata:JSONSche
   }
 
   if(schemaconfigs.generateDocumentNumber){
+    if(!schemaconfigs.docNoPattern){
+      log.error(docname+" generateDocumentNumber=true but undefine docNoPattern")
+      throw new Error(docname+" generateDocumentNumber=true but undefine docNoPattern")
+    }
     const tmp = {
         type: "object",       
         "x-foreignkey":"docnoformat", 
@@ -58,8 +62,12 @@ export const readJsonSchemaBuilder = async (docname: string,orijsondata:JSONSche
     const apis = schemaconfigs.additionalApis
     for(let i =0 ; i< apis.length; i++ ){
       if(!apis[i].responseType){
-        log.error("Undefine responseType in api  "+ apis[i].action)
-        throw new Error("Undefine responseType in api  "+ apis[i].action)
+        log.error(docname +" undefine responseType in api  "+ apis[i].action)
+        throw new Error(docname+ " undefine responseType in api  "+ apis[i].action)
+      }
+      if(!Array.isArray(apis[i].requiredRole) || apis[i].requiredRole.length==0 ){
+        log.error(docname+ " undefine requiredRole in api  "+ apis[i].action)
+        throw new Error(docname +" undefine requiredRole in api  "+ apis[i].action)
       }
     }
   }

package/src/type.ts

@@ -140,10 +140,12 @@ export type SchemaConfig = {
   documentTitle?:string 
   loseDataIsolation?:boolean
   generateDocumentNumber?:boolean
+  docNoPattern?:string
   documentDate?:string
   allStatus?:DocumentStatus[]
   additionalApis?:DocumentApi[]      
   additionalAutoCompleteFields ?: string[]  
+  search?:string[]
   // libs?:ImportLibs[]   // both process class and frontend client class will import same lib
   formulas?: Formula[]  
   documentType: string

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

@@ -149,19 +149,40 @@ export class <%= it.typename %>Controller extends SimpleAppAbstractController<
   }
 
 
+<% if(simpleappconfig.search !==undefined){%>
+@Get('/fulltextsearch/:keyword')
+  @HttpCode(200)
+  @Roles(Role.SuperAdmin, Role.SuperUser, Role.<%= `${it.typename}_search`%>)
+  @ApiResponse({
+    status: 200,
+    description: 'success',
+    type: [schemas.<%= it.typename%>]
+  })
+  @ApiResponse({ status: 400, description: 'bad request' })
+  @ApiResponse({ status: 500, description: 'internal error' })
+  @ApiOperation({ operationId: 'runFullTextSearch' })
+  async fulltextsearch(
+    @AppUser() appuser: UserContext,
+    @Param('keyword') keyword:string
+  ) {
+    return await this._fulltextsearch(appuser, keyword);
+  }
+<%}%>
+
+
 /***************************** begin additionalAPI definations *****************************************/
 
 <% for(let i=0;i<it.apiSettings.length;i++){%>
 <% let api = it.apiSettings[i] %>
 <%~ `@${capitalizeFirstLetter(api.method)}('${api.entryPoint}')`%>
   <%if(superadmindoctype.includes(it.doctype)){%>
-  @Roles(Role.SuperAdmin,Role.<%= `${it.typename}_${api.action}`%>,
+  @Roles(Role.SuperAdmin,
     <%if(api.requiredRole && api.requiredRole.length>0) { %>
         <% for(let r=0;r<api.requiredRole.length;r++){%>Role.<%=api.requiredRole[r]%>,<%}%>
       <%}%>
   )
   <%}else{%>
-  @Roles(Role.SuperAdmin,Role.SuperUser,Role.<%= `${it.typename}_${api.action}`%>,
+  @Roles(Role.SuperAdmin,Role.SuperUser,
       <%if(api.requiredRole && api.requiredRole.length>0) { %>
         <% for(let r=0;r<api.requiredRole.length;r++){%>Role.<%=api.requiredRole[r]%>,<%}%>
       <%}%>

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

@@ -46,7 +46,7 @@ export const <%= capitalizeFirstLetter(it.name) %>MongoSchema = new Schema(schem
     <%}%>  
   <%}%>
 
-  <% if(config['uniqueKeys']) {%>
+  <% if(config['uniqueKeys']!==undefined) {%>
     <% for(let i=0; i< config['uniqueKeys'].length; i++ ){ %>
       <% const keys = config['uniqueKeys'][i] %>
       .index({ 
@@ -59,6 +59,14 @@ export const <%= capitalizeFirstLetter(it.name) %>MongoSchema = new Schema(schem
     <% } %>
   <%}%>
 
+<% if(config['search']) {%>
+.index({ 
+  <% for(let i=0; i< config['search'].length; i++ ){ %>
+      <% const key = config['search'][i] %>            
+          '<%= key %>' : 'text',             
+    <% } %>
+  },{name:"<%= it.typename %>TextIndex"})
+<%}%>
 
 
 <% if(it.foreignkeys){%>

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

@@ -77,13 +77,13 @@ export class <%= it.typename %>Resolver {
     <% let api = it.apiSettings[i] %>
     <% if(api.method!='get') continue %>
     <%if(superadmindoctype.includes(it.doctype)){%>
-    @Roles(Role.SuperAdmin,Role.<%= `${it.typename}_${api.action}`%>,
+    @Roles(Role.SuperAdmin,
     <%if(api.requiredRole && api.requiredRole.length>0) { %>
         <% for(let r=0;r<api.requiredRole.length;r++){%>Role.<%=api.requiredRole[r]%>,<%}%>
         <%}%>
     )
     <%}else{%>
-    @Roles(Role.SuperAdmin,Role.SuperUser,Role.<%= `${it.typename}_${api.action}`%>,
+    @Roles(Role.SuperAdmin,Role.SuperUser,
         <%if(api.requiredRole && api.requiredRole.length>0) { %>
         <% for(let r=0;r<api.requiredRole.length;r++){%>Role.<%=api.requiredRole[r]%>,<%}%>
         <%}%>

package/templates/basic/nuxt/pages.[id].vue.eta

@@ -11,25 +11,25 @@
  */
 
 import {<%= it.typename %>} from '~/simpleapp/generate/types'
+import {FormCrudEvent} from "~/types"
 const doc = useNuxtApp().$<%= it.typename %>Doc()
 const _id = getPathPara('id','')
 
-const after = (actionName: string, data: <%= it.typename %>) => {    
-  console.log("<%= it.typename %> capture after emits ", actionName)
+const after = (actionName: FormCrudEvent, data: <%= it.typename %>) => {    
   switch (actionName) {
-    case "exit":
+    case FormCrudEvent.exit:
       goTo(doc.getDocName());
       break;
-    case "create":
+    case FormCrudEvent.create:
       goTo(doc.getDocName(), data._id);      
       refreshDocumentList(doc.getDocName())
       useNuxtApp().$event('CloseDialog',doc.getDocName().toLowerCase())
       break;
-    case "update":
+    case FormCrudEvent.update:
       refreshDocumentList(doc.getDocName());
-      useNuxtApp().$event('CloseDialog',doc.getDocName().toLowerCase())
+      //useNuxtApp().$event('CloseDialog',doc.getDocName().toLowerCase())
       break;
-    case "delete":
+    case FormCrudEvent.delete:
       goTo(doc.getDocName(), "new");
       refreshDocumentList(doc.getDocName())
       useNuxtApp().$event('CloseDialog',doc.getDocName().toLowerCase())

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

@@ -131,7 +131,6 @@
       <%})%>  
       </div>        
     </SimpleAppForm>
-    <DebugDocumentData v-model="data" :label="doc.getDocName()"/>
     </div>
 </template>
 
@@ -161,9 +160,7 @@ const newData = () =>  doc.setNew()
 const getRecord = async () => {
   if(id.value && id.value != 'new'){
     await doc.getById(id.value)
-  }else{
-      newData()
-    } 
+  }
 }
 
 getRecord()

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

@@ -4,26 +4,7 @@
    <PageDocList :document="doc" :columns="columns" :data="docdata" :sorts="sorts">
    <template #mobileList="{index,item}">
    </template>
-   <template #dataTableColumns>
-    <%Object.keys(it.jsonschema.properties).forEach(function(key) { %>
-          <%let obj=it.jsonschema.properties[key] %>
-          <%let config=it.jsonschema['x-simpleapp-config'] %>
-          <%if(skipcolumns.indexOf(key)>=0){%>
-          <%} else if(config['uniqueKey'] && (config['uniqueKey']==key || config['documentTitle']==key)  ){%>
-          <Column #body="{index,data}" :header="t('<%=key%>')">
-            <RendererLink :value="data" :setting="{path:'<%=it.name%>'}" :fields="['<%=key%>']">{{ data.<%=key%> }}</RendererLink>
-          </Column>
-
-          <%} else if(['string','number','integer','boolean'].indexOf(obj.type)>=0){%>
-            <Column #body="{index,data}" :header="t('<%=key%>')">
-              {{data.<%=key%>}}
-            </Column>          
-          <%} else if(obj.type =='object' && obj['x-foreignkey'] ){%>
-            <Column #body="{index,data}" :header="t('<%=key%>')">
-              <RendererViewer :value="data.<%=key%>" :setting="{documentName:'<%=obj["x-foreignkey"]%>'}" :fields="['<%=key%>']">{{ data.label }}</RendererViewer>
-            </Column>            
-          <%}%>
-      <%})%>
+   <template #dataTableColumns>    
    </template>
    <template #default><div><NuxtPage :_id="id ?? 'new'"/></div></template>    
   </PageDocList>

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

@@ -121,7 +121,7 @@ export class <%= it.typename%>Client extends SimpleAppClient<openapi.<%= it.type
 
 
   /*****************************begin x-document-api code*****************************************/
-
+ 
   <%for(let i=0;i<it.apiSettings.length;i++){%>
   <% let api = it.apiSettings[i] %>
   async run<%=capitalizeFirstLetter(api.action)%>(
@@ -299,4 +299,11 @@ export class <%= it.typename%>Client extends SimpleAppClient<openapi.<%= it.type
     }
   <%}%>
   /***************************** end document status code*****************************************/
+
+  <%if(it.jsonschema['x-simpleapp-config']['search']!==undefined){%>
+    async runFullTextSearh(keyword:string) {
+      const response = await this.docapi.runFullTextSearch(keyword)
+      return response.data
+    }
+  <%}%>
 }

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

@@ -17,4 +17,6 @@ export class ApiSearchBody{
     fields:  [Object];
     @ApiProperty({"type":()=>[Object],"required":true,"examples":['[[ "field1", "asc" ]]'],"default":[[ 'field1', 'asc' ]]} )
     sorts:  [Object];
+    @ApiProperty({type: () => Object,required: false,})
+    lookup: Object
 }

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

@@ -8,7 +8,14 @@ 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%>},
+      {
+        docName:'<%= d['docname'] %>',
+        docType:'<%= d['doctype'].toUpperCase()%>',
+        page: '<%=d['pagetype']%>', 
+        isolationType:'<%=conf['isolationType']%>', 
+        documentDate:'<%=conf['documentDate']??""%>', 
+        docNumber:<%=conf['generateDocumentNumber']??false%>,
+        docNoPattern: '<%=conf['docNoPattern']%>'
+        },
     <%}%>
   ]

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

@@ -11,6 +11,11 @@ export enum Role {
     SuperUser = 'suerpuser',     //reserved, plan use by support 
     TenantOwner = 'tenantowner', //tenant owner/creator 
     User = 'user',
+    //role generated from groups
+    <% Object.getOwnPropertyNames(it.allroles).forEach((key)=>{%>
+        <%=  capitalizeFirstLetter(key) %> = '<%=key%>', 
+    <%})%>
+    //role generate from schema
     <% for(let i=0;i<it.modules.length; i++){ %>
         <% const m = it.modules[i] %>
         <%=m.docname%>_access='<%=m.docname%>:access',
@@ -26,17 +31,7 @@ export enum Role {
         <%if(m.schema['x-simpleapp-config']['printFormats']){%>
             <%=m.docname%>_print='<%=m.docname%>:print',
         <%}%>
-
-
-        <% if(m.api && m.api.length >0) {%>
-
-            <% for(let j=0;j<m.api.length; j++){ %>
-                <%let api = m.api[j]%>
         
-        <%=m.docname%>_<%=api.action%>='<%=m.docname%>:<%=api.action%>',
-        
-            <%}%>
-        <%}%>
         <% if(m.schema['x-simpleapp-config']['allStatus'] && m.schema['x-simpleapp-config']['allStatus'].length >0) {%>
             <%let allstatus = m.schema['x-simpleapp-config']['allStatus']%>
             <% for(let j=0;j<allstatus.length; j++){ %>

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

@@ -9,6 +9,7 @@ import {Role} from './roles.enum'
 <% Object.getOwnPropertyNames(it.allroles).forEach((key)=>{ %>
 export const <%=key%>=()=>[
     Role.User,
+    Role.<%=capitalizeFirstLetter(key)%>,
     <%for(let i=0; i <it.allroles[key].length; i++){%>
     Role.<%=it.allroles[key][i]%>,
     <%}%>

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

@@ -0,0 +1,50 @@
+import {
+  BadRequestException,
+  Injectable,
+  InternalServerErrorException,
+  Logger,
+  NotFoundException,
+} from '@nestjs/common';
+import { EventEmitter2, OnEvent } from '@nestjs/event-emitter';
+import { UserContext } from './user.context';
+import { WebhookService } from 'src/simpleapp/services/webhook.service';
+@Injectable()
+export class RunWebhookService {
+  public constructor(private webhookService: WebhookService) {}
+  @OnEvent('webhook')
+  async runWebhook(
+    appuser: UserContext,
+    documentName: string,
+    actionName: string,
+    data?: any,
+  ) {
+    let subscribeall=false
+    const webhooks = await this.webhookService.search(appuser, {
+      documentName: documentName,
+      active: true,
+    });
+    if (webhooks.length == 0) return;
+
+    const webhook = webhooks[0];
+    let subscribes:string[] = []
+    if(webhook.setting=='' || webhook.setting===undefined){
+      subscribeall=true
+    }else{
+      subscribes= JSON.parse(webhook.setting)
+    }
+
+    if(subscribes.includes(actionName)){
+      const webhookurl = webhook.url;
+      const secretkey = webhook.secret;
+      const req = await fetch(webhookurl, {
+        method: 'POST',
+        headers: { 'x-apiKey': secretkey },
+        body: JSON.stringify(data),
+      });
+      const statusCode = req.status
+      const body = req.body
+
+    }
+    
+  }
+}

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

@@ -91,6 +91,7 @@ export class UserContext {
   getTenantId = () => this.tenantId;
   getOrgId = () => this.orgId;
   getBranchId = () => this.branchId;
+  getBranchCode = () => this.branchCode;
   getEmail = () => this.email;
   getTimeZone = () => this.timeZone;
   getCountry = () => this.country;
@@ -218,7 +219,7 @@ export class UserContext {
             }
           }
 
-          userinfo.branchRecordId = myperm.currentbranch[0].branchRecordId;
+          userinfo.branchRecordId = myperm.currentbranch[0]._id;
           userinfo.branchCode = myperm.currentbranch[0].branchCode;
           userinfo.branchName = myperm.currentbranch[0].branchName;
           userinfo.orgRecordId = myperm.currentorg[0]._id;
@@ -258,7 +259,7 @@ export class UserContext {
     const tokeninfo = jwt.decode(tokenstr);
     this.token = tokenstr;
     this.uid = tokeninfo?.sub ?? '';
-    this.email = tokeninfo?.email ??'';
+    this.email = tokeninfo?.email ?? '';
     this.uname = tokeninfo?.preferred_username ?? '';
     this.fullname = tokeninfo?.name ?? [];
     this.ssoACL = tokeninfo?.resource_access ?? [];
@@ -535,7 +536,7 @@ export class UserContext {
   };
 
   searchInsertedRecordId(collection: string, _id: string) {
-    if(!this.modifiedRecords.createds[collection]) return undefined
+    if (!this.modifiedRecords.createds[collection]) return undefined;
     return this.modifiedRecords.createds[collection].find(
       (item) => item === _id,
     );
@@ -724,4 +725,13 @@ export class UserContext {
     }
     return data;
   }
+
+  offsetDate(date: string): string {
+    const timestamp = new Date(date).getTime();
+    const offsets = this.getOffsetMinute() * 60000;
+    const isodate =
+      new Date(timestamp + offsets).toISOString().split('.')[0] + 'Z';
+    // console.log("Generate schedule ",date,":",appuser.getOffsetMinute()," => ",isodate)
+    return isodate;
+  }
 }

package/templates/nest/src/simpleapp/generate/controllers/simpleapp.controller.ts.eta

@@ -30,6 +30,7 @@ type ServiceType = {
   findIdThenPatch: Function;
   setData: Function;
   getAutoComplete: Function;
+  fullTextSearch:Function;
 };
 
 // @ApiTags(doctype)
@@ -50,15 +51,22 @@ export class SimpleAppAbstractController<
   async _list(appuser: UserContext) {
     return this.service.list(appuser);
   }
+  async _fulltextsearch(appuser: UserContext, keyword: string) {
+    return this.service.fullTextSearch(
+      appuser,
+      keyword
+    );
+  }
   async _search(appuser: UserContext, searchObject: SearchBody) {
     return this.service.search(
       appuser,
       searchObject['filter'],
       searchObject['fields'],
       searchObject['sorts'],
+      searchObject['lookup'],
     );
   }
-  async _autocomplete(appuser: UserContext, keyword:string,data?:T) {
+  async _autocomplete(appuser: UserContext, keyword: string, data?: T) {
     return this.service.getAutoComplete(appuser, keyword, data);
   }
   async _findOne(appuser: UserContext, id: string) {