@simitgroup/simpleapp-generator 1.6.6-h-alpha → 1.6.6-j-alpha

package/dist/schematype/simplemasterdata.js

@@ -0,0 +1,31 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.simplemasterdata = void 0;
+const type_1 = require("../type");
+exports.simplemasterdata = {
+    type: "object",
+    "x-simpleapp-config": {
+        isolationType: type_1.IsolationType.org,
+        pageType: "crud",
+        schemaType: type_1.SupportedSchemaType.simplemasterdata,
+        documentType: '',
+        documentName: '',
+    },
+    properties: {
+        _id: { type: 'string' },
+        tenantId: { type: 'integer', default: 1, description: "system field" },
+        orgId: { type: 'integer', default: 1, description: "system field" },
+        branchId: { type: 'integer', default: 1, description: "system field" },
+        created: { type: 'string', description: "system field" },
+        updated: { type: 'string', description: "system field" },
+        createdby: { type: 'string', description: "system field" },
+        updatedby: { type: 'string', description: "system field" },
+    },
+    definitions: {
+        foreignkey: {
+            type: "object",
+            properties: { _id: { "type": "string" }, label: { "type": "string" }, code: { "type": "string" } }
+        }
+    },
+};
+//# sourceMappingURL=simplemasterdata.js.map

package/dist/schematype/simplemasterdata.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"simplemasterdata.js","sourceRoot":"","sources":["../../src/schematype/simplemasterdata.ts"],"names":[],"mappings":";;;AAAA,kCAAoE;AACvD,QAAA,gBAAgB,GAAc;IACvC,IAAI,EAAC,QAAQ;IACb,oBAAoB,EAAC;QACnB,aAAa,EAAE,oBAAa,CAAC,GAAG;QAChC,QAAQ,EAAC,MAAM;QACf,UAAU,EAAE,0BAAmB,CAAC,gBAAgB;QAChD,YAAY,EAAC,EAAE;QACf,YAAY,EAAC,EAAE;KAChB;IACD,UAAU,EAAC;QACP,GAAG,EAAC,EAAC,IAAI,EAAC,QAAQ,EAAC;QACnB,QAAQ,EAAC,EAAC,IAAI,EAAC,SAAS,EAAC,OAAO,EAAC,CAAC,EAAC,WAAW,EAAC,cAAc,EAAC;QAC9D,KAAK,EAAC,EAAC,IAAI,EAAC,SAAS,EAAC,OAAO,EAAC,CAAC,EAAC,WAAW,EAAC,cAAc,EAAC;QAC3D,QAAQ,EAAC,EAAC,IAAI,EAAC,SAAS,EAAC,OAAO,EAAC,CAAC,EAAC,WAAW,EAAC,cAAc,EAAC;QAC9D,OAAO,EAAC,EAAC,IAAI,EAAC,QAAQ,EAAC,WAAW,EAAC,cAAc,EAAC;QAClD,OAAO,EAAC,EAAC,IAAI,EAAC,QAAQ,EAAC,WAAW,EAAC,cAAc,EAAC;QAClD,SAAS,EAAC,EAAC,IAAI,EAAC,QAAQ,EAAC,WAAW,EAAC,cAAc,EAAC;QACpD,SAAS,EAAC,EAAC,IAAI,EAAC,QAAQ,EAAC,WAAW,EAAC,cAAc,EAAC;KACtD;IACD,WAAW,EAAC;QACX,UAAU,EAAE;YACV,IAAI,EAAC,QAAQ;YACb,UAAU,EAAE,EAAC,GAAG,EAAE,EAAC,MAAM,EAAE,QAAQ,EAAC,EAAC,KAAK,EAAE,EAAC,MAAM,EAAE,QAAQ,EAAC,EAAC,IAAI,EAAE,EAAC,MAAM,EAAE,QAAQ,EAAC,EAAC;SACzF;KACF;CACF,CAAA"}

package/dist/schematype/transaction.js

