@simitgroup/simpleapp-generator 1.6.6-i-alpha → 1.6.6-k-alpha

package/src/processors/jsonschemabuilder.ts

@@ -112,7 +112,8 @@ export const readJsonSchemaBuilder = async (docname: string,orijsondata:JSONSche
     jsondata['required'] ?? [],
     '$',
     schemaconfigs,
-    allmodels
+    allmodels,
+    ""
   );
   return allmodels
 };
@@ -135,18 +136,19 @@ const genSchema = async (
     jsondata: JsonSchemaProperties,
     requiredlist: string[] | undefined,parentpath:string,
     schemaconfigs:SchemaConfig,
-    allmodels: ChildModels
+    allmodels: ChildModels,
+    parentFlatStr: string, // ex: docnoformat.branch
   ): Promise<SchemaModel> => {
-    
     if(!allfields.includes(docname)){
       allfields.push(docname)
     }
     const newmodel: SchemaModel = {};
-    // console.log("jsondata--->>>>",docname,jsondata)
+
     Object.keys(jsondata).forEach(async (key) => {      
       if(!allfields.includes(key)){
         allfields.push(key)
       }
+    
       //below is Object.assign use for force datatype compatibility
       const obj:JSONSchema7={}
       Object.assign(obj,jsondata[key]);
@@ -158,7 +160,11 @@ const genSchema = async (
         isrequired=true
       }
       const newName: string = _.upperFirst(docname) + _.upperFirst(key);
-
+      // const flatHierarchyStr: string = docname + '.' + key;
+      let flatHierarchyStr = parentFlatStr + "." + key;
+      if(parentFlatStr == ''){
+        flatHierarchyStr = docname+ '.' + key;
+      }
 
     // if(obj[X_AUTOCOMPLETE_FIELD]){
     //   docSetting.autocompleteFields.push(key)
@@ -177,11 +183,17 @@ const genSchema = async (
       // newmodel[key] = 'Object';
       // }
       // else 
+
+    
       if(obj[FOREIGNKEY_PROPERTY]){
+      
         const masterdatacollection = obj[FOREIGNKEY_PROPERTY]
-        const clientdatacollection = docname.toLowerCase()
+        // const clientdatacollection = docname.toLowerCase()
+        const clientdatacollection = parentFlatStr.split(".")[0] || docname.toLowerCase();
         const foreignkeyidentity= (obj.type=='object')? `${key}._id` : key
-        const foreignkeypath = (obj.type=='object') ?`${parentpath}.${key}._id`:`${parentpath}.${key}`
+        const foreignkeypath = (obj.type=='object') ? `${parentpath}.${key}._id` : (obj.type =='array') ? `${parentpath}.${key}[*]._id` : `${parentpath}.${key}`
+
+        const foreignkeyidentityNew = foreignkeypath.replace("$.", "").replace("[*]", "")
         
         //current document foreignkeys
         if(schemaconfigs.foreignKeys[masterdatacollection]){
@@ -193,20 +205,21 @@ const genSchema = async (
         //centralize foreignkeys catalogue
         if(!allforeignkeys[masterdatacollection]){
           let tmp:TypeForeignKey = {} as TypeForeignKey
-          tmp[clientdatacollection]=[foreignkeyidentity]
+          tmp[clientdatacollection]=[foreignkeyidentityNew]
           allforeignkeys[masterdatacollection] = tmp
         }
         else if(!allforeignkeys[masterdatacollection][clientdatacollection]){
-          allforeignkeys[masterdatacollection][clientdatacollection]=[foreignkeyidentity]
+
+          allforeignkeys[masterdatacollection][clientdatacollection]=[foreignkeyidentityNew]
         }else{
-          allforeignkeys[masterdatacollection][clientdatacollection].push(foreignkeyidentity)
-        }
-                
+          // console.log(masterdatacollection, 3);
+          allforeignkeys[masterdatacollection][clientdatacollection].push(foreignkeyidentityNew)
+        }       
       }
 
       if (obj.type == 'object') {
         // console.log("line  175",key,obj.type,obj.properties)      
-        await genSchema(newName, obj.type, obj.properties, obj.required,`${parentpath}.${key}`,schemaconfigs,allmodels);
+        await genSchema(newName, obj.type, obj.properties, obj.required,`${parentpath}.${key}`,schemaconfigs,allmodels, flatHierarchyStr);
         newmodel[key] = newName;
       } else if (obj.type == 'array' && obj.items && objectitem?.type == 'object') {
         const childprops = objectitem?.properties
@@ -226,7 +239,7 @@ const genSchema = async (
           childprops['_id']={type:'string'}
         }
         // console.log("line  195")      
-        await genSchema(newName, obj.type, objectitem?.properties, obj.items['required'],`${parentpath}.${key}[*]`,schemaconfigs,allmodels);
+        await genSchema(newName, obj.type, objectitem?.properties, obj.items['required'],`${parentpath}.${key}[*]`,schemaconfigs,allmodels, flatHierarchyStr);
         newmodel[key] = [newName];
       } else if (obj.type == 'array' && objectitem?.type != 'object') {
         //array need submodel

package/src/type.ts

@@ -297,5 +297,5 @@ export interface SimpleAppJSONSchema7 {
     default?: JSONSchema7Type | undefined;
     readOnly?: boolean | undefined;
     writeOnly?: boolean | undefined;
-    example?: JSONSchema7Type | undefined;
+    examples?: JSONSchema7Type | undefined;
 }

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

@@ -36,8 +36,9 @@ import {AppUser} from '../commons/decorators/appuser.decorator'
 import {UserContext} from '../commons/user.context'
 
 
-<% const getFieldType =(proptype, typename)=>{
+<% const getFieldType =(proptype, typename,actionname)=>{
   const systemtypes = ['Boolean','boolean','string','String','number','Number','object','Object','integer','Integer']
+  if(!typename) throw actionname +" undefine schema";
   let tmptypename = typename.replace('[','').replace(']','')
   
   if(systemtypes.includes(tmptypename)){
@@ -192,12 +193,12 @@ export class <%= it.typename %>Controller extends SimpleAppAbstractController<
   <%}%>
   <% if(['post','put','patch'].includes(api.method)){ %>
     @ApiBody({ description: 'Request Body', 
-        type: <%= getFieldType('schema',api.schema)%>
+        type: <%= getFieldType('schema',api.schema,api.action)%>
        
         })
   <%}%>  
   @ApiResponse({status: 200,description: '<%=api.description%>' 
-      ,type: <%= getFieldType('schema',api.responseType)%>
+      ,type: <%= getFieldType('schema',api.responseType,api.action)%>
         })  
   @ApiOperation({ operationId: 'run<%=capitalizeFirstLetter(api.action)%>' })
   <% if(api.queryPara && api.queryPara.length>0) {%>
@@ -208,7 +209,7 @@ export class <%= it.typename %>Controller extends SimpleAppAbstractController<
   async <%=capitalizeFirstLetter(api.action) %>(
     @AppUser() appuser: UserContext,
     <%if(['post','put','patch'].includes(api.method.toLowerCase())){%> 
-      @Body() data:<%= getFieldType('type',api.schema)%>,
+      @Body() data:<%= getFieldType('type',api.schema,api.action)%>,
       //@Body() data:any,
     <%}%>
     <% if(api.entryPoint && api.entryPoint.includes(':')) {%>
@@ -230,7 +231,7 @@ export class <%= it.typename %>Controller extends SimpleAppAbstractController<
          ){
     
 
-      const res:<%= getFieldType('type',api.responseType)%>  = await this.service.run<%=capitalizeFirstLetter(api.action)%>(appuser,<% if(api.entryPoint && api.entryPoint.includes(':')) {%>
+      const res:<%= getFieldType('type',api.responseType,api.action)%>  = await this.service.run<%=capitalizeFirstLetter(api.action)%>(appuser,<% if(api.entryPoint && api.entryPoint.includes(':')) {%>
           <%let subpath = api.entryPoint.split('/')%>
           <% for(let a=0;a<subpath.length;a++){%>
             <%const partstr = subpath[a]%>

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

@@ -14,8 +14,10 @@ import { Role } from '../commons/roles/roles.enum';
 
 import { Request } from '@nestjs/common';
 
-<% const getFieldType =(proptype, typename)=>{
+<% const getFieldType =(proptype, typename,actionname)=>{
     const systemtypes = ['Boolean','boolean','string','String','number','Number','object','Object','integer','Integer']
+    if(!typename) throw actionname +" undefine schema";
+
     let tmptypename = typename.replace('[','').replace(']','')
     
     if(systemtypes.includes(tmptypename)){
@@ -89,7 +91,7 @@ export class <%= it.typename %>Resolver {
         <%}%>
         )
     <%}%>
-      @Query(()=> <%= getFieldType('schema',api.responseType)%>)  
+      @Query(()=> <%= getFieldType('schema',api.responseType,api.action)%>)  
 
 
 

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

@@ -13,8 +13,11 @@ import { <%= it.typename %>Processor } from '../generate/processors/<%= it.docty
 //import { <%= it.typename %>,<%= it.typename %>Hooks} from '../generate/types';
 import * as types from '../generate/types';
 export { <%= it.typename %>} from '../generate/types';
-<% const getFieldType =(proptype, typename)=>{
+<% const getFieldType =(proptype, typename,actionname)=>{
   const systemtypes = ['Boolean','boolean','string','String','number','Number','object','Object','integer','Integer']
+  console.log("run service typename----",typename)
+  if(!typename) throw actionname +" undefine schema";
+
   let tmptypename = typename.replace('[','').replace(']','')
   
   if(systemtypes.includes(tmptypename)){
@@ -69,7 +72,7 @@ export class <%= it.typename %>Service extends <%= it.typename %>Processor {
         <%}%>
             
         <%if(['post','put','patch'].includes(api.method.toLowerCase())){%> 
-              data:<%= getFieldType('schema',api.schema)%>,
+              data:<%= getFieldType('schema',api.schema,api.action)%>,
             <%}%>
 
          ){

package/templates/basic/nuxt/simpleapp.generate.client.ts.eta

@@ -265,7 +265,7 @@ export class <%= capitalizeFirstLetter(it.name)%>Client extends SimpleAppClient<
   /***************************** begin document status code*****************************************/
   <%for(let i=0;i<it.docStatusSettings.length;i++){%>
     <% let setting = it.docStatusSettings[i] %> 
-    async setStatus<%=capitalizeFirstLetter(setting.status)%>(id:string='',data:<%= it.typename%>,runValidate:boolean=false) {
+    async setStatus<%=capitalizeFirstLetter(setting.status)%>(id:string='',data:openapi.<%= it.typename%>,runValidate:boolean=false) {
       const {$event} =useNuxtApp()
       if(runValidate){
         const errors = this.validateFailed();
@@ -292,9 +292,9 @@ export class <%= capitalizeFirstLetter(it.name)%>Client extends SimpleAppClient<
           documentName:this.getDocName(),
           summary:t('setStatus<%=capitalizeFirstLetter(setting.status)%>Failed'),
           status:NotificationStatus.error,
-          data:errors.response.data.data
+          data:errors.response.data.statusMessage
         })
-        console.error('error:<%=capitalizeFirstLetter(setting.status)%>',errors.response.data.data)
+        console.error('error:<%=capitalizeFirstLetter(setting.status)%>',errors.response.data.statusMessage)
       return Promise.reject(errors)
       })
     }

package/templates/nest/.gitignore.eta

@@ -6,11 +6,10 @@
 # compiled output
 /dist
 /node_modules
-/public_html
-/src/app.module.ts
-/src/app.service.ts
-/src/app.controller.ts
-/src/main.ts
+# /src/app.module.ts
+# /src/app.service.ts
+# /src/app.controller.ts
+# /src/main.ts
 # Logs
 logs
 *.log

package/templates/nest/src/{app.module.ts.eta → app.module.ts._eta}

@@ -1,6 +1,6 @@
 /**
- * This file was automatically generated by simpleapp generator. Every
- * MODIFICATION OVERRIDE BY GENERATEOR
+ * This file was automatically generated by simpleapp generator. It is changable.
+ * --remove-this-line-to-prevent-override--
  * last change 2024-03-17
  * Author: Ks Tan
  */

package/templates/nest/src/{main.ts.eta → main.ts._eta}

@@ -1,6 +1,6 @@
 /**
- * This file was automatically generated by simpleapp generator. Every
- * MODIFICATION OVERRIDE BY GENERATEOR
+ * This file was automatically generated by simpleapp generator. It is changable.
+ * --remove-this-line-to-prevent-override--
  * last change 2023-10-28
  * Author: Ks Tan
  */

package/templates/nest/src/printapi/printapi.service.ts.eta

@@ -6,8 +6,8 @@
  */
 
 import { Injectable, InternalServerErrorException } from '@nestjs/common';
-import * as api from './api';
 import { UserContext } from 'src/simpleapp/generate/commons/user.context';
+import * as api from './api';
 
 @Injectable()
 export class PrintApiService {
@@ -25,18 +25,17 @@ export class PrintApiService {
   }
   async getBase64Pdf(appuser: UserContext, formatid: string, id: string) {
     const printapi = new api.DefaultApi(this.getConfig(appuser), undefined);
-    try{
-      const result:any = await printapi.runPdfBase64(formatid, id, {
+    try {
+      const result: any = await printapi.runPdfBase64(formatid, id, {
         headers: {
-          'x-org': appuser.getXorg(),
+          'x-org': appuser.getXOrg(),
         },
       });
 
       const pdfresult: string = result.data;
-      return pdfresult;  
-    }catch(e){
-      throw new InternalServerErrorException('print-service servicer error')
+      return pdfresult;
+    } catch (e) {
+      throw new InternalServerErrorException('print-service servicer error');
     }
-    
   }
 }

package/templates/nest/src/simpleapp/.gitignore.eta

@@ -3,5 +3,5 @@
 # last change 2024-02-23
 # Author: Ks Tan
 
-generate
+# generate
 workflows/bpmn

package/templates/nest/src/simpleapp/generate/commons/audittrail.service.ts.eta

@@ -1,4 +1,4 @@
-  /**
+/**
  * This file was automatically generated by simpleapp generator. Every
  * MODIFICATION OVERRIDE BY GENERATEOR
  * last change 2023-10-28
@@ -47,6 +47,6 @@ export class AuditTrail {
     eventType: string,
     data: any[],
   ) {
-    console.log('add many event', documentName, eventType);
+    // console.log('add many event', documentName, eventType);
   }
 }

package/templates/nest/src/simpleapp/generate/commons/customkeycloa.guard.ts.eta

@@ -10,20 +10,22 @@ import { ResourceGuard } from 'nest-keycloak-connect';
 
 @Injectable()
 export class CustomKeycloakGuard implements CanActivate {
-  constructor(private reflector: Reflector, private resourceGuard: ResourceGuard) {}
+  constructor(
+    private reflector: Reflector,
+    private resourceGuard: ResourceGuard,
+  ) {}
 
   async canActivate(context: ExecutionContext): Promise<boolean> {
     const request = context.switchToHttp().getRequest();
-    
 
-    //graphql no http request, exclude from capability of x-api-key
-    if(request?.headers){
-        const apiKey = request.headers['x-api-key'];
-        const apiSecret = request.headers['x-api-secret'];
-        // validate apikey and apisecret at middleware level, reach here mean approved as robot
-        if (apiKey && apiSecret ) {
-          return true;
-        }
+    //graphql no http request, exclude from capability of x-apikey
+    if (request?.headers) {
+      const apiKey = request.headers['x-apikey'];
+      const apiSecret = request.headers['x-apisecret'];
+      // validate apikey and apisecret at middleware level, reach here mean approved as robot
+      if (apiKey && apiSecret) {
+        return true;
+      }
     }
 
     // If API key is not present, fall back to Keycloak authentication
@@ -35,9 +37,9 @@ export class CustomKeycloakGuard implements CanActivate {
     }
   }
 
-  private validateApiKey(apiKey: string, apiSecret: string): boolean {    
+  private validateApiKey(apiKey: string, apiSecret: string): boolean {
     // Implement your API key and secret validation logic here
     // This is just a simple example
     return apiKey === 'your-valid-api-key' && apiSecret === 'your-valid-api-secret';
   }
-}
+}

package/templates/nest/src/simpleapp/generate/commons/customkeycloak.guard.ts.eta

@@ -4,48 +4,42 @@
  * last change 2024-06-21
  * Author: Ks Tan
  */
-import {
-    Injectable,
-    CanActivate,
-    ExecutionContext,
-    UnauthorizedException,
-  } from '@nestjs/common';
-  import { Reflector } from '@nestjs/core';
-  import { ResourceGuard } from 'nest-keycloak-connect';
-  
-  @Injectable()
-  export class CustomKeycloakGuard implements CanActivate {
-    constructor(
-      private reflector: Reflector,
-      private resourceGuard: ResourceGuard,
-    ) {}
-  
-    async canActivate(context: ExecutionContext): Promise<boolean> {
-      const request = context.switchToHttp().getRequest();
-  
-      //graphql no http request, exclude from capability of x-api-key
-      if (request?.headers) {
-        const apiKey = request.headers['x-api-key'];
-        const apiSecret = request.headers['x-api-secret'];
-        // validate apikey and apisecret at middleware level, reach here mean approved as robot
-        if (apiKey && apiSecret) {
-          return true;
-        }
-      }
-  
-      // If API key is not present, fall back to Keycloak authentication
-      try {
-        const canActivate = await this.resourceGuard.canActivate(context);
-        return canActivate as boolean;
-      } catch (error) {
-        throw new UnauthorizedException('Invalid API key or Keycloak token');
+import { Injectable, CanActivate, ExecutionContext, UnauthorizedException } from '@nestjs/common';
+import { Reflector } from '@nestjs/core';
+import { ResourceGuard } from 'nest-keycloak-connect';
+
+@Injectable()
+export class CustomKeycloakGuard implements CanActivate {
+  constructor(
+    private reflector: Reflector,
+    private resourceGuard: ResourceGuard,
+  ) {}
+
+  async canActivate(context: ExecutionContext): Promise<boolean> {
+    const request = context.switchToHttp().getRequest();
+
+    //graphql no http request, exclude from capability of x-apikey
+    if (request?.headers) {
+      const apiKey = request.headers['x-apikey'];
+      const apiSecret = request.headers['x-apisecret'];
+      // validate apikey and apisecret at middleware level, reach here mean approved as robot
+      if (apiKey && apiSecret) {
+        return true;
       }
     }
-  
-    // private validateApiKey(apiKey: string, apiSecret: string): boolean {
-    //   // Implement your API key and secret validation logic here
-    //   // This is just a simple example
-    //   return apiKey === 'your-valid-api-key' && apiSecret === 'your-valid-api-secret';
-    // }
+
+    // If API key is not present, fall back to Keycloak authentication
+    try {
+      const canActivate = await this.resourceGuard.canActivate(context);
+      return canActivate as boolean;
+    } catch (error) {
+      throw new UnauthorizedException('Invalid API key or Keycloak token');
+    }
   }
-  
+
+  // private validateApiKey(apiKey: string, apiSecret: string): boolean {
+  //   // Implement your API key and secret validation logic here
+  //   // This is just a simple example
+  //   return apiKey === 'your-valid-api-key' && apiSecret === 'your-valid-api-secret';
+  // }
+}

package/templates/nest/src/simpleapp/generate/commons/docnogenerator.service.ts.eta

@@ -47,12 +47,15 @@ export class DocNumberFormatGenerator {
     id: string = '',
   ) => {
     doctype = doctype.toUpperCase();
-    let filter = { docNoType: doctype };
+    const filter = { docNoType: doctype, active: true };
     if (id) {
       filter['_id'] = id;
     }
+    //
     Object.assign(filter, appuser.getBranchFilter());
-    const result = await this.docformat.find(filter).session(appuser.getDBSession());
+    const result = await this.docformat
+      .find(filter)
+      .session(appuser.getDBSession());
     //search(appuser, filter);
     if (result && result.length > 0) {
       const d: Docnoformat = result[0];
@@ -79,7 +82,7 @@ export class DocNumberFormatGenerator {
       }
     } else {
       throw new BadRequestException(
-        `invalid parameter doctype: "${doctype}" or id: ${id}`,
+        `No active document number found for ${doctype}. Please update in Settings > Document Numbering Format`,
       );
     }
   };

package/templates/nest/src/simpleapp/generate/commons/encryption.static.ts.eta

@@ -3,76 +3,71 @@
  * MODIFICATION OVERRIDE BY GENERATEOR
  * last change 2023-10-31
  * Author: Ks Tan
- * 
+ *
  * this class developed for implement field level encryption, however it still half way and keep here for future enhancement
  * it doesn't effect anything at the moment
  */
 
 import { Injectable } from '@nestjs/common';
-import { createCipheriv,createDecipheriv, randomBytes, scrypt,Cipher,Decipher } from 'crypto';
+import {
+  createCipheriv,
+  createDecipheriv,
+  randomBytes,
+  scrypt,
+  Cipher,
+  Decipher,
+} from 'crypto';
 import { promisify } from 'util';
 
+export class Encryption {
+  private static instance: Encryption;
+  private algorithm = 'aes-256-ctr';
+  private iv = randomBytes(16);
+  private password = String(process.env.ENRYPTION_KEY);
 
+  private key: Buffer;
 
-export class Encryption{
-    private static instance: Encryption;
-    private algorithm = 'aes-256-ctr'
-    private iv = randomBytes(16);
-    private password = String(process.env.ENRYPTION_KEY)
-
-    private key :Buffer
-
-    constructor(){
-        this.init();
-    }
-    public static getInstance(): Encryption {
-        if (!Encryption.instance) {
-            Encryption.instance = new Encryption();
-        }
-
-        return Encryption.instance;
-    }
-
-
-
-    async init (){
-        
-        
-        console.log("Initialized encryption class")
+  constructor() {
+    this.init();
+  }
+  public static getInstance(): Encryption {
+    if (!Encryption.instance) {
+      Encryption.instance = new Encryption();
     }
 
-
-    getKey = async (salt)=>{
-        const key = (await promisify(scrypt)(this.password,salt , 32)) as Buffer;
-        return key
-    }
-
-    encrypt = async (value:string)=>{
-        const salt ='salt'
-        const key = await this.getKey(salt)
-        const cipher = createCipheriv(this.algorithm, key, this.iv);
-        console.log("Encrypting text ",value,cipher)
-        const encryptedText = Buffer.concat([
-            cipher.update(value),
-            cipher.final(),
-          ]).toString('hex');
-          console.log("encryptedText",encryptedText)
-        return encryptedText
-    }
-
-    decrypt = async (value:string,salt:string)=>{
-        const key = await this.getKey(salt)
-        const decipher = createDecipheriv('aes-256-ctr', key, this.iv);
-        const buf = Buffer.from(value)
-        const decryptedText = Buffer.concat([
-            decipher.update(buf),
-            decipher.final(),
-        ]).toString('hex');
-        return decryptedText
-
-    }
+    return Encryption.instance;
+  }
+
+  async init() {
+    // console.log('Initialized encryption class');
+  }
+
+  getKey = async (salt) => {
+    const key = (await promisify(scrypt)(this.password, salt, 32)) as Buffer;
+    return key;
+  };
+
+  encrypt = async (value: string) => {
+    const salt = 'salt';
+    const key = await this.getKey(salt);
+    const cipher = createCipheriv(this.algorithm, key, this.iv);
+    // console.log('Encrypting text ', value, cipher);
+    const encryptedText = Buffer.concat([
+      cipher.update(value),
+      cipher.final(),
+    ]).toString('hex');
+    // console.log('encryptedText', encryptedText);
+    return encryptedText;
+  };
+
+  decrypt = async (value: string, salt: string) => {
+    const key = await this.getKey(salt);
+    const decipher = createDecipheriv('aes-256-ctr', key, this.iv);
+    const buf = Buffer.from(value);
+    const decryptedText = Buffer.concat([
+      decipher.update(buf),
+      decipher.final(),
+    ]).toString('hex');
+    return decryptedText;
+  };
 }
-
-
-
-