@simitgroup/simpleapp-generator 1.0.58 → 1.0.60

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

@@ -6,6 +6,7 @@
  */
 import { Injectable, Scope,Inject,Logger, BadRequestException } from '@nestjs/common';
 import { Model, model, connect, PipelineStage } from 'mongoose';
+import {ModifiedCollection,ModifiedRecords} from '../types'
 import _ from 'lodash'
 import { Module } from '@nestjs/common';
 import * as jwt from 'jsonwebtoken';
@@ -20,8 +21,10 @@ import {   Permission,  }  from './../types/perm.type';
 import {ProfileUserBranch , ProfileUserInvites} from '../../profile/profile.types'
 
 import {ClientSession}  from 'mongoose'
-@Injectable()
+
+@Injectable({scope:Scope.REQUEST})
 export class UserContext {
+  protected sessionId : string =crypto.randomUUID()
   protected logger = new Logger()
   protected uid: string = '';
   protected _id: string = '';
@@ -41,19 +44,20 @@ export class UserContext {
   protected orgCode: string = '';
   protected orgName: string = '';  
   protected branches: any[] = []
+  protected lastActivity : string = new Date().toISOString()
   protected invites: any[] = []  //User + field tenant:Tenant[]
   protected roles: string[] = [];
-  
+  protected modifiedRecords:ModifiedRecords = {createds:{},updateds:{},deleteds:{}}
 
   constructor(
     private readonly usermodel:Model<User>,
     private readonly permmodel:Model<Permission>,
-    private dbsession:ClientSession
+    private dbsession:ClientSession,
+    
     ) {
     
   }
   getDBSession = ():ClientSession => this.dbsession
-
   getId = () => this._id;
   getUid = () => this.uid;
   getUname = () => this.uname;
@@ -64,6 +68,7 @@ export class UserContext {
   getEmail = () => this.email;
   getGroup = () => this.group;
   getRoles = () => this.roles;
+  getModifieds = () => this.modifiedRecords
   getBranches = ():ProfileUserBranch[] => {
     this.branches;
     const data:ProfileUserBranch[] = []
@@ -118,21 +123,19 @@ export class UserContext {
    */
   obtainProfileFromDb = async () : Promise<User|undefined>=>{
     const filter = { $match:{uid:this.uid,tenantId:this.tenantId} }
-    
-    
-
 
     const joinpermission:PipelineStage = {$lookup: {
       from : 'permission',
-      localField : 'uid',
-      foreignField : 'uid',
+      localField : '_id',
+      foreignField : 'userId',
       as : 'permissions',
       pipeline:[
-          { $match:{
-            uid:this.uid,
-            tenantId:this.tenantId,
-            orgId:this.orgId,
-            branchId:this.branchId,            
+          { 
+            $match:{
+              // userId:this.getId(),
+              tenantId:this.tenantId,
+              orgId:this.orgId,
+              branchId:this.branchId,            
           }},
           {$lookup:{from: 'branch',localField: 'branchId',foreignField:'branchId',as: 'currentbranch'}},
           {$lookup:{from: 'organization',localField: 'orgId',foreignField:'orgId',as: 'currentorg'}}
@@ -153,22 +156,38 @@ export class UserContext {
     // console.log("obtainProfileFromDbobtainProfileFromDb ",users)
     if(users && users.length>0){
       const userinfo = users[0]
-      // console.log("userinfouserinfouserinfouserinfouserinfouserinfo ",userinfo)
+      console.log("userinfouserinfouserinfouserinfouserinfouserinfo ",userinfo)
 
       if(this.tenantId>0){
         const myperm=userinfo.permissions[0]
         if(myperm && myperm.group){
           userinfo.group = myperm.group                    
-          userinfo.roles = rolegroups[userinfo.group]   
+          userinfo.roles = rolegroups[userinfo.group]()
           userinfo.branchCode = myperm.currentbranch[0].branchCode
           userinfo.branchName = myperm.currentbranch[0].branchName          
           userinfo.orgCode = myperm.currentorg[0].orgCode
           userinfo.orgName = myperm.currentorg[0].orgName
+          
         }    
       }else{        
         userinfo.group = '' 
       }
+      console.log('userinfouserinfouserinfouserinfo',userinfo)
+      const currentitme = new Date(this.lastActivity).getTime()
+      console.log(" userinfo.lastactivity  userinfo.lastactivity  userinfo.lastactivity ", userinfo.lastActivity )
+      const dblastactivity = userinfo.lastActivity ?? '2000-01-01T00:00:00Z' 
+      const lastvisit = new Date( dblastactivity).getTime() ?? 0
+      // if(currentitme - lastvisit)
+      console.log(`${userinfo._id}:  ${this.lastActivity}: ${currentitme} -  ${dblastactivity}:${lastvisit} = ${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
@@ -290,6 +309,7 @@ export class UserContext {
     // obtain basic user info
     const userinfo = {
       _id: this.getId() ,
+      sessionId:this.sessionId,
       tenantId: this.getTenantId(),
       orgId: this.getOrgId(),
       branchId: this.getBranchId(),
@@ -309,14 +329,17 @@ export class UserContext {
 
     if(this.getId()!=''){
       this.logger.debug(userinfo,"obtain permissions and invitations")
-      const filter:PipelineStage ={ $match:{uid:this.uid }} as PipelineStage
+      const filter:PipelineStage ={ $match:{
+        uid:this.uid,
+        tenantId :this.tenantId
+       }} as PipelineStage
       const permission:PipelineStage = {$lookup: {
       from : 'permission',
-      localField : 'uid',
-      foreignField : 'uid',
+      localField : '_id',
+      foreignField : 'userId',
       as : 'permissions',
       pipeline:[
-        {$match:{uid: this.uid,},},
+        // {$match:{userId: this.getId(),},},
         {$lookup:{from : 'branch',localField : 'branchId',foreignField : 'branchId',as : 'branch',}},
       ]
     }}
@@ -339,6 +362,7 @@ export class UserContext {
     this.logger.debug(pipeline,"getUserInfo")
     // // // const users = await usermodel.find(filter)
     const users = await this.usermodel.aggregate(pipeline)
+    this.logger.debug(users,'users from aggregate')
 
     
     this.invites = users[0].invites
@@ -387,13 +411,123 @@ export class UserContext {
     const o = this.ssoACL    
     const ssoclient = process.env.OAUTH2_CLIENTID
     const adminRole = process.env.OAUTH2_ADMINROLE    
-    if( o[ssoclient] && o[ssoclient]['roles'] && o[ssoclient]['roles'] == adminRole ){
-      //console.log("isadmin")
+    // return false
+    if(this.getEmail()===process.env.ADMIN_EMAIL){
+      return true
+    }    
+    else if( o[ssoclient] && o[ssoclient]['roles'] && o[ssoclient]['roles'] == adminRole ){
           return true
     }else{     
-      //console.log("not admin")
       return false
     }
     
   }
+
+
+  searchInsertedRecordId(collection:string,_id:string){
+    return this.modifiedRecords.createds[collection].find((item)=>item===_id)
+  }
+  addInsertedRecordId(collection:string,_id:string){
+    if(this.modifiedRecords.createds[collection]){
+      this.modifiedRecords.createds[collection].push(_id)
+    }else{
+      this.modifiedRecords.createds[collection] = [_id]
+    }
+  }
+  addUpdatedRecordId(collection:string,_id:string){
+    if(this.modifiedRecords.updateds[collection]){
+      this.modifiedRecords.updateds[collection].push(_id)
+    }else{
+      this.modifiedRecords.updateds[collection] = [_id]
+    }
+
+  }
+  addDeletedRecordId(collection:string,_id:string){
+    if(this.modifiedRecords.deleteds[collection]){
+      this.modifiedRecords.deleteds[collection].push(_id)
+    }else{
+      this.modifiedRecords.deleteds[collection] = [_id]
+    }
+
+  }
+
+
+  async getAllTenants (){
+    const results = []
+    if(this.getId()!=''){
+        const filteruser:PipelineStage ={ $match:{
+          uid:this.uid,
+          tenantId :{'$gt':0}
+        }} as PipelineStage
+
+        const getTenantData:PipelineStage = { $lookup:{
+          from : 'tenant',
+          localField : 'tenantId',
+          foreignField : 'tenantId',
+          as : 'tenant',}}
+
+        const permission:PipelineStage = {$lookup: {
+        from : 'permission',
+        localField : '_id',
+        foreignField : 'userId',
+        as : 'permissions',
+        pipeline:[
+          
+          {$lookup:{from : 'organization',localField : 'orgId',foreignField : 'orgId',as : 'org',}},
+          {$lookup:{from : 'branch',localField : 'branchId',foreignField : 'branchId',as : 'branch',}},
+        ]
+      }}
+      
+      const pipelines:PipelineStage[] =[filteruser,getTenantData,permission]
+      // const users=[]
+      this.logger.warn(pipelines,"pipelines")
+      const users = await this.usermodel.aggregate(pipelines)    
+      
+      if(users){
+
+        
+        const activeusers = users.filter((u)=>{
+          // console.log(u.active,'===',true, ' && ',u.tenant[0].active,'===',true)
+          return u.active===true && u.tenant[0].active===true
+        })
+        // return activeusers
+        activeusers.forEach((u)=>{
+
+          const permissions = u.permissions.filter((item:any)=>{
+            return item.org[0].active && item.branch[0].active
+           })
+           .map((item:any)=>{
+  
+            return {
+              _id: item._id,
+              orgId: item.orgId,
+              branchId: item.branchId,
+              group: item.group,
+              orgCode: item.org[0].orgCode,
+              orgName: item.org[0].orgName,
+              branchCode: item.branch[0].branchCode,
+              branchName: item.branch[0].branchName,
+              xOrg: this.generateXorg(u.tenantId,item.orgId,item.branchId)
+            }
+           })
+  
+  
+  
+            
+           results.push({
+            _id: u._id,
+            fullname : u.fullname,
+            tenantId: u.tenantId,
+            tenantName: u.tenant[0].tenantName,
+            permissions: permissions
+           })
+        })
+        
+      }
+
+
+      
+    }
+    return results
+  }
 }

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

@@ -236,7 +236,7 @@ export class SimpleAppService<T extends { _id?: string }> {
       await this.hook(appuser,HookType.beforeSearch, newfilters);
       // console.log("before _find",newfilters)
       // console.log("this.doc",this.doc)
-      const products = await this.doc.find(newfilters,projection).sort(sort);
+      const products = await this.doc.find(newfilters,projection,{session:appuser.getDBSession()}).sort(sort);
       // console.log("after search",products)
       const productlist = products.map((p: T) => {
         return p;
@@ -264,7 +264,7 @@ export class SimpleAppService<T extends { _id?: string }> {
 
 
   async create(appuser:UserContext, data:T) {
-    this.audittrail.addEvent(data)
+    
     let result;
     if(!data._id){
       data._id = crypto.randomUUID()
@@ -279,7 +279,7 @@ export class SimpleAppService<T extends { _id?: string }> {
     if(this.withDocNumberFormat && !data[this.documentIdentityCode]){
       await this.genNewDocNo(appuser,data)
     }
-    console.log("DATA for create",data)
+    
     await this.hook(appuser,HookType.beforeCreate, data);
     
     let isolationFilter:any =  {...appuser.getCreateFilter()}    
@@ -297,9 +297,10 @@ export class SimpleAppService<T extends { _id?: string }> {
 
     this.applyNestedDateTime(appuser,data,'create')
     const newdoc = new this.doc(data);
-    await this.identifyUniqueKeys(appuser,data)
+    await this.identifyForeignKeys(appuser,data)
     try{
       result = await newdoc.save({session:dbsession})
+      appuser.addInsertedRecordId(this.documentName, result._id)
     }catch(err){
       this.logger.error(err)
       throw new InternalServerErrorException(err)
@@ -429,6 +430,8 @@ export class SimpleAppService<T extends { _id?: string }> {
         filterIsolation['_id'] =  id;
         this.logger.debug('delete filter', filterIsolation);
         const result = await this.doc.deleteOne(filterIsolation).session(dbsession);
+
+        appuser.addUpdatedRecordId(this.documentName, id)
         const deleteresult = {result:result, data: deletedata}
         this.logger.debug(deleteresult, " delete result" +this.doc.collection.name,)
         // this.doc.findByIdAndDelete(id)
@@ -478,6 +481,7 @@ export class SimpleAppService<T extends { _id?: string }> {
     this.applyNestedDateTime(appuser,data,'update')
     try{
       const result = await this.doc.findOneAndUpdate(isolationFilter, data).session(dbsession);
+      appuser.addUpdatedRecordId(this.documentName, data._id)
       await this.hook(appuser,HookType.afterUpdate, data);
       return result;        
     } catch (err) {
@@ -571,7 +575,7 @@ export class SimpleAppService<T extends { _id?: string }> {
   }
 
 
-  async identifyUniqueKeys(appuser:UserContext,data:T){
+  async identifyForeignKeys(appuser:UserContext,data:T){
      /**
      * 1. looping schemas identify what foreign key exists
      * 2. loop through record obtain all foreign key value 
@@ -590,9 +594,9 @@ export class SimpleAppService<T extends { _id?: string }> {
        const fks:string[] = this.foreignkeys[collectionname]
        let  results:string[] = []
        fks.forEach(fieldpath=>{        
-          // console.log("fieldpath:",fieldpath,"vdata",data,vdata)
+          console.log("fieldpath:",fieldpath,"vdata",data,vdata)
          const tmp = jsonpath.query(vdata,fieldpath).filter((item:string)=>item!='')
-        //  console.log("tmp",tmp)
+         console.log("tmp",tmp)
          
          results = results.concat(tmp)        
        })
@@ -600,12 +604,12 @@ export class SimpleAppService<T extends { _id?: string }> {
        
  
        if(results.length>0){  
-         console.log('tmp',results)
          if(results.length>1){
            results = uniq<string>(results)   
          }
          
          keystore[collectionname]= results   
+         console.log("keystorekeystore",keystore)
          let addfield={$addFields:{collection:collectionname}}        
          
          const stagefilter:PipelineStage =  {
@@ -614,23 +618,23 @@ export class SimpleAppService<T extends { _id?: string }> {
          pipelines.push(stagefilter)
        }            
      })
-     this.logger.debug(pipelines,'identifyUniqueKeys')
+     this.logger.log(pipelines,'identifyForeignKeys pipelines')
      // this.doc.db.collection(collectionname);
      const unionresult = await this.doc.aggregate(pipelines)
      
      if(!unionresult){
-      this.logger.error("foreign key control failed ",'identifyUniqueKeys')
+      this.logger.error("foreign key control failed ",'identifyForeignKeys')
        throw new InternalServerErrorException("Foreignkey check execution error",pipelines as HttpExceptionOptions)
      }else{
        let searchresult:any = {}
        unionresult.forEach(item=>{
-        console.log("111")
          if(searchresult[item.collection]){
            searchresult[item.collection].push(item._id)
          }else{
            searchresult[item.collection] = [item._id]
          }
        })
+       this.logger.log(unionresult,this.documentType+" search Result")
        
        //search is it all foreign key exists in db
        for(let i=0; i<collections.length; i++){
@@ -643,11 +647,15 @@ export class SimpleAppService<T extends { _id?: string }> {
            const key = keys[k]
            if(searchresult[collectionname] && searchresult[collectionname].includes(key)){
             this.logger.debug(`foreignkey ${collectionname}->${key} exists`)
-          }
+           }
+           else if(appuser.searchInsertedRecordId(collectionname,key)){
+            this.logger.debug(`foreignkey ${collectionname} exists in user context which not yet commited`)
+           }
            else{
-            this.logger.warn(`Foreignkey ${key} at collection ${collectionname} does not exist`,'identifyUniqueKeys')
+            this.logger.warn(`${this.documentType}: Foreignkey ${key} at collection ${collectionname} does not exist`,'identifyForeignKeys')
+            this.logger.log(appuser.getModifieds,"appuser.getModifieds")
             const errordata = {key:key,collection:collectionname}
-            throw new BadRequestException(`Foreignkey ${key} at collection ${collectionname} does not exist`,JSON.stringify(errordata))
+            throw new BadRequestException(`${this.documentType}: Foreignkey ${key} at collection ${collectionname} does not exist`,JSON.stringify(errordata))
 
            }
          }
@@ -655,7 +663,6 @@ export class SimpleAppService<T extends { _id?: string }> {
        }      
        
      }    
-     console.log("666")
   }
 
 

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

@@ -8,6 +8,14 @@ export type ForeignKey = {
     _id: string
     label: string
 }
+export type ModifiedCollection = {
+    [key:string]:string[]
+}
+export type ModifiedRecords = {
+    createds: ModifiedCollection
+    updateds: ModifiedCollection
+    deleteds: ModifiedCollection
+}
 export type DocNumberFormatResult = {
     formatId: string
     formatName: string 

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

@@ -67,6 +67,31 @@ export class ProfileController {
     }
   }
 
+  @Get('/tenants')
+  @Roles(Role.Everyone, Role.User)
+  @ApiOperation({
+    operationId: 'getAllTenants',
+    description: 'Get all tenants',
+  })
+  @ApiResponse({
+    status: 200,
+    type: () => [MyProfileApiSchema],
+    description: 'Success',
+  })
+  @ApiResponse({ status: 401, type: Object, description: 'Undefine profile' })
+  async getAllTenants(@AppUser() appuser: UserContext) {
+    this.logger.debug(
+      `access getAllTenants API by ${appuser.getUid()},(${appuser.getId()})`,
+    );
+    const result = await this.profileservice.getAllTenants(appuser);
+    this.logger.debug('getProfile result is:');
+    this.logger.debug(result);
+    if (result) {
+      return result;
+    } else {
+      throw new HttpException('Forbidden', HttpStatus.FORBIDDEN);
+    }
+  }
 
   @Post('/tenant')
   @Roles(Role.Everyone)
@@ -106,10 +131,8 @@ export class ProfileController {
       decision,
     );
     if (result) {
-      console.log('result', result);
       return result;
     } else {
-      console.log('throw error');
       throw new HttpException('Forbidden', HttpStatus.FORBIDDEN);
     }
   }

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

@@ -67,8 +67,6 @@ export class ProfileService {
   }
 
   async createUserProfile(appuser: UserContext) {
-
-    
     const data: User = {
       uid: appuser.getUid(),
       fullname: appuser.getFullname(),
@@ -76,7 +74,11 @@ export class ProfileService {
       active: true,
       doctype: 'user',
     } as User;
-
+    if (appuser.getTenantId() == 0) {
+      data.tenantId = 0;
+      data.orgId = 0;
+      data.branchId = 0;
+    }
     const createresult = await this.usersvc.create(appuser, data);
     const userinfo = await appuser.getUserInfo();
     userinfo._id = createresult._id;
@@ -85,7 +87,7 @@ export class ProfileService {
 
   async createTenant(appuser: UserContext, tenantName: string) {
     // try{
-    appuser.getDBSession().startTransaction()    
+    appuser.getDBSession().startTransaction();
     const tenantdata: Tenant = {
       tenantId: 1,
       tenantName: tenantName,
@@ -112,7 +114,7 @@ export class ProfileService {
       orgCode: 'HQ',
       orgId: 1,
     };
-    
+
     this.logger.log(orgdata, 'createOrg data');
     const orgResult = await this.orgsvc.create(appuser, orgdata);
     if (!orgResult) {
@@ -131,7 +133,7 @@ export class ProfileService {
       organization: { _id: orgRecordId, label: tenantName },
     };
     this.logger.log(branchdata, 'createbranch data');
-    
+
     const branchResult = await this.branchsvc.create(appuser, branchdata);
     if (!branchResult) {
       throw new BadRequestException('Create Branch failed');
@@ -163,6 +165,7 @@ export class ProfileService {
       orgId: orgResult.orgId,
       branchId: branchResult.branchId,
       uid: appuser.getUid(),
+      userId: userRecordId,
       group: 'admin',
     };
     this.logger.log(permdata, 'create Permission data');
@@ -173,6 +176,16 @@ export class ProfileService {
 
     this.logger.log(permResult, 'create Permission result');
 
+
+    //tenant owner shall map to userId for that tenant
+    
+    const tenantUpdateData = await this.tenantsvc.findById(appuser,tenantResult._id)
+    this.logger.log(tenantUpdateData, `update tenant owner(${tenantResult._id})`);
+    tenantUpdateData.owner._id = userRecordId    
+    const updateTenantOwnerResult = await this.tenantsvc.findIdThenUpdate(appuser,tenantResult._id,tenantUpdateData)
+    if (!updateTenantOwnerResult) {
+      throw new BadRequestException('Update tenant owner failed');
+    }
     const xorg: string = Base64URL.encodeText(
       `${tenantResult.tenantId}-${orgResult.orgId}-${branchResult.branchId}`,
     );
@@ -198,4 +211,8 @@ export class ProfileService {
   async decideInvitation(appuser: UserContext, id: string, decision: string) {
     return await appuser.decideInvitation(id, decision);
   }
+
+  async getAllTenants(appuser: UserContext) {
+    return await appuser.getAllTenants();
+  }
 }

package/templates/nest/src/simpleapp/services/branch.service.ts.eta

@@ -9,19 +9,19 @@ import { Model } from 'mongoose';
 import { Injectable, InternalServerErrorException } from '@nestjs/common';
 import { BranchProcessor } from '../generate/processors/branch.processor';
 import { Branch } from '../generate/types/branch.type';
-import {alldocuments} from '../generate/commons/dicts/documents'
+import { alldocuments } from '../generate/commons/dicts/documents';
 export { Branch } from '../generate/types/branch.type';
 import { AutoincreamentService } from './autoinc.service';
 import { UserContext } from '../generate/commons/user.context';
-import { Docnoformat,DocnoformatService } from './docno.service';
+import { Docnoformat, DocnoformatService } from './docno.service';
 // import { Docnoformat } from '../generate/types/docno.type';
 @Injectable()
 export class BranchService extends BranchProcessor {
   protected strictIsolation = false;
   constructor(
     @InjectModel('Branch') mydoc: Model<Branch>,
-    private increament: AutoincreamentService,    
-    private docnoservice:DocnoformatService
+    private increament: AutoincreamentService,
+    private docnoservice: DocnoformatService,
   ) {
     super(mydoc);
   }
@@ -46,9 +46,9 @@ export class BranchService extends BranchProcessor {
         );
         data.branchId = searchresult.nextno;
         break;
-              case 'afterCreate':
-                await this.generateDefaultDocNumbers(appuser,data);
-              break;
+      case 'afterCreate':
+        await this.generateDefaultDocNumbers(appuser, data);
+        break;
       //         case 'beforeUpdate':
       //         break;
       //         case 'afterUpdate':
@@ -67,40 +67,41 @@ export class BranchService extends BranchProcessor {
     return true;
   };
 
-  generateDefaultDocNumbers =async (appuser,data) => {
-    const branchName = data.branchName
-    const branchCode = data.branchCode
-    const recordId = data._id
-    const branchId= data.branchId
-    const orgId = data.orgId
-    const tenantId = data.tenantId
-    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 formatdata:Docnoformat = {
-        _id:crypto.randomUUID(),
-        docNoFormatNo:'Default',
-        docNoFormatName:'Default',        
+  generateDefaultDocNumbers = async (appuser, data) => {
+    const branchName = data.branchName;
+    const branchCode = data.branchCode;
+    const recordId = data._id;
+    const branchId = data.branchId;
+    const orgId = data.orgId;
+    const tenantId = data.tenantId;
+    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 formatdata: Docnoformat = {
+        _id: crypto.randomUUID(),
+        docNoFormatNo: doc.docType,
+        docNoFormatName: `Default ${doc.docType}`,
         docNoType: doc.docType,
-        docNoPattern:  pattern,
-        branch:{_id:recordId,branchId:branchId,label:branchName},
-        branchId:branchId,
-        orgId:orgId,
-        tenantId:tenantId,
-        nextNumber:1,              
-      } as Docnoformat
-      try{
-        const result = await this.docnoservice.create(appuser,formatdata)
-        if(!result){
-          throw new InternalServerErrorException(`Generate default document number for "${branchCode}" failed. Pattern: ${pattern}`,'generateDefaultDocNumbers')
+        docNoPattern: pattern,
+        branch: { _id: recordId, branchId: branchId, label: branchName },
+        branchId: branchId,
+        orgId: orgId,
+        tenantId: tenantId,
+        nextNumber: 1,
+      } as Docnoformat;
+      try {
+        const result = await this.docnoservice.create(appuser, formatdata);
+        if (!result) {
+          throw new InternalServerErrorException(
+            `Generate default document number for "${branchCode}" failed. Pattern: ${pattern}`,
+            'generateDefaultDocNumbers',
+          );
         }
-
-      }catch(err){
-        this.logger.error(err)
-        throw new InternalServerErrorException(err)
+      } catch (err) {
+        this.logger.error(err);
+        throw new InternalServerErrorException(err);
       }
-            
-    }    
-  }
+    }
+  };
 }