@simitgroup/simpleapp-generator 2.0.0-e-alpha → 2.0.0-g-alpha

package/templates/nest/src/simple-app/.core/features/log/log.service.ts.eta

@@ -17,6 +17,36 @@ export class SimpleAppLogService {
   // addEvent(data: any) {
   //   console.log('Add event into db:', data);
   // }
+  //
+  async searchDocumentEvent(appUser: UserContext, documentName: string, id: string) {
+    const data = await this.doc.aggregate([
+      { $match: { documentName: documentName, documentId: id } },
+      {
+        $lookup: {
+          from: 'user',
+          as: 'user',
+          localField: 'createdBy',
+          foreignField: 'uid',
+          pipeline: [{ $match: { tenantId: appUser.getTenantId() } }, { $project: { fullName: 1 } }],
+        },
+      },
+      { $unwind: '$user' },
+      {
+        $project: {
+          _id: 1,
+          fullName: '$user.fullName',
+          eventType: 1,
+          createdBy: 1,
+          created: 1,
+          eventData: 1,
+        },
+      },
+      { $sort: { created: 1 } },
+    ]);
+    // find({documentName:documentName,documentId:id},null,{session:appUser.getDBSession()})
+
+    return data;
+  }
   async addEvent(appUser: UserContext, documentName: string, id: string, eventType: string, data: any) {
     const eventdata: DocumentEvent = {
       _id: crypto.randomUUID(),
@@ -24,13 +54,13 @@ export class SimpleAppLogService {
       documentId: id,
       eventType: eventType,
       eventData: data,
-      created:'',
-      createdBy:'',
+      created: '',
+      createdBy: '',
       updated: '',
-      updatedBy:'',
-      tenantId:0,
-      orgId:0,
-      branchId:0,
+      updatedBy: '',
+      tenantId: 0,
+      orgId: 0,
+      branchId: 0,
     };
     Object.assign(eventdata, appUser.getCreateFilter());
     // console.log('add event', documentName, id, eventType);
@@ -51,18 +81,23 @@ export class SimpleAppLogService {
         documentId: data.id,
         eventType: eventType,
         eventData: data,
-        created:'',
-        createdBy:'',
+        created: '',
+        createdBy: '',
         updated: '',
-        updatedBy:'',
-        tenantId:0,
-        orgId:0,
-        branchId:0,
+        updatedBy: '',
+        tenantId: 0,
+        orgId: 0,
+        branchId: 0,
       };
       Object.assign(eventdata, appUser.getCreateFilter());
       alldata.push(eventdata);
     }
     const dbsession = appUser.getDBSession();
-    this.doc.insertMany(alldata, { session: dbsession });
+    try{
+      await this.doc.insertMany(alldata, { session: dbsession });  
+    }catch(e){
+      throw e
+    }
+    
   }
 }

package/templates/nest/src/simple-app/.core/features/log/schemas/document-event.schema.ts.eta

@@ -3,6 +3,28 @@ import { Field, ObjectType, ID } from '@nestjs/graphql';
 import GraphQLJSON, { GraphQLJSONObject } from 'graphql-type-json';
 import { Prop, Schema, SchemaFactory } from '@nestjs/mongoose';
 