@@ -0,0 +1,74 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.transaction = void 0;
+const type_1 = require("../type");
+exports.transaction = {
+    type: "object",
+    "x-simpleapp-config": {
+        isolationType: type_1.IsolationType.org,
+        requiredRoles: [],
+        documentType: '',
+        documentName: '',
+        pageType: "crud",
+        uniqueKey: "documentNo",
+        documentTitle: "documentTitle",
+        generateDocumentNumber: true,
+        documentDate: "documentDate",
+        allStatus: [
+            { "status": "D", statusName: "Draft", "readOnly": true, "actions": ["confirm", "void"] },
+            { "status": "CO", statusName: "Confirmed", "readOnly": true, "actions": ["revert", "void"] },
+            { "status": "V", statusName: "Void", "readOnly": true, "actions": ["revert"] },
+        ],
+        additionalApis: [{
+                action: "confirm",
+                entrypoint: ":id/confirm",
+                requiredrole: [],
+                method: type_1.RESTMethods.post,
+                execute: "setDocumentStatus",
+                description: "confirm document and change status to CO"
+            }, {
+                action: "void",
+                entrypoint: ":id/void",
+                querypara: ["reason"],
+                requiredrole: [],
+                method: type_1.RESTMethods.post,
+                execute: "setDocumentStatus",
+                description: "confirm document and change status to V"
+            }, {
+                action: "revert",
+                entrypoint: ":id/revert",
+                requiredrole: [],
+                method: type_1.RESTMethods.post,
+                execute: "setDocumentStatus",
+                description: "revert document and change status to D"
+            }],
+        // simple => pure model and service(no page,api),
+        // default => force masterdata property,  
+        // transaction => force masterdata property
+        schemaType: type_1.SupportedSchemaType.transaction,
+    },
+    properties: {
+        _id: { type: 'string', description: "system field" },
+        tenantId: { type: 'integer', default: 1, description: "system field" },
+        orgId: { type: 'integer', default: 1, description: "system field" },
+        branchId: { type: 'integer', default: 1, description: "system field" },
+        created: { type: 'string', description: "system field" },
+        updated: { type: 'string', description: "system field" },
+        createdby: { type: 'string', description: "system field" },
+        updatedby: { type: 'string', description: "system field" },
+        docNoFormat: {
+            type: "object",
+            "x-foreignkey": "docnoformat",
+            properties: { _id: { "type": "string" }, label: { "type": "string" } },
+            description: "system field"
+        },
+        docStatus: { type: "string", description: "system field" }
+    },
+    definitions: {
+        foreignkey: {
+            type: "object",
+            properties: { _id: { "type": "string" }, label: { "type": "string" }, code: { "type": "string" } }
+        }
+    },
+};
+//# sourceMappingURL=transaction.js.map

package/dist/schematype/transaction.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"transaction.js","sourceRoot":"","sources":["../../src/schematype/transaction.ts"],"names":[],"mappings":"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"}

package/package.json

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

package/src/buildinschemas/webhook.ts

@@ -52,6 +52,7 @@ export const webhook:SchemaType = {
       },
 
       description: {type: "string",format:"text"},
+      body:{type:"string",format:"text",minLength:3},
       active: {type: "boolean", default:true},
       eventTypes:{
         type:"array",

package/src/framework.ts

@@ -4,6 +4,7 @@ import _ from 'lodash'
 import { Logger, ILogObj } from "tslog";
 import * as constants from './constant'
 import  {Eta}  from 'eta';
+import path from 'path';
 const log: Logger<ILogObj> = new Logger();
 
 let config = {
@@ -76,7 +77,7 @@ export const prepareNest = (callback:Function)=>{
         
         //@nestjs/graphql @nestjs/apollo graphql apollo-server-express apollo-server-core
         //@nestjs/graphql graphql-tools graphql apollo-server-express 
-        exec(`cd ${targetfolder};pnpm install --save @nestjs/graphql country-to-currency  graphql-type-json countries-and-timezones @nestjs/apollo @apollo/server graphql @nestjs/event-emitter dayjs bpmn-server@2.1.7 @casl/ability jsonpath yaml lodash @types/lodash nest-keycloak-connect keycloak-connect bpmn-client @nestjs/serve-static jsonwebtoken axios @darkwolf/base64url json-schema @wearenova/mongoose-tenant @nestjs/swagger @nestjs/mongoose mongoose  ajv ajv-formats ajv-errors @nestjs/config`,async (error, stdout, stderr)=>{
+        exec(`cd ${targetfolder};pnpm install --save @nestjs/graphql mustache country-to-currency  graphql-type-json countries-and-timezones @nestjs/apollo @apollo/server graphql @nestjs/event-emitter dayjs bpmn-server@2.1.7 @casl/ability jsonpath yaml lodash @types/lodash nest-keycloak-connect keycloak-connect bpmn-client @nestjs/serve-static jsonwebtoken axios @darkwolf/base64url json-schema @wearenova/mongoose-tenant @nestjs/swagger @nestjs/mongoose mongoose  ajv ajv-formats ajv-errors @nestjs/config`,async (error, stdout, stderr)=>{
             // log.info(`dependency installed`)
             if(!error){
                 // fs.mkdirSync(`${targetfolder}/public_html`,{recursive:true})
@@ -164,11 +165,37 @@ 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@latest @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 @nuxtjs/tailwindcss @types/jsonpath @sidebase/nuxt-auth @types/node @vueuse/nuxt @sidebase/nuxt-auth @vueuse/core prettier @primevue/core primevue tailwindcss-primeui`, (error, stdout, stderr)=>{                
             //;pnpm install    
             console.log(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)
+                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 @primevue/nuxt-module lru-cache vue-advanced-cropper@vue-3`, (error, stdout, stderr)=> {                
+                    console.log(error, stdout, stderr)
+
+                    // copy nuxt primevue tailwind preset to folder
+                    const copyFolderRecursiveSync = (source: string, target: string) => {
+                        // Check if folder needs to be created or integrated
+                        const targetFolder = path.join(target, path.basename(source));
+                        if (!fs.existsSync(targetFolder)) {
+                            fs.mkdirSync(targetFolder, { recursive: true });
+                        }
+
+                        // Copy
+                        if (fs.lstatSync(source).isDirectory()) {
+                            const files = fs.readdirSync(source);
+                            files.forEach((file) => {
+                                const curSource = path.join(source, file);
+                                if (fs.lstatSync(curSource).isDirectory()) {
+                                    copyFolderRecursiveSync(curSource, targetFolder);
+                                } else {
+                                    fs.copyFileSync(curSource, path.join(targetFolder, file));
+                                }
+                            });
+                        }
+                    };
+
+                    // Define source and target folders
+                    const sourceFolder = path.join(constants.templatedir, 'nuxt', 'presets');
+                    copyFolderRecursiveSync(sourceFolder, config.frontendFolder);
                 
                 // fs.mkdirSync(`${targetfolder}/assets/css/`,{recursive:true})
                 // fs.mkdirSync(`${targetfolder}/layouts`,{recursive:true})

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

@@ -36,8 +36,9 @@ import {AppUser} from '../commons/decorators/appuser.decorator'
 import {UserContext} from '../commons/user.context'
 
 
-<% const getFieldType =(proptype, typename)=>{
+<% const getFieldType =(proptype, typename,actionname)=>{
   const systemtypes = ['Boolean','boolean','string','String','number','Number','object','Object','integer','Integer']
+  if(!typename) throw actionname +" undefine schema";
   let tmptypename = typename.replace('[','').replace(']','')
   
   if(systemtypes.includes(tmptypename)){
@@ -192,12 +193,12 @@ export class <%= it.typename %>Controller extends SimpleAppAbstractController<
   <%}%>
   <% if(['post','put','patch'].includes(api.method)){ %>
     @ApiBody({ description: 'Request Body', 
-        type: <%= getFieldType('schema',api.schema)%>
+        type: <%= getFieldType('schema',api.schema,api.action)%>
        
         })
   <%}%>  
   @ApiResponse({status: 200,description: '<%=api.description%>' 
-      ,type: <%= getFieldType('schema',api.responseType)%>
+      ,type: <%= getFieldType('schema',api.responseType,api.action)%>
         })  
   @ApiOperation({ operationId: 'run<%=capitalizeFirstLetter(api.action)%>' })
   <% if(api.queryPara && api.queryPara.length>0) {%>
@@ -208,7 +209,7 @@ export class <%= it.typename %>Controller extends SimpleAppAbstractController<
   async <%=capitalizeFirstLetter(api.action) %>(
     @AppUser() appuser: UserContext,
     <%if(['post','put','patch'].includes(api.method.toLowerCase())){%> 
-      @Body() data:<%= getFieldType('type',api.schema)%>,
+      @Body() data:<%= getFieldType('type',api.schema,api.action)%>,
       //@Body() data:any,
     <%}%>
     <% if(api.entryPoint && api.entryPoint.includes(':')) {%>
@@ -230,7 +231,7 @@ export class <%= it.typename %>Controller extends SimpleAppAbstractController<
          ){
     
 
-      const res:<%= getFieldType('type',api.responseType)%>  = await this.service.run<%=capitalizeFirstLetter(api.action)%>(appuser,<% if(api.entryPoint && api.entryPoint.includes(':')) {%>
+      const res:<%= getFieldType('type',api.responseType,api.action)%>  = await this.service.run<%=capitalizeFirstLetter(api.action)%>(appuser,<% if(api.entryPoint && api.entryPoint.includes(':')) {%>
           <%let subpath = api.entryPoint.split('/')%>
           <% for(let a=0;a<subpath.length;a++){%>
             <%const partstr = subpath[a]%>

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

@@ -14,8 +14,10 @@ import { Role } from '../commons/roles/roles.enum';
 
 import { Request } from '@nestjs/common';
 
-<% const getFieldType =(proptype, typename)=>{
+<% const getFieldType =(proptype, typename,actionname)=>{
     const systemtypes = ['Boolean','boolean','string','String','number','Number','object','Object','integer','Integer']
+    if(!typename) throw actionname +" undefine schema";
+
     let tmptypename = typename.replace('[','').replace(']','')
     
     if(systemtypes.includes(tmptypename)){
@@ -89,7 +91,7 @@ export class <%= it.typename %>Resolver {
         <%}%>
         )
     <%}%>
-      @Query(()=> <%= getFieldType('schema',api.responseType)%>)  
+      @Query(()=> <%= getFieldType('schema',api.responseType,api.action)%>)  
 
 
 

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

@@ -13,8 +13,11 @@ import { <%= it.typename %>Processor } from '../generate/processors/<%= it.docty
 //import { <%= it.typename %>,<%= it.typename %>Hooks} from '../generate/types';
 import * as types from '../generate/types';
 export { <%= it.typename %>} from '../generate/types';
-<% const getFieldType =(proptype, typename)=>{
+<% const getFieldType =(proptype, typename,actionname)=>{
   const systemtypes = ['Boolean','boolean','string','String','number','Number','object','Object','integer','Integer']
+  console.log("run service typename----",typename)
+  if(!typename) throw actionname +" undefine schema";
+
   let tmptypename = typename.replace('[','').replace(']','')
   
   if(systemtypes.includes(tmptypename)){
@@ -69,7 +72,7 @@ export class <%= it.typename %>Service extends <%= it.typename %>Processor {
         <%}%>
             
         <%if(['post','put','patch'].includes(api.method.toLowerCase())){%> 
-              data:<%= getFieldType('schema',api.schema)%>,
+              data:<%= getFieldType('schema',api.schema,api.action)%>,
             <%}%>
 
          ){

package/templates/nest/.env._eta

@@ -13,7 +13,7 @@ HTTP_PORT=<%=it.configs.backendPort%>
 
 BPMN_PATH=./src/simpleapp/workflows/bpmn/
 
-X_APIKEY=
+X_API_KEY=
 X_API_SECRET=
 
 OAUTH2_BASEURL=<%=it.configs.oauthSetting ? it.configs.oauthSetting.oauthBaseUrl : ''%>

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

@@ -69,9 +69,9 @@ export class TenantMiddleware implements NestMiddleware {
 
     
     //if APIKEY defined, and there is api key and secret supplied. use robot user
-    if(process.env.X_APIKEY &&req.headers['x-api-key'] && req.headers['x-api-secret']){
+    if(process.env.X_API_KEY &&req.headers['x-api-key'] && req.headers['x-api-secret']){
     
-      if(req.headers['x-api-key']==process.env.X_APIKEY &&
+      if(req.headers['x-api-key']==process.env.X_API_KEY &&
         req.headers['x-api-secret']==process.env.X_API_SECRET){        
 
          u.setAsStaticUser(

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

@@ -11,27 +11,22 @@ import {
   Webhook,
   WebhookService,
 } from 'src/simpleapp/services/webhook.service';
-import {alldocuments} from 'src/simpleapp/generate/commons/dicts/documents'
+import { alldocuments } from 'src/simpleapp/generate/commons/dicts/documents';
 
 @Injectable()
 export class RunWebhookService {
-  private webhookApiKey = process.env.WEBHOOK_SERVER_APIKEY
-  private webhookAppId=process.env.WEBHOOK_SERVER_APP_ID
+  private webhookApiKey = process.env.WEBHOOK_SERVER_APIKEY;
+  private webhookAppId = process.env.WEBHOOK_SERVER_APP_ID;
   private webhookurl = process.env.WEBHOOK_SERVER_URL;
-  private webhookprefix = process.env.PROJECT_CODE+'.'
-  private  webhookeventurl = `${process.env.WEBHOOK_SERVER_URL}/event/`;
-  private  webhookeventtypeurl = `${process.env.WEBHOOK_SERVER_URL}/event_types/`;
-  private webhooksync:boolean = process.env.WEBHOOKER_SYNC_EVENTTYPE=='true'
+  private webhookprefix = process.env.PROJECT_CODE + '.';
+  private webhookeventurl = `${process.env.WEBHOOK_SERVER_URL}/event/`;
+  private webhookeventtypeurl = `${process.env.WEBHOOK_SERVER_URL}/event_types/`;
+  private webhooksync: boolean = process.env.WEBHOOKER_SYNC_EVENTTYPE == 'true';
 
-
-
-  public constructor(
-    private webhookService: WebhookService,    
-  ) {
-    if(this.webhooksync) this.syncEventTypes()
+  public constructor(private webhookService: WebhookService) {
+    if (this.webhooksync) this.syncEventTypes();
   }
 
-
   @OnEvent('webhook')
   async loadWebhook(
     appuser: UserContext,
@@ -39,18 +34,16 @@ export class RunWebhookService {
     actionName: string,
     data?: any,
   ) {
-
     //no webhook server implemented
-    if(!this.webhookApiKey) return true
-
+    if (!this.webhookApiKey) return true;
 
     const filter = {
-      eventTypes: documentName + '.' + actionName ,
+      eventTypes: documentName + '.' + actionName,
       active: true,
-    }
-    console.log("Load webhook",documentName,actionName,filter)
+    };
+    console.log('Load webhook', documentName, actionName, filter);
     const webhooks = await this.webhookService.search(appuser, filter);
-    console.log("Loaded webhook",webhooks)
+    console.log('Loaded webhook', webhooks);
     if (webhooks.length == 0) return;
 
     for (let i = 0; i < webhooks.length; i++) {
@@ -74,128 +67,127 @@ export class RunWebhookService {
     webhook: Webhook,
     documentName: string,
     actionName: string,
-    data: any,
+    oridata: any,
   ) {
-    
     const headers = {};
-
-    console.log("Run webhook ",documentName,actionName)
-    if (Array.isArray(webhook.headers)) {
-      webhook.headers.forEach((h) => {
-        headers[h.name] = h.value;
-      });
-    }
-    headers['accept'] = 'application/json';
-    headers['content-type'] = 'application/json';
-    headers['Authorization'] = this.webhookApiKey;
-    const eventname = `${this.webhookprefix}${documentName}.${actionName}`
-    const options = {
-      method: webhook.requestMethod.toUpperCase(),
-      headers: headers,
-      body: JSON.stringify({
-        labels: {
-          tenantId: appuser.getTenantId().toString(),
-        },
-        metadata: {
-          src: process.env.PROJECT_NAME,
-          user: appuser.getFullname(),
-        },
-        application_id: this.webhookAppId,
-        event_type: eventname,
-        event_id: crypto.randomUUID(),
-        occurred_at: new Date().toISOString(),
-        payload: JSON.stringify(data),
-        payload_content_type: 'application/json',
-      }),
-    };
-    try {
-      console.log("webhook request ",this.webhookeventurl,options)
+    
+    try{
+      
+      console.log('Run webhook ', documentName, actionName);
+      const Mustache = require('mustache');
+      const data = Mustache.render(webhook.body,oridata)
+      if (Array.isArray(webhook.headers)) {
+        webhook.headers.forEach((h) => {
+          headers[h.name] = h.value;
+        });
+      }
+      headers['accept'] = 'application/json';
+      headers['content-type'] = 'application/json';
+      headers['Authorization'] = this.webhookApiKey;
+      const eventname = `${this.webhookprefix}${documentName}.${actionName}`;
+      const options = {
+        method: webhook.requestMethod.toUpperCase(),
+        headers: headers,
+        body: JSON.stringify({
+          labels: {
+            tenantId: appuser.getTenantId().toString(),
+          },
+          metadata: {
+            src: process.env.PROJECT_NAME,
+            user: appuser.getFullname(),
+          },
+          application_id: this.webhookAppId,
+          event_type: eventname,
+          event_id: crypto.randomUUID(),
+          occurred_at: new Date().toISOString(),
+          payload: data, //JSON.stringify(),
+          payload_content_type: 'application/json',
+        }),
+      };
+      
+      console.log('webhook request ', this.webhookeventurl, options);
       const req = await fetch(this.webhookeventurl, options);
       const statusCode = req.status;
-      if(statusCode>=300){
-        throw new InternalServerErrorException(`create event ${eventname} failed to webhook server`)
+      if (statusCode >= 300) {
+        throw new InternalServerErrorException(
+          `create event ${eventname} failed to webhook server`,
+        );
       }
-      
+
       // const body = req.body;
     } catch (e) {
-      return e
+      return e;
     }
   }
 
-
-
-  async syncEventTypes(){
+  async syncEventTypes() {
     const options = {
-      method: 'GET', 
+      method: 'GET',
       headers: {
         accept: 'application/json',
-        Authorization: this.webhookApiKey
-      }};
+        Authorization: this.webhookApiKey,
+      },
+    };
     //  {
     //   "service_name": "billing",
     //   "resource_type_name": "invoice",
     //   "verb_name": "documentno",
     //   "event_type_name": "billing.invoice.documentno"
     // },
-    try{
-
-
-    const res = await fetch(
-      `${this.webhookeventtypeurl}?application_id=${this.webhookAppId}`, 
-      options)
-
-    const locallist = this.getSchemaEventTypes()
-    const eventlist = (await res.json()).map(item=>item.event_type_name)
-
-    for(let i=0; i<locallist.length;i++){
-      const item = locallist[i]
-      if(!eventlist.includes(item)){
-        //create remote event type
-        await this.createEventType(item)
+    try {
+      const res = await fetch(
+        `${this.webhookeventtypeurl}?application_id=${this.webhookAppId}`,
+        options,
+      );
+
+      const locallist = this.getSchemaEventTypes();
+      const eventlist = (await res.json()).map((item) => item.event_type_name);
+
+      for (let i = 0; i < locallist.length; i++) {
+        const item = locallist[i];
+        if (!eventlist.includes(item)) {
+          //create remote event type
+          await this.createEventType(item);
+        }
       }
+    } catch (e) {
+      throw new InternalServerErrorException(e);
     }
-
-   
-    }catch(e){
-      throw new InternalServerErrorException(e)
-    }
-
-
   }
 
-
-  async createEventType(eventname:string){
-    const para = eventname.split('.')
+  async createEventType(eventname: string) {
+    const para = eventname.split('.');
     const options = {
       method: 'POST',
       headers: {
         accept: 'application/json',
         'content-type': 'application/json',
-        Authorization: this.webhookApiKey
+        Authorization: this.webhookApiKey,
       },
       body: JSON.stringify({
         application_id: this.webhookAppId,
         resource_type: para[0],
         service: para[1],
-        verb: para[2]
-      })
+        verb: para[2],
+      }),
     };
 
-    await fetch(this.webhookeventtypeurl, options)
-      // .then(response => response.json())
-      // .then(response => console.log(response))
-      // .catch(err => console.error(err));
+    await fetch(this.webhookeventtypeurl, options);
+    // .then(response => response.json())
+    // .then(response => console.log(response))
+    // .catch(err => console.error(err));
   }
-  getSchemaEventTypes(){
-    const alleventtypes:string[] = []
-    alldocuments.filter(item=>Array.isArray(item.webhook))
-      .forEach(item=>{
-        item.webhook.forEach(h=>{
+  getSchemaEventTypes() {
+    const alleventtypes: string[] = [];
+    alldocuments
+      .filter((item) => Array.isArray(item.webhook))
+      .forEach((item) => {
+        item.webhook.forEach((h) => {
           alleventtypes.push(
-            `${this.webhookprefix}${item.docName.toLowerCase()}.${h}`)
-        })
-      })
-    return alleventtypes
-
+            `${this.webhookprefix}${item.docName.toLowerCase()}.${h}`,
+          );
+        });
+      });
+    return alleventtypes;
   }
 }

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

@@ -525,7 +525,7 @@ export class UserContext {
         this.logger.log(result, 'accept invitation 1');
         //set permission of all user under this.user_id
         const updateresult = await this.permmodel
-          .updateMany({ uid: '', user_id: res._id }, { uid: this.getUid() })
+          .updateMany({ uid: '', userId: res._id }, { uid: this.getUid() })
           .session(this.dbsession);
         this.logger.log(updateresult, 'update all permission');
         return true;
@@ -534,7 +534,7 @@ export class UserContext {
           .deleteOne({ _id: id })
           .session(this.dbsession);
         await this.permmodel
-          .deleteMany({ uid: '', user_id: res._id })
+          .deleteMany({ uid: '', userId: res._id })
           .session(this.dbsession);
         return true;
       }

package/templates/nest/src/simpleapp/generate/processors/simpleapp.processor.ts.eta

@@ -20,9 +20,7 @@ import {
   FilterQuery,
   ProjectionType,
 } from 'mongoose';
-import Ajv from 'ajv';
-import addFormats from 'ajv-formats';
-import addErrors from 'ajv-errors';
+import { getValidateService } from 'src/simpleapp/generate/sharelibs/validate';
 import {
   NotFoundException,
   HttpException,
@@ -461,18 +459,8 @@ export class SimpleAppService<T extends { _id?: string; __v?: number }> {
     }
   };
   async validateData(appuser: UserContext, data: T, _id?: string) {
-    const ajv = new Ajv({ allErrors: true, useDefaults: true });
-    addFormats(ajv);
-    addErrors(ajv);
-
-    ajv.addFormat('tel', /^$|^\d{7,15}$/gm);
-    ajv.addFormat('text', /.*$/);
-    ajv.addFormat('html', /.*$/);
-    ajv.addFormat('documentno', /.*$/);
-    ajv.addFormat('money', /.*$/);
-
-    ajv.addKeyword({ keyword: 'x-foreignkey', schemaType: 'string' });
-    ajv.addKeyword({ keyword: 'x-simpleapp-config', schemaType: 'object' });
+    const ajv = getValidateService();
+
     this.logger.debug('run hook during validation');
     let issuccess = true;
     if (this.hooks.beforeValidation) {