@simitgroup/simpleapp-generator 2.0.0-a-alpha → 2.0.0-c-alpha

package/ReleaseNote.md

@@ -1,3 +1,11 @@
+[2.0.0c-alpha]
+1. fix profile session keeping error
+
+[2.0.0b-alpha]
+1. fix audit trail 
+2. add patch many api
+3. fix webhook
+
 [2.0.0a-alpha]
 1. big restructure of files and folders
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@simitgroup/simpleapp-generator",
-  "version": "2.0.0a-alpha",
+  "version": "2.0.0c-alpha",
   "description": "frontend nuxtjs and backend nests code generator using jsonschema",
   "main": "dist/index.js",
   "scripts": {

package/templates/basic/nest/controller.ts.eta

@@ -172,6 +172,18 @@ export class <%= it.typename %>Controller extends SimpleAppController<
 <%}%>
 
 
+  @Patch('bulk-patch')
+  @ApiResponse({ status: 200, description: 'success',})
+  @Roles(Role.SuperAdmin, Role.SuperUser, Role.<%= it.typename%>_update)
+  @ApiResponse({ status: 404, description: 'Document not found' })
+  @ApiResponse({ status: 500, description: 'Internal error' })
+  @ApiBody({ description: 'Data', type: schemas.PatchManyRequest<schemas.<%= it.typename%>> })
+  @ApiOperation({ operationId: 'runPatchMany' })
+  <%~ drawMiniAppScope('patch-many') %>
+  async patchMany(@AppUser() appuser: UserContext, @Param('id') id: string, @Body() patchManyData: schemas.PatchManyRequest<schemas.<%= it.typename%>>) {
+    return await this._patchMany(appuser, id, patchManyData);
+  }
+
 
 /***************************** start status control api definitions *****************************************/
 <%for(let s=0; s<it.docStatusSettings.length; s++){ %>
@@ -286,6 +298,7 @@ export class <%= it.typename %>Controller extends SimpleAppController<
       return data;
     }
   } 
-
   <%}%>
+
+
 }

package/templates/basic/nest/module.ts.eta

@@ -12,9 +12,10 @@ import { <%= it.typename%>MongoSchema } from './<%= camelToKebab(it.resourceName
 import { <%= it.typename%>Resolver } from './<%= camelToKebab(it.resourceName)%>.resolver';
 
 import { DocumentNoFormatModule} from 'src/simple-app/.core/features/document-no-format/document-no-format.module';
