@simitgroup/simpleapp-generator 1.0.59 → 1.0.60

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

@@ -21,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 = '';
@@ -42,6 +44,7 @@ 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:{}}
@@ -49,7 +52,8 @@ export class UserContext {
   constructor(
     private readonly usermodel:Model<User>,
     private readonly permmodel:Model<Permission>,
-    private dbsession:ClientSession
+    private dbsession:ClientSession,
+    
     ) {
     
   }
@@ -119,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'}}
@@ -154,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
@@ -200,7 +218,7 @@ export class UserContext {
       this.orgCode = userinfo['orgCode'] ?? ''
       this.orgName = userinfo['orgName'] ?? ''
       this.group = userinfo['group'] ?? ''
-      this.roles = userinfo['roles'] ?? [Role.Everyone,Role.User,Role.SuperAdmin]
+      this.roles = userinfo['roles'] ?? [Role.Everyone,Role.User]
     }else{
       this.logger.debug(`Set unknown id of current user`,'setUserToken' )   
       // this.group = ''
@@ -291,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(),
@@ -310,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',}},
       ]
     }}
@@ -340,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
@@ -388,11 +411,13 @@ 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
     }
     
@@ -425,4 +450,84 @@ export class UserContext {
     }
 
   }
+
+
+  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;

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

@@ -74,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;
@@ -161,7 +165,7 @@ export class ProfileService {
       orgId: orgResult.orgId,
       branchId: branchResult.branchId,
       uid: appuser.getUid(),
-      user_id: appuser.getId(),
+      userId: userRecordId,
       group: 'admin',
     };
     this.logger.log(permdata, 'create Permission data');
