@simitgroup/simpleapp-generator 1.5.1-alpha → 1.6.1-alpha

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

@@ -25,12 +25,15 @@ import addFormats from 'ajv-formats';
 import addErrors from 'ajv-errors';
 import {
   NotFoundException,
+  HttpException,
   BadRequestException,
   ForbiddenException,
   InternalServerErrorException,
   HttpExceptionOptions,
 } from '@nestjs/common/exceptions';
 import { UserContext } from '../commons/user.context';
+import { CloudApiService } from 'src/cloudapi/cloudapi.service';
+import { PrintApiService } from 'src/printapi/printapi.service';
 import { DocNumberFormatGenerator } from '../commons/docnogenerator.service';
 import {
   IsolationType,
@@ -43,6 +46,10 @@ import {
 export class SimpleAppService<T extends { _id?: string }> {
   @Inject(EventEmitter2)
   protected eventEmitter: EventEmitter2;
+  @Inject(CloudApiService)
+  protected cloudapi: CloudApiService;
+  @Inject(PrintApiService)
+  protected printapi: PrintApiService;
   protected hooks: DefaultHooks<T> = {};
   protected logger = new Logger();
   protected strictIsolation = true;
@@ -79,6 +86,7 @@ export class SimpleAppService<T extends { _id?: string }> {
     this.documentType = doctype.toUpperCase();
     this.documentName = docname;
     this.doc = newdoc;
+
     this.isolationtype = isolationtype;
     if (this.hooks.init) this.hooks.init();
     // this.tenantdoc = tenantdoc
@@ -188,12 +196,15 @@ export class SimpleAppService<T extends { _id?: string }> {
    * @param filters
    * @returns
    */
-  private async searchNoIsolation(appuser: UserContext, filters: Object) {
+  private async searchNoIsolation(
+    appuser: UserContext,
+    filters: FilterQuery<T>,
+  ) {
     try {
       if (this.hooks.beforeSearch)
         await this.hooks.beforeSearch(appuser, filters);
       const products = await this.doc.find(filters);
-      const productlist = products.map((p: T) => {
+      const productlist = products.map((p) => {
         return p;
       });
       if (this.hooks.afterSearch)
@@ -235,7 +246,7 @@ export class SimpleAppService<T extends { _id?: string }> {
       this.polishIsolationFilter(isolationFilter);
 
       // console.log("initial search",filters)
-      const newfilters = { ...filters, ...isolationFilter };
+      const newfilters: FilterQuery<T> = { ...filters, ...isolationFilter };
 
       if (this.hooks.beforeSearch)
         await this.hooks.beforeSearch(appuser, newfilters);
@@ -262,7 +273,8 @@ export class SimpleAppService<T extends { _id?: string }> {
   async findById(appuser: UserContext, id: string) {
     if (this.hooks.beforeFetchRecord)
       await this.hooks.beforeFetchRecord(appuser, id);
-    const data = await this.search(appuser, { _id: id });
+
+    const data = await this.search(appuser, { _id: id as any });
     if (this.hooks.afterFetchRecord)
       await this.hooks.afterFetchRecord(appuser, data[0]);
 
@@ -395,7 +407,7 @@ export class SimpleAppService<T extends { _id?: string }> {
       }
     }
   };
-  async validateData(appuser: UserContext, data: T) {
+  async validateData(appuser: UserContext, data: T, _id?: string) {
     const ajv = new Ajv({ allErrors: true, useDefaults: true });
     addFormats(ajv);
     addErrors(ajv);
@@ -410,7 +422,7 @@ export class SimpleAppService<T extends { _id?: string }> {
     this.logger.debug('run hook during validation');
     let issuccess = true;
     if (this.hooks.beforeValidation) {
-      issuccess = await this.hooks.beforeValidation(appuser, data);
+      issuccess = await this.hooks.beforeValidation(appuser, data, _id);
     }
     // const issuccess = await this.hook(appuser, HookType.beforeValidation, data);
     if (!issuccess) {
@@ -441,7 +453,7 @@ export class SimpleAppService<T extends { _id?: string }> {
       );
     }
     if (this.hooks.afterValidation)
-      await this.hooks.afterValidation(appuser, data);
+      await this.hooks.afterValidation(appuser, data, _id);
   }
 
   polishIsolationFilter = (filterIsolation: any, data: any = {}) => {
@@ -544,11 +556,12 @@ export class SimpleAppService<T extends { _id?: string }> {
     // try {
     Object.assign(data, appuser.getUpdateFilter());
     // Object.assign(existingdata, data);
+
     delete data['_id'];
     this.reCalculateValue(data);
 
     // existingdata['_id']=''
-    await this.validateData(appuser, data);
+    await this.validateData(appuser, data, id);
 
     const isolationFilter = { ...this.getIsolationFilter(appuser) };
     this.polishIsolationFilter(isolationFilter);
@@ -561,8 +574,8 @@ export class SimpleAppService<T extends { _id?: string }> {
       });
       appuser.addUpdatedRecordId(this.documentName, data._id);
       if (this.hooks.afterUpdate)
-        await this.hooks.afterUpdate(appuser, id, result);
-      return  result // await this.findById(appuser, id);
+        await this.hooks.afterUpdate(appuser, id, existingdata, result);
+      return result; // await this.findById(appuser, id);
     } catch (err) {
       this.logger.error(err);
       throw new InternalServerErrorException(err.message);
@@ -614,8 +627,8 @@ export class SimpleAppService<T extends { _id?: string }> {
       appuser.addUpdatedRecordId(this.documentName, data._id);
 
       if (this.hooks.afterUpdate)
-        await this.hooks.afterUpdate(appuser, id, result);
-      return result //await this.findById(appuser, id);
+        await this.hooks.afterUpdate(appuser, id, existingdata, result);
+      return result; //await this.findById(appuser, id);
     } catch (err) {
       throw new InternalServerErrorException(err.message);
     }
@@ -722,6 +735,48 @@ export class SimpleAppService<T extends { _id?: string }> {
     }
   }
 
+  /**
+   * similar like runWorker, but it is syncronizely add event into queue and return.
+   * No result will return from this method,  it also lose appuser db's transaction
+   * due out of request flow
+   *
+   * @param      {UserContext}  appuser    The appuser
+   * @param      {string}       eventName  The event name
+   * @param      {any}          data       The data
+   */
+  runBackgroundWorker(appuser: UserContext, eventName: string, payloads:any) {
+    this.eventEmitter.emit(eventName, appuser, payloads);
+  }
+
+  /**
+   * runWorker design with 2 purpose
+   *   1. we wish developer develop complex programming flow in worker class instead
+   *      of service class. We wish service class remain simple and easy to understand
+   *      it wish to do hook and api only
+   *      complex task service class may pass to worker class.
+   *   2. it not cause circulate injection hell, which is useful in complex dependency
+   * this run foreground event which can async/await to obtain execution result,
+   * the appuser dbtransaction remain usable. however, the execution may delay response
+   *
+   *
+   * @param      {UserContext}  appuser    The appuser
+   * @param      {string}       eventName  The event name
+   * @param      {any}          data       The data
+   * @return     {Promise}      { description_of_the_return_value }
+   */
+  async runWorker(appuser: UserContext, eventName: string, payloads:any) {
+    const res = await this.eventEmitter.emitAsync(eventName, appuser, payloads);
+    if (!this.eventEmitter.hasListeners(eventName)) {
+      throw new InternalServerErrorException(`${eventName} seems no listener`);
+    }
+    if (!res) {
+      throw new InternalServerErrorException(`${eventName} is invalid worker`);
+    }
+
+    const result = res[0];
+    if (result?.name && result?.name.includes('Exception')) throw result;
+    return result;
+  }
   startWorkflow(
     appuser: UserContext,
     processName: WorkflowName,
@@ -745,7 +800,11 @@ export class SimpleAppService<T extends { _id?: string }> {
     this.logger.debug(result, 'genNewDocNo');
     data[this.documentIdentityCode] = result;
   }
-
+  async runDefault(appuser: UserContext): Promise<unknown> {
+    return (
+      'Hello this is ' + this.getDocumentType() + ': ' + this.getDocumentName()
+    );
+  }
   async identifyForeignKeys(appuser: UserContext, data: T) {
     /**
      * 1. looping schemas identify what foreign key exists
@@ -851,4 +910,9 @@ export class SimpleAppService<T extends { _id?: string }> {
       }
     }
   }
+
+  async print(appuser: UserContext, id: string, formatid: string) {
+    const pdfresult = await this.printapi.getBase64Pdf(appuser, formatid, id);
+    return pdfresult;
+  }
 }

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

@@ -0,0 +1,49 @@
+/**
+ * This file was automatically generated by simpleapp generator. Every
+ * MODIFICATION OVERRIDE BY GENERATEOR
+ * last change 2024-02-23
+ * Author: Ks Tan
+ */
+import { UserContext } from '../commons/user.context';
+import * as sharelibs from '../sharelibs';
+import { Injectable,Inject } from '@nestjs/common';
+import { InjectModel } from '@nestjs/mongoose';
+import * as jsonpath from 'jsonpath';
+import { Model } from 'mongoose';
+import { SystemmessageJsonSchema } from '../jsonschemas/sysmsg.jsonschema';
+import { SimpleAppService } from './simpleapp.processor';
+import { IsolationType } from '../types';
+import { DocNumberFormatGenerator } from '../commons/docnogenerator.service';
+import { Systemmessage } from '../types/sysmsg.type';
+import { DefaultSystemmessage } from '../defaults/sysmsg.default';
+
+@Injectable()
+export class SystemmessageProcessor extends SimpleAppService<Systemmessage> {
+  protected documentIdentityCode = '';
+  protected documentIdentityLabel = 'messageTitle';
+
+  protected foreignkeys = {};
+  constructor(mydoc: Model<Systemmessage>) {
+    super('SYSMSG', 'systemmessage', mydoc, IsolationType.tenant);
+    this.setSchema(SystemmessageJsonSchema);
+    this.setData(DefaultSystemmessage(crypto.randomUUID()));
+  }
+
+  reCalculateValue(data: Systemmessage) {
+    //console.log('trigger new recalculate')
+    const jsopbj = new jsonpath['JSONPath']();
+  }
+
+  /***************************** additional execute *****************************************/
+  async runDefault(appuser: UserContext) {
+    return await this.search(appuser, { uid: appuser.getUid() });
+  }
+  async runReadmsg(appuser:UserContext,id:string){
+    const data =  await this.findById(appuser, id); 
+    data.read=true
+    await await this.findIdThenUpdate(appuser,id,data)
+    return data
+  }
+  
+ 
+}

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

@@ -0,0 +1,52 @@
+/**
+ * This file was automatically generated by simpleapp generator. Every
+ * MODIFICATION OVERRIDE BY GENERATEOR
+ * last change 2024-02-23
+ * Author: Ks Tan
+ */
+import { UserContext } from '../commons/user.context';
+import * as sharelibs from '../sharelibs';
+import { Injectable,Inject } from '@nestjs/common';
+import { InjectModel } from '@nestjs/mongoose';
+import * as jsonpath from 'jsonpath';
+import { Model } from 'mongoose';
+import { TenantJsonSchema } from '../jsonschemas/tenant.jsonschema';
+import { SimpleAppService } from './simpleapp.processor';
+import { IsolationType ,TenantHooks} from '../types';
+import { DocNumberFormatGenerator } from '../commons/docnogenerator.service';
+import { TenantOwner, Tenant } from '../types/tenant.type';
+import { DefaultTenantOwner, DefaultTenant } from '../defaults/tenant.default';
+import { AutoincreamentService } from '../../services/autoinc.service';
+@Injectable()
+export class TenantProcessor extends SimpleAppService<Tenant> {
+  @Inject(AutoincreamentService)
+  protected increament: AutoincreamentService;
+  
+  protected documentIdentityCode = 'tenantId';
+  protected documentIdentityLabel = 'tenantName';
+  protected hooks : TenantHooks = {
+    beforeCreate: async (appuser: UserContext, data: Tenant) => await this.tenantBeforeCreate(appuser,data),
+  };
+  
+  protected foreignkeys = { user: ['$.owner._id'] };
+  constructor(mydoc: Model<Tenant>) {
+    super('TENANT', 'tenant', mydoc, IsolationType.none);
+    this.setSchema(TenantJsonSchema);
+    this.setData(DefaultTenant(crypto.randomUUID()));
+  }
+
+  reCalculateValue(data: Tenant) {
+    //console.log('trigger new recalculate')
+    const jsopbj = new jsonpath['JSONPath']();
+  }
+
+  /***************************** additional execute *****************************************/
+  async tenantBeforeCreate(appuser:UserContext,data:Tenant){
+     const searchresult = await this.increament.runGenerateNextNo(
+          appuser,
+          'tenant',
+          'tenantId',
+        );
+        data.tenantId = searchresult.nextno;        
+  }    
+}

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

@@ -39,8 +39,8 @@ export type DefaultHooks<T> = {
   init?: () => Promise<void>;
   beforeSearch?: (appuser: UserContext, filter: any) => Promise<void>;
   afterSearch?: (appuser: UserContext, data: T[]) => Promise<void>;
-  beforeValidation?: (appuser: UserContext, data: T) => Promise<boolean>;
-  afterValidation?: (appuser: UserContext, data: T) => Promise<void>;
+  beforeValidation?: (appuser: UserContext, data: T,_id?:string) => Promise<boolean>;
+  afterValidation?: (appuser: UserContext, data: T,_id?:string) => Promise<void>;
   beforeCreate?: (appuser: UserContext, data: T) => Promise<void>;
   afterCreate?: (appuser: UserContext, data: T) => Promise<void>;
   beforeUpdate?: (
@@ -49,7 +49,7 @@ export type DefaultHooks<T> = {
     data: T,
     existingdata: T,
   ) => Promise<void>;
-  afterUpdate?: (appuser: UserContext, id: string, data: T) => Promise<void>;
+  afterUpdate?: (appuser: UserContext, id: string, prevdata: T,newdata:T) => Promise<void>;
   beforeDelete?: (
     appuser: UserContext,
     id: string,
@@ -140,8 +140,15 @@ export type SchemaConfig = {
     documentType: string
     documentName: string
     collectionName?: string
-    foreignKeys?:MyForeignKey,
-  }
+    foreignKeys?:MyForeignKey
+    printFormats?: SchemaPrintFormat[]
+}
+export type SchemaPrintFormat = {
+  formatName: string
+  formatId: string
+  description?: string
+}
+
   export type MyForeignKey = {
     [collectionname:string]:string[]
   }

package/templates/nest/src/simpleapp/generate/workflow/workflow.controller.ts.eta

@@ -1,7 +1,7 @@
 /**
  * This file was automatically generated by simpleapp generator. Every
  * MODIFICATION OVERRIDE BY GENERATEOR
- * last change 2024-04-15
+ * last change 2024-04-21
  * Author: Ks Tan
  */
 import {
@@ -72,7 +72,7 @@ export class WorkflowController {
     @AppUser() appuser: UserContext,
     @Param() uid: string,
   ) {
-    return await this.workflowService.getActorUserTask(appuser, uid);
+    return await this.workflowService.getActorUserTask(appuser);
   }
 
   /**

package/templates/nest/src/simpleapp/generate/workflow/workflow.delegate.ts.eta

@@ -1,13 +1,14 @@
 /**
  * This file was automatically generated by simpleapp generator. Every
  * MODIFICATION OVERRIDE BY GENERATEOR
- * last change 2024-02-23
+ * last change 2024-04-23
  * Author: Ks Tan
  */
 import {
   Injectable,
   InternalServerErrorException,
   Logger,
+  Inject,
 } from '@nestjs/common';
 import {
   IExecution,
@@ -19,13 +20,17 @@ import {
   BPMNServer,
   Execution,
 } from 'bpmn-server';
+import { UserResolverService } from '../../services/userresolver.service';
 import { moddleOptions } from 'bpmn-server/dist/elements/js-bpmn-moddle';
 let mydelegate: WorkflowDelegate;
 @Injectable()
 export class WorkflowDelegate implements IAppDelegate {
   protected logger = new Logger();
   server: BPMNServer;
-  servicesProvider: any = () => new Object();
+
+  @Inject(UserResolverService)
+  servicesProvider: UserResolverService;
+
   constructor() {}
   getServicesProvider = (execution: Execution) => this.servicesProvider;
 
@@ -60,7 +65,7 @@ export class WorkflowDelegate implements IAppDelegate {
 
   async messageThrown(messageId, data, messageMatchingKey: any, item: Item) {
     const msgId = item.node.messageId;
-    item.context.logger.log('Message Issued' + msgId);
+    // item.context.logger.log('Message Issued' + msgId);
     // issue it back for others to receive
     const resp = await item.context.engine.throwMessage(
       msgId,
@@ -68,19 +73,19 @@ export class WorkflowDelegate implements IAppDelegate {
       messageMatchingKey,
     );
     if (resp && resp.instance) {
-      item.context.logger.log(
-        ' invoked another process ' +
-          resp.instance.id +
-          ' for ' +
-          resp.instance.name,
-      );
+      // item.context.logger.log(
+      //   ' invoked another process ' +
+      //     resp.instance.id +
+      //     ' for ' +
+      //     resp.instance.name,
+      // );
     } else await this.issueMessage(messageId, data);
   }
 
   async issueMessage(messageId, data) {}
   async issueSignal(signalId, data) {}
   async signalThrown(signalId, data, messageMatchingKey: any, item: Item) {
-    item.context.logger.log('Signal Issued' + signalId);
+    // item.context.logger.log('Signal Issued' + signalId);
 
     const resp = await item.context.engine.throwSignal(
       signalId,
@@ -88,27 +93,27 @@ export class WorkflowDelegate implements IAppDelegate {
       messageMatchingKey,
     );
     if (resp && resp.instance) {
-      item.context.logger.log(
-        ' invoked another process ' +
-          resp.instance.id +
-          ' for ' +
-          resp.instance.name,
-      );
+      // item.context.logger.log(
+      //   ' invoked another process ' +
+      //     resp.instance.id +
+      //     ' for ' +
+      //     resp.instance.name,
+      // );
     } else await this.issueSignal(signalId, data);
   }
 
   consoleKeyTypes = (obj1) => {
     const keys = Object.getOwnPropertyNames(obj1);
-    console.log('consoleKeyTypesconsoleKeyTypesconsoleKeyTypes', keys);
+    // console.log('consoleKeyTypesconsoleKeyTypesconsoleKeyTypes', keys);
     for (let k = 0; k < keys.length; k++) {
       const key = keys[k];
 
       if (!obj1[key]) {
-        console.log(key, 'empty ');
+        // console.log(key, 'empty ');
       } else if (typeof obj1[key] == 'object') {
-        console.log(key, typeof obj1[key], Object.keys(obj1[key]));
+        // console.log(key, typeof obj1[key], Object.keys(obj1[key]));
       } else {
-        console.log(key, typeof obj1[key], obj1[key]);
+        // console.log(key, typeof obj1[key], obj1[key]);
       }
     }
   };
@@ -165,8 +170,8 @@ export class WorkflowDelegate implements IAppDelegate {
             return (${script});`;
       result = Function(js).bind(scope)();
     } catch (exc) {
-      console.log('error in script evaluation', js);
-      console.log(exc);
+      // console.log('error in script evaluation', js);
+      // console.log(exc);
     }
     return result;
   }
@@ -183,13 +188,13 @@ export class WorkflowDelegate implements IAppDelegate {
             var output=this.output;
             ${script}`;
       result = await new AsyncFunction(js).bind(scope)();
-      scope.token.log('..executing js is done ' + scope.id);
+      // scope.token.log('..executing js is done ' + scope.id);
     } catch (exc) {
-      scope.token.log(
-        'ERROR in executing Script ' + exc.message + '\n' + script,
-      );
-      console.log('error in script execution', js);
-      console.log(exc);
+      // scope.token.log(
+      //   'ERROR in executing Script ' + exc.message + '\n' + script,
+      // );
+      // console.log('error in script execution', js);
+      // console.log(exc);
     }
     return result;
   }