@simitgroup/simpleapp-generator 1.0.47 → 1.0.48

package/templates/nest/src/simpleapp/generate/models/tenant.model.ts.eta

@@ -1,11 +1,9 @@
 /**
- * This file was automatically generated by simpleapp generator.
- * DO NOT MODIFY IT BY HAND. Instead, modify the source JSONSchema file,
- * and regenerate this file.
- * last change 2023-09-09
+ * This file was automatically generated by simpleapp generator. Every
+ * MODIFICATION OVERRIDE BY GENERATEOR
+ * last change 2023-10-28
  * Author: Ks Tan
  */
-
 import { Schema } from 'mongoose';
 import { TenantOwner, Tenant } from '../types/tenant.type';
 const schemasetting = {

package/templates/nest/src/simpleapp/generate/models/user.model.ts.eta

@@ -1,8 +1,7 @@
 /**
- * This file was automatically generated by simpleapp generator.
- * DO NOT MODIFY IT BY HAND. Instead, modify the source JSONSchema file,
- * and regenerate this file.
- * last change 2023-09-09
+ * This file was automatically generated by simpleapp generator. Every
+ * MODIFICATION OVERRIDE BY GENERATEOR
+ * last change 2023-10-28
  * Author: Ks Tan
  */
 

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

@@ -1,8 +1,14 @@
+/**
+ * This file was automatically generated by simpleapp generator. Every
+ * MODIFICATION OVERRIDE BY GENERATEOR
+ * last change 2023-10-28
+ * Author: Ks Tan
+ */
 import { Injectable, Logger,Inject } from '@nestjs/common';
 import { InjectModel } from '@nestjs/mongoose';
 import * as jsonpath from 'jsonpath'
 import {  uniq } from 'lodash';
-
+import { AuditTrail } from '../commons/audittrail.service';
 import {foreignkeys} from '../commons/dicts/foreignkeys'
 import { Model,Types,PipelineStage,mongo, FilterQuery, ProjectionType} from 'mongoose';
 import Ajv from 'ajv';
@@ -60,14 +66,21 @@ export class SimpleAppService<T extends { _id?: string }> {
   protected errorlist = [];
   protected withDocNumberFormat=false
   protected foreignkeys = {}
+  
+  @Inject(AuditTrail)
+  protected audittrail: AuditTrail
+
+  @Inject(DocNumberFormatGenerator)
+  protected docnogenerator: DocNumberFormatGenerator
+
+
   // protected userprovider = new UserContext() ;
 
   constructor(
     doctype: string,
     docname: string,
     newdoc: Model<T>,
-    isolationtype: IsolationType = IsolationType.org,
-    private docnogenerator:DocNumberFormatGenerator
+    isolationtype: IsolationType = IsolationType.org    
   ) {            
     // console.log("-------init simpleapp service abstract class -------userprovider=",typeof this.userprovider)
     this.documentType = doctype.toUpperCase();
@@ -251,10 +264,16 @@ export class SimpleAppService<T extends { _id?: string }> {
 
 
   async create(appuser:UserContext, data:T) {
+    this.audittrail.addEvent(data)
     let result;
     if(!data._id){
       data._id = crypto.randomUUID()
     }
+    const dbsession = appuser.getDBSession()
+    if(!dbsession.inTransaction()){
+      dbsession.startTransaction()
+    }
+
 
     this.logger.debug('this.withDocNumberFormat :' + this.withDocNumberFormat + '  && ' + '!data[this.documentIdentityCode] ==' + !data[this.documentIdentityCode])
     if(this.withDocNumberFormat && !data[this.documentIdentityCode]){
@@ -280,7 +299,7 @@ export class SimpleAppService<T extends { _id?: string }> {
     const newdoc = new this.doc(data);
     
     try{
-      result = await newdoc.save({session:appuser.getDBSession()})
+      result = await newdoc.save({session:dbsession})
     }catch(err){
       this.logger.error(err)
       throw new InternalServerErrorException(err)
@@ -392,6 +411,11 @@ export class SimpleAppService<T extends { _id?: string }> {
   }
   async findIdThenDelete(appuser:UserContext,id: string): Promise<any> {
     const deletedata = await this.findById(appuser,id);    
+    const dbsession = appuser.getDBSession()
+    if(!dbsession.inTransaction()){
+      dbsession.startTransaction()
+    }
+
     let dependency
     try {
       await this.hook(appuser,HookType.beforeDelete, id);
@@ -404,7 +428,7 @@ export class SimpleAppService<T extends { _id?: string }> {
         
         filterIsolation['_id'] =  id;
         this.logger.debug('delete filter', filterIsolation);
-        const result = await this.doc.deleteOne(filterIsolation).session(appuser.getDBSession());
+        const result = await this.doc.deleteOne(filterIsolation).session(dbsession);
         const deleteresult = {result:result, data: deletedata}
         this.logger.debug(deleteresult, " delete result" +this.doc.collection.name,)
         // this.doc.findByIdAndDelete(id)
@@ -431,6 +455,12 @@ export class SimpleAppService<T extends { _id?: string }> {
   findIdThenUpdate = async (appuser:UserContext,id: string, data: T,session:mongo.ClientSession=undefined) => {
     const existingdata = await this.findById(appuser,id);
     await this.hook(appuser,HookType.beforeUpdate, data);
+
+    const dbsession = appuser.getDBSession()
+    if(!dbsession.inTransaction()){
+      dbsession.startTransaction()
+    }
+
     // try {
     Object.assign(data, appuser.getUpdateFilter());
     Object.assign(existingdata, data);
@@ -444,12 +474,13 @@ export class SimpleAppService<T extends { _id?: string }> {
 
     isolationFilter['_id'] = id;
     this.applyNestedDateTime(appuser,data,'update')
-    const result = await this.doc.findOneAndUpdate(isolationFilter, data).session(appuser.getDBSession());
-    await this.hook(appuser,HookType.afterUpdate, data);
-    return result;
-    // } catch (err) {
-    //   throw new InternalServerErrorException(err.message);
-    // }
+    try{
+      const result = await this.doc.findOneAndUpdate(isolationFilter, data).session(dbsession);
+      await this.hook(appuser,HookType.afterUpdate, data);
+      return result;        
+    } catch (err) {
+      throw new InternalServerErrorException(err.message);
+    }
   };
 
   //find what foreign key constraint

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

@@ -0,0 +1,22 @@
+/**
+ * This file was automatically generated by simpleapp generator. Every
+ * MODIFICATION OVERRIDE BY GENERATEOR
+ * last change 2023-10-28
+ * Author: Ks Tan
+ */
+export type ApiEvent = {
+    _id: string
+    created: string
+    updated?:string
+    duration: number
+    createdby: string
+    path: string
+    ip: string
+    method: string
+    headers: any
+    data?:  any
+    statusCode:number
+    status:string
+    errMsg?:string
+    errData?: any
+}

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

@@ -1,3 +1,9 @@
+/**
+ * This file was automatically generated by simpleapp generator. Every
+ * MODIFICATION OVERRIDE BY GENERATEOR
+ * last change 2023-10-28
+ * Author: Ks Tan
+ */
 export type ForeignKey = {
     _id: string
     label: string

package/templates/nest/src/simpleapp/profile/profile.apischema.ts.eta

@@ -1,3 +1,9 @@
+/**
+ * This file was automatically generated by simpleapp generator. Every
+ * MODIFICATION OVERRIDE BY GENERATEOR
+ * last change 2023-10-28
+ * Author: Ks Tan
+ */
 import { ApiProperty } from '@nestjs/swagger';
 import {ProfileUserInvites,ProfileUserBranch} from './profile.types'
 export class RegTenantApiSchema {

package/templates/nest/src/simpleapp/profile/profile.controller.ts.eta

@@ -1,3 +1,9 @@
+/**
+ * This file was automatically generated by simpleapp generator. Every
+ * MODIFICATION OVERRIDE BY GENERATEOR
+ * last change 2023-10-28
+ * Author: Ks Tan
+ */
 import {
   Controller,
   Get,

package/templates/nest/src/simpleapp/profile/profile.service.ts.eta

@@ -1,3 +1,9 @@
+/**
+ * This file was automatically generated by simpleapp generator. Every
+ * MODIFICATION OVERRIDE BY GENERATEOR
+ * last change 2023-10-28
+ * Author: Ks Tan
+ */
 import { UserService, User } from './../services/user.service';
 import {
   Injectable,

package/templates/nest/src/simpleapp/profile/profile.types.ts.eta

@@ -1,3 +1,9 @@
+/**
+ * This file was automatically generated by simpleapp generator. Every
+ * MODIFICATION OVERRIDE BY GENERATEOR
+ * last change 2023-10-28
+ * Author: Ks Tan
+ */
 export type RegTenant = {
     tenantName: string;
   };

package/templates/nest/src/simpleapp/services/autoinc.service.ts.eta

@@ -1,14 +1,14 @@
 /**
- * This file was automatically generated by simpleapp generator.
- * It will not override by generator
- * last change 2023-09-23
+ * This file was automatically generated by simpleapp generator. Every
+ * MODIFICATION OVERRIDE BY GENERATEOR
+ * last change 2023-10-28
  * Author: Ks Tan
  */
 import { InjectModel } from '@nestjs/mongoose';
 import { Model } from 'mongoose';
 import { Injectable } from '@nestjs/common';
 import { AutoincreamentProcessor } from '../generate/processors/autoinc.processor';
-import { DocNumberFormatGenerator } from '../generate/commons/docnogenerator.service';
+
 import { Autoincreament } from '../generate/types/autoinc.type';
 import { UserContext } from '../generate/commons/user.context';
 export { Autoincreament } from '../generate/types/autoinc.type';
@@ -17,9 +17,8 @@ export { Autoincreament } from '../generate/types/autoinc.type';
 export class AutoincreamentService extends AutoincreamentProcessor {
   constructor(
     @InjectModel('Autoincreament') mydoc: Model<Autoincreament>,
-    docnogenerator: DocNumberFormatGenerator,
     ) {
-    super(mydoc,docnogenerator);
+    super(mydoc);
   }
 
   //    hook = async (appuser:UserContext,type: string, data?: any) => {

package/templates/nest/src/simpleapp/services/branch.service.ts.eta

@@ -1,27 +1,29 @@
 /**
- * This file was automatically generated by simpleapp generator.
- * It will not override by generator
- * last change 2023-09-23
+ * This file was automatically generated by simpleapp generator. Every
+ * MODIFICATION OVERRIDE BY GENERATEOR
+ * last change 2023-10-28
  * Author: Ks Tan
  */
 import { InjectModel } from '@nestjs/mongoose';
 import { Model } from 'mongoose';
-import { Injectable } from '@nestjs/common';
+import { Injectable, InternalServerErrorException } from '@nestjs/common';
 import { BranchProcessor } from '../generate/processors/branch.processor';
 import { Branch } from '../generate/types/branch.type';
+import {alldocuments} from '../generate/commons/dicts/documents'
 export { Branch } from '../generate/types/branch.type';
 import { AutoincreamentService } from './autoinc.service';
 import { UserContext } from '../generate/commons/user.context';
-import { DocNumberFormatGenerator } from '../generate/commons/docnogenerator.service';
+import { Docnoformat,DocnoformatService } from './docno.service';
+// import { Docnoformat } from '../generate/types/docno.type';
 @Injectable()
 export class BranchService extends BranchProcessor {
   protected strictIsolation = false;
   constructor(
     @InjectModel('Branch') mydoc: Model<Branch>,
-    private increament: AutoincreamentService,
-    docnogenerator: DocNumberFormatGenerator,
+    private increament: AutoincreamentService,    
+    private docnoservice:DocnoformatService
   ) {
-    super(mydoc,docnogenerator);
+    super(mydoc);
   }
 
   hook = async (appuser: UserContext, type: string, data?: any) => {
@@ -44,8 +46,9 @@ export class BranchService extends BranchProcessor {
         );
         data.branchId = searchresult.nextno;
         break;
-      //         case 'afterCreate':
-      //         break;
+              case 'afterCreate':
+                await this.generateDefaultDocNumbers(appuser,data);
+              break;
       //         case 'beforeUpdate':
       //         break;
       //         case 'afterUpdate':
@@ -63,4 +66,41 @@ export class BranchService extends BranchProcessor {
     }
     return true;
   };
+
+  generateDefaultDocNumbers =async (appuser,data) => {
+    const branchName = data.branchName
+    const branchCode = data.branchCode
+    const recordId = data._id
+    const branchId= data.branchId
+    const orgId = data.orgId
+    const tenantId = data.tenantId
+    const docformats = alldocuments.filter((item)=>item.docNumber)
+    for(let i=0; i< docformats.length; i++){
+      const doc = docformats[i]
+      const pattern = `${doc.docType}-${branchCode}-[00000]`
+      const formatdata:Docnoformat = {
+        _id:crypto.randomUUID(),
+        docNoFormatNo:'Default',
+        docNoFormatName:'Default',        
+        docNoType: doc.docType,
+        docNoPattern:  pattern,
+        branch:{_id:recordId,branchId:branchId,label:branchName},
+        branchId:branchId,
+        orgId:orgId,
+        tenantId:tenantId,
+        nextNumber:1,              
+      } as Docnoformat
+      try{
+        const result = await this.docnoservice.create(appuser,formatdata)
+        if(!result){
+          throw new InternalServerErrorException(`Generate default document number for "${branchCode}" failed. Pattern: ${pattern}`,'generateDefaultDocNumbers')
+        }
+
+      }catch(err){
+        this.logger.error(err)
+        throw new InternalServerErrorException(err)
+      }
+            
+    }    
+  }
 }

package/templates/nest/src/simpleapp/services/docno.service.ts.eta

@@ -1,8 +1,7 @@
-import { BadRequestException } from '@nestjs/common';
 /**
- * This file was automatically generated by simpleapp generator.
- * It will not override by generator
- * last change 2023-09-23
+ * This file was automatically generated by simpleapp generator. Every
+ * MODIFICATION OVERRIDE BY GENERATEOR
+ * last change 2023-10-28
  * Author: Ks Tan
  */
 import { InjectModel } from '@nestjs/mongoose';
@@ -17,11 +16,11 @@ export { Docnoformat } from '../generate/types/docno.type';
 
 @Injectable()
 export class DocnoformatService extends DocnoformatProcessor {
+  protected strictIsolation = false;
   constructor(
     @InjectModel('Docnoformat') mydoc: Model<Docnoformat>,
-    docnogenerator: DocNumberFormatGenerator,
   ) {
-    super(mydoc, docnogenerator);
+    super(mydoc);
   }
 
   //    hook = async (type: string, data?: any) => {
@@ -82,7 +81,6 @@ export class DocnoformatService extends DocnoformatProcessor {
           docNoFormatNo: s.docNoFormatNo,
           docNoFormatName: s.docNoFormatName,
           docNoPattern: s.docNoPattern,
-          isMonthly: s.isMonthly,
           nextNumber: s.nextNumber,
           default: s.default,
           sample: DocNumberFormatGenerator.previewDocNo(s),

package/templates/nest/src/simpleapp/services/org.service.ts.eta

@@ -1,7 +1,7 @@
 /**
- * This file was automatically generated by simpleapp generator.
- * It will not override by generator
- * last change 2023-09-23
+ * This file was automatically generated by simpleapp generator. Every
+ * MODIFICATION OVERRIDE BY GENERATEOR
+ * last change 2023-10-28
  * Author: Ks Tan
  */
 import { InjectModel } from '@nestjs/mongoose';
@@ -11,7 +11,6 @@ import { OrganizationProcessor } from '../generate/processors/org.processor';
 import { Organization } from '../generate/types/org.type';
 export { Organization } from '../generate/types/org.type';
 import { AutoincreamentService } from './autoinc.service';
-import { DocNumberFormatGenerator } from '../generate/commons/docnogenerator.service';
 import { UserContext } from '../generate/commons/user.context';
 
 @Injectable()
@@ -20,9 +19,8 @@ export class OrganizationService extends OrganizationProcessor {
   constructor(
     @InjectModel('Organization') mydoc: Model<Organization>,
     private increament: AutoincreamentService,
-    docnogenerator: DocNumberFormatGenerator,
   ) {
-    super(mydoc,docnogenerator);
+    super(mydoc);
   }
 
   hook = async (appuser: UserContext, type: string, data?: any) => {

package/templates/nest/src/simpleapp/services/perm.service.ts.eta

@@ -1,7 +1,7 @@
 /**
- * This file was automatically generated by simpleapp generator.
- * It will not override by generator
- * last change 2023-09-23
+ * This file was automatically generated by simpleapp generator. Every
+ * MODIFICATION OVERRIDE BY GENERATEOR
+ * last change 2023-10-28
  * Author: Ks Tan
  */
 import { InjectModel } from '@nestjs/mongoose';
@@ -10,17 +10,16 @@ import { Injectable } from '@nestjs/common';
 import { PermissionProcessor } from '../generate/processors/perm.processor';
 import { Permission } from '../generate/types/perm.type';
 import { UserContext } from '../generate/commons/user.context';
-import { DocNumberFormatGenerator } from '../generate/commons/docnogenerator.service';
+
 export { Permission } from '../generate/types/perm.type';
 
 @Injectable()
 export class PermissionService extends PermissionProcessor {
   protected strictIsolation = false;
   constructor(
-    @InjectModel('Permission') mydoc: Model<Permission>,
-    docnogenerator: DocNumberFormatGenerator,
+    @InjectModel('Permission') mydoc: Model<Permission>,    
     ) {
-    super(mydoc,docnogenerator);
+    super(mydoc);
   }
 
   hook = async (appuser: UserContext, type: string, data?: any) => {

package/templates/nest/src/simpleapp/services/tenant.service.ts.eta

@@ -1,7 +1,7 @@
 /**
- * This file was automatically generated by simpleapp generator.
- * It will not override by generator
- * last change 2023-09-23
+ * This file was automatically generated by simpleapp generator. Every
+ * MODIFICATION OVERRIDE BY GENERATEOR
+ * last change 2023-10-28
  * Author: Ks Tan
  */
 
@@ -12,7 +12,6 @@ import { TenantProcessor } from '../generate/processors/tenant.processor';
 import { Tenant } from '../generate/types/tenant.type';
 import { AutoincreamentService } from './autoinc.service';
 import { UserContext } from '../generate/commons/user.context';
-import { DocNumberFormatGenerator } from '../generate/commons/docnogenerator.service';
 export { Tenant } from '../generate/types/tenant.type';
 
 @Injectable()
@@ -20,9 +19,9 @@ export class TenantService extends TenantProcessor {
   constructor(
     @InjectModel('Tenant') mydoc: Model<Tenant>,
     private increament: AutoincreamentService,
-    docnogenerator: DocNumberFormatGenerator,
+
   ) {
-    super(mydoc,docnogenerator);
+    super(mydoc);
   }
 
   hook = async (appuser: UserContext, type: string, data?: any) => {

package/templates/nest/src/simpleapp/services/user.service.ts.eta

@@ -1,7 +1,7 @@
 /**
- * This file was automatically generated by simpleapp generator.
- * It will not override by generator
- * last change 2023-09-23
+ * This file was automatically generated by simpleapp generator. Every
+ * MODIFICATION OVERRIDE BY GENERATEOR
+ * last change 2023-10-28
  * Author: Ks Tan
  */
 import { InjectModel } from '@nestjs/mongoose';
@@ -11,7 +11,7 @@ import { Injectable } from '@nestjs/common';
 import { UserProcessor } from '../generate/processors/user.processor';
 import { Permission } from '../generate/types/perm.type';
 import { User } from '../generate/types/user.type';
-import { DocNumberFormatGenerator } from '../generate/commons/docnogenerator.service';
+
 export { User } from '../generate/types/user.type';
 
 
@@ -21,9 +21,8 @@ export class UserService extends UserProcessor {
   constructor(
     @InjectModel('User') mydoc: Model<User>,
     @InjectModel('Permission') private permdoc: Model<Permission>,
-    docnogenerator: DocNumberFormatGenerator,
   ) {
-    super(mydoc,docnogenerator);
+    super(mydoc);
   }
 
   hook = async (appuser: UserContext, type: string, data?: any) => {

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

@@ -1,15 +1,13 @@
-
 /**
- * This file was automatically generated by simpleapp generator.
- * DO NOT MODIFY IT BY HAND. Instead, modify the source JSONSchema file,
- * and regenerate this file.
- * last change 2023-09-09
+ * This file was automatically generated by simpleapp generator. Every
+ * MODIFICATION OVERRIDE BY GENERATEOR
+ * last change 2023-10-28
  * Author: Ks Tan
  */
 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]%>
@@ -37,7 +35,7 @@ import { ProfileService } from './profile/profile.service';
       ]),
   ],
   controllers: [<% for(let i=0;i<it.modules.length; i++){ %><%= it.modules[i].docname %>Controller,<%}%> ProfileController],
-  providers: [DocNumberFormatGenerator,<% for(let i=0;i<it.modules.length; i++){ %><%= it.modules[i].docname %>Service,<%}%> ProfileService,],
-  exports:[DocNumberFormatGenerator,<% for(let i=0;i<it.modules.length; i++){ %><%= it.modules[i].docname %>Service,<%}%> ProfileService,]
+  providers: [AuditTrail,DocNumberFormatGenerator,<% for(let i=0;i<it.modules.length; i++){ %><%= it.modules[i].docname %>Service,<%}%> ProfileService,],
+  exports:[AuditTrail,DocNumberFormatGenerator,<% for(let i=0;i<it.modules.length; i++){ %><%= it.modules[i].docname %>Service,<%}%> ProfileService,]
 })
 export class GenerateModule {}

package/templates/nuxt/app.vue.eta

@@ -1,5 +1,10 @@
 <script setup lang="ts">
-
+/**
+ * This file was automatically generated by simpleapp generator. Every
+ * MODIFICATION OVERRIDE BY GENERATEOR
+ * last change 2023-10-28
+ * Author: Ks Tan
+ */
 </script>
 <template>
   <div>

package/templates/nuxt/assets/css/style.css._eta

@@ -0,0 +1,12 @@
+.btn {
+    @apply p-2  border-2 m-1
+}
+.btn-primary{
+    @apply bg-primary-600 text-white
+}
+.btn-danger{
+    @apply bg-danger-600 text-white
+}
+.btn-warning{
+    @apply bg-danger-600 text-white
+}

package/templates/nuxt/assets/css/tailwind.css._eta

@@ -0,0 +1,10 @@
+/* tailwind.css */
+@layer tailwind-base {
+    @tailwind base;
+  }
+  
+  @layer tailwind-utilities {
+    @tailwind components;
+    @tailwind utilities;
+  }
+

package/templates/nuxt/assets/primevue/passthrough.ts._eta

@@ -0,0 +1,37 @@
+import { usePassThrough } from "primevue/passthrough";
+import Tailwind from "primevue/passthrough/tailwind";
+
+
+const CustomTailwind = usePassThrough(
+    Tailwind,
+    {
+        button:{
+            root:{
+                class:['p-2 m-2 border']
+            }
+        },
+        dialog:{
+            root:{
+               class:['bg-white border p-2' ]
+            }
+        },
+        panel: {
+            root:{
+                class:['border']
+            },
+            title: {
+                class: ['leading-none font-light text-2xl']
+            },
+            header:{
+                class:['bg bg-gray-200 h-10 content-middle']
+            },
+            content:{
+                class:['']
+            }
+        }
+    },
+);
+
+
+
+export default CustomTailwind;