@simitgroup/simpleapp-generator 1.6.4-c-alpha → 1.6.4-d-alpha

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

@@ -28,21 +28,22 @@ export const Default<%=modelname%> = (uuid:string)=>{
           <%}else if(key=='doctype'){ %>
             doctype : '<%=it.doctype.toUpperCase()%>',
           <% } else if(typeof field.default !='undefined' && field.type=='string'){%> 
-            <%=key%> : '<%= field.default  %>',
-          <%} else if(typeof field.default !='undefined'){%> 
-            <%=key%> : <%= field.default  %>,
+            <%=key%> : '<%= field.default  %>',          
+          <%} else if(typeof field.default !='undefined' && JSON.stringify(field.default)=='{}'){%>           
+          //  <%=key%> : <%~ JSON.stringify(field.default) %>,
+          <%} else if(typeof field.default !='undefined'){%>           
+              <%=key%> : <%= field.default  %>,          
           <%} else if(field.type=='boolean' ){%> 
               <%=key%> :false ,
           <%} else if(typeof field=='string'){%>
             <%=key%> :  Default<%= field  %>(''),
           <%} else if(field.type=='string'){%>
               <%=key%> : '<%= field.default  %>',
-
             <%} else if(Array.isArray(field) && ['string','integer','number','boolean'].includes(field[0])) {%>
               <%=key%> : <<%=field[0]%>[]>[],  //typeof field == array     <%~JSON.stringify(field)%>    
             <%} else if(Array.isArray(field)) {%>
               <%=key%> : [Default<%=field[0]%>(crypto.randomUUID())],  //typeof field == array     <%~JSON.stringify(field)%>    
-            <%} else {%>
+            <%} else {%>            
               <%=key%> : <%=field.default%>,  //else <%= typeof field %>
           <%}%>
         <%})%>

package/templates/basic/nuxt/default.ts.eta

@@ -27,6 +27,8 @@ export const Default<%=modelname%> = (uuid:string)=>{
             orgId : getUserProfile()?.orgId,
           <%}else if(key=='branchId'){ %>
             branchId : getUserProfile()?.branchId,
+          <%} else if(typeof field.default !='undefined' && JSON.stringify(field.default)=='{}'){%>           
+            //<%=key%> : <%~ JSON.stringify(field.default) %>,          
           <% } else if(typeof field.default !='undefined' && field.type=='string'){%> 
             <%=key%> : '<%= field.default  %>',
           <%} else if(typeof field.default !='undefined'){%> 

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

@@ -300,10 +300,5 @@ 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/apischemas/index.ts._eta

@@ -67,3 +67,20 @@ export class UserPermission {
   @ApiProperty({ type: 'string', required: true, format: 'uuid', default: '' })
   userId: string;
 }
+
+@ObjectType()
+export class TextSearchBody{
+  @Field()
+  @ApiProperty({ type: String })
+  keyword:string
+  @Field(()=>[String])
+  @ApiProperty({ type: ()=>[String] })
+  fields?:string[]
+  @Field(()=>[[String]])
+  @ApiProperty({ type: ()=>[[String]], })  
+  sorts?:string[][]
+  @Field()
+  @ApiProperty({ type: Object })  
+  
+  lookup?: Record<string,string>  
+}

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

@@ -4,14 +4,44 @@
  * last change 2023-10-28
  * Author: Ks Tan
  */
-import { Injectable } from "@nestjs/common";
+import { InjectModel } from '@nestjs/mongoose';
+import { Injectable } from '@nestjs/common';
+import { UserContext } from '../commons/user.context';
+import { Model } from 'mongoose';
+import * as types from 'src/simpleapp/generate/types';
 
 @Injectable()
 export class AuditTrail {
-    constructor(){        
-    }
 
-    addEvent(data:any){
-        console.log("Add event into db:",data)
-    }
-}
+  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 addManyEvents(appuser:UserContext,documentName:string,eventType:string,data:any[]){
+    console.log('add many event',documentName,eventType)
+  }
+}

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

@@ -7,18 +7,28 @@ import {
 } from '@nestjs/common';
 import { EventEmitter2, OnEvent } from '@nestjs/event-emitter';
 import { UserContext } from './user.context';