@@ -172,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}`,
     );
@@ -197,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);
       }
-            
-    }    
-  }
+    }
+  };
 }

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

@@ -14,7 +14,6 @@ import { User } from '../generate/types/user.type';
 
 export { User } from '../generate/types/user.type';
 
-
 @Injectable()
 export class UserService extends UserProcessor {
   protected strictIsolation = false;
@@ -45,14 +44,16 @@ export class UserService extends UserProcessor {
       //         break;
       //         case 'afterUpdate':
       //         break;
-      //         case 'beforeDelete':
-      //         break;
-      case 'afterDelete':
-        const result = await this.permdoc.deleteMany({
-          user_id: data['data']['_id'], //delete hook data = _id
-        });
-        this.logger.log(result, 'user deleteHook');
-        break;
+              case 'beforeDelete':
+                console.log("before delete",data)
+                const result = await this.permdoc.deleteMany({
+                  user_id: data['data'], //delete hook data = _id
+                });
+                this.logger.log(result, 'user deleteHook');
+              break;
+      // case 'afterDelete':
+        
+        // break;
       //         case 'beforeFetchRecord':
       //         break;
       //         case 'afterFetchRecord':

package/templates/nuxt/app.vue.eta

@@ -9,7 +9,8 @@
 <template>
   <div>
     <NuxtLayout>      
-      <EventMonitor/>
+      <EventDecision/>
+      <EventNotification/>
       <NuxtPage />
     </NuxtLayout>
     </div>

package/templates/nuxt/assets/css/style.css._eta

@@ -1,12 +1,3 @@
-.btn {
-    @apply p-2  border-2 m-1
-}
-.btn-primary{
-    @apply bg-primary-600 text-white
-}
-.btn-danger{
-    @apply bg-danger-600 text-white
-}
-.btn-warning{
-    @apply bg-danger-600 text-white
-}
+.router-link-exact-active{
+    @apply  bg-primary-100 block
+}

package/templates/nuxt/assets/primevue/passthrough.ts._eta

@@ -5,29 +5,33 @@ import Tailwind from "primevue/passthrough/tailwind";
 const CustomTailwind = usePassThrough(
     Tailwind,
     {
-        button:{
-            root:{
-                class:['p-2 m-2 border']
-            }
+        
+        toast:{
+            root:{ class:'w-1/3 '},
+            message:{},
+            container:{class:'w-full ' },
+            content:{class:'flex flex-row-reverse w-full'},
+            buttonContainer:{class:'hidden'},
         },
-        dialog:{
-            root:{
-               class:['bg-white border p-2' ]
-            }
+        card:{root:{class:'shadow p-4'}},       
+        tabpanel:{headerTitle:{class:'m-3 p-3 bg bg-text-300'},},
+        selectbutton:{
+            root:{class:'flex flex-row gap-1'},
+            button: ({ context }) => ({
+                class: ['text-center border rounded  p-2 cursor-pointer hover:bg-primary-400 hover:text-white', context.active ? 'bg-primary-600 text-white' : '']
+            }),
+            label:{class: 'text-sm'},
+        },
+        button:{root:{class: 'focus:outline-none transition duration-150 ease-in-out rounded px-8 py-2 m-1 border'}},
+        dialog:{root:{class:['border p-2']}},
+        sidebar:{
+            root:{class:'w-1/2 bg-white border p-2 h-full'}
         },
         panel: {
-            root:{
-                class:['border']
-            },
-            title: {
-                class: ['leading-none font-light text-2xl']
-            },
-            header:{
-                class:['bg bg-gray-200 h-10 content-middle']
-            },
-            content:{
-                class:['']
-            }
+            root:{class:['border']},
+            title: {class: ['leading-none font-light text-2xl']},
+            header:{class:['bg bg-gray-200 h-10 content-middle']},
+            content:{class:['']}
         }
     },
 );

package/templates/nuxt/components/ButtonCreateTenant.vue.eta

@@ -1,31 +1,38 @@
 <template>
   <div>
-      <Button class="btn-primary " @click="visible = true">
-        <i class="pi pi-sitemap mr-2"></i>Create My Company 
-      </Button>
-      <Dialog
-        v-model:visible="visible"
-        modal
-        :header="createtitle"
-        class="crudsimple-dialog"
-      >
-        <form @submit.prevent="true" class="flex flex-col text-center">
-          <div v-if="errCreateTenant" class="text-error">
-            {{ errCreateTenant }}
-          </div>
-          <InputText
-            v-else
-            type="text"
-            autofocus="true"
-            v-model:model-value="data.tenantName"
-            placeholder="Organization Name"
-          />
 
-          <Button class=" btn-primary" type="submit" @click="createTenant" :loading="onhold">
-            Create <span class="pi pi-save"></span>
+    <div class="mt-8 md:flex justify-start md:gap-4">
+        <!-- <input  placeholder="Company Name" 
+          class="placeholder-gray-600 dark:bg-gray-800 dark:border-transparent dark:placeholder-gray-200 dark:text-white w-full md:w-1/2 p-4 grid place-items-center border rounded-md focus:outline-none" 
+          v-model:model-value="data.tenantName"
+          /> -->
+         
+        <!-- <button class="">Create</button> -->
+        <form @submit.prevent="true" class="flex flex-row text-center">
+          <div class="flex flex-col">
+            <InputText            
+              type="text"
+              autofocus="true"
+              v-model:model-value="data.tenantName"
+              placeholder="Organization Name"
+            />
+            <div v-if="errCreateTenant" class="text-error">{{ errCreateTenant }}</div>
+          </div>
+          <Button class="w-full md:w-auto bg-primary-800 dark:border-transparent text-white px-8 py-4 border rounded-md hover:bg-primary-800 grid place-items-center font-semibold mt-4 md:mt-0 focus:outline-none focus:ring-2 focus:ring-primary-700 focus:ring-primary-50" type="submit" @click="createTenant" :loading="onhold">
+            Create
           </Button>
         </form>
-      </Dialog>
+    </div>
+
+
+
+
+
+<!-- 
+      <Button @click="visible = true"  v-bind="$attrs">
+        <slot>Create Company</slot>        
+      </Button> -->
+      
   </div>
   
 </template>

package/templates/nuxt/components/ButtonHome.vue.eta

@@ -1,5 +1,5 @@
 <template>
-    <button class="flex flex-row">
+    <button class="flex flex-row" @click="goHome">
         <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="w-6 h-6">
             <path stroke-linecap="round" stroke-linejoin="round" d="M2.25 12l8.954-8.955c.44-.439 1.152-.439 1.591 0L21.75 12M4.5 9.75v10.125c0 .621.504 1.125 1.125 1.125H9.75v-4.875c0-.621.504-1.125 1.125-1.125h2.25c.621 0 1.125.504 1.125 1.125V21h4.125c.621 0 1.125-.504 1.125-1.125V9.75M8.25 21h8.25" />
             </svg>
@@ -7,4 +7,17 @@
         <span>{{ getUserProfile().orgName }}</span>
 
     </button>
-</template>
+</template>
+<script setup lang="ts">
+
+const goHome = () =>{
+    
+    if(getCurrentXorg()){
+        navigateTo(`/${getCurrentXorg()}`)
+    }else{
+        navigateTo(`/`)
+    }
+}
+
+
+</script>