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

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

@@ -7,39 +7,39 @@
 import { UserContext } from './user.context';
 import { InjectModel } from '@nestjs/mongoose';
 import { Model } from 'mongoose';
-import {DocNumberFormatResult} from '../types'
-import { Docnoformat } from '../types/docno.type'
-import { Injectable, InternalServerErrorException,BadRequestException } from '@nestjs/common';
-import moment from 'moment';
-import {ForeignKey} from '../types'
+import { DocNumberFormatResult } from '../types';
+import { Docnoformat } from '../types/docno.type';
+import {  Injectable, InternalServerErrorException, BadRequestException} from '@nestjs/common';
+// import moment from 'moment';
+import dayjs from 'dayjs'
+import { ForeignKey } from '../types';
 
-export class DocNumberFormatGenerator{
-  constructor(@InjectModel('Docnoformat') private docformat: Model<Docnoformat>) {}
+export class DocNumberFormatGenerator {
+  constructor(@InjectModel('Docnoformat') private docformat: Model<Docnoformat>,) {}
 
 
-  async generateNextNumberFromDocument(appuser:UserContext,docType:string,data:any){
-    let formatId = ''
-    if(data.docNoFormat && data.docNoFormat._id){
-      formatId=data.docNoFormat._id
+  async generateNextNumberFromDocument( appuser: UserContext, docType: string, data: any,) {
+    let formatId = '';
+    if (data.docNoFormat && data.docNoFormat._id) {
+      formatId = data.docNoFormat._id;
     }
-    const docnoobj = await this.generateNextNo(appuser,docType,formatId)        
-    const result:ForeignKey = {
-      _id : String(docnoobj.formatId),
-      label: docnoobj.formatName
-    }
-    data.docNoFormat = result
-    return docnoobj.result
+    const docnoobj = await this.generateNextNo(appuser, docType, formatId);
+    const result: ForeignKey = {
+      _id: String(docnoobj.formatId),
+      label: docnoobj.formatName,
+    };
+    data.docNoFormat = result;
+    return docnoobj.result;
   }
 
-
-  generateNextNo = async (appuser: UserContext,doctype: string,id: string = '') => {
+  generateNextNo = async ( appuser: UserContext,doctype: string, id: string = '',) => {
     doctype = doctype.toUpperCase();
     let filter = { docNoType: doctype };
     if (id) {
       filter['_id'] = id;
     }
-    Object.assign(filter,appuser.getBranchFilter())
-    const result = await this.docformat.find(filter)
+    Object.assign(filter, appuser.getBranchFilter());
+    const result = await this.docformat.find(filter);
     //search(appuser, filter);
     if (result && result.length > 0) {
       const d: Docnoformat = result[0];
@@ -47,11 +47,17 @@ export class DocNumberFormatGenerator{
       const newdocno = DocNumberFormatGenerator.previewDocNo(d);
       const newnextnumber = d.nextNumber + 1;
       const updatedata = { nextNumber: newnextnumber } as Docnoformat;
-      const updateresult = await this.docformat.findByIdAndUpdate(recordId,updatedata).session(appuser.getDBSession())
-      
-      if (updateresult) {         
-        const result:DocNumberFormatResult = {formatId:d._id,formatName:d.docNoFormatName,result: newdocno }
-        return result 
+      const updateresult = await this.docformat
+        .findByIdAndUpdate(recordId, updatedata)
+        .session(appuser.getDBSession());
+
+      if (updateresult) {
+        const result: DocNumberFormatResult = {
+          formatId: d._id,
+          formatName: d.docNoFormatName,
+          result: newdocno,
+        };
+        return result;
         //;
       } else {
         throw new InternalServerErrorException(
@@ -86,13 +92,13 @@ export class DocNumberFormatGenerator{
           nextnumber = '0' + nextnumber;
         }
         newvalue = newvalue.replace(numberpattern[0], nextnumber);
-      }      
+      }
 
       if (datepattern && datepattern.length > 0) {
         for (let d = 0; d < datepattern.length; d++) {
           const dpattern = datepattern[d];
           const date = new Date();
-          const formatteddate = moment().format(
+          const formatteddate =dayjs().format(
             dpattern.replace('{', '').replace('}', ''),
           );
           newvalue = newvalue.replace(dpattern, formatteddate);
@@ -104,4 +110,4 @@ export class DocNumberFormatGenerator{
       throw new InternalServerErrorException(errors);
     }
   };
-}
+}

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

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

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

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

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

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

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

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

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

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

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

@@ -6,7 +6,11 @@
  */
 import { UserContext } from '../commons/user.context';
 import * as sharelibs from '../sharelibs';
-import { Injectable, Inject,InternalServerErrorException } from '@nestjs/common';
+import {
+  Injectable,
+  Inject,
+  InternalServerErrorException,
+} from '@nestjs/common';
 import { InjectModel } from '@nestjs/mongoose';
 import * as jsonpath from 'jsonpath';
 import { Model } from 'mongoose';
@@ -17,7 +21,7 @@ import { DocNumberFormatGenerator } from '../commons/docnogenerator.service';
 import { AutoincreamentService } from '../../services/autoinc.service';
 import { alldocuments } from '../commons/dicts/documents';
 import { Docnoformat, DocnoformatService } from '../../services/docno.service';
-import { BranchOrganization, Branch,BranchHooks } from '../types/branch.type';
+import { BranchOrganization, Branch, BranchHooks } from '../types/branch.type';
 import {
   DefaultBranchOrganization,
   DefaultBranch,
@@ -32,9 +36,11 @@ export class BranchProcessor extends SimpleAppService<Branch> {
   protected strictIsolation = false;
   protected documentIdentityCode = 'branchCode';
   protected documentIdentityLabel = 'branchName';
-  protected hooks: BranchHooks = {        
-    beforeCreate: async (appuser: UserContext, data: Branch) => await this.branchBeforeCreate(appuser,data),
-    afterCreate: async (appuser: UserContext, data: Branch) => await this.branchAfterCreate(appuser,data),
+  protected hooks: BranchHooks = {
+    beforeCreate: async (appuser: UserContext, data: Branch) =>
+      await this.branchBeforeCreate(appuser, data),
+    afterCreate: async (appuser: UserContext, data: Branch) =>
+      await this.branchAfterCreate(appuser, data),
   };
   protected foreignkeys = { organization: ['$.organization._id'] };
   constructor(mydoc: Model<Branch>) {
@@ -74,7 +80,7 @@ export class BranchProcessor extends SimpleAppService<Branch> {
     const docformats = alldocuments.filter((item) => item.docNumber);
     for (let i = 0; i < docformats.length; i++) {
       const doc = docformats[i];
-      const pattern = `${doc.docType}-${branchCode}-[00000]`;
+      const pattern = doc.docNoPattern.replace('@BranchCode',branchCode);
       const formatdata: Docnoformat = {
         _id: crypto.randomUUID(),
         docNoFormatNo: `${doc.docType}-${branchCode}`,

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

@@ -43,7 +43,7 @@ import {
   WorkflowName,
 } from '../types';
 @Injectable()
-export class SimpleAppService<T extends { _id?: string }> {
+export class SimpleAppService<T extends { _id?: string; __v?: number }> {
   @Inject(EventEmitter2)
   protected eventEmitter: EventEmitter2;
   @Inject(CloudApiService)
@@ -53,7 +53,12 @@ export class SimpleAppService<T extends { _id?: string }> {
   protected hooks: DefaultHooks<T> = {};
   protected logger = new Logger();
   protected strictIsolation = true;
-  protected jsonschema = { type: 'object', properties: {}, required: [] };
+  protected jsonschema: any = {
+    type: 'object',
+    'x-simpleapp-config': {},
+    properties: {},
+    required: [],
+  };
   protected documentIdentityCode = 'code';
   protected documentIdentityLabel = 'label';
   protected documentName = '-unknowndocname-';
@@ -97,6 +102,7 @@ export class SimpleAppService<T extends { _id?: string }> {
   getRecordId = (): string => this.data._id;
   setSchema = (newschema) => (this.jsonschema = newschema);
   getSchema = () => this.doc.schema.obj;
+  getJsonSchema = () => this.jsonschema;
   getHooks = () => this.hooks;
   getData = () => {
     //console.log('thisdata', this.data);
@@ -225,7 +231,9 @@ export class SimpleAppService<T extends { _id?: string }> {
 
         Object.assign(pipeline[0]['$match'], isolationFilter);
         //console.log("final agg",pipeline)
-        return await this.doc.aggregate(pipeline);
+        return await this.doc.aggregate(pipeline, {
+          session: appuser.getDBSession(),
+        });
       } catch (err) {
         throw new InternalServerErrorException(err);
       }
@@ -238,8 +246,9 @@ export class SimpleAppService<T extends { _id?: string }> {
   async search(
     appuser: UserContext,
     filters: FilterQuery<T>,
-    projection: ProjectionType<T> = undefined,
+    projection: string[] = undefined,
     sort: any = undefined,
+    lookup: { [key: string]: string } = undefined,
   ) {
     try {
       const isolationFilter = { ...this.getIsolationFilter(appuser) };
@@ -252,24 +261,47 @@ export class SimpleAppService<T extends { _id?: string }> {
         await this.hooks.beforeSearch(appuser, newfilters);
       // console.log("before _find",newfilters)
       // console.log("this.doc",this.doc)
-      const products = await this.doc
-        .find(newfilters, projection, { session: appuser.getDBSession() })
-        .sort(sort);
-      // console.log("after search",products)
-      const productlist = products.map((p: T) => {
+      let searchResults: T[] = [];
+      if (lookup === undefined) {
+        this.logger.debug('after search', newfilters);
+        searchResults = await this.doc
+          .find(newfilters, projection, { session: appuser.getDBSession() })
+          .sort(sort);
+      } else {
+        const pipelines = this.searchToAggregate(
+          filters,
+          projection,
+          sort,
+          lookup,
+        );
+        this.logger.debug('after aggregate', pipelines);
+
+        searchResults = await this.aggregate(appuser, pipelines);
+      }
+
+      const list: T[] = searchResults.map((p: T) => {
         return p;
       });
       // console.log("after map",productlist)
-      if (this.hooks.afterSearch)
-        await this.hooks.afterSearch(appuser, productlist);
+      if (this.hooks.afterSearch) await this.hooks.afterSearch(appuser, list);
 
       //   console.log(products);
-      return productlist;
+      return list;
     } catch (err) {
       throw new BadRequestException(err.message);
     }
     // return this;
   }
+
+  async fullTextSearch(appuser: UserContext, keyword: string) {
+    const isolationFilter = { ...this.getIsolationFilter(appuser) };
+    this.polishIsolationFilter(isolationFilter);
+
+    const filters = { $text: { $search: keyword } };
+    const newfilters: FilterQuery<T> = { ...filters, ...isolationFilter };
+
+    return await this.doc.find(newfilters);
+  }
   async findById(appuser: UserContext, id: string) {
     if (this.hooks.beforeFetchRecord)
       await this.hooks.beforeFetchRecord(appuser, id);
@@ -364,6 +396,7 @@ export class SimpleAppService<T extends { _id?: string }> {
     // result = await newdoc.save()
     try {
       if (this.hooks.afterCreate) await this.hooks.afterCreate(appuser, result);
+      this.callWebhook(appuser, 'create', result);
       return result as T;
     } catch (err) {
       throw new InternalServerErrorException(
@@ -416,6 +449,7 @@ export class SimpleAppService<T extends { _id?: string }> {
     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' });
@@ -524,6 +558,7 @@ export class SimpleAppService<T extends { _id?: string }> {
         if (this.hooks.afterDelete)
           await this.hooks.afterDelete(appuser, deleteresult, id);
         //this.doc.findByIdAndDelete(id);
+        this.callWebhook(appuser, 'delete', deletedata);
         return deleteresult;
       } else {
         this.logger.debug('reject query', dependency);
@@ -542,6 +577,15 @@ export class SimpleAppService<T extends { _id?: string }> {
 
   findIdThenUpdate = async (appuser: UserContext, id: string, data: T) => {
     const existingdata = await this.findById(appuser, id);
+
+    //version exists, need ensure different only 1
+    if (typeof data.__v == 'number' && data.__v != existingdata.__v) {
+      throw new BadRequestException(
+        `You submit older version data "v${data.__v}"" but latest version = "v${existingdata.__v}"`,
+      );
+    }
+
+    data.__v = existingdata.__v + 1;
     if (!existingdata) {
       throw new NotFoundException(`${id} not found`, 'not found');
     }
@@ -575,6 +619,7 @@ export class SimpleAppService<T extends { _id?: string }> {
       appuser.addUpdatedRecordId(this.documentName, data._id);
       if (this.hooks.afterUpdate)
         await this.hooks.afterUpdate(appuser, id, existingdata, result);
+      this.callWebhook(appuser, 'update', result);
       return result; // await this.findById(appuser, id);
     } catch (err) {
       this.logger.error(err);
@@ -592,6 +637,13 @@ export class SimpleAppService<T extends { _id?: string }> {
     if (!existingdata) {
       throw new NotFoundException(`${id} not found`, 'not found');
     }
+    if (typeof data.__v == 'number' && data.__v != existingdata.__v) {
+      throw new BadRequestException(
+        `You submit older version data "v${data.__v}"" but latest version = "v${existingdata.__v}"`,
+      );
+    }
+
+    data.__v = existingdata.__v + 1;
 
     if (this.hooks.beforeUpdate)
       await this.hooks.beforeUpdate(appuser, id, data, existingdata);
@@ -628,6 +680,7 @@ export class SimpleAppService<T extends { _id?: string }> {
 
       if (this.hooks.afterUpdate)
         await this.hooks.afterUpdate(appuser, id, existingdata, result);
+      this.callWebhook(appuser, 'update', result);
       return result; //await this.findById(appuser, id);
     } catch (err) {
       throw new InternalServerErrorException(err.message);
@@ -731,6 +784,7 @@ export class SimpleAppService<T extends { _id?: string }> {
       if (this.hooks.afterSetStatus)
         await this.hooks.afterSetStatus(appuser, docstatus, finaldata);
 
+      this.callWebhook(appuser, docstatus, finaldata);
       return updateresult;
     }
   }
@@ -744,7 +798,7 @@ export class SimpleAppService<T extends { _id?: string }> {
    * @param      {string}       eventName  The event name
    * @param      {any}          data       The data
    */
-  runBackgroundWorker(appuser: UserContext, eventName: string, payloads:any) {
+  runBackgroundWorker(appuser: UserContext, eventName: string, payloads: any) {
     this.eventEmitter.emit(eventName, appuser, payloads);
   }
 
@@ -764,7 +818,7 @@ export class SimpleAppService<T extends { _id?: string }> {
    * @param      {any}          data       The data
    * @return     {Promise}      { description_of_the_return_value }
    */
-  async runWorker(appuser: UserContext, eventName: string, payloads:any) {
+  async runWorker(appuser: UserContext, eventName: string, payloads: any) {
     const res = await this.eventEmitter.emitAsync(eventName, appuser, payloads);
     if (!this.eventEmitter.hasListeners(eventName)) {
       throw new InternalServerErrorException(`${eventName} seems no listener`);
@@ -915,4 +969,64 @@ export class SimpleAppService<T extends { _id?: string }> {
     const pdfresult = await this.printapi.getBase64Pdf(appuser, formatid, id);
     return pdfresult;
   }
+
+  searchToAggregate(
+    filter: FilterQuery<T>,
+    columns: string[],
+    sort: string[][],
+    lookup: { [key: string]: string },
+  ) {
+    const pipelines: PipelineStage[] = [];
+    const projection = {};
+    // console.log('sortsort', sort);
+
+    pipelines.push({ $match: filter });
+    if (Array.isArray(columns) && columns.length > 0) {
+      columns.forEach((col) => {
+        projection[col] = 1;
+      });
+    }
+
+    const collections = Object.keys(lookup);
+    collections.forEach((tokey: string) => {
+      const toarr = tokey.split('.');
+      const to = toarr[0];
+      const foreignField = toarr[1] ?? '_id';
+      pipelines.push({
+        $lookup: {
+          from: to,
+          as: '_' + to,
+          localField: lookup[tokey],
+          foreignField: foreignField,
+        },
+      });
+      pipelines.push({ $unwind: '$_' + to });
+
+      if (Object.keys(projection).length > 0) projection['_' + to] = 1;
+    });
+
+    if (Object.keys(projection).length > 0)
+      pipelines.push({ $project: projection });
+
+    if (Array.isArray(sort) && sort.length > 0) {
+      const sortobj = {};
+      sort.forEach((item) => {
+        sortobj[item[0]] = item[1].toLowerCase() == 'asc' ? 1 : -1;
+      });
+      pipelines.push({ $sort: sortobj });
+    }
+    // console.log('pipelinespipelinespipelines', pipelines);
+
+    return pipelines;
+  }
+
+  callWebhook(appuser: UserContext, actionName: string, data: any) {
+    this.eventEmitter.emit(
+      'webhook',
+      appuser,
+      this.documentName,
+      actionName,
+      data,
+    );
+  }
 }

package/templates/nest/src/simpleapp/generate/types/schema.type.ts.eta

@@ -30,17 +30,19 @@ export type DocumentStatus = {
     formula:string  //example "jslib.getDocumentSubTotal(@F{$.details})"
   } 
 export type SchemaConfig = {
-    isolationType: IsolationType  
+    isolationType: string  
     requiredRoles?:string[]
     pageType?: string  
     uniqueKey?:string  
     uniqueKeys?:string[][]
     documentTitle?:string 
     generateDocumentNumber?:boolean
+    docNoPattern?:string
     documentDate?:string
     allStatus?:DocumentStatus[]
     additionalApis?:DocumentApi[]      
     additionalAutoCompleteFields ?: string[]
+    search?:string[]
     // libs?:ImportLibs[]   // both process class and frontend client class will import same lib
     formulas?: Formula[]  
     documentType: string

package/templates/nest/src/simpleapp/generate/types/simpleapp.type.ts.eta

@@ -27,6 +27,7 @@ export type SearchBody = {
   fields?: any[];
 
   sorts?: any[];
+  lookup?:Object;
 };
 
 export enum IsolationType {

package/templates/nest/src/simpleapp/profile/profile.controller.ts.eta

@@ -160,4 +160,23 @@ export class ProfileController {
       throw new HttpException('Forbidden', HttpStatus.FORBIDDEN);
     }
   }
+  @Post('/tour-complete/:guidename')
+  @Roles(Role.User)
+  @ApiOperation({
+    operationId: 'runTourComplete',
+    description: 'complete specific tour guide',
+  })
+  @ApiResponse({ status: 201, type: Object, description: 'Success' })
+  async runTourComplete(
+    @AppUser() appuser: UserContext,
+    @Param('guidename') guidename: string,
+    
+  ) {
+    const result = await this.profileservice.runTourComplete(appuser,guidename,);
+    if (result) {
+      return result;
+    } else {
+      throw new HttpException('Forbidden', HttpStatus.FORBIDDEN);
+    }
+  }
 }