-
+import { SimpleAppLogModule } from 'src/simple-app/.core/features/log/log.module';
+import { SimpleAppWebhookModule } from 'src/simple-app/.core/features/webhook/webhook.module';
 @Module({
-  imports: [ DocumentNoFormatModule,
+  imports: [ DocumentNoFormatModule,SimpleAppLogModule,SimpleAppWebhookModule,
     MongooseModule.forFeature([
       { name: '<%= it.typename%>', schema: <%= it.typename%>MongoSchema },
      ])],

package/templates/basic/nest/service.ts.eta

@@ -21,6 +21,8 @@ import { DocumentNoFormatService } from 'src/simple-app/.core/features/document-
 
 import * as defaultValue from './<%= camelToKebab(it.resourceName) %>.default'
 import * as schema from './<%= camelToKebab(it.resourceName) %>.schema';
+import { SimpleAppLogService } from 'src/simple-app/.core/features/log/log.service';
+import { RunWebhookService } from 'src/simple-app/.core/features/webhook/run-webhook.service';
 //export * from './<%= camelToKebab(it.resourceName) %>.schema';
 
 
@@ -47,9 +49,11 @@ export class <%= it.typename %>Service extends SimpleAppService<schema.<%= it.ty
     constructor(
         @InjectModel('<%= it.typename %>')  mydoc: Model<schema.<%= it.typename %>>,
         @Inject(forwardRef(() => EventEmitter2)) event2:EventEmitter2,
-        docNoGen:DocumentNoFormatService
+        docNoGen:DocumentNoFormatService,
+        logSvc: SimpleAppLogService,
+        webhookSvc:RunWebhookService
       ) {
-    super('<%= it.doctype.toUpperCase() %>','<%= it.name %>',mydoc,IsolationType.<%=it.isolationtype%>,event2,docNoGen);
+    super('<%= it.doctype.toUpperCase() %>','<%= it.name %>',mydoc,IsolationType.<%=it.isolationtype%>,event2,docNoGen,logSvc,webhookSvc);
     this.setSchema(<%= it.typename%>JsonSchema)
     this.setData(defaultValue.Default<%=it.typename%>(crypto.randomUUID()))
     <%if(it.moreAutoComplete.length>0){%>

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

@@ -7,14 +7,14 @@
 import { Module } from '@nestjs/common';
 import { MongooseModule } from '@nestjs/mongoose';
 import { ApiEventMongoSchema,DocumentEventMongoSchema } from './schemas';
-
+import {SimpleAppLogService} from './log.service'
 @Module({
   imports: [MongooseModule.forFeature([
     { name: 'ApiEvent', schema: ApiEventMongoSchema },
     { name: 'DocumentEvent', schema: DocumentEventMongoSchema }
     ])],
   controllers: [],
-  providers: [],
-  exports: [MongooseModule],
+  providers: [SimpleAppLogService],
+  exports: [MongooseModule,SimpleAppLogService],
 })
 export class SimpleAppLogModule {}

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

@@ -43,26 +43,26 @@ export class ProfileController {
     }
   }
 
-  // @Get('session')
-  // @Roles(Role.Everyone, Role.User)
-  // @ApiOperation({
-  //   operationId: 'getSession',
-  //   description: 'Get current user session',
-  // })
-  // @ApiResponse({
-  //   status: 200,
-  //   type: () => String,
-  //   description: 'Success',
-  // })
-  // @ApiResponse({ status: 401, type: Object, description: 'Expired' })
-  // async getSession(@AppUser() appuser: UserContext) {
-  //   const result = await this.profileservice.getSession(appuser);
-  //   if (result) {
-  //     return result;
-  //   } else {
-  //     throw new HttpException('Forbidden', HttpStatus.FORBIDDEN);
-  //   }
-  // }
+  @Get('session')
+  @Roles(Role.Everyone, Role.User)
+  @ApiOperation({
+    operationId: 'getSession',
+    description: 'Get current user session',
+  })
+  @ApiResponse({
+    status: 200,
+    type: () => String,
+    description: 'Success',
+  })
+  @ApiResponse({ status: 401, type: Object, description: 'Expired' })
+  async getSession(@AppUser() appuser: UserContext) {
+    const result = await this.profileservice.getSession(appuser);
+    if (result) {
+      return result;
+    } else {
+      throw new HttpException('Forbidden', HttpStatus.FORBIDDEN);
+    }
+  }
 
   @Get('/tenants')
   @Roles(Role.Everyone, Role.User)
@@ -90,7 +90,7 @@ export class ProfileController {
 
   @Post('/tenant')
   @Roles(Role.Everyone)
-  @ApiBody({ description: 'create tenant name', type: RegTenant})
+  @ApiBody({ description: 'create tenant name', type: RegTenant })
   @ApiOperation({
     operationId: 'createTenant',
     description: 'create new tenant',

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

@@ -16,7 +16,7 @@ import { SimpleAppSoftwarePolicyModule } from './policy/policy.module';
 import { SimpleAppMiniAppModule } from './mini-app/mini-app.module';
 import { ProfileModule } from './profile/profile.module';
 import { SimpleAppUserContextModule } from './user-context/user-context.module';
-import { SimpleWebhookModule } from './webhook/webhook.module';
+import { SimpleAppWebhookModule } from './webhook/webhook.module';
 import { AutoIncreamentModule } from './auto-increament/auto-increament.module';
 @Module({
   imports: [
@@ -28,7 +28,7 @@ import { AutoIncreamentModule } from './auto-increament/auto-increament.module';
     MaintenanceModule,
     ProfileModule,
     SimpleAppUserContextModule,
-    SimpleWebhookModule,
+    SimpleAppWebhookModule,
     SimpleAppMiniAppModule,
     SimpleAppSoftwarePolicyModule,
   ],
@@ -43,7 +43,7 @@ import { AutoIncreamentModule } from './auto-increament/auto-increament.module';
     MaintenanceModule,
     ProfileModule,
     SimpleAppUserContextModule,
-    SimpleWebhookModule,
+    SimpleAppWebhookModule,
     SimpleAppMiniAppModule,
     SimpleAppSoftwarePolicyModule,
   ],

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

@@ -8,24 +8,31 @@ import { alldocuments } from '../document-no-format/document.dict';
 export class RunWebhookService {
   @Inject(EventEmitter2)
   protected eventEmitter: EventEmitter2;
-
+  protected systemWebhooks : Webhook[] = []
   protected logger = new Logger();
   protected maxRetries = 5;
   public constructor() {}
+  public addWebhook = (wh:Webhook)=> this.systemWebhooks.push(wh)
 
   /**
    * trigger
    */
   async run(appuser: UserContext, documentName: string, actionName: string, data: any) {
-    if (process.env.WEBHOOK_ONOFF && process.env.WEBHOOK_ONOFF.toLowerCase() == 'on') return await this.runRealtimeWebHook(appuser, documentName, actionName, data);
-    else this.logger.warn(`Webhook off, not run for ${documentName}:${actionName}`);
+    if (process.env.WEBHOOK_ONOFF && process.env.WEBHOOK_ONOFF.toLowerCase() == 'on') {
+      return await this.runRealtimeWebhook(appuser, documentName, actionName, data);
+    }
+    else {
+      this.logger.warn(`Webhook off, not run for ${documentName}:${actionName}`);
+    }
   }
 
-  async runRealtimeWebHook(appuser: UserContext, documentName: string, actionName: string, data: any) {
+  async runRealtimeWebhook(appuser: UserContext, documentName: string, actionName: string, data: any) {
     this.logger.debug(`Run webhook ${documentName}, ${actionName}`);
 
-    const webhooks = appuser.getWebHooks().filter((wh) => wh.resourceName == documentName && wh.eventType == actionName);
-    // console.log(webhooks);
+    const userWebhooks = appuser.getWebHooks().filter((wh) => wh.resourceName == documentName && wh.eventType == actionName && wh.active);
+    const systemWebhooks = this.systemWebhooks.filter((wh) => wh.resourceName == documentName && wh.eventType == actionName && wh.active);    
+    const webhooks = []
+    webhooks.concat(userWebhooks).concat(systemWebhooks)    
 
     const systemVars = {
       $xOrg: appuser.getXOrg(),

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

@@ -10,7 +10,7 @@ import GraphQLJSON, { GraphQLJSONObject } from 'graphql-type-json';
 import { Prop, Schema, SchemaFactory } from '@nestjs/mongoose';
 
 @ObjectType()
-@Schema({collection:'webhook'})
+@Schema({ collection: 'webhook' })
 export class WebhookBasicAuth {
   @Prop()
   @Field()
@@ -61,35 +61,35 @@ export class Webhook {
   @Prop()
   @Field()
   @ApiProperty({ type: 'string', required: false, format: 'uuid', default: '' })
-  _id: string;
+  _id?: string;
   @Prop()
   @Field()
   @ApiProperty({ type: 'string', required: false, default: '' })
-  created: string;
+  created?: string;
   @Prop()
   @Field()
   @ApiProperty({ type: 'string', required: false, default: '' })
-  updated: string;
+  updated?: string;
   @Prop()
   @Field()
   @ApiProperty({ type: 'string', required: false, default: '' })
-  createdBy: string;
+  createdBy?: string;
   @Prop()
   @Field()
   @ApiProperty({ type: 'string', required: false, default: '' })
-  updatedBy: string;
+  updatedBy?: string;
   @Prop()
   @Field()
   @ApiProperty({ type: 'number', required: false, default: 1 })
-  tenantId: number;
+  tenantId?: number;
   @Prop()
   @Field()
   @ApiProperty({ type: 'number', required: false, default: 1 })
-  orgId: number;
+  orgId?: number;
   @Prop()
   @Field()
   @ApiProperty({ type: 'number', required: false, default: 1 })
-  branchId: number;
+  branchId?: number;
   @Prop()
   @Field()
   @ApiProperty({ type: 'string', required: true, default: '' })
@@ -105,11 +105,11 @@ export class Webhook {
   @Prop()
   @Field()
   @ApiProperty({ type: 'string', required: false, description: 'apikey authentication use none + headers props', default: '' })
-  authentication: string;
+  authentication?: string;
   @Prop()
   @Field()
   @ApiProperty({ type: 'string', required: false, format: 'text', default: '' })
-  description: string;
+  description?: string;
   @Prop()
   @Field()
   @ApiProperty({ type: 'string', required: false, description: 'POST,PUT body template', format: 'text', default: '*' })
@@ -136,11 +136,11 @@ export class Webhook {
   retryAttemps: number;
   @Field()
   @ApiProperty({ type: () => WebhookBasicAuth, required: false })
-  basicAuth: WebhookBasicAuth;
+  basicAuth?: WebhookBasicAuth;
   @Prop()
   @Field(() => [WebhookHeaders])
   @ApiProperty({ type: () => [WebhookHeaders], required: false })
-  headers: WebhookHeaders[];
+  headers?: WebhookHeaders[];
 }
 
 /***************************************** Start Auto Complete *****************************************/

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

@@ -7,6 +7,7 @@
 import { Module } from '@nestjs/common';
 import { MongooseModule } from '@nestjs/mongoose';
 import { WebhookMongoSchema,WebhookLogMongoSchema } from './schemas';
+import { RunWebhookService } from './run-webhook.service';
 @Module({
   imports: [ MongooseModule.forFeature([
     { name: 'Webhook', schema: WebhookMongoSchema },
@@ -14,7 +15,7 @@ import { WebhookMongoSchema,WebhookLogMongoSchema } from './schemas';
     ])
   ],
   controllers: [],
-  providers: [],
-  exports: [MongooseModule],
+  providers: [RunWebhookService],
+  exports: [MongooseModule,RunWebhookService],
 })
-export class SimpleWebhookModule {}
+export class SimpleAppWebhookModule {}

package/templates/nest/src/simple-app/.core/framework/base/simple-app.controller.ts.eta

@@ -7,7 +7,7 @@
 import { Controller, Get, Put, Post, Delete, Body, Param, Type } from '@nestjs/common';
 // import { ApiTags, ApiBody, ApiResponse, ApiOperation } from '@nestjs/swagger';
 import { UserContext } from '../../features/user-context/user.context';
-import { SearchBody, TextSearchBody } from '../schemas';
+import { SearchBody, TextSearchBody,PatchManyRequest } from '../schemas';
 const doctype = 'person'.toUpperCase();
 type ServiceType = {
   list: Function;
@@ -74,4 +74,11 @@ export class SimpleAppController<TService extends ServiceType, TApiSchema> {
   async _delete(appuser: UserContext, id: string) {
     return this.service.findIdThenDelete(appuser, id);
   }
+  async _patchMany(appuser: UserContext, id: string, patchManyData: PatchManyRequest<TApiSchema>) {   
+    return this.service.findIdThenPatch(appuser, id, patchManyData) as TApiSchema;
+  }
+
+  async _deleteMany(appuser: UserContext, data: SearchBody) {
+    return this.service.findIdThenDelete(appuser, data);
+  }
 }

package/templates/nest/src/simple-app/.core/framework/base/simple-app.service.ts.eta

@@ -23,6 +23,7 @@ import { DocumentNoFormatService } from '../../features/document-no-format/docum
 import { UserContext } from '../../features/user-context/user.context';
 import { RunWebhookService } from '../../features/webhook/run-webhook.service';
 import { UniqueKeyExistResponse, DeleteResultType, IsolationType, MoreProjectionType, SchemaFields, TextSearchBody, PatchManyRequest } from '../schemas';
+import { SimpleAppLogService } from '../../features/log/log.service';
 
 @Injectable()
 export class SimpleAppService<T extends SchemaFields> {
@@ -61,10 +62,10 @@ export class SimpleAppService<T extends SchemaFields> {
   protected withDocNumberFormat = false;
   protected foreignkeys = {};
   private eventEmitter: EventEmitter2;
-
+  private logSvc:SimpleAppLogService;
   // protected userprovider = new UserContext() ;
 
-  constructor(doctype: string, docname: string, newdoc: Model<T>, isolationtype: IsolationType = IsolationType.org, eventEmitter: EventEmitter2, docnogenerator: DocumentNoFormatService) {
+  constructor(doctype: string, docname: string, newdoc: Model<T>, isolationtype: IsolationType = IsolationType.org, eventEmitter: EventEmitter2, docnogenerator: DocumentNoFormatService,logSvc: SimpleAppLogService,runWebHook: RunWebhookService) {
     // console.log("-------init simpleapp service abstract class -------userprovider=",typeof this.userprovider)
     this.eventEmitter = eventEmitter;
     this.documentType = doctype.toUpperCase();
@@ -72,7 +73,8 @@ export class SimpleAppService<T extends SchemaFields> {
     this.doc = newdoc;
     this.docnogenerator = docnogenerator;
     this.isolationtype = isolationtype;
-
+    this.logSvc = logSvc
+    this.runWebHook = runWebHook
     // this.tenantdoc = tenantdoc
   }
   getDocumentType = () => this.documentType;
@@ -1274,30 +1276,16 @@ export class SimpleAppService<T extends SchemaFields> {
   //only realtime webhook supported at this moment
   async callWebhook(appuser: UserContext, actionName: string, data: any) {
     try {
-      // await this.runWebHook.run(appuser, this.documentName, actionName, data);
-      // await this.runEvent(appuser, 'webhook.run', {
-      //   documentName: this.documentName,
-      //   actionName: actionName,
-      //   data: data,
-      // });
+      await this.runWebHook.run(appuser, this.documentName, actionName, data);      
     } catch (e) {
       throw new InternalServerErrorException(e);
     }
   }
 
-  async addAuditEvent(appuser: UserContext, documentName: string, id: string, eventType: string, data: any) {
-    // await this.runEvent(appuser, 'audittrail.add', {
-    //   documentName: documentName,
-    //   id: id,
-    //   eventType: eventType,
-    //   data: data,
-    // });
+  async addAuditEvent(appUser: UserContext, documentName: string, id: string, eventType: string, data: any) {
+    await this.logSvc.addEvent(appUser,documentName,id,eventType,data)    
   }
-  async addManyAuditEvents(appuser: UserContext, documentName: string, eventType: string, datas: any) {
-    // await this.runEvent(appuser, 'audittrail.add', {
-    //   documentName: documentName,
-    //   eventType: eventType,
-    //   datas: datas,
-    // });
+  async addManyAuditEvents(appUser: UserContext, documentName: string, eventType: string, datas: any) {
+    await this.logSvc.addManyEvents(appUser,documentName,eventType,datas)    
   }
 }