@simitgroup/simpleapp-generator 1.6.3-alpha → 1.6.4-b-alpha

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

@@ -90,7 +90,9 @@ export class UserContext {
   getFullname = () => this.fullname;
   getTenantId = () => this.tenantId;
   getOrgId = () => this.orgId;
+  getOrgRecordId = () => this.orgRecordId;
   getBranchId = () => this.branchId;
+  getBranchCode = () => this.branchCode;
   getEmail = () => this.email;
   getTimeZone = () => this.timeZone;
   getCountry = () => this.country;
@@ -218,7 +220,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 +260,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 +537,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,
     );
@@ -608,6 +610,7 @@ export class UserContext {
                 as: 'org',
               },
             },
+            {$unwind:'$org'},
             {
               $lookup: {
                 from: 'branch',
@@ -616,6 +619,7 @@ export class UserContext {
                 as: 'branch',
               },
             },
+            {$unwind:'$branch'},
           ],
         },
       };
@@ -638,7 +642,7 @@ export class UserContext {
         activeusers.forEach((u) => {
           const permissions = u.permissions
             .filter((item: any) => {
-              return item.org[0].active && item.branch[0].active;
+              return item.org.active && item.branch.active;
             })
             .map((item: any) => {
               return {
@@ -646,10 +650,11 @@ export class UserContext {
                 orgId: item.orgId,
                 branchId: item.branchId,
                 groups: item.groups,
-                orgCode: item.org[0].orgCode,
-                orgName: item.org[0].orgName,
-                branchCode: item.branch[0].branchCode,
-                branchName: item.branch[0].branchName,
+                orgRecordId:item.org._id, 
+                orgCode: item.org.orgCode,
+                orgName: item.org.orgName,
+                branchCode: item.branch.branchCode,
+                branchName: item.branch.branchName,
                 xOrg: this.generateXorg(u.tenantId, item.orgId, item.branchId),
               };
             });
@@ -724,4 +729,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/org.processor.ts.eta

@@ -32,8 +32,6 @@ export class OrganizationProcessor extends SimpleAppService<Organization> {
   protected documentIdentityLabel = 'orgName';
   protected strictIsolation = false;
   protected foreignkeys = {};
-  protected defaultlogo =
-    'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAAApgAAAKYB3X3/OAAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAANCSURBVEiJtZZPbBtFFMZ/M7ubXdtdb1xSFyeilBapySVU8h8OoFaooFSqiihIVIpQBKci6KEg9Q6H9kovIHoCIVQJJCKE1ENFjnAgcaSGC6rEnxBwA04Tx43t2FnvDAfjkNibxgHxnWb2e/u992bee7tCa00YFsffekFY+nUzFtjW0LrvjRXrCDIAaPLlW0nHL0SsZtVoaF98mLrx3pdhOqLtYPHChahZcYYO7KvPFxvRl5XPp1sN3adWiD1ZAqD6XYK1b/dvE5IWryTt2udLFedwc1+9kLp+vbbpoDh+6TklxBeAi9TL0taeWpdmZzQDry0AcO+jQ12RyohqqoYoo8RDwJrU+qXkjWtfi8Xxt58BdQuwQs9qC/afLwCw8tnQbqYAPsgxE1S6F3EAIXux2oQFKm0ihMsOF71dHYx+f3NND68ghCu1YIoePPQN1pGRABkJ6Bus96CutRZMydTl+TvuiRW1m3n0eDl0vRPcEysqdXn+jsQPsrHMquGeXEaY4Yk4wxWcY5V/9scqOMOVUFthatyTy8QyqwZ+kDURKoMWxNKr2EeqVKcTNOajqKoBgOE28U4tdQl5p5bwCw7BWquaZSzAPlwjlithJtp3pTImSqQRrb2Z8PHGigD4RZuNX6JYj6wj7O4TFLbCO/Mn/m8R+h6rYSUb3ekokRY6f/YukArN979jcW+V/S8g0eT/N3VN3kTqWbQ428m9/8k0P/1aIhF36PccEl6EhOcAUCrXKZXXWS3XKd2vc/TRBG9O5ELC17MmWubD2nKhUKZa26Ba2+D3P+4/MNCFwg59oWVeYhkzgN/JDR8deKBoD7Y+ljEjGZ0sosXVTvbc6RHirr2reNy1OXd6pJsQ+gqjk8VWFYmHrwBzW/n+uMPFiRwHB2I7ih8ciHFxIkd/3Omk5tCDV1t+2nNu5sxxpDFNx+huNhVT3/zMDz8usXC3ddaHBj1GHj/As08fwTS7Kt1HBTmyN29vdwAw+/wbwLVOJ3uAD1wi/dUH7Qei66PfyuRj4Ik9is+hglfbkbfR3cnZm7chlUWLdwmprtCohX4HUtlOcQjLYCu+fzGJH2QRKvP3UNz8bWk1qMxjGTOMThZ3kvgLI5AzFfo379UAAAAASUVORK5CYII=';
   protected hooks: OrganizationHooks = {
     beforeCreate: async (appuser: UserContext, data: Organization) =>
       await this.orgBeforeCreate(appuser, data),
@@ -65,23 +63,22 @@ export class OrganizationProcessor extends SimpleAppService<Organization> {
   async runGetlogo(appuser: UserContext) {
     const logo = await this.searchLogo(appuser);
     if (logo) return logo.value;
-    else return this.defaultlogo;
+    else return ''
   }
 
   async searchLogo(appuser: UserContext) {
     const keyvaluepair = await this.kvpairService.search(appuser, {
-      key: 'orglogo',
+      key: 'org-'+appuser.getOrgRecordId(),
     });
     if (keyvaluepair && keyvaluepair.length > 0) return keyvaluepair[0];
     else return null;
   }
-  async runUploadlogo(appuser: UserContext, data: KeyValue) {
-    // this.setDefaultLogo(data.value);
+  async runUploadlogo(appuser: UserContext, data: KeyValue) {    
     const key = data.key;
 
     let kvdata: Keyvaluepair = await this.searchLogo(appuser);
     if (kvdata) {
-      kvdata.value=data.value
+      kvdata.value = data.value;
       const res = await this.kvpairService.findIdThenUpdate(
         appuser,
         kvdata._id,
@@ -95,7 +92,7 @@ export class OrganizationProcessor extends SimpleAppService<Organization> {
     } else {
       kvdata = {
         _id: crypto.randomUUID(),
-        key: 'orglogo',
+        key: 'org-'+appuser.getOrgRecordId(),
         value: data.value,
       };
       const res = await this.kvpairService.create(appuser, kvdata);
@@ -106,10 +103,8 @@ export class OrganizationProcessor extends SimpleAppService<Organization> {
       }
     }
 
-    return this.defaultlogo;
+    return ''
   }
 
-  async setDefaultLogo(data: string) {
-    this.defaultlogo = data;
-  }
+  
 }

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, __v?:number }> {
+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, __v?:number }> {
   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, __v?:number }> {
   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);
@@ -224,8 +230,10 @@ export class SimpleAppService<T extends { _id?: string, __v?:number }> {
         this.polishIsolationFilter(isolationFilter);
 
         Object.assign(pipeline[0]['$match'], isolationFilter);
-        //console.log("final agg",pipeline)
-        return await this.doc.aggregate(pipeline);
+        this.logger.verbose(pipeline, `${this.documentName} aggregate:`);
+        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, __v?:number }> {
   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, __v?:number }> {
         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, __v?:number }> {
     // 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, __v?:number }> {
     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, __v?:number }> {
         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);
@@ -541,18 +576,24 @@ export class SimpleAppService<T extends { _id?: string, __v?:number }> {
   // };
 
   findIdThenUpdate = async (appuser: UserContext, id: string, data: T) => {
-    const existingdata = await this.findById(appuser, id);
-
+    
+    try {
     //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');
-    }
+      const existingdata = await this.findById(appuser, id);
+      if(!existingdata) throw new NotFoundException(`${this.documentName} findIdThenUpdate:  _id:${id} not found`, 'not found');
 
+      this.logger.debug("update id:"+id,this.documentName+' findIdThenUpdate')
+      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}"`,
+        );
+      }
+      this.logger.debug("warn1",existingdata)
+    data.__v = existingdata.__v + 1;
+    // if (!existingdata) {
+    //   throw new NotFoundException(`${id} not found`, 'not found');
+    // }
+    this.logger.debug("warn2")
     if (this.hooks.beforeUpdate)
       await this.hooks.beforeUpdate(appuser, id, data, existingdata);
 
@@ -574,7 +615,7 @@ export class SimpleAppService<T extends { _id?: string, __v?:number }> {
     this.polishIsolationFilter(isolationFilter);
     isolationFilter['_id'] = id;
     this.applyNestedDateTime(appuser, data, 'update');
-    try {
+    
       const result = await this.doc.findOneAndReplace(isolationFilter, data, {
         session: dbsession,
         new: true,
@@ -582,6 +623,7 @@ export class SimpleAppService<T extends { _id?: string, __v?:number }> {
       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);
@@ -599,12 +641,13 @@ export class SimpleAppService<T extends { _id?: string, __v?:number }> {
     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}"`)
+    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
-
+    data.__v = existingdata.__v + 1;
 
     if (this.hooks.beforeUpdate)
       await this.hooks.beforeUpdate(appuser, id, data, existingdata);
@@ -641,6 +684,7 @@ export class SimpleAppService<T extends { _id?: string, __v?:number }> {
 
       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);
@@ -744,6 +788,7 @@ export class SimpleAppService<T extends { _id?: string, __v?:number }> {
       if (this.hooks.afterSetStatus)
         await this.hooks.afterSetStatus(appuser, docstatus, finaldata);
 
+      this.callWebhook(appuser, docstatus, finaldata);
       return updateresult;
     }
   }
@@ -928,4 +973,64 @@ export class SimpleAppService<T extends { _id?: string, __v?:number }> {
     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);
+    }
+  }
 }

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

@@ -5,8 +5,8 @@
  * Author: Ks Tan
  */
 import { UserService, User } from './../services/user.service';
-import countrytimezone from 'countries-and-timezones'
-import countryToCurrency, { Currencies, Countries } from "country-to-currency";
+import countrytimezone from 'countries-and-timezones';
+import countryToCurrency, { Currencies, Countries } from 'country-to-currency';
 import {
   Injectable,
   Scope,
@@ -91,14 +91,14 @@ export class ProfileService {
     appuser: UserContext,
     tenantName: string,
     timeZone: string,
-    utcOffset: number
+    utcOffset: number,
   ) {
     // try{
-    const timezonedata = countrytimezone.getCountriesForTimezone(timeZone)[0]
-    const countryCode  = timezonedata['id']
-    const countryName  = timezonedata['name']
-    const currencyCode = countryToCurrency[countryCode]
-    
+    const timezonedata = countrytimezone.getCountriesForTimezone(timeZone)[0];
+    const countryCode = timezonedata['id'];
+    const countryName = timezonedata['name'];
+    const currencyCode = countryToCurrency[countryCode];
+
     appuser.getDBSession().startTransaction();
     const tenantdata: Tenant = {
       tenantId: 1,
@@ -124,6 +124,7 @@ export class ProfileService {
       orgName: tenantName,
       active: true,
       orgCode: 'HQ',
+      registrationNo: '000000',
       timeZone: timeZone,
       offsetMinute: utcOffset,
       currency: currencyCode,
@@ -143,6 +144,13 @@ export class ProfileService {
       branchId: 1,
       branchCode: 'HQ',
       branchName: tenantName,
+      street1: '11,my street 1',
+      street2: 'my street 2',
+      postcode: '11111',
+      city: 'my city',
+      tel: '99999999999',
+      email: 'change-email@email.com',
+      region: 'my region',
       country: countryName,
       active: true,
       orgId: orgResult.orgId,
@@ -245,4 +253,21 @@ export class ProfileService {
   async getSession(appuser: UserContext) {
     return 'OK';
   }
+
+  async runTourComplete(appuser: UserContext, guideName: string) {
+    if (!guideName || guideName == '')
+      throw new BadRequestException('undefine guideName');
+
+    const user = await this.usersvc.findById(appuser, appuser.getId());
+    if (!Array.isArray(user.completedTours)) {
+      user.completedTours = [];
+    }
+
+    if (!user.completedTours.includes(guideName)) {
+      user.completedTours.push(guideName);
+      const res = await this.usersvc.findIdThenUpdate(appuser, user._id, user);
+    }
+
+    return 'ok';
+  }
 }