@simitgroup/simpleapp-generator 1.0.55 → 1.0.57

package/package.json

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

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

@@ -8,6 +8,7 @@
 import { UserContext } from '../commons/user.context'
 import { Injectable } from '@nestjs/common';
 import { InjectModel } from '@nestjs/mongoose';
+import * as jsonpath from 'jsonpath'
 import { Model } from 'mongoose';
 import {<%= it.typename%>JsonSchema } from '../jsonschemas/<%= it.doctype %>.jsonschema'
 import { SimpleAppService,IsolationType,HookType } from './simpleapp.processor';
@@ -48,80 +49,19 @@ export class <%= it.typename %>Processor extends SimpleAppService<<%= it.typenam
     }
   
 
-   reCalculateValue(){
-    console.log('trigger new recalculate')
-    const data = this.getData()
+   reCalculateValue(data:<%= it.typename %>):<%= it.typename %>{
+    console.log('trigger new recalculate')    
+    <% if(it.jsonschema['x-simpleapp-config']['formulas']){ %>
+        <%Object.keys(it.jsonschema['x-simpleapp-config']['formulas']).forEach(function(index) { %>
+          <% let fml = it.jsonschema['x-simpleapp-config']['formulas'][index] %>
+          // <%~ JSON.stringify(fml) %>
+          //const tmp = jsonpath.query(vdata,fieldpath).filter((item:string)=>item!='')
+          
+          jsonpath.apply(data, '<%~ fml.jsonpath %>', function(value) { return <%~fml.formula %> });
 
-    <%Object.keys(it.jsonschema.properties).forEach(function(key) { %>
-      <%let obj = it.jsonschema.properties[key]%>
-      <%if(obj['x-compute']){%> //x-compute first level field
-
-        data.<%=key%> = <%= obj['x-compute'].function %>( 
-          <% if(obj['x-compute'].paramters){ %>
-            <% let p = obj['x-compute'].paramters %>
-            <%for(let j=0; j<p.length; j++){%>
-              <%= p[j].replace('@data','data')  %>,
-            <%}%>
-          <%}%>
-          )
-      <%}%>
-      <%if(obj.type=='array' && obj.items.type=='object'){%> 
-        // process compute for 2nd level sub tables
-        for(let index=0;index<data.<%=key%>.length;index++){ 
-        <%Object.keys(obj.items.properties).forEach(function(subkey) { %>
-          <%let subobj = obj.items.properties[subkey]%>
-          <%if(subobj['x-compute']){%> 
-
-            data.<%=key%>[index].<%=subkey%> = <%= subobj['x-compute'].function %>( 
-              <% if(subobj['x-compute'].paramters){ %>
-                <% let subp = subobj['x-compute'].paramters %>
-                <%for(let k=0; k<subp.length; k++){%>
-                  <%= subp[k].replace('@data','data').replace('@index','index')  %>,
-                <%}%>
-              <%}%>
-              )
-          <%}%>
-
-          <% if(subobj.type=='array' && subobj.items && subobj.items.type=='object'){ %> 
-            // process compute for 3rd level sub tables
-            for(let index2=0;index<data.<%=key%>[index].length;index2++){
-            <%Object.keys(subobj.items.properties).forEach(function(sub2key) { %>
-              <%let sub2obj = subobj.items.properties[sub2key]%>
-              <%if(sub2obj['x-compute']){%> //x-compute 3rd level field
-                data.<%=key%>[index].<%=subkey%>[index2].<%=sub2key%> = <%= sub2obj['x-compute'].function %>( 
-                  <% if(sub2obj['x-compute'].paramters){ %>
-                    <% let sub2p = sub2obj['x-compute'].paramters %>
-                    <%for(let l=0; l<sub2p.length; l++){%>
-                      <%= sub2p[l].replace('@data','data').replace('@index','index').replace('@index2','index2')  %>,
-                    <%}%>
-                  <%}%>
-                  )
-              <%}%>
-              <%if(sub2obj.type=='array' && sub2obj.items && sub2obj.items.type=='object'){%> 
-                // process compute for 4rd level sub tables
-                for(let index3=0;index<data.<%=key%>[index].<%=subkey%>[index2].length;index3++){ 
-                <%Object.keys(sub2obj.items.properties).forEach(function(sub3key) { %>
-                  <%let sub3obj = sub2obj.items.properties[sub3key]%>
-                  <%if(sub3obj['x-compute']){%> //x-compute 4th level field
-                    data.<%=key%>[index].<%=subkey%>[index2].<%=sub2key%>.[index3].<%=sub3key%> = <%= sub3obj['x-compute'].function %>( 
-                      <% if(sub3obj['x-compute'].paramters){ %>
-                        <% let sub3p = sub3obj['x-compute'].paramters %>
-                        <%for(let m=0; m<sub3p.length; m++){%>
-                          <%= subp[m].replace('@data','data').replace('@index','index').replace('@index2','index2').replace('@index3','index3')  %>,
-                        <%}%>
-                      <%}%>
-                      )
-                  <%}%>
-                 
-                <%})%>
-              <%} /* process compute for 4rd level sub tables */%>
-            <%})%>
-            } 
-          <%} // process compute for 3rd level sub tables%>
-        <%}) %> 
-        } 
-      <%} /*process compute for 2nd level sub tables*/%>
-    <%}) %>
+        <%}) %>
+      <%} %>
+    return data
   }
 
 

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

@@ -0,0 +1,78 @@
+/**
+ * This file was automatically generated by simpleapp generator. Every
+ * 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 { 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
+
+    constructor(){
+        this.init();
+    }
+    public static getInstance(): Encryption {
+        if (!Encryption.instance) {
+            Encryption.instance = new Encryption();
+        }
+
+        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
+
+    }
+}
+
+
+
+

package/templates/nest/src/simpleapp/generate/commons/exceptions/SimpleAppExceptionFilter.ts.eta

@@ -29,18 +29,26 @@ export class SimpleAppExceptionFilter implements ExceptionFilter {
       const session:ClientSession = request['sessionuser'].getDBSession()
       if(session.inTransaction())session.abortTransaction()      
     }
-    
+    console.log('exceptionexception',typeof exception,Object.keys(exception),exception)
+    let errordata
+    let finalstatus
+    let msg
+    if(Object.keys(exception).length>0){
+      msg = exception.message      
+      errordata = (exception.response && exception.response.options) ? exception.response.options : exception.options
+      finalstatus = ( exception.response &&  exception.response.status) ? exception.response.status : exception.status
+    }else{
+      msg = String(exception)      
+      finalstatus = 500
+    }
 
     const responseBody = {
-      message:exception.message,
+      message: msg,
       timestamp: new Date().toISOString(),      
       path: httpAdapter.getRequestUrl(ctx.getRequest()),
-      error: exception.response.options?? exception.options
+      error:errordata
     };
-    // console.log("exception properties", Object.getOwnPropertyNames(exception),exception.options)
-   
-    // console.log("exception.responseexception.response",exception)
-    const finalstatus =  exception.response.status??exception.status
+    
     const eventObj = request['eventObj']
     if(eventObj){    
       eventObj.statusCode=finalstatus

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

@@ -6,7 +6,7 @@
  */
 import { Injectable, Logger,Inject } from '@nestjs/common';
 import { InjectModel } from '@nestjs/mongoose';
-import * as jsonpath from 'jsonpath'
+import jsonpath from 'jsonpath'
 import {  uniq } from 'lodash';
 import { AuditTrail } from '../commons/audittrail.service';
 import {foreignkeys} from '../commons/dicts/foreignkeys'
@@ -290,14 +290,14 @@ export class SimpleAppService<T extends { _id?: string }> {
     this.logger.debug("Create data before isolation",'SimpleAppService')
     this.logger.debug(data,'SimpleAppService')
     Object.assign(data, isolationFilter);
-    
+    data = this.reCalculateValue(data)
     await this.validateData(appuser,data);
     this.logger.debug("Create record",'SimpleAppService')
     this.logger.debug(data,'SimpleAppService')
 
     this.applyNestedDateTime(appuser,data,'create')
     const newdoc = new this.doc(data);
-    
+    await this.identifyUniqueKeys(appuser,data)
     try{
       result = await newdoc.save({session:dbsession})
     }catch(err){
@@ -464,7 +464,9 @@ export class SimpleAppService<T extends { _id?: string }> {
     // try {
     Object.assign(data, appuser.getUpdateFilter());
     Object.assign(existingdata, data);
-    delete existingdata['_id']
+    delete data['_id']
+
+    data = this.reCalculateValue(data)
     // existingdata['_id']=''
     // console.log("newdata",data)
     await this.validateData(appuser,data);
@@ -508,7 +510,7 @@ export class SimpleAppService<T extends { _id?: string }> {
         const collection = this.doc.db.collection(collectionname);
         //single schema may have multiple foreign key link here, loop all
         for (let j = 0; j < fobjs.length; j++) {
-          const fkey = fobjs[j] + '._id';
+          const fkey = fobjs[j] 
           let filter = {}
           filter[fkey] = id;
          
@@ -579,23 +581,26 @@ export class SimpleAppService<T extends { _id?: string }> {
 
      //get all foreign keys catalogue
      const collections = Object.getOwnPropertyNames(this.foreignkeys)
- 
+    console.log("111111",collections)
      //obtain exists data in according foreign key
      const pipelines :PipelineStage[] =[ {$match:{_id:false}}] //exclude data from current collection
-     const vdata = data['_doc']
+     const vdata = data//['_doc']
      const keystore = {}
      collections.forEach((collectionname)=>{
        const fks:string[] = this.foreignkeys[collectionname]
        let  results:string[] = []
        fks.forEach(fieldpath=>{        
+          // console.log("fieldpath:",fieldpath,"vdata",data,vdata)
          const tmp = jsonpath.query(vdata,fieldpath).filter((item:string)=>item!='')
+        //  console.log("tmp",tmp)
+         
          results = results.concat(tmp)        
        })
        
        
  
        if(results.length>0){  
-         console.log(results)
+         console.log('tmp',results)
          if(results.length>1){
            results = uniq<string>(results)   
          }
@@ -609,22 +614,24 @@ export class SimpleAppService<T extends { _id?: string }> {
          pipelines.push(stagefilter)
        }            
      })
- 
+     this.logger.debug(pipelines,'identifyUniqueKeys')
      // this.doc.db.collection(collectionname);
      const unionresult = await this.doc.aggregate(pipelines)
      
      if(!unionresult){
+      this.logger.error("foreign key control failed ",'identifyUniqueKeys')
        throw new InternalServerErrorException("Foreignkey check execution error",pipelines as HttpExceptionOptions)
      }else{
        let searchresult:any = {}
        unionresult.forEach(item=>{
+        console.log("111")
          if(searchresult[item.collection]){
            searchresult[item.collection].push(item._id)
          }else{
            searchresult[item.collection] = [item._id]
          }
        })
- 
+       
        //search is it all foreign key exists in db
        for(let i=0; i<collections.length; i++){
          const collectionname = collections[i]
@@ -634,19 +641,21 @@ export class SimpleAppService<T extends { _id?: string }> {
          }
          for(let k=0;k<keys.length; k++){
            const key = keys[k]
-           if(!searchresult[collectionname].includes(key)){
-             console.log(`Foreignkey ${key} at collection ${collectionname} does not exist`)
-             throw new BadRequestException(`Foreignkey ${key} at collection ${collectionname} does not exist`)
-           }
+           if(searchresult[collectionname] && searchresult[collectionname].includes(key)){
+            this.logger.debug(`foreignkey ${collectionname}->${key} exists`)
+          }
            else{
-            //  console.log(`${collectionname} - ${key} found`)      
+            this.logger.warn(`Foreignkey ${key} at collection ${collectionname} does not exist`,'identifyUniqueKeys')
+            const errordata = {key:key,collection:collectionname}
+            throw new BadRequestException(`Foreignkey ${key} at collection ${collectionname} does not exist`,JSON.stringify(errordata))
+
            }
          }
  
        }      
        
      }    
-     
+     console.log("666")
   }
 
 

package/templates/nest/src/simpleapp/simpleapp.module.ts.eta

@@ -8,6 +8,7 @@ import { Module } from '@nestjs/common';
 import { MongooseModule } from '@nestjs/mongoose';
 import {DocNumberFormatGenerator} from './generate/commons/docnogenerator.service'
 import { AuditTrail } from './generate/commons/audittrail.service';
+
 // auto import modules
 <% for(let i=0;i<it.modules.length; i++){ %>
 <% let obj = it.modules[i]%>
@@ -23,7 +24,7 @@ import { ProfileService } from './profile/profile.service';
 
 
 //<%if(it.doctype != 'autoinc'){%>import {AutoincreamentModule} from '../autoinc/autoinc.module'<%}%>
-
+//encryption use for model (not class and cant inject, use singleton instead and init as early as possible)
 
 @Module({
   imports: [

package/templates/nuxt/tsconfig.json.eta

@@ -0,0 +1,7 @@
+{
+  // https://nuxt.com/docs/guide/concepts/typescript
+  "extends": "./.nuxt/tsconfig.json",
+  "compilerOptions": {
+    "verbatimModuleSyntax": false
+  }
+}