+@ObjectType()
+export class DocumentEventListItem {
+  @Field()
+  @ApiProperty({ type: 'string', required: false, format: 'uuid', default: '' })
+  _id: string;
+  @Field()
+  @ApiProperty({ type: 'string', required: false, format: 'uuid', default: '' })
+  eventType: string;
+  @Field()
+  @ApiProperty({ type: 'string', required: false, format: 'uuid', default: '' })
+  created: string;
+  @Field()
+  @ApiProperty({ type: 'string', required: false, format: 'uuid', default: '' })
+  createdBy: string;
+  @Field()
+  @ApiProperty({ type: 'string', required: false, format: 'uuid', default: '' })
+  fullName: string;
+  @Field(()=>GraphQLJSON)
+  @ApiProperty({ type: ()=>Object, required: false, format: 'uuid', default: '' })
+  eventData: any;
+}
+
 @ObjectType()
 @Schema()
 export class DocumentEvent {
@@ -50,7 +72,7 @@ export class DocumentEvent {
   @Field()
   @ApiProperty({ type: 'string', required: false, example: ['create', 'delete'], default: '' })
   eventType: string;
-  @Prop({type: ()=>Object})
+  @Prop({ type: () => Object })
   @Field(() => GraphQLJSON)
   @ApiProperty({ type: () => Object, required: false, default: {} })
   eventData: Object;

package/templates/nest/src/simple-app/.core/features/mini-app/mini-app-manager/mini-app-manager-policy.service.ts.eta

@@ -5,7 +5,7 @@ import { PolicyService } from 'src/simple-app/.core/features/policy/policy.servi
 import { Role } from 'src/simple-app/.core/features/auth/role-guard/roles.enum';
 import { UserContext } from 'src/simple-app/.core/features/user-context/user.context';
 import { MiniApp } from '../dto';
-
+import * as plans from 'src/simple-app/features/subscription/license/plans'
 @Injectable()
 export class MiniAppManagerPolicyService {
   readonly _RELEASED_STATUSES = [MiniAppStatusEnum.PUBLISHED];
@@ -30,11 +30,18 @@ export class MiniAppManagerPolicyService {
 
   hasRequiredPlan(appUser: UserContext, miniApp: MiniApp) {
     const currentPlan = appUser.tenantInfo.package;
-    const requiredPlans = miniApp.access.requiredPlans ?? [];
-
-    if (_.isEmpty(requiredPlans)) return true;
-
-    return requiredPlans.includes(currentPlan);
+    // const requiredPlans = miniApp.access.requiredPlans ?? [];
+    
+    if(plans[currentPlan]){
+      const plansetting = plans[currentPlan]()
+      return plansetting?.features?.advance?.features?.miniApp ?? false
+
+    }else{
+      return false
+    }
+    // if (_.isEmpty(requiredPlans)) return true;
+
+    // return requiredPlans.includes(currentPlan);
   }
 
   isMiniAppRealeased(status: MiniAppStatusEnum) {

package/templates/nest/src/simple-app/.core/features/mini-app/mini-app-manager/mini-app-manager.service.ts.eta

@@ -9,7 +9,7 @@ import { MiniAppInstallationService } from 'src/simple-app/.core/resources/mini-
 import _ from 'lodash';
 import { MiniAppManagerPolicyService } from './mini-app-manager-policy.service';
 import { MiniAppError } from './mini-app-manager.error';
-
+import * as plans from 'src/simple-app/features/subscription/license/plans'
 @Injectable()
 export class MiniAppManagerService {
   constructor(
@@ -82,7 +82,7 @@ export class MiniAppManagerService {
     });
 
     const permissions = this.getMiniAppActionAccess(appUser);
-
+    
     const installedMiniApps = miniAppInstallations.map((installation) => {
       const miniApp = miniApps.find((miniApp) => miniApp._id === installation.miniApp._id);
       if (!miniApp) {
@@ -176,6 +176,9 @@ export class MiniAppManagerService {
   }
 
   private getMiniAppActionAccess(appUser: UserContext) {
+    const currentPlan = appUser.tenantInfo.package; 
+    const planSetting =  plans[currentPlan]()
+
     return {
       hasMiniAppFeature: this.policyService.hasFeature(appUser),
       canInstall: this.policyService.canInstall(appUser),

package/templates/nest/src/simple-app/.core/features/policy/policy.service.ts.eta

@@ -1,7 +1,7 @@
 import { Injectable } from '@nestjs/common';
 import { Role } from 'src/simple-app/.core/features/auth/role-guard/roles.enum';
 import { UserContext } from 'src/simple-app/.core/features/user-context/user.context';
-
+import * as plans from 'src/simple-app/features/subscription/license/plans'
 @Injectable()
 export class PolicyService {
   private readonly _HIGH_PRIVILEGE_ROLES = [Role.SuperAdmin, Role.SuperUser, Role.TenantOwner];
@@ -27,11 +27,12 @@ export class PolicyService {
    * - plans/pro.ts
    * - plans/enterprise.ts
    */
-  hasFeature(appUser: UserContext, feature: keyof typeof this._FEATURES): boolean {
-    const appPackage = appUser.tenantInfo.package
+  hasFeature(appUser: UserContext, feature: keyof typeof this._FEATURES): boolean {    
+    const appPackage = appUser.tenantInfo.package;
     const allowedPlans = this._FEATURES[feature];
-
-    return allowedPlans.includes(appPackage);
+    const planSetting = plans[appPackage]();
+    const allowed = planSetting.features?.advance?.features[feature]  ?? false;
+    return allowed
   }
 
   can(appUser: UserContext, role: Role) {

package/templates/nest/src/simple-app/.core/features/profile/profile.service.ts.eta

@@ -50,11 +50,13 @@ export class ProfileService {
     this.logger.verbose(`get userprofile for ${appuser.getUid()} for tenantId ${accessTenantId}`, 'getProfile');
     const userinfo: UserContextInfo = await appuser.getUserInfo();
 
-    if (userinfo._id == '') {
+    if (!userinfo._id) {
       this.logger.warn('unknown _id for ', appuser.getUid());
 
       let newprofile;
+      
       if (accessTenantId == 0) {
+      
         newprofile = await this.createUserProfile(appuser);
         newprofile['time'] = new Date().toISOString();
         return newprofile;

package/templates/nest/src/simple-app/.core/features/queue/queue-base/queue-base.consumer.ts.eta

@@ -31,12 +31,11 @@ export abstract class BaseQueueConsumer extends WorkerHost {
   async startSession(appUser: UserContext) {
     const session = await this.connection.startSession();
     appUser.setDBSession(session);
-    appUser.getDBSession().startTransaction({ readPreference: 'primary' });
   }
 
   async process(job: Job) {
     // console.log("process job", job.data)
-    const { userContext, payload } = job.data
+    const { userContext, payload } = job.data;
 
     const appUser = this.createUserContext(userContext.user);
     await this.startSession(appUser);
@@ -46,13 +45,16 @@ export abstract class BaseQueueConsumer extends WorkerHost {
       // this.queueUserContext.assign(userContext);
 
       await this.dispatch(appUser, job, payload);
-
-      await appUser.getDBSession().commitTransaction();
+      if(appUser.getDBSession().inTransaction()) {
+        await appUser.getDBSession().commitTransaction();
+      }
       return {
         success: true,
       };
     } catch (e) {
-      await appUser.getDBSession().abortTransaction();
+      if(appUser.getDBSession().inTransaction()) {
+        await appUser.getDBSession().abortTransaction();
+      }
       throw e;
     } finally {
       appUser.getDBSession().endSession();

package/templates/nest/src/simple-app/.core/features/simple-app-core-features.module.ts.eta

@@ -7,7 +7,7 @@
 import { Module } from '@nestjs/common';
 
 import { SimpleAppAuthModule } from './auth/auth.module';
-import { DocumentNoFormatModule } from './document-no-format/document-no-format.module';
+import { SimpleAppDocumentNoFormatModule } from './document-no-format/document-no-format.module';
 import { SimpleAppForeignKeyModule } from './foreign-key/foreign-key.module';
 import { SimpleAppLogModule } from './log/log.module';
 import { MaintenanceModule } from './maintenance/maintenance.module';
@@ -22,7 +22,7 @@ import { AutoIncreamentModule } from './auto-increament/auto-increament.module';
   imports: [
     AutoIncreamentModule,
     SimpleAppAuthModule,
-    DocumentNoFormatModule,
+    SimpleAppDocumentNoFormatModule,
     SimpleAppForeignKeyModule,
     SimpleAppLogModule,
     MaintenanceModule,
@@ -37,7 +37,7 @@ import { AutoIncreamentModule } from './auto-increament/auto-increament.module';
   exports: [
     AutoIncreamentModule,
     SimpleAppAuthModule,
-    DocumentNoFormatModule,
+    SimpleAppDocumentNoFormatModule,
     SimpleAppForeignKeyModule,
     SimpleAppLogModule,
     MaintenanceModule,

package/templates/nest/src/simple-app/.core/features/user-context/user.context.ts.eta

@@ -1000,6 +1000,17 @@ export class UserContext extends UserContextInfo {
     return miniAppInstallation;
   }
 
+  async findInstalledMiniAppCode(miniAppCode: string) {
+    const miniAppInstallation = await this.miniAppInstallationModel.findOne({
+      'miniApp.code': miniAppCode,
+      isActive: true,
+      tenantId: this.tenantId,
+      orgId: this.orgId,
+      branchId: this.branchId,
+    });    
+    return miniAppInstallation.miniApp;
+  }
+
   async setUserProfileFromDB() {
     // const userProfile = await this.obtainProfileFromDB();
     // if (userProfile) {

package/templates/nest/src/simple-app/.core/features/webhook/schemas/webhook.schema.ts.eta

@@ -9,132 +9,132 @@ import { Field, ObjectType, ID } from '@nestjs/graphql';
 import GraphQLJSON, { GraphQLJSONObject } from 'graphql-type-json';
 import { Prop, Schema, SchemaFactory } from '@nestjs/mongoose';
 
-@ObjectType()
+// @ObjectType()
 @Schema({ collection: 'webhook' })
 export class WebhookBasicAuth {
   @Prop()
-  @Field()
+  // @Field()
   @ApiProperty({ type: 'string', required: false, default: '' })
   user: string;
   @Prop()
-  @Field()
+  // @Field()
   @ApiProperty({ type: 'string', required: false, default: '' })
   password: string;
 }
 
-@ObjectType()
+// @ObjectType()
 @Schema()
 export class WebhookHeaders {
   @Prop()
-  @Field()
+  // @Field()
   @ApiProperty({ type: 'string', required: false, default: '' })
   name: string;
   @Prop()
-  @Field()
+  // @Field()
   @ApiProperty({ type: 'string', required: false, default: '' })
   value: string;
   @Prop()
-  @Field()
+  // @Field()
   @ApiProperty({ type: 'string', required: false, description: 'iso8601 dataempty mean new record', default: '' })
   created: string;
   @Prop()
-  @Field()
+  // @Field()
   @ApiProperty({ type: 'string', required: false, description: 'iso8601 or empty', default: '' })
   updated: string;
   @Prop()
-  @Field()
+  // @Field()
   @ApiProperty({ type: 'string', required: false, default: '' })
   createdBy: string;
   @Prop()
-  @Field()
+  // @Field()
   @ApiProperty({ type: 'string', required: false, default: '' })
   updatedBy: string;
   @Prop()
-  @Field()
+  // @Field()
   @ApiProperty({ type: 'string', required: false, default: '' })
   _id: string;
 }
 
-@ObjectType()
+// @ObjectType()
 @Schema()
 export class Webhook {
   @Prop()
-  @Field()
+  // @Field()
   @ApiProperty({ type: 'string', required: false, format: 'uuid', default: '' })
   _id?: string;
   @Prop()
-  @Field()
+  // @Field()
   @ApiProperty({ type: 'string', required: false, default: '' })
   created?: string;
   @Prop()
-  @Field()
+  // @Field()
   @ApiProperty({ type: 'string', required: false, default: '' })
   updated?: string;
   @Prop()
-  @Field()
+  // @Field()
   @ApiProperty({ type: 'string', required: false, default: '' })
   createdBy?: string;
   @Prop()
-  @Field()
+  // @Field()
   @ApiProperty({ type: 'string', required: false, default: '' })
   updatedBy?: string;
   @Prop()
-  @Field()
+  // @Field()
   @ApiProperty({ type: 'number', required: false, default: 1 })
   tenantId?: number;
   @Prop()
-  @Field()
+  // @Field()
   @ApiProperty({ type: 'number', required: false, default: 1 })
   orgId?: number;
   @Prop()
-  @Field()
+  // @Field()
   @ApiProperty({ type: 'number', required: false, default: 1 })
   branchId?: number;
   @Prop()
-  @Field()
+  // @Field()
   @ApiProperty({ type: 'string', required: true, default: '' })
   title: string;
   @Prop()
-  @Field()
+  // @Field()
   @ApiProperty({ type: 'string', required: true, format: 'uri', default: '' })
   url: string;
   @Prop()
-  @Field()
+  // @Field()
   @ApiProperty({ type: 'string', required: false, default: '' })
   requestMethod: string;
   @Prop()
-  @Field()
+  // @Field()
   @ApiProperty({ type: 'string', required: false, description: 'apikey authentication use none + headers props', default: '' })
   authentication?: string;
   @Prop()
-  @Field()
+  // @Field()
   @ApiProperty({ type: 'string', required: false, format: 'text', default: '' })
   description?: string;
   @Prop()
-  @Field()
+  // @Field()
   @ApiProperty({ type: 'string', required: false, description: 'POST,PUT body template', format: 'text', default: '*' })
   body: string;
   @Prop()
-  @Field()
+  // @Field()
   @ApiProperty({ type: 'boolean', required: false, default: true })
   active: boolean;
   @Prop()
-  @Field()
+  // @Field()
   @ApiProperty({ type: 'string', required: false, default: '' })
   resourceName: string;
   @Prop()
-  @Field()
+  // @Field()
   @ApiProperty({ type: 'string', required: false, default: '' })
   eventType: string;
   @Prop()
-  @Field()
+  // @Field()
   @ApiProperty({ type: 'string', required: false, description: 'temporary support realtime and roll-back-when-failed, 2nd way way throw error and roll back data if webhook failed.)', default: '' })
   jobType: string;
   @Prop()
-  @Field()
+  // @Field()
   @ApiProperty({ type: 'number', required: false, description: 'retries how many time when webhook failed', default: 0 })
   retryAttemps: number;
-  @Field()
+  // @Field()
   @ApiProperty({ type: () => WebhookBasicAuth, required: false })
   basicAuth?: WebhookBasicAuth;
   @Prop()
@@ -144,21 +144,21 @@ export class Webhook {
 }
 
 /***************************************** Start Auto Complete *****************************************/
-@ObjectType()
+// @ObjectType()
 @Schema()
 export class WebhookAutoComplete {
   @Prop()
-  @Field()
+  // @Field()
   @ApiProperty({ type: 'string', required: true, default: '' })
   _id: string;
 
   @Prop()
-  @Field()
+  // @Field()
   @ApiProperty({ type: 'string', required: true, default: '' })
   code: string;
 
   @Prop()
-  @Field()
+  // @Field()
   @ApiProperty({ type: 'string', required: true, default: '' })
   label: string;
 }