-import { WebhookService } from 'src/simpleapp/services/webhook.service';
+import {
+  Webhook,
+  WebhookService,
+} from 'src/simpleapp/services/webhook.service';
+import {
+  Webhookhistory,
+  WebhookhistoryService,
+} from 'src/simpleapp/services/webhookhistory.service';
 @Injectable()
 export class RunWebhookService {
-  public constructor(private webhookService: WebhookService) {}
+  public constructor(
+    private webhookService: WebhookService,
+    private webhookhistoryService: WebhookhistoryService,
+  ) {}
   @OnEvent('webhook')
-  async runWebhook(
+  async loadWebhook(
     appuser: UserContext,
     documentName: string,
     actionName: string,
     data?: any,
   ) {
-    let subscribeall=false
+    let subscribeall = false;
     const webhooks = await this.webhookService.search(appuser, {
       documentName: documentName,
       active: true,
@@ -26,25 +36,34 @@ export class RunWebhookService {
     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)
+    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
+    if (subscribeall || subscribes.includes(actionName)) {
+      await this.runWebHook(appuser, webhook, data);
+    }
+  }
 
+  async runWebHook(appuser: UserContext, webhook: Webhook, data: any) {
+    const webhookurl = webhook.url;
+    const headers = { 'x-from': process.env.PROJECT_NAME };
+    if (Array.isArray(webhook.headers)) {
+      webhook.headers.forEach((h) => {
+        headers[h.name] = h.value;
+      });
     }
-    
+    const options = {
+      method: webhook.requestMethod,
+      body: JSON.stringify(data),
+      headers: headers,
+    };
+
+    const req = await fetch(webhookurl, options);
+    const statusCode = req.status;
+    const body = req.body;
   }
 }

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

@@ -26,8 +26,13 @@ import { UserService } from './../../services/user.service';
 import { InjectModel } from '@nestjs/mongoose';
 const Base64URL = require('@darkwolf/base64url');
 import { UserMongoSchema } from './../models/user.model';
-import { User } from './../types/user.type';
-import { Permission } from './../types/perm.type';
+// import { User } from './../types/user.type';
+import {
+  TenantClientSetting,
+  Permission,
+  User,
+} from 'src/simpleapp/generate/types';
+// import { Permission } from './../types/perm.type';
 import {
   ProfileUserBranch,
   ProfileUserInvites,
@@ -67,6 +72,11 @@ export class UserContext {
   protected invites: any[] = []; //User + field tenant:Tenant[]
   protected roles: string[] = [];
   protected moreProps: any[] = [];
+  protected clientSetting: TenantClientSetting = {
+    auditTrail: false,
+    support: false,
+    webhook: false,
+  };
   private dbsession: ClientSession;
   protected modifiedRecords: ModifiedRecords = {
     createds: {},
@@ -92,6 +102,7 @@ export class UserContext {
   getOrgId = () => this.orgId;
   getOrgRecordId = () => this.orgRecordId;
   getBranchId = () => this.branchId;
+  getClientSetting = () => this.clientSetting;
   getBranchCode = () => this.branchCode;
   getEmail = () => this.email;
   getTimeZone = () => this.timeZone;
@@ -103,10 +114,10 @@ export class UserContext {
   getRoles = () => this.roles;
   getModifieds = () => this.modifiedRecords;
   getBranches = (): ProfileUserBranch[] => {
-    this.branches;
+    // this.branches;
     const data: ProfileUserBranch[] = [];
 
-    if (this.branches) {
+    if (Array.isArray(this.branches)) {
       for (let i = 0; i < this.branches.length; i++) {
         const b = this.branches[i];
         data.push({
@@ -175,6 +186,9 @@ export class UserContext {
               as: 'currentbranch',
             },
           },
+          {
+            $unwind: '$currentbranch',
+          },
           {
             $lookup: {
               from: 'organization',
@@ -183,6 +197,20 @@ export class UserContext {
               as: 'currentorg',
             },
           },
+          {
+            $unwind: '$currentorg',
+          },
+          {
+            $lookup: {
+              from: 'tenant',
+              localField: 'tenantId',
+              foreignField: 'tenantId',
+              as: 'currentTenant',
+            },
+          },
+          {
+            $unwind: '$currentTenant',
+          }          
         ],
       },
     };
@@ -191,10 +219,12 @@ export class UserContext {
 
     if (this.tenantId > 0) {
       pipeline.push(joinpermission);
+      pipeline.push({$unwind:'$permissions'})
+
     }
     // console.log("obtainProfileFromDbobtainProfileFromDb ",pipeline)
     // const users = await usermodel.find(filter)
-    const users = await this.usermodel.aggregate(pipeline);
+    const users = await this.usermodel.aggregate(pipeline);    
     this.logger.verbose(
       `aggregate user profile from database`,
       'obtainProfileFromDb',
@@ -207,7 +237,7 @@ export class UserContext {
 
       //console.log(userinfo)
       if (this.tenantId > 0) {
-        const myperm = userinfo.permissions[0];
+        const myperm = userinfo.permissions;
 
         if (myperm && myperm.groups) {
           userinfo.groups = myperm.groups;
@@ -220,16 +250,17 @@ export class UserContext {
             }
           }
 
-          userinfo.branchRecordId = myperm.currentbranch[0]._id;
-          userinfo.branchCode = myperm.currentbranch[0].branchCode;
-          userinfo.branchName = myperm.currentbranch[0].branchName;
-          userinfo.orgRecordId = myperm.currentorg[0]._id;
-          userinfo.orgCode = myperm.currentorg[0].orgCode;
-          userinfo.orgName = myperm.currentorg[0].orgName;
-          userinfo.timeZone = myperm.currentorg[0].timeZone;
-          userinfo.currency = myperm.currentorg[0].currency;
-          userinfo.country = myperm.currentorg[0].country;
-          userinfo.offsetMinute = myperm.currentorg[0].offsetMinute;
+          userinfo.branchRecordId = myperm.currentbranch._id;
+          userinfo.branchCode = myperm.currentbranch.branchCode;
+          userinfo.branchName = myperm.currentbranch.branchName;
+          userinfo.orgRecordId = myperm.currentorg._id;
+          userinfo.orgCode = myperm.currentorg.orgCode;
+          userinfo.orgName = myperm.currentorg.orgName;
+          userinfo.timeZone = myperm.currentorg.timeZone;
+          userinfo.currency = myperm.currentorg.currency;
+          userinfo.country = myperm.currentorg.country;
+          userinfo.offsetMinute = myperm.currentorg.offsetMinute;
+          userinfo.clientSetting = myperm.currentTenant.clientSetting;
         }
       } else {
         userinfo.groups = [];
@@ -239,16 +270,6 @@ export class UserContext {
 
       const dblastactivity = userinfo.lastActivity ?? '2000-01-01T00:00:00Z';
       const lastvisit = new Date(dblastactivity).getTime() ?? 0;
-      // if(currentitme - lastvisit)
-
-      //update last activtity dont too frequent
-      //if(!dblastactivity || currentitme - lastvisit > 5000 ){
-      //  const newusermodel = await this.usermodel.findById(userinfo._id)
-      //  newusermodel.lastActivity= this.lastActivity
-      //  const result = await newusermodel.save()
-      //}
-
-      // const result =  await this.usermodel.findOneAndUpdate({_id: userinfo._id},{lastActivity: new Date().toISOString})
       return userinfo;
     } else {
       return undefined;
@@ -287,6 +308,7 @@ export class UserContext {
       this.orgRecordId = userinfo['orgRecordId'] ?? '';
       this.branchRecordId = userinfo['branchRecordId'] ?? '';
       this.groups = userinfo['groups'] ?? [];
+      this.clientSetting = userinfo['clientSetting'] ?? {};
       this.roles = userinfo['roles'] ?? [Role.Everyone, Role.User];
       this.moreProps = this.setMoreProps(userinfo);
     } else {
@@ -586,14 +608,6 @@ export class UserContext {
         },
       } as PipelineStage;
 
-      const getTenantData: PipelineStage = {
-        $lookup: {
-          from: 'tenant',
-          localField: 'tenantId',
-          foreignField: 'tenantId',
-          as: 'tenant',
-        },
-      };
 
       const permission: PipelineStage = {
         $lookup: {
@@ -610,7 +624,7 @@ export class UserContext {
                 as: 'org',
               },
             },
-            {$unwind:'$org'},
+            { $unwind: '$org' },
             {
               $lookup: {
                 from: 'branch',
@@ -619,14 +633,14 @@ export class UserContext {
                 as: 'branch',
               },
             },
-            {$unwind:'$branch'},
+            { $unwind: '$branch' },
           ],
         },
       };
 
       const pipelines: PipelineStage[] = [
-        filteruser,
-        getTenantData,
+        { $match: { uid: this.uid, tenantId: { $gt: 0 }}},
+        { $lookup: { from: 'tenant', localField: 'tenantId', foreignField: 'tenantId',as: 'tenant'}},
         permission,
       ];
       // const users=[]
@@ -650,7 +664,7 @@ export class UserContext {
                 orgId: item.orgId,
                 branchId: item.branchId,
                 groups: item.groups,
-                orgRecordId:item.org._id, 
+                orgRecordId: item.org._id,
                 orgCode: item.org.orgCode,
                 orgName: item.org.orgName,
                 branchCode: item.branch.branchCode,

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

@@ -16,7 +16,7 @@ import {
 } from '@nestjs/common';
 // import { ApiTags, ApiBody, ApiResponse, ApiOperation } from '@nestjs/swagger';
 import { UserContext } from '../commons/user.context';
-import { SearchBody } from '../types';
+import { SearchBody,TextSearchBody } from '../types';
 const doctype = 'person'.toUpperCase();
 type ServiceType = {
   list: Function;
@@ -51,10 +51,10 @@ export class SimpleAppAbstractController<
   async _list(appuser: UserContext) {
     return this.service.list(appuser);
   }
-  async _fulltextsearch(appuser: UserContext, keyword: string) {
+  async _fulltextsearch(appuser: UserContext, body:TextSearchBody) {
     return this.service.fullTextSearch(
       appuser,
-      keyword
+      body
     );
   }
   async _search(appuser: UserContext, searchObject: SearchBody) {