@simitgroup/simpleapp-generator 1.6.4-e-alpha → 1.6.4-f-alpha

package/dist/buildinschemas/index.d.ts

@@ -7,6 +7,5 @@ export { docnoformat } from './docnoformat';
 export { systemmessage } from './systemmessage';
 export { keyvaluepair } from './keyvaluepair';
 export { webhook } from './webhook';
-export { webhookhistory } from './webhookhistory';
 export { documentevent } from './documentevent';
 //# sourceMappingURL=index.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/buildinschemas/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,MAAM,EAAC,MAAM,UAAU,CAAA;AAC/B,OAAO,EAAC,YAAY,EAAC,MAAM,gBAAgB,CAAA;AAC3C,OAAO,EAAC,MAAM,EAAC,MAAM,UAAU,CAAA;AAC/B,OAAO,EAAC,UAAU,EAAC,MAAM,cAAc,CAAA;AAEvC,OAAO,EAAC,cAAc,EAAC,MAAM,kBAAkB,CAAA;AAC/C,OAAO,EAAC,WAAW,EAAC,MAAM,eAAe,CAAA;AACzC,OAAO,EAAC,aAAa,EAAC,MAAM,iBAAiB,CAAA;AAC7C,OAAO,EAAC,YAAY,EAAC,MAAM,gBAAgB,CAAA;AAC3C,OAAO,EAAC,OAAO,EAAC,MAAM,WAAW,CAAA;AACjC,OAAO,EAAC,cAAc,EAAE,MAAM,kBAAkB,CAAA;AAChD,OAAO,EAAC,aAAa,EAAC,MAAM,iBAAiB,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/buildinschemas/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,MAAM,EAAC,MAAM,UAAU,CAAA;AAC/B,OAAO,EAAC,YAAY,EAAC,MAAM,gBAAgB,CAAA;AAC3C,OAAO,EAAC,MAAM,EAAC,MAAM,UAAU,CAAA;AAC/B,OAAO,EAAC,UAAU,EAAC,MAAM,cAAc,CAAA;AAEvC,OAAO,EAAC,cAAc,EAAC,MAAM,kBAAkB,CAAA;AAC/C,OAAO,EAAC,WAAW,EAAC,MAAM,eAAe,CAAA;AACzC,OAAO,EAAC,aAAa,EAAC,MAAM,iBAAiB,CAAA;AAC7C,OAAO,EAAC,YAAY,EAAC,MAAM,gBAAgB,CAAA;AAC3C,OAAO,EAAC,OAAO,EAAC,MAAM,WAAW,CAAA;AACjC,OAAO,EAAC,aAAa,EAAC,MAAM,iBAAiB,CAAA"}

package/dist/buildinschemas/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.documentevent = exports.webhookhistory = exports.webhook = exports.keyvaluepair = exports.systemmessage = exports.docnoformat = exports.autoincreament = exports.permission = exports.branch = exports.organization = exports.tenant = void 0;
+exports.documentevent = exports.webhook = exports.keyvaluepair = exports.systemmessage = exports.docnoformat = exports.autoincreament = exports.permission = exports.branch = exports.organization = exports.tenant = void 0;
 var tenant_1 = require("./tenant");
 Object.defineProperty(exports, "tenant", { enumerable: true, get: function () { return tenant_1.tenant; } });
 var organization_1 = require("./organization");
@@ -20,8 +20,6 @@ var keyvaluepair_1 = require("./keyvaluepair");
 Object.defineProperty(exports, "keyvaluepair", { enumerable: true, get: function () { return keyvaluepair_1.keyvaluepair; } });
 var webhook_1 = require("./webhook");
 Object.defineProperty(exports, "webhook", { enumerable: true, get: function () { return webhook_1.webhook; } });
-var webhookhistory_1 = require("./webhookhistory");
-Object.defineProperty(exports, "webhookhistory", { enumerable: true, get: function () { return webhookhistory_1.webhookhistory; } });
 var documentevent_1 = require("./documentevent");
 Object.defineProperty(exports, "documentevent", { enumerable: true, get: function () { return documentevent_1.documentevent; } });
 //# sourceMappingURL=index.js.map

package/dist/buildinschemas/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/buildinschemas/index.ts"],"names":[],"mappings":";;;AAAA,mCAA+B;AAAvB,gGAAA,MAAM,OAAA;AACd,+CAA2C;AAAnC,4GAAA,YAAY,OAAA;AACpB,mCAA+B;AAAvB,gGAAA,MAAM,OAAA;AACd,2CAAuC;AAA/B,wGAAA,UAAU,OAAA;AAClB,8BAA8B;AAC9B,mDAA+C;AAAvC,gHAAA,cAAc,OAAA;AACtB,6CAAyC;AAAjC,0GAAA,WAAW,OAAA;AACnB,iDAA6C;AAArC,8GAAA,aAAa,OAAA;AACrB,+CAA2C;AAAnC,4GAAA,YAAY,OAAA;AACpB,qCAAiC;AAAzB,kGAAA,OAAO,OAAA;AACf,mDAAgD;AAAxC,gHAAA,cAAc,OAAA;AACtB,iDAA6C;AAArC,8GAAA,aAAa,OAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/buildinschemas/index.ts"],"names":[],"mappings":";;;AAAA,mCAA+B;AAAvB,gGAAA,MAAM,OAAA;AACd,+CAA2C;AAAnC,4GAAA,YAAY,OAAA;AACpB,mCAA+B;AAAvB,gGAAA,MAAM,OAAA;AACd,2CAAuC;AAA/B,wGAAA,UAAU,OAAA;AAClB,8BAA8B;AAC9B,mDAA+C;AAAvC,gHAAA,cAAc,OAAA;AACtB,6CAAyC;AAAjC,0GAAA,WAAW,OAAA;AACnB,iDAA6C;AAArC,8GAAA,aAAa,OAAA;AACrB,+CAA2C;AAAnC,4GAAA,YAAY,OAAA;AACpB,qCAAiC;AAAzB,kGAAA,OAAO,OAAA;AACf,iDAA6C;AAArC,8GAAA,aAAa,OAAA"}

package/dist/buildinschemas/systemmessage.js

@@ -28,15 +28,15 @@ exports.systemmessage = {
         "orgId": { "type": "integer", "default": 1 },
         "branchId": { "type": "integer", "default": 1 },
         "uid": { "type": "string", "format": "uuid" },
+        "messageType": { "type": "string", minLength: 3 },
         "messageTitle": {
             "type": "string",
             "minLength": 3
         },
         "read": { "type": "boolean", "default": false },
-        "url": { "type": "string" },
-        "description": {
+        "body": {
             "type": "string",
-            "format": "text"
+            "format": "html"
         }
     }
 };

package/dist/buildinschemas/systemmessage.js.map

@@ -1 +1 @@
-{"version":3,"file":"systemmessage.js","sourceRoot":"","sources":["../../src/buildinschemas/systemmessage.ts"],"names":[],"mappings":";;;AAAA,kCAA4D;AAE/C,QAAA,aAAa,GAC1B;IACI,MAAM,EAAE,QAAQ;IAChB,oBAAoB,EAAE;QACpB,cAAc,EAAE,QAAQ;QACxB,cAAc,EAAE,eAAe;QAC/B,eAAe,EAAE,oBAAa,CAAC,MAAM;QACrC,eAAe,EAAE,cAAc;QAC/B,cAAc,EAAC,CAAC;gBACd,QAAQ,EAAC,SAAS;gBAClB,YAAY,EAAC,UAAU;gBACvB,cAAc,EAAC,CAAC,MAAM,CAAC;gBACvB,cAAc,EAAC,eAAe;gBAC9B,QAAQ,EAAC,kBAAW,CAAC,GAAG;gBACxB,aAAa,EAAC,mCAAmC;aAClD,CAAE;KACJ;IACD,YAAY,EAAE;QACZ,KAAK,EAAE,EAAE,MAAM,EAAE,QAAQ,EAAC,QAAQ,EAAC,MAAM,EAAE;QAC3C,SAAS,EAAE,EAAE,MAAM,EAAE,QAAQ,EAAE;QAC/B,SAAS,EAAE,EAAE,MAAM,EAAE,QAAQ,EAAE;QAC/B,WAAW,EAAE,EAAE,MAAM,EAAE,QAAQ,EAAE;QACjC,WAAW,EAAE,EAAE,MAAM,EAAE,QAAQ,EAAE;QACjC,UAAU,EAAE,EAAE,MAAM,EAAE,SAAS,EAAE,SAAS,EAAE,CAAC,EAAE;QAC/C,OAAO,EAAE,EAAE,MAAM,EAAE,SAAS,EAAE,SAAS,EAAE,CAAC,EAAE;QAC5C,UAAU,EAAE,EAAE,MAAM,EAAE,SAAS,EAAE,SAAS,EAAE,CAAC,EAAE;QAC/C,KAAK,EAAE,EAAE,MAAM,EAAE,QAAQ,EAAC,QAAQ,EAAC,MAAM,EAAE;QAC3C,cAAc,EAAE;YACd,MAAM,EAAE,QAAQ;YAChB,WAAW,EAAE,CAAC;SACf;QACD,MAAM,EAAE,EAAE,MAAM,EAAE,SAAS,EAAE,SAAS,EAAE,KAAK,EAAC;QAC9C,KAAK,EAAC,EAAE,MAAM,EAAE,QAAQ,EAAC;QACzB,aAAa,EAAE;YACb,MAAM,EAAE,QAAQ;YAChB,QAAQ,EAAE,MAAM;SACjB;KACF;CACF,CAAA"}
+{"version":3,"file":"systemmessage.js","sourceRoot":"","sources":["../../src/buildinschemas/systemmessage.ts"],"names":[],"mappings":";;;AAAA,kCAA4D;AAE/C,QAAA,aAAa,GAC1B;IACI,MAAM,EAAE,QAAQ;IAChB,oBAAoB,EAAE;QACpB,cAAc,EAAE,QAAQ;QACxB,cAAc,EAAE,eAAe;QAC/B,eAAe,EAAE,oBAAa,CAAC,MAAM;QACrC,eAAe,EAAE,cAAc;QAC/B,cAAc,EAAC,CAAC;gBACd,QAAQ,EAAC,SAAS;gBAClB,YAAY,EAAC,UAAU;gBACvB,cAAc,EAAC,CAAC,MAAM,CAAC;gBACvB,cAAc,EAAC,eAAe;gBAC9B,QAAQ,EAAC,kBAAW,CAAC,GAAG;gBACxB,aAAa,EAAC,mCAAmC;aAClD,CAAE;KACJ;IACD,YAAY,EAAE;QACZ,KAAK,EAAE,EAAE,MAAM,EAAE,QAAQ,EAAC,QAAQ,EAAC,MAAM,EAAE;QAC3C,SAAS,EAAE,EAAE,MAAM,EAAE,QAAQ,EAAE;QAC/B,SAAS,EAAE,EAAE,MAAM,EAAE,QAAQ,EAAE;QAC/B,WAAW,EAAE,EAAE,MAAM,EAAE,QAAQ,EAAE;QACjC,WAAW,EAAE,EAAE,MAAM,EAAE,QAAQ,EAAE;QACjC,UAAU,EAAE,EAAE,MAAM,EAAE,SAAS,EAAE,SAAS,EAAE,CAAC,EAAE;QAC/C,OAAO,EAAE,EAAE,MAAM,EAAE,SAAS,EAAE,SAAS,EAAE,CAAC,EAAE;QAC5C,UAAU,EAAE,EAAE,MAAM,EAAE,SAAS,EAAE,SAAS,EAAE,CAAC,EAAE;QAC/C,KAAK,EAAE,EAAE,MAAM,EAAE,QAAQ,EAAC,QAAQ,EAAC,MAAM,EAAE;QAC3C,aAAa,EAAC,EAAC,MAAM,EAAC,QAAQ,EAAC,SAAS,EAAC,CAAC,EAAC;QAC3C,cAAc,EAAE;YACd,MAAM,EAAE,QAAQ;YAChB,WAAW,EAAE,CAAC;SACf;QACD,MAAM,EAAE,EAAE,MAAM,EAAE,SAAS,EAAE,SAAS,EAAE,KAAK,EAAC;QAC9C,MAAM,EAAE;YACN,MAAM,EAAE,QAAQ;YAChB,QAAQ,EAAE,MAAM;SACjB;KACF;CACF,CAAA"}

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

@@ -1 +1 @@
-{"version":3,"file":"user.d.ts","sourceRoot":"","sources":["../../src/buildinschemas/user.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,UAAU,EAA2B,MAAM,SAAS,CAAA;AAE5D,eAAO,MAAM,IAAI,EAAC,UAqDjB,CAAA"}
+{"version":3,"file":"user.d.ts","sourceRoot":"","sources":["../../src/buildinschemas/user.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,UAAU,EAA2B,MAAM,SAAS,CAAA;AAE5D,eAAO,MAAM,IAAI,EAAC,UA4DjB,CAAA"}

package/dist/buildinschemas/user.js

@@ -47,6 +47,13 @@ exports.user = {
         },
         fullName: { type: "string", minLength: 3 },
         email: { type: "string", minLength: 10, format: "email" },
+        mobileNo: {
+            type: "string",
+            anyOf: [
+                { "const": "" },
+                { "format": "tel", "examples": ["0123456789"] }
+            ]
+        },
         active: { type: "boolean", default: true },
         description: { type: "string" },
         lastActivity: { type: "string", description: "capture ISO8601 last api call" },

package/dist/buildinschemas/user.js.map

@@ -1 +1 @@
-{"version":3,"file":"user.js","sourceRoot":"","sources":["../../src/buildinschemas/user.ts"],"names":[],"mappings":";;;AAAA,kCAA4D;AAE/C,QAAA,IAAI,GAAa;IAC1B,IAAI,EAAE,QAAQ;IACd,oBAAoB,EAAC;QACjB,YAAY,EAAC,MAAM;QACnB,YAAY,EAAC,MAAM;QACnB,QAAQ,EAAC,MAAM;QACf,iBAAiB,EAAC,IAAI;QACtB,aAAa,EAAC,oBAAa,CAAC,MAAM;QAClC,SAAS,EAAC,OAAO;QACjB,aAAa,EAAC,UAAU;QACxB,aAAa,EAAC,CAAC,WAAW,CAAC;QAC3B,4BAA4B,EAAC,CAAC,KAAK,CAAC;QACpC,cAAc,EAAC;YACX,EAAC,QAAQ,EAAC,eAAe;gBACzB,YAAY,EAAC,gBAAgB;gBAC7B,cAAc,EAAC,EAAE;gBACjB,QAAQ,EAAC,kBAAW,CAAC,GAAG;gBACxB,cAAc,EAAC,kBAAkB;gBACjC,aAAa,EAAC,qBAAqB;aAClC;YACD,EAAC,QAAQ,EAAC,kBAAkB;gBAC5B,YAAY,EAAC,gBAAgB;gBAC7B,cAAc,EAAC,EAAE;gBACjB,QAAQ,EAAC,kBAAW,CAAC,GAAG;gBACxB,QAAQ,EAAC,kBAAkB;gBAC3B,aAAa,EAAC,qBAAqB;aAClC;SACJ;KACF;IACH,UAAU,EAAE;QACR,GAAG,EAAC,EAAC,IAAI,EAAC,QAAQ,EAAC;QACnB,OAAO,EAAC,EAAC,IAAI,EAAC,QAAQ,EAAC;QACvB,OAAO,EAAC,EAAC,IAAI,EAAC,QAAQ,EAAC;QACvB,SAAS,EAAC,EAAC,IAAI,EAAC,QAAQ,EAAC;QACzB,SAAS,EAAC,EAAC,IAAI,EAAC,QAAQ,EAAC;QACzB,QAAQ,EAAE,EAAC,IAAI,EAAC,SAAS,EAAC,OAAO,EAAC,CAAC,EAAC,OAAO,EAAC,CAAC,EAAE;QAC/C,KAAK,EAAE,EAAC,IAAI,EAAC,SAAS,EAAC,OAAO,EAAC,CAAC,EAAC,OAAO,EAAC,CAAC,EAAE;QAC5C,QAAQ,EAAE,EAAC,IAAI,EAAC,SAAS,EAAC,OAAO,EAAC,CAAC,EAAC,OAAO,EAAC,CAAC,EAAE;QAC/C,GAAG,EAAE;YACH,IAAI,EAAE,QAAQ;YACd,KAAK,EAAC,CAAC,EAAC,QAAQ,EAAC,MAAM,EAAC,EAAC,EAAC,KAAK,EAAC,EAAE,EAAC,CAAC;YACpC,WAAW,EAAC,iEAAiE;SAC9E;QACD,QAAQ,EAAE,EAAC,IAAI,EAAE,QAAQ,EAAC,SAAS,EAAC,CAAC,EAAC;QACtC,KAAK,EAAE,EAAC,IAAI,EAAE,QAAQ,EAAC,SAAS,EAAC,EAAE,EAAC,MAAM,EAAE,OAAO,EAAC;QACpD,MAAM,EAAE,EAAC,IAAI,EAAE,SAAS,EAAC,OAAO,EAAC,IAAI,EAAC;QACtC,WAAW,EAAE,EAAC,IAAI,EAAC,QAAQ,EAAC;QAC5B,YAAY,EAAE,EAAC,IAAI,EAAE,QAAQ,EAAC,WAAW,EAAC,+BAA+B,EAAC;QAC1E,cAAc,EAAE;YACd,IAAI,EAAE,OAAO;YACb,KAAK,EAAE,EAAE,MAAM,EAAE,QAAQ,EAAE,UAAU,EAAE,CAAC,UAAU,CAAC,EAAE;SACtD;KACF;CACN,CAAA"}
+{"version":3,"file":"user.js","sourceRoot":"","sources":["../../src/buildinschemas/user.ts"],"names":[],"mappings":";;;AAAA,kCAA4D;AAE/C,QAAA,IAAI,GAAa;IAC1B,IAAI,EAAE,QAAQ;IACd,oBAAoB,EAAC;QACjB,YAAY,EAAC,MAAM;QACnB,YAAY,EAAC,MAAM;QACnB,QAAQ,EAAC,MAAM;QACf,iBAAiB,EAAC,IAAI;QACtB,aAAa,EAAC,oBAAa,CAAC,MAAM;QAClC,SAAS,EAAC,OAAO;QACjB,aAAa,EAAC,UAAU;QACxB,aAAa,EAAC,CAAC,WAAW,CAAC;QAC3B,4BAA4B,EAAC,CAAC,KAAK,CAAC;QACpC,cAAc,EAAC;YACX,EAAC,QAAQ,EAAC,eAAe;gBACzB,YAAY,EAAC,gBAAgB;gBAC7B,cAAc,EAAC,EAAE;gBACjB,QAAQ,EAAC,kBAAW,CAAC,GAAG;gBACxB,cAAc,EAAC,kBAAkB;gBACjC,aAAa,EAAC,qBAAqB;aAClC;YACD,EAAC,QAAQ,EAAC,kBAAkB;gBAC5B,YAAY,EAAC,gBAAgB;gBAC7B,cAAc,EAAC,EAAE;gBACjB,QAAQ,EAAC,kBAAW,CAAC,GAAG;gBACxB,QAAQ,EAAC,kBAAkB;gBAC3B,aAAa,EAAC,qBAAqB;aAClC;SACJ;KACF;IACH,UAAU,EAAE;QACR,GAAG,EAAC,EAAC,IAAI,EAAC,QAAQ,EAAC;QACnB,OAAO,EAAC,EAAC,IAAI,EAAC,QAAQ,EAAC;QACvB,OAAO,EAAC,EAAC,IAAI,EAAC,QAAQ,EAAC;QACvB,SAAS,EAAC,EAAC,IAAI,EAAC,QAAQ,EAAC;QACzB,SAAS,EAAC,EAAC,IAAI,EAAC,QAAQ,EAAC;QACzB,QAAQ,EAAE,EAAC,IAAI,EAAC,SAAS,EAAC,OAAO,EAAC,CAAC,EAAC,OAAO,EAAC,CAAC,EAAE;QAC/C,KAAK,EAAE,EAAC,IAAI,EAAC,SAAS,EAAC,OAAO,EAAC,CAAC,EAAC,OAAO,EAAC,CAAC,EAAE;QAC5C,QAAQ,EAAE,EAAC,IAAI,EAAC,SAAS,EAAC,OAAO,EAAC,CAAC,EAAC,OAAO,EAAC,CAAC,EAAE;QAC/C,GAAG,EAAE;YACH,IAAI,EAAE,QAAQ;YACd,KAAK,EAAC,CAAC,EAAC,QAAQ,EAAC,MAAM,EAAC,EAAC,EAAC,KAAK,EAAC,EAAE,EAAC,CAAC;YACpC,WAAW,EAAC,iEAAiE;SAC9E;QACD,QAAQ,EAAE,EAAC,IAAI,EAAE,QAAQ,EAAC,SAAS,EAAC,CAAC,EAAC;QACtC,KAAK,EAAE,EAAC,IAAI,EAAE,QAAQ,EAAC,SAAS,EAAC,EAAE,EAAC,MAAM,EAAE,OAAO,EAAC;QACpD,QAAQ,EAAE;YACR,IAAI,EAAE,QAAQ;YACd,KAAK,EAAC;gBACJ,EAAC,OAAO,EAAC,EAAE,EAAC;gBACZ,EAAC,QAAQ,EAAE,KAAK,EAAC,UAAU,EAAE,CAAC,YAAY,CAAC,EAAC;aAC7C;SACF;QACD,MAAM,EAAE,EAAC,IAAI,EAAE,SAAS,EAAC,OAAO,EAAC,IAAI,EAAC;QACtC,WAAW,EAAE,EAAC,IAAI,EAAC,QAAQ,EAAC;QAC5B,YAAY,EAAE,EAAC,IAAI,EAAE,QAAQ,EAAC,WAAW,EAAC,+BAA+B,EAAC;QAC1E,cAAc,EAAE;YACd,IAAI,EAAE,OAAO;YACb,KAAK,EAAE,EAAE,MAAM,EAAE,QAAQ,EAAE,UAAU,EAAE,CAAC,UAAU,CAAC,EAAE;SACtD;KACF;CACN,CAAA"}

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,EAAC,UAAU,EAA2B,MAAM,SAAS,CAAA;AAE5D,eAAO,MAAM,OAAO,EAAC,UA8CpB,CAAA"}
+{"version":3,"file":"webhook.d.ts","sourceRoot":"","sources":["../../src/buildinschemas/webhook.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,UAAU,EAA2B,MAAM,SAAS,CAAA;AAE5D,eAAO,MAAM,OAAO,EAAC,UA4DpB,CAAA"}

package/dist/buildinschemas/webhook.js

@@ -8,10 +8,10 @@ exports.webhook = {
         documentType: 'webhook',
         documentName: 'webhook',
         isolationType: type_1.IsolationType.tenant,
-        uniqueKey: 'documentName',
-        documentTitle: 'documentName'
+        uniqueKey: 'title',
+        documentTitle: 'title'
     },
-    required: ["documentName", "url"],
+    required: ["title", "url"],
     properties: {
         _id: { type: 'string' },
         created: { type: 'string' },
@@ -21,8 +21,10 @@ exports.webhook = {
         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, },
+        title: { type: "string", minLength: 3, },
         url: { type: "string", format: 'uri' },
+        serverSubscriptionId: { type: "string" },
+        serverSubscriptionSecret: { type: "string" },
         requestMethod: {
             type: "string",
             enum: ['post', 'get', 'patch', 'put', 'delete', 'head'],
@@ -32,6 +34,13 @@ exports.webhook = {
             enum: ['none', 'basic'],
             description: "apikey authentication use none + headers props"
         },
+        basicAuth: {
+            type: "object",
+            properties: {
+                user: { type: "string" },
+                password: { type: "string" }
+            }
+        },
         headers: {
             type: "array",
             items: {
@@ -45,7 +54,13 @@ exports.webhook = {
         },
         description: { type: "string", format: "text" },
         active: { type: "boolean", default: true },
-        setting: { type: "string", format: "text" }
+        eventTypes: {
+            type: "array",
+            minItems: 1,
+            items: {
+                type: "string"
+            }
+        }
     }
 };
 //# sourceMappingURL=webhook.js.map

package/dist/buildinschemas/webhook.js.map

@@ -1 +1 @@
-{"version":3,"file":"webhook.js","sourceRoot":"","sources":["../../src/buildinschemas/webhook.ts"],"names":[],"mappings":";;;AAAA,kCAA4D;AAE/C,QAAA,OAAO,GAAc;IAC9B,IAAI,EAAE,QAAQ;IACd,oBAAoB,EAAC;QACnB,YAAY,EAAC,SAAS;QACtB,YAAY,EAAC,SAAS;QACtB,aAAa,EAAC,oBAAa,CAAC,MAAM;QAClC,SAAS,EAAC,cAAc;QACxB,aAAa,EAAC,cAAc;KAC7B;IACD,QAAQ,EAAC,CAAC,cAAc,EAAC,KAAK,CAAC;IAC/B,UAAU,EAAE;QACV,GAAG,EAAC,EAAC,IAAI,EAAC,QAAQ,EAAC;QACnB,OAAO,EAAC,EAAC,IAAI,EAAC,QAAQ,EAAC;QACvB,OAAO,EAAC,EAAC,IAAI,EAAC,QAAQ,EAAC;QACvB,SAAS,EAAC,EAAC,IAAI,EAAC,QAAQ,EAAC;QACzB,SAAS,EAAC,EAAC,IAAI,EAAC,QAAQ,EAAC;QACzB,QAAQ,EAAE,EAAC,IAAI,EAAC,SAAS,EAAC,OAAO,EAAC,CAAC,EAAC,OAAO,EAAC,CAAC,EAAE;QAC/C,KAAK,EAAE,EAAC,IAAI,EAAC,SAAS,EAAC,OAAO,EAAC,CAAC,EAAC,OAAO,EAAC,CAAC,EAAE;QAC5C,QAAQ,EAAE,EAAC,IAAI,EAAC,SAAS,EAAC,OAAO,EAAC,CAAC,EAAC,OAAO,EAAC,CAAC,EAAE;QAC/C,YAAY,EAAC,EAAC,IAAI,EAAC,QAAQ,EAAC,SAAS,EAAC,CAAC,GAAE;QACzC,GAAG,EAAE,EAAC,IAAI,EAAE,QAAQ,EAAE,MAAM,EAAC,KAAK,EAAC;QACnC,aAAa,EAAC;YACZ,IAAI,EAAE,QAAQ;YACd,IAAI,EAAC,CAAC,MAAM,EAAC,KAAK,EAAC,OAAO,EAAC,KAAK,EAAC,QAAQ,EAAC,MAAM,CAAC;SAClD;QACD,cAAc,EAAC;YACb,IAAI,EAAC,QAAQ;YACb,IAAI,EAAC,CAAC,MAAM,EAAC,OAAO,CAAC;YACrB,WAAW,EAAC,gDAAgD;SAC7D;QACD,OAAO,EAAE;YACP,IAAI,EAAE,OAAO;YACb,KAAK,EAAC;gBACJ,IAAI,EAAC,QAAQ;gBACb,WAAW,EAAC,cAAc;gBAC1B,UAAU,EAAC;oBACT,IAAI,EAAC,EAAC,IAAI,EAAC,QAAQ,EAAC;oBACpB,KAAK,EAAC,EAAC,IAAI,EAAC,QAAQ,EAAC;iBACtB;aACF;SACF;QAED,WAAW,EAAE,EAAC,IAAI,EAAE,QAAQ,EAAC,MAAM,EAAC,MAAM,EAAC;QAC3C,MAAM,EAAE,EAAC,IAAI,EAAE,SAAS,EAAE,OAAO,EAAC,IAAI,EAAC;QACvC,OAAO,EAAC,EAAC,IAAI,EAAC,QAAQ,EAAC,MAAM,EAAC,MAAM,EAAC;KACtC;CACJ,CAAA"}
+{"version":3,"file":"webhook.js","sourceRoot":"","sources":["../../src/buildinschemas/webhook.ts"],"names":[],"mappings":";;;AAAA,kCAA4D;AAE/C,QAAA,OAAO,GAAc;IAC9B,IAAI,EAAE,QAAQ;IACd,oBAAoB,EAAC;QACnB,YAAY,EAAC,SAAS;QACtB,YAAY,EAAC,SAAS;QACtB,aAAa,EAAC,oBAAa,CAAC,MAAM;QAClC,SAAS,EAAC,OAAO;QACjB,aAAa,EAAC,OAAO;KACtB;IACD,QAAQ,EAAC,CAAC,OAAO,EAAC,KAAK,CAAC;IACxB,UAAU,EAAE;QACV,GAAG,EAAC,EAAC,IAAI,EAAC,QAAQ,EAAC;QACnB,OAAO,EAAC,EAAC,IAAI,EAAC,QAAQ,EAAC;QACvB,OAAO,EAAC,EAAC,IAAI,EAAC,QAAQ,EAAC;QACvB,SAAS,EAAC,EAAC,IAAI,EAAC,QAAQ,EAAC;QACzB,SAAS,EAAC,EAAC,IAAI,EAAC,QAAQ,EAAC;QACzB,QAAQ,EAAE,EAAC,IAAI,EAAC,SAAS,EAAC,OAAO,EAAC,CAAC,EAAC,OAAO,EAAC,CAAC,EAAE;QAC/C,KAAK,EAAE,EAAC,IAAI,EAAC,SAAS,EAAC,OAAO,EAAC,CAAC,EAAC,OAAO,EAAC,CAAC,EAAE;QAC5C,QAAQ,EAAE,EAAC,IAAI,EAAC,SAAS,EAAC,OAAO,EAAC,CAAC,EAAC,OAAO,EAAC,CAAC,EAAE;QAC/C,KAAK,EAAC,EAAC,IAAI,EAAC,QAAQ,EAAC,SAAS,EAAC,CAAC,GAAE;QAClC,GAAG,EAAE,EAAC,IAAI,EAAE,QAAQ,EAAE,MAAM,EAAC,KAAK,EAAC;QACnC,oBAAoB,EAAE,EAAC,IAAI,EAAC,QAAQ,EAAC;QACrC,wBAAwB,EAAE,EAAC,IAAI,EAAC,QAAQ,EAAC;QACzC,aAAa,EAAC;YACZ,IAAI,EAAE,QAAQ;YACd,IAAI,EAAC,CAAC,MAAM,EAAC,KAAK,EAAC,OAAO,EAAC,KAAK,EAAC,QAAQ,EAAC,MAAM,CAAC;SAClD;QACD,cAAc,EAAC;YACb,IAAI,EAAC,QAAQ;YACb,IAAI,EAAC,CAAC,MAAM,EAAC,OAAO,CAAC;YACrB,WAAW,EAAC,gDAAgD;SAC7D;QACD,SAAS,EAAC;YACR,IAAI,EAAC,QAAQ;YACb,UAAU,EAAC;gBACT,IAAI,EAAC,EAAC,IAAI,EAAC,QAAQ,EAAC;gBACpB,QAAQ,EAAC,EAAC,IAAI,EAAC,QAAQ,EAAC;aACzB;SACF;QACD,OAAO,EAAE;YACP,IAAI,EAAE,OAAO;YACb,KAAK,EAAC;gBACJ,IAAI,EAAC,QAAQ;gBACb,WAAW,EAAC,cAAc;gBAC1B,UAAU,EAAC;oBACT,IAAI,EAAC,EAAC,IAAI,EAAC,QAAQ,EAAC;oBACpB,KAAK,EAAC,EAAC,IAAI,EAAC,QAAQ,EAAC;iBACtB;aACF;SACF;QAED,WAAW,EAAE,EAAC,IAAI,EAAE,QAAQ,EAAC,MAAM,EAAC,MAAM,EAAC;QAC3C,MAAM,EAAE,EAAC,IAAI,EAAE,SAAS,EAAE,OAAO,EAAC,IAAI,EAAC;QACvC,UAAU,EAAC;YACT,IAAI,EAAC,OAAO;YACZ,QAAQ,EAAC,CAAC;YACV,KAAK,EAAC;gBACJ,IAAI,EAAC,QAAQ;aACd;SAAC;KACL;CACJ,CAAA"}

package/package.json

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

package/src/buildinschemas/index.ts

@@ -8,5 +8,4 @@ export {docnoformat} from './docnoformat'
 export {systemmessage} from './systemmessage'
 export {keyvaluepair} from './keyvaluepair'
 export {webhook} from './webhook'
-export {webhookhistory } from './webhookhistory'
 export {documentevent} from './documentevent'

package/src/buildinschemas/systemmessage.ts

@@ -27,15 +27,15 @@ export const systemmessage:SchemaType =
       "orgId": { "type": "integer", "default": 1 },
       "branchId": { "type": "integer", "default": 1 },      
       "uid": { "type": "string","format":"uuid" },
+      "messageType":{"type":"string",minLength:3},
       "messageTitle": {
         "type": "string",
         "minLength": 3
       },
       "read": { "type": "boolean", "default": false},    
-      "url":{ "type": "string"},    
-      "description": {
+      "body": {
         "type": "string",
-        "format": "text"
+        "format": "html"
       }
     }
   }

package/src/buildinschemas/user.ts

@@ -45,6 +45,13 @@ export const user:SchemaType ={
         },
         fullName: {type: "string",minLength:3},
         email: {type: "string",minLength:10,format: "email"},
+        mobileNo: {
+          type: "string",
+          anyOf:[
+            {"const":""},
+            {"format": "tel","examples": ["0123456789"]}          
+          ]
+        },
         active: {type: "boolean",default:true},
         description: {type:"string"},
         lastActivity: {type: "string",description:"capture ISO8601 last api call"},

package/src/buildinschemas/webhook.ts

@@ -6,10 +6,10 @@ export const webhook:SchemaType = {
       documentType:'webhook',
       documentName:'webhook',
       isolationType:IsolationType.tenant,      
-      uniqueKey:'documentName',
-      documentTitle:'documentName'     
+      uniqueKey:'title',
+      documentTitle:'title'     
     },        
-    required:["documentName","url"],
+    required:["title","url"],
     properties: {     
       _id:{type:'string'},
       created:{type:'string'},
@@ -19,8 +19,10 @@ export const webhook:SchemaType = {
       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'},      
+      title:{type:"string",minLength:3,},
+      url: {type: "string", format:'uri'},     
+      serverSubscriptionId :{type:"string"},
+      serverSubscriptionSecret :{type:"string"},
       requestMethod:{
         type: "string", 
         enum:['post','get','patch','put','delete','head'],
@@ -29,7 +31,14 @@ export const webhook:SchemaType = {
         type:"string",
         enum:['none','basic'],
         description:"apikey authentication use none + headers props"
-      },  
+      },
+      basicAuth:{
+        type:"object",
+        properties:{
+          user:{type:"string"},
+          password:{type:"string"}
+        }
+      },
       headers: {
         type: "array",
         items:{
@@ -44,7 +53,12 @@ export const webhook:SchemaType = {
 
       description: {type: "string",format:"text"},
       active: {type: "boolean", default:true},
-      setting:{type:"string",format:"text"}
+      eventTypes:{
+        type:"array",
+        minItems:1,
+        items:{
+          type:"string"
+        }}
     }
 }
 

package/templates/nest/.env._eta

@@ -31,6 +31,11 @@ AUTH_SECRET_KEY=<%=it.configs.oauthSetting ? it.configs.oauthSetting.oauthAuthSe
 BACKEND_URL=http://localhost:<%=it.configs.backendPort%>
 
 
+WEBHOOK_SERVER_URL=
+WEBHOOK_SERVER_APP_ID=
+WEBHOOK_SERVER_APIKEY=
+
+
 ADMIN_EMAIL= 
 TEST_OAUTH2_USERNAME=
 TEST_OAUTH2_PASSWORD=

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

@@ -1,4 +1,4 @@
-/**
+  /**
  * This file was automatically generated by simpleapp generator. Every
  * MODIFICATION OVERRIDE BY GENERATEOR
  * last change 2023-10-28
@@ -12,36 +12,41 @@ import * as types from 'src/simpleapp/generate/types';
 
 @Injectable()
 export class AuditTrail {
-
-  constructor( @InjectModel('Documentevent') private doc: Model<types.Documentevent>) {}
-
-
+  constructor(
+    @InjectModel('Documentevent') private doc: Model<types.Documentevent>,
+  ) {}
 
   // addEvent(data: any) {
   //   console.log('Add event into db:', data);
   // }
-  async addEvent(appuser:UserContext,documentName:string,id:string,eventType:string,data:any){
-      
-
-      
-      const eventdata:types.Documentevent = {
-        _id:crypto.randomUUID(),
-        documentName:documentName,
-        documentId:id,
-        eventType:eventType,
-        eventdata:data
-      }
-      Object.assign(eventdata, appuser.getCreateFilter());  
-        console.log('add event',documentName,id,eventType)
-        console.log('Add event into db:', eventdata);
-        const newdoc = new this.doc(eventdata);
-        const dbsession = appuser.getDBSession();
-        const result = await newdoc.save({ session: dbsession });
-
-        
+  async addEvent(
+    appuser: UserContext,
+    documentName: string,
+    id: string,
+    eventType: string,
+    data: any,
+  ) {
+    const eventdata: types.Documentevent = {
+      _id: crypto.randomUUID(),
+      documentName: documentName,
+      documentId: id,
+      eventType: eventType,
+      eventdata: data,
+    };
+    Object.assign(eventdata, appuser.getCreateFilter());
+    // console.log('add event', documentName, id, eventType);
+    // console.log('Add event into db:', eventdata);
+    const newdoc = new this.doc(eventdata);
+    const dbsession = appuser.getDBSession();
+    const result = await newdoc.save({ session: dbsession });
   }
 
-  async addManyEvents(appuser:UserContext,documentName:string,eventType:string,data:any[]){
-    console.log('add many event',documentName,eventType)
+  async addManyEvents(
+    appuser: UserContext,
+    documentName: string,
+    eventType: string,
+    data: any[],
+  ) {
+    console.log('add many event', documentName, eventType);
   }
 }

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

@@ -15,7 +15,8 @@ export const alldocuments:any[] = [
         isolationType:'<%=conf['isolationType']%>', 
         documentDate:'<%=conf['documentDate']??""%>', 
         docNumber:<%=conf['generateDocumentNumber']??false%>,
-        docNoPattern: '<%=conf['docNoPattern']%>'
+        docNoPattern: '<%=conf['docNoPattern']%>',
+        webhook:<%~ JSON.stringify(conf['webhook'])%>
         },
     <%}%>
   ]

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

@@ -11,16 +11,27 @@ import {
   Webhook,
   WebhookService,
 } from 'src/simpleapp/services/webhook.service';
-import {
-  Webhookhistory,
-  WebhookhistoryService,
-} from 'src/simpleapp/services/webhookhistory.service';
+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 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'
+
+
+
   public constructor(
-    private webhookService: WebhookService,
-    private webhookhistoryService: WebhookhistoryService,
-  ) {}
+    private webhookService: WebhookService,    
+  ) {
+    if(this.webhooksync) this.syncEventTypes()
+  }
+
+
   @OnEvent('webhook')
   async loadWebhook(
     appuser: UserContext,
@@ -28,42 +39,163 @@ export class RunWebhookService {
     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);
+    //no webhook server implemented
+    if(!this.webhookApiKey) return true
+
+
+    const filter = {
+      eventTypes: documentName + '.' + actionName ,
+      active: true,
     }
+    console.log("Load webhook",documentName,actionName,filter)
+    const webhooks = await this.webhookService.search(appuser, filter);
+    console.log("Loaded webhook",webhooks)
+    if (webhooks.length == 0) return;
 
-    if (subscribeall || subscribes.includes(actionName)) {
-      await this.runWebHook(appuser, webhook, data);
+    for (let i = 0; i < webhooks.length; i++) {
+      const webhook = webhooks[i];
+      try {
+        const res = await this.runWebHook(
+          appuser,
+          webhook,
+          documentName,
+          actionName,
+          data,
+        );
+      } catch (e) {
+        return e;
+      }
     }
   }
 
-  async runWebHook(appuser: UserContext, webhook: Webhook, data: any) {
-    const webhookurl = webhook.url;
-    const headers = { 'x-from': process.env.PROJECT_NAME };
+  async runWebHook(
+    appuser: UserContext,
+    webhook: Webhook,
+    documentName: string,
+    actionName: string,
+    data: 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,
-      body: JSON.stringify(data),
+      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)
+      const req = await fetch(this.webhookeventurl, options);
+      const statusCode = req.status;
+      if(statusCode>=300){
+        throw new InternalServerErrorException(`create event ${eventname} failed to webhook server`)
+      }
+      
+      // const body = req.body;
+    } catch (e) {
+      return e
+    }
+  }
+
+
+
+  async syncEventTypes(){
+    const options = {
+      method: 'GET', 
+      headers: {
+        accept: 'application/json',
+        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)
+      }
+    }
+
+   
+    }catch(e){
+      throw new InternalServerErrorException(e)
+    }
+
+
+  }
+
+
+  async createEventType(eventname:string){
+    const para = eventname.split('.')
+    const options = {
+      method: 'POST',
+      headers: {
+        accept: 'application/json',
+        'content-type': 'application/json',
+        Authorization: this.webhookApiKey
+      },
+      body: JSON.stringify({
+        application_id: this.webhookAppId,
+        resource_type: para[0],
+        service: para[1],
+        verb: para[2]
+      })
     };
 
-    const req = await fetch(webhookurl, options);
-    const statusCode = req.status;
-    const body = req.body;
+    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=>{
+          alleventtypes.push(
+            `${this.webhookprefix}${item.docName.toLowerCase()}.${h}`)
+        })
+      })
+    return alleventtypes
+
   }
 }

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

@@ -367,7 +367,6 @@ export class SimpleAppService<T extends { _id?: string; __v?: number }> {
       dbsession.startTransaction();
     }
 
-
     this.logger.debug(
       'this.withDocNumberFormat :' +
         this.withDocNumberFormat +
@@ -379,7 +378,6 @@ export class SimpleAppService<T extends { _id?: string; __v?: number }> {
       await this.genNewDocNo(appuser, data);
     }
 
-    
     let isolationFilter: any = { ...appuser.getCreateFilter() };
     isolationFilter = this.polishIsolationFilter(isolationFilter, data);
 
@@ -623,14 +621,14 @@ export class SimpleAppService<T extends { _id?: string; __v?: number }> {
           `You submit older version data "v${data.__v}"" but latest version = "v${existingdata.__v}"`,
         );
       }
-      this.logger.debug('warn1', existingdata);
+      // this.logger.debug('warn1', existingdata);
       data.__v = existingdata.__v + 1;
       // if (!existingdata) {
       //   throw new NotFoundException(`${id} not found`, 'not found');
       // }
-      this.logger.debug('warn2');
+      // this.logger.debug('warn2');
       if (this.hooks.beforeUpdate)
-        await this.hooks.beforeUpdate(appuser, id, data, existingdata);
+        await this.hooks.beforeUpdate(appuser, id,  existingdata,data);
 
       const dbsession = appuser.getDBSession();
       if (dbsession && !dbsession.inTransaction()) {
@@ -693,7 +691,7 @@ export class SimpleAppService<T extends { _id?: string; __v?: number }> {
     data.__v = existingdata.__v + 1;
 
     if (this.hooks.beforeUpdate)
-      await this.hooks.beforeUpdate(appuser, id, data, existingdata);
+      await this.hooks.beforeUpdate(appuser, id,existingdata, data);
 
     const dbsession = appuser.getDBSession();
     if (dbsession && !dbsession.inTransaction()) {