@simitgroup/simpleapp-generator 1.6.6-u-alpha → 1.6.6-v-alpha

package/ReleaseNote.md

@@ -1,3 +1,6 @@
+[1.6.6v-alpha]
+1. Fix webhook no store logs, and add api to obtain webhook execution histories
+
 [1.6.6u-alpha]
 1. Fix repo crash
 

package/dist/buildinschemas/webhook.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"webhook.d.ts","sourceRoot":"","sources":["../../src/buildinschemas/webhook.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAA8B,MAAM,SAAS,CAAC;AAEjE,eAAO,MAAM,OAAO,EAAE,UAsIrB,CAAA"}
+{"version":3,"file":"webhook.d.ts","sourceRoot":"","sources":["../../src/buildinschemas/webhook.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAA8B,MAAM,SAAS,CAAC;AAEjE,eAAO,MAAM,OAAO,EAAE,UA+IrB,CAAA"}

package/dist/buildinschemas/webhook.js

@@ -10,7 +10,17 @@ exports.webhook = {
         "isolationType": type_1.IsolationType.branch,
         "uniqueKey": "title",
         "documentTitle": "title",
-        "resourceName": "webhook"
+        "resourceName": "webhook",
+        additionalApis: [
+            {
+                action: 'getHistories',
+                entryPoint: ':id/histories',
+                requiredRole: ["Admin"],
+                method: type_1.RESTMethods.get,
+                responseType: '[Webhooklog]',
+                description: 'Get webhook execute histories'
+            }
+        ]
     },
     "required": [
         "title",

package/dist/buildinschemas/webhook.js.map

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

package/dist/buildinschemas/webhooklog.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"webhooklog.d.ts","sourceRoot":"","sources":["../../src/buildinschemas/webhooklog.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAA8B,MAAM,SAAS,CAAC;AAEjE,eAAO,MAAM,UAAU,EAAE,UAwExB,CAAA"}
+{"version":3,"file":"webhooklog.d.ts","sourceRoot":"","sources":["../../src/buildinschemas/webhooklog.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAA8B,MAAM,SAAS,CAAC;AAEjE,eAAO,MAAM,UAAU,EAAE,UA4ExB,CAAA"}

package/dist/buildinschemas/webhooklog.js

@@ -13,6 +13,7 @@ exports.webhooklog = {
     },
     "required": [
         "title",
+        "webHookId",
         "body",
         "msg"
     ],
@@ -20,6 +21,9 @@ exports.webhooklog = {
         "_id": {
             "type": "string"
         },
+        "webHookId": {
+            "type": "string"
+        },
         "created": {
             "type": "string"
         },

package/dist/buildinschemas/webhooklog.js.map

@@ -1 +1 @@
-{"version":3,"file":"webhooklog.js","sourceRoot":"","sources":["../../src/buildinschemas/webhooklog.ts"],"names":[],"mappings":";;;AAAA,kCAAiE;AAEpD,QAAA,UAAU,GAAe;IACpC,MAAM,EAAE,QAAQ;IAChB,oBAAoB,EAAE;QACpB,cAAc,EAAE,YAAY;QAC5B,cAAc,EAAE,YAAY;QAC5B,eAAe,EAAE,oBAAa,CAAC,MAAM;QACrC,WAAW,EAAE,KAAK;QAClB,cAAc,EAAE,YAAY;KAC7B;IACD,UAAU,EAAE;QACV,OAAO;QACP,MAAM;QACN,KAAK;KACN;IACD,YAAY,EAAE;QACZ,KAAK,EAAE;YACL,MAAM,EAAE,QAAQ;SACjB;QACD,SAAS,EAAE;YACT,MAAM,EAAE,QAAQ;SACjB;QACD,SAAS,EAAE;YACT,MAAM,EAAE,QAAQ;SACjB;QACD,WAAW,EAAE;YACX,MAAM,EAAE,QAAQ;SACjB;QACD,WAAW,EAAE;YACX,MAAM,EAAE,QAAQ;SACjB;QACD,UAAU,EAAE;YACV,MAAM,EAAE,SAAS;YACjB,SAAS,EAAE,CAAC;YACZ,SAAS,EAAE,CAAC;SACb;QACD,OAAO,EAAE;YACP,MAAM,EAAE,SAAS;YACjB,SAAS,EAAE,CAAC;YACZ,SAAS,EAAE,CAAC;SACb;QACD,UAAU,EAAE;YACV,MAAM,EAAE,SAAS;YACjB,SAAS,EAAE,CAAC;YACZ,SAAS,EAAE,CAAC;SACb;QACD,OAAO,EAAE;YACP,MAAM,EAAE,QAAQ;YAChB,WAAW,EAAE,CAAC;SACf;QACD,UAAU,EAAE;YACV,MAAM,EAAE,QAAQ;SACjB;QACD,YAAY,EAAE;YACZ,MAAM,EAAE,QAAQ;SACjB;QACD,YAAY,EAAE;YACZ,MAAM,EAAE,QAAQ;SACjB;QACD,QAAQ,EAAE;YACR,MAAM,EAAE,QAAQ;YAChB,MAAM,EAAC,CAAC,SAAS,EAAC,QAAQ,CAAC;SAC5B;QACD,MAAM,EAAE;YACN,MAAM,EAAE,QAAQ;YAChB,QAAQ,EAAC,MAAM;YACf,WAAW,EAAC,CAAC;SACd;QACD,KAAK,EAAC;YACJ,MAAM,EAAC,QAAQ;SAChB;KAEF;CACF,CAAA"}
+{"version":3,"file":"webhooklog.js","sourceRoot":"","sources":["../../src/buildinschemas/webhooklog.ts"],"names":[],"mappings":";;;AAAA,kCAAiE;AAEpD,QAAA,UAAU,GAAe;IACpC,MAAM,EAAE,QAAQ;IAChB,oBAAoB,EAAE;QACpB,cAAc,EAAE,YAAY;QAC5B,cAAc,EAAE,YAAY;QAC5B,eAAe,EAAE,oBAAa,CAAC,MAAM;QACrC,WAAW,EAAE,KAAK;QAClB,cAAc,EAAE,YAAY;KAC7B;IACD,UAAU,EAAE;QACV,OAAO;QACP,WAAW;QACX,MAAM;QACN,KAAK;KACN;IACD,YAAY,EAAE;QACZ,KAAK,EAAE;YACL,MAAM,EAAE,QAAQ;SACjB;QACD,WAAW,EAAE;YACX,MAAM,EAAE,QAAQ;SACjB;QACD,SAAS,EAAE;YACT,MAAM,EAAE,QAAQ;SACjB;QACD,SAAS,EAAE;YACT,MAAM,EAAE,QAAQ;SACjB;QACD,WAAW,EAAE;YACX,MAAM,EAAE,QAAQ;SACjB;QACD,WAAW,EAAE;YACX,MAAM,EAAE,QAAQ;SACjB;QACD,UAAU,EAAE;YACV,MAAM,EAAE,SAAS;YACjB,SAAS,EAAE,CAAC;YACZ,SAAS,EAAE,CAAC;SACb;QACD,OAAO,EAAE;YACP,MAAM,EAAE,SAAS;YACjB,SAAS,EAAE,CAAC;YACZ,SAAS,EAAE,CAAC;SACb;QACD,UAAU,EAAE;YACV,MAAM,EAAE,SAAS;YACjB,SAAS,EAAE,CAAC;YACZ,SAAS,EAAE,CAAC;SACb;QACD,OAAO,EAAE;YACP,MAAM,EAAE,QAAQ;YAChB,WAAW,EAAE,CAAC;SACf;QACD,UAAU,EAAE;YACV,MAAM,EAAE,QAAQ;SACjB;QACD,YAAY,EAAE;YACZ,MAAM,EAAE,QAAQ;SACjB;QACD,YAAY,EAAE;YACZ,MAAM,EAAE,QAAQ;SACjB;QACD,QAAQ,EAAE;YACR,MAAM,EAAE,QAAQ;YAChB,MAAM,EAAC,CAAC,SAAS,EAAC,QAAQ,CAAC;SAC5B;QACD,MAAM,EAAE;YACN,MAAM,EAAE,QAAQ;YAChB,QAAQ,EAAC,MAAM;YACf,WAAW,EAAC,CAAC;SACd;QACD,KAAK,EAAC;YACJ,MAAM,EAAC,QAAQ;SAChB;KAEF;CACF,CAAA"}

package/package.json

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

package/src/buildinschemas/webhook.ts

@@ -8,7 +8,16 @@ export const webhook: SchemaType = {
     "isolationType":IsolationType.branch,
     "uniqueKey": "title",
     "documentTitle": "title",
-    "resourceName": "webhook"
+    "resourceName": "webhook",
+     additionalApis: [
+      {
+        action: 'getHistories',
+        entryPoint: ':id/histories',
+        requiredRole: ["Admin"],
+        method: RESTMethods.get,
+        responseType: '[Webhooklog]',
+        description: 'Get webhook execute histories'
+      }]
   },
   "required": [
     "title",

package/src/buildinschemas/webhooklog.ts

@@ -11,6 +11,7 @@ export const webhooklog: SchemaType = {
   },
   "required": [
     "title",
+    "webHookId",
     "body",
     "msg"
   ],
@@ -18,6 +19,9 @@ export const webhooklog: SchemaType = {
     "_id": {
       "type": "string"
     },
+    "webHookId": {
+      "type": "string"
+    },    
     "created": {
       "type": "string"
     },

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

@@ -4,10 +4,10 @@
  * last change 2024-03-17
  * Author: Ks Tan
  */
-import { BadRequestException, Injectable,Inject, InternalServerErrorException, Logger, NotFoundException } from '@nestjs/common';
+import { BadRequestException, Injectable, Inject, InternalServerErrorException, Logger, NotFoundException } from '@nestjs/common';
 import { EventEmitter2, OnEvent } from '@nestjs/event-emitter';
 import { UserContext } from './user.context';
-import { Webhook,Webhooklog } from '../types';
+import { Webhook, Webhooklog } from '../types';
 import { alldocuments } from 'src/simpleapp/generate/commons/dicts/documents';
 
 @Injectable()
@@ -16,22 +16,21 @@ export class RunWebhookService {
   protected eventEmitter: EventEmitter2;
 
   protected logger = new Logger();
-  protected maxRetries = 5
+  protected maxRetries = 5;
   public constructor() {}
 
-
-
   /**
    * trigger
    */
   async run(appuser: UserContext, documentName: string, actionName: string, data: any) {
-    return await this.runRealtimeWebHook(appuser,documentName,actionName,data)
+    if (process.env.WEBHOOK_ONOFF && process.env.WEBHOOK_ONOFF.toLowerCase() == 'on') return await this.runRealtimeWebHook(appuser, documentName, actionName, data);
+    else this.logger.warn(`Webhook off, not run for ${documentName}:${actionName}`);
   }
   /**
    * get/delete
    * http://myendpoint.com/{orgid}/invoice/{documentid}/delete
    * http://myendpoint.com/{orgid}/invoice/{documentid}?action=delete
-   * 
+   *
    * post/put/patch
    * http://myendpoint.com/{orgid}/invoice/{documentid}
    * {json body}
@@ -40,131 +39,138 @@ export class RunWebhookService {
     this.logger.debug(`Run webhook ${documentName}, ${actionName}`);
     // console.log(`Run webhook ${documentName}, ${actionName}`);
 
-
-    const webhooks = appuser.getWebHooks().filter(wh=>
-      wh.resourceName==documentName && wh.eventType==actionName 
-      )
+    const webhooks = appuser.getWebHooks().filter((wh) => wh.resourceName == documentName && wh.eventType == actionName);
     // console.log(webhooks);
-    
-    //same resource,actionName may have multiple webhook, run 1 by 1
-    for(let whNo=0;whNo<webhooks.length;whNo++){    
 
-      const webhook = webhooks[whNo]
-      const reqMethod = webhook.requestMethod
-      this.logger.verbose(webhook)
+    const systemVars = {
+      $xOrg: appuser.getXOrg(),
+      $accessToken: appuser.getUserToken(),
+      $fullName: appuser.getFullname(),
+      $email: appuser.getEmail(),
+      $uid: appuser.getUid(),
+      $resourceName: documentName,
+      $actionName: actionName,
+    };
+
+    //same resource,actionName may have multiple webhook, run 1 by 1
+    for (let whNo = 0; whNo < webhooks.length; whNo++) {
+      const webhook = webhooks[whNo];
+      const reqMethod = webhook.requestMethod;
+      let webhookUrl = webhook.url;
+      // this.logger.verbose(webhook);
       const headers = {};
-      
+
+      Object.keys(systemVars).forEach((k) => {
+        webhookUrl = webhookUrl.replace('{{' + k + '}}', systemVars[k]);
+      });
+
       if (Array.isArray(webhook.headers)) {
         webhook.headers.forEach((h) => {
-          h.value = h.value.replace('{{access_token}}',appuser.getUserToken())          
-          headers[h.name] = h.value;
+          let headerValue = h.value;
+          Object.keys(systemVars).forEach((k) => {
+            headerValue = headerValue.replace('{{' + k + '}}', systemVars[k]);
+          });
+
+          headers[h.name] = headerValue;
         });
       }
       headers['accept'] = 'application/json';
       headers['content-type'] = 'application/json';
-      headers['x-org']=appuser.getXOrg()
-      headers['x-resource-name']=documentName
-      headers['x-action-name']=actionName
 
-      if(webhook.authentication=='basic')
-      headers['Authorization']= 'Basic ' + Buffer.from(webhook.basicAuth.user + ":" + webhook.basicAuth.password).toString('base64');
+      if (webhook.authentication == 'basic') headers['Authorization'] = 'Basic ' + Buffer.from(webhook.basicAuth.user + ':' + webhook.basicAuth.password).toString('base64');
+
+      // console.log(webhook)
 
-      let tries = webhook.retryAttemps ?? 0
+      let tries: number = webhook.retryAttemps ?? 0;
       //first try need + 1
-      tries = tries+1
+      tries = tries + 1;
       //hardcode max retries
-      if(tries > this.maxRetries) tries = this.maxRetries
-      const options:RequestInit = {
+      if (tries > this.maxRetries) tries = this.maxRetries;
+      const options: RequestInit = {
         method: reqMethod.toUpperCase(),
         headers: headers,
-
       };
-      try {
-        if(['POST','PUT','PATCH'].includes(options.method)){
-          options.body= this.prepareBody(webhook,data)
-        }
-
 
+      if (['POST', 'PUT', 'PATCH'].includes(options.method)) {
+        options.body = this.prepareBody(appuser, webhook, data, systemVars);
+      }
 
-        
-        while(tries>0){
-          tries--
-          console.log("Excute webhook id",webhook._id)
-          const req = await fetch(webhook.url, options);
-          const statusCode = req.status;        
-           
-
-          
+      while (tries > 0) {
+        // console.log(`Excute webhook id ${webhook._id} max ${tries}`);
+        tries--;
+        let req: Response;
+        let msg = '';
+        let statusCode = 0;
+        try {
+          req = await fetch(webhookUrl, options);
+          statusCode = req.status;
+          //sucess, break and no more retry
           if (statusCode >= 200 && statusCode <= 300) {
             //success, continue next webhook
-            const msg = `webhook triggered successfully for ${documentName}:${actionName}. ${reqMethod} ${webhook.url}, try:${tries}, ${statusCode},${req.statusText}`
-            this.addLog(appuser,documentName,webhook,actionName,data,options,"success",statusCode,msg)          
+            msg = `webhook triggered successfully for ${documentName}:${actionName}. ${reqMethod} ${webhookUrl}, try:${tries}, ${statusCode},${req.statusText}`;
+            this.addLog(appuser, documentName, webhook, actionName, data, options, 'success', statusCode, msg);
             break;
-          }else if(tries<=0 && webhook.jobType=='roll-back-when-failed'){          
-            //failed, trigger server error for roll back
-            const msg = `webhook faied, data roll back ${documentName}:${actionName}. ${reqMethod} ${webhook.url}, try:${tries}, ${statusCode},${req.statusText}`
-            this.addLog(appuser,documentName,webhook,actionName,data,options,'failed',statusCode,msg)          
-            throw new InternalServerErrorException(msg);
-          }else if(tries<=0 && webhook.jobType=='realtime'){
-            //failed, but no need to trigger server error/rollback
-            const msg = `webhook failed, ${documentName}:${actionName}. ${reqMethod} ${webhook.url}, try:${tries},  ${statusCode},${req.statusText}`
-            this.addLog(appuser,documentName,webhook,actionName,data,options,'failed',statusCode,msg)            
-          }else{
-            //failed, but still continue retry
-            const msg = `webhook ${documentName}:${actionName}. ${reqMethod} ${webhook.url}, try:${tries},  ${statusCode},${req.statusText}`
-            this.addLog(appuser,documentName,webhook,actionName,data,options,'warn',statusCode,msg)
+          } else {
+            //common error like 404
+            msg = `webhook ${statusCode} failed, ${documentName}:${actionName}. ${reqMethod} ${webhookUrl}, try:${tries}, ${statusCode},${req.statusText}`;
+            this.addLog(appuser, documentName, webhook, actionName, data, options, 'failed', statusCode, msg);
           }
-          
+        } catch (e) {
+          // exception, usually server not accessible. use error 500
+          msg = `Webhook error ${documentName}:${actionName}  (${webhook._id}) ${e} at ${webhookUrl}`;
+          this.addLog(appuser, documentName, webhook, actionName, data, options, 'failed', 500, msg);
         }
 
-        // const body = req.body;
-      } catch (e) {
-        throw new InternalServerErrorException(e);
-      }
-
-    }
+        //finish tries, throw error
+        if (tries == 0 && webhook.jobType == 'roll-back-when-failed') {
+          throw new InternalServerErrorException(msg);
+        }
+      } //end retries
+    } //next webhook
 
-    return true
+    return true;
   }
 
-
-  addLog(appuser: UserContext, documentName: string, webhook:Webhook, actionName: string, data: any,options,status:string,statusCode:number,msg:string){
-
-
-    if(status=='warn'){
-      status="failed"
-      this.logger.warn(msg)
+  addLog(appuser: UserContext, documentName: string, webhook: Webhook, actionName: string, data: any, options, status: string, statusCode: number, msg: string) {
+    if (status == 'success') {
+      this.logger.debug(msg);
+    } else {
+      this.logger.warn(msg);
     }
-    else if(status=='success')
-      this.logger.debug(msg)
-    else 
-      this.logger.error (msg)
+    const logbody = options.body;
+    let body = JSON.stringify(logbody, null, 4);
 
-    let body = JSON.stringify(options,null,4)
-    
     const whlog: Webhooklog = {
+      _id: crypto.randomUUID(),
+      tenantId: appuser.getTenantId(),
+      orgId: appuser.getOrgId(),
+      branchId: appuser.getBranchId(),
+      webHookId: webhook._id,
+      created: new Date().toISOString(),
+      createdBy: appuser.getUid(),
       title: `${webhook.requestMethod} ${webhook.url}`,
       resource: documentName,
       actionName: actionName,
       status: status,
       statusCode: statusCode,
-      body:  body,
-      msg:msg
-    }
+      body: body,
+      msg: msg,
+    };
 
-    this.eventEmitter.emit('webhooklog.add', appuser,whlog);
+    this.eventEmitter.emit('webhooklog.add', appuser, whlog);
   }
-  prepareBody(webhook:Webhook,data:any){
-    const cleandata = JSON.parse(JSON.stringify(data))
+  prepareBody(appuser: UserContext, webhook: Webhook, data: any, systemVars: any) {
+    const cleandata = JSON.parse(JSON.stringify(data));
 
-    if(webhook.body?.trim()=='*'){
-      return JSON.stringify(cleandata)
+    if (webhook.body?.trim() == '*') {
+      return JSON.stringify(cleandata);
     }
-    const parse = require('json-templates');    
-    const template = parse(webhook.body);    
-    const x:BodyInit =template(cleandata)
-    // this.logger.log(x)    
-    return JSON.parse(JSON.stringify(x))
-  }  
-  
+    const finaldata = { ...cleandata, ...systemVars };
+
+    const parse = require('json-templates');
+    const template = parse(webhook.body);
+    const x: BodyInit = template(finaldata);
+    // this.logger.log(x)
+    return JSON.parse(JSON.stringify(x));
+  }
 }

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

@@ -0,0 +1,45 @@
+/**
+ * This file was automatically generated by simpleapp generator. Every
+ * MODIFICATION OVERRIDE BY GENERATEOR
+ * last change 2024-07-10
+ * Author: Ks Tan
+ * Last Modified By: Yong Xiang
+ */
+import { UserContext } from '../commons/user.context';
+import * as sharelibs from '../sharelibs';
+import { Injectable } from '@nestjs/common';
+import { InjectModel } from '@nestjs/mongoose';
+import jsonpath from 'jsonpath';
+import { Model } from 'mongoose';
+import { WebhooklogJsonSchema } from '../jsonschemas/webhooklog.jsonschema';
+import { SimpleAppService } from './simpleapp.processor';
+import { IsolationType } from '../types';
+import { DocNumberFormatGenerator } from '../commons/docnogenerator.service';
+import { Webhooklog } from '../types/webhooklog.type';
+import { DefaultWebhooklog } from '../defaults/webhooklog.default';
+import { EventEmitter2, OnEvent } from '@nestjs/event-emitter';
+
+@Injectable()
+export class WebhooklogProcessor extends SimpleAppService<Webhooklog> {
+  protected documentIdentityCode = '_id';
+  protected documentIdentityLabel = '';
+
+  protected foreignkeys = {};
+  constructor(mydoc: Model<Webhooklog>) {
+    super('WEBHOOKLOG', 'webhooklog', mydoc, IsolationType.branch);
+    this.setSchema(WebhooklogJsonSchema);
+    this.setData(DefaultWebhooklog(crypto.randomUUID()));
+  }
+
+  reCalculateValue(data: Webhooklog) {
+    //console.log('trigger new recalculate')
+    const $data = data;
+  }
+  @OnEvent('webhooklog.add')
+  addLog(appuser: UserContext, whlog: Webhooklog) {
+    const newdoc = new this.doc(whlog);
+    newdoc.save();
+  }
+
+  /***************************** additional execute *****************************************/
+}

package/templates/nest/src/simpleapp/services/webhook.service.ts._eta

@@ -0,0 +1,37 @@
+/**
+ * This file was automatically generated by simpleapp generator. It is changable
+ * --remove-this-line-to-prevent-override--
+ * last change 2024-02-23
+ * Author: Ks Tan
+ */
+
+import { InjectModel } from '@nestjs/mongoose';
+import { Model } from 'mongoose';
+import { Injectable } from '@nestjs/common';
+import { UserContext } from '../generate/commons/user.context';
+import { WebhookProcessor } from '../generate/processors/webhook.processor';
+//import { Webhook,WebhookHooks} from '../generate/types';
+import * as types from '../generate/types';
+import { WebhooklogService } from './webhooklog.service';
+export { Webhook } from '../generate/types';
+
+@Injectable()
+export class WebhookService extends WebhookProcessor {
+  //protected hooks: types.WebhookHooks = {}
+  constructor(
+    @InjectModel('Webhook') mydoc: Model<types.Webhook>,
+    private webhooklogService: WebhooklogService,
+    ) {
+    super(mydoc);
+  }
+
+  /***************************** begin x-document-api definitions *****************************************/
+  
+
+  async runGetHistories(appuser: UserContext, id: string) {
+    const results = await this.webhooklogService.search(appuser, { webHookId: id });
+    return results;
+  }
+
+  /***************************** end x-document-api definitions *****************************************/
+}

package/templates/nest/src/simpleapp/webhooks/branch.ts._eta

@@ -5,33 +5,40 @@
  * Author: Ks Tan
  */
 
-import { Webhook } from "../generate/types";
-const branch_hooks:Webhook[] = []
+import { Webhook } from '../generate/types';
+const branch_hooks: Webhook[] = [];
 
- branch_hooks.push({
-  "_id": "branch.update",
-  "title": "branch_update",
-  "url": "https://localhost:8080",
-  "requestMethod": "post",
-  "authentication": "none",
-  "description": "aa",
-  "body": '{ "id":"{{_id}}", "code":"{{branchCode}}","name":"{{branchName}}" }',
-  "active": false,
-  "resourceName": "branch",
-  "eventType": "update",
-  "jobType": "realtime",
-  "retryAttemps": 2,
-  "basicAuth": {
-    "user": "",
-    "password": ""
+
+
+branch_hooks.push({
+  _id: 'branch.create.welcome-msg',
+  title: 'branch first send well come message',
+  url: 'https://mywebhook.app.com/init-new-branch',
+  requestMethod: 'post',
+  authentication: 'none',
+  description: '',
+  body: `{
+    "email":"{{email}}",
+    "name":"{{$fullName}}",
+    "centerName":"{{branchName}}",
+    "centerUrl":"https://myurl.com"
+  }`,
+  active: false,
+  resourceName: 'branch',
+  eventType: 'update',
+  // jobType: 'roll-back-when-failed',
+  jobType: 'realtime',
+  retryAttemps: 2,
+  basicAuth: {
+    user: '',
+    password: '',
   },
-  "headers": [
+  headers: [
     {
-      "name": "token",
-      "value": "{{access_token}}"
-    }
-  ]
-}) 
-
+      name: 'x-api-key',
+      value: 'xxxxxxxxxx',
+    },
+  ],
+});
 
-export default branch_hooks
+export default branch_hooks;

package/templates/nest/src/simpleapp/generate/processors/webhook.processor.ts.etaxxxx

@@ -1,224 +0,0 @@
-/**
- * This file was automatically generated by simpleapp generator. Every
- * MODIFICATION OVERRIDE BY GENERATEOR
- * last change 2024-07-10
- * Author: Ks Tan
- * Last Modified By: Yong Xiang
- */
-import { UserContext } from '../commons/user.context';
-import * as sharelibs from '../sharelibs';
-import { Injectable,  InternalServerErrorException, } from '@nestjs/common';
-import { InjectModel } from '@nestjs/mongoose';
-import jsonpath from 'jsonpath';
-import { Model } from 'mongoose';
-import { WebhookJsonSchema } from '../jsonschemas/webhook.jsonschema';
-import { SimpleAppService } from './simpleapp.processor';
-import * as types from '../types';
-import { DocNumberFormatGenerator } from '../commons/docnogenerator.service';
-import {
-  WebhookBasicAuth,
-  WebhookHeaders,
-  Webhook,
-} from '../types/webhook.type';
-import {
-  DefaultWebhookBasicAuth,
-  DefaultWebhookHeaders,
-  DefaultWebhook,
-} from '../defaults/webhook.default';
-
-@Injectable()
-export class WebhookProcessor extends SimpleAppService<Webhook> {
-  protected documentIdentityCode = 'title';
-  protected documentIdentityLabel = 'title';
-  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  webhooksubscribtionurl = `${process.env.WEBHOOK_SERVER_URL}/subscriptions/`;
-
-  protected hooks: types.WebhookHooks = {
-    beforeCreate: async (appuser: UserContext, data: types.Webhook) =>
-      this.beforeCreate(appuser, data),
-    beforeUpdate: async (
-      appuser: UserContext,
-      id: string,
-      prevdata: types.Webhook,
-      newdata: types.Webhook,
-    ) => this.beforeUpdate(appuser, id, prevdata, newdata),
-    afterDelete: async (
-      appuser: UserContext,
-      result: types.DeleteResultType<types.Webhook>,
-      id: string,
-    ) => this.afterDelete(appuser, result, id),
-  };
-
-
-  protected foreignkeys = {};
-  constructor(mydoc: Model<Webhook>) {
-    super('WEBHOOK', 'webhook', mydoc, types.IsolationType.tenant);
-    this.setSchema(WebhookJsonSchema);
-    this.setData(DefaultWebhook(crypto.randomUUID()));
-  }
-
-  reCalculateValue(data: Webhook) {
-    //console.log('trigger new recalculate')
-    const $data = data;
-  }
-
-  async beforeCreate(appuser: UserContext, data: types.Webhook) {
-    const createResult = await this.addRemoteWebhook(appuser, data);
-    if (!createResult['subscription_id'])
-      throw new InternalServerErrorException(
-        'syncronize webhook server failed',
-      );
-    data.serverSubscriptionId = createResult.subscription_id;
-    data.serverSubscriptionSecret = createResult.secret;
-    // throw new BadRequestException("fail purposely")
-  }
-
-  async beforeUpdate(
-    appuser: UserContext,
-    id: string,
-    prevdata: types.Webhook,
-    newdata: types.Webhook,
-  ) {
-
-    if(!prevdata.serverSubscriptionId){
-        const createResult = await this.addRemoteWebhook(appuser, newdata);
-        if (!createResult['subscription_id'])
-          throw new InternalServerErrorException(
-            'syncronize webhook server failed',
-           );
-        newdata.serverSubscriptionId = createResult.subscription_id;
-        newdata.serverSubscriptionSecret = createResult.secret;
-    }else{
-      await this.updateRemoteWebhook(appuser,newdata)
-    }
-  }
-
-  async afterDelete(
-    appuser: UserContext,
-    result: types.DeleteResultType<types.Webhook>,
-    id: string,
-  ) {
-    await this.removeRemoteWebhook(appuser,result,id)         
-  }
-
-  async removeRemoteWebhook(
-    appuser: UserContext,
-    result: types.DeleteResultType<types.Webhook>,
-    id: string,
-  ){
-    const options = {
-      method: 'DELETE',
-      headers: {Authorization: this.webhookApiKey}
-    };
-
-
-    const subscriptionId=result.data.serverSubscriptionId
-    if(!subscriptionId)return 
-
-    try{
-      const res = await fetch(
-          `${this.webhooksubscribtionurl}/${subscriptionId}?application_id=${this.webhookAppId}`,
-          options)            
-    }catch(e){
-      throw new InternalServerErrorException(e)
-    }
-
-  }
-  async addRemoteWebhook(appuser: UserContext, data: types.Webhook) {
-    const headers = {};
-    data.headers.forEach((h) => {
-      headers[h.name] = h.value;
-    });
-
-    const options = {
-      method: 'POST',
-      headers: {
-        Authorization: this.webhookApiKey,
-        accept: 'application/json',
-        'content-type': 'application/json',
-      },
-      body: JSON.stringify({
-        application_id: this.webhookAppId,
-        description: data.title,
-        metadata: {
-          tenantId: data.tenantId.toString(),
-          creator: appuser.getUname(),
-        },
-        is_enabled: data.active,
-        event_types: data.eventTypes.map(
-          (item) => this.webhookprefix + item,
-        ),
-        label_key: 'tenantId',
-        label_value: data.tenantId.toString(),
-        target: {
-          headers: headers,
-          type: 'http',
-          method: data.requestMethod.toUpperCase(),
-          url: data.url,
-        },
-      }),
-    };
-    try {
-      const res = await fetch(this.webhooksubscribtionurl, options);
-      return await res.json();
-      if (res.status >= 300) {
-        this.logger.error(res.statusText, 'create webhook failed');
-        throw new InternalServerErrorException('create webhook failed');
-      }
-    } catch (e) {
-      throw new InternalServerErrorException(e);
-    }
-  }
-
-  async updateRemoteWebhook(appuser: UserContext, data: types.Webhook) {
-    const headers = {};
-    data.headers.forEach((h) => {
-      headers[h.name] = h.value;
-    });
-
-    const options = {
-      method: 'PUT',
-      headers: {
-        Authorization: this.webhookApiKey,
-        accept: 'application/json',
-        'content-type': 'application/json',
-      },
-      body: JSON.stringify({
-        application_id: this.webhookAppId,
-        description: data.title,
-        metadata: {
-          tenantId: data.tenantId.toString(),
-          creator: appuser.getUname(),
-        },
-        is_enabled: data.active,
-        event_types: data.eventTypes.map(
-          (item) => this.webhookprefix + item,
-        ),
-        label_key: 'tenantId',
-        label_value: data.tenantId.toString(),
-        target: {
-          headers: headers,
-          type: 'http',
-          method: data.requestMethod.toUpperCase(),
-          url: data.url,
-        },
-      }),
-    };
-    try {
-      const subscriptionId = data.serverSubscriptionId
-      const res = await fetch(`${this.webhooksubscribtionurl}/${subscriptionId}`, options);
-      return await res.json();
-      if (res.status >= 300) {
-        this.logger.error(res.statusText, 'updateRemoteWebhook webhook failed');
-        throw new InternalServerErrorException('update webhook failed');
-      }
-    } catch (e) {
-      throw new InternalServerErrorException(e);
-    }
-  }
-
-  /***************************** additional execute *****************************************/
-}