@simitgroup/simpleapp-generator 1.6.7-l-alpha → 1.6.7-o-alpha

package/ReleaseNote.md

@@ -1,3 +1,9 @@
+[1.6.7o-alpha]
+1. exclude findIdThenPatch to execute beforeUpdate and afterUpdate
+
+[1.6.7m-alpha]
+1. insert many bug fix
+
 [1.6.7l-alpha]
 1. insert many support transaction
 

package/package.json

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

package/templates/nest/src/app.module.ts._eta

@@ -10,6 +10,7 @@ import { MongooseModule,MongooseModuleOptions } from '@nestjs/mongoose';
 import { GraphQLModule } from '@nestjs/graphql';
 import { ApolloDriver, ApolloDriverConfig } from '@nestjs/apollo';
 import {GenerateModule} from './simpleapp/simpleapp.module'
+import {EnvironmentMongoSchema} from './simpleapp/maintenance/models/environment.model'
 <% const nestmodules = it.configs.additionalNestModules%>
 <% for(let i=0; i<nestmodules.length;i++){ %>
 <%    const modulename = capitalizeFirstLetter(nestmodules[i]) %>
@@ -91,6 +92,7 @@ import { WebhookMongoSchema } from './simpleapp/generate/models/webhook.model';
       { name: 'Permission', schema: PermissionMongoSchema },
       { name: 'ApiEvent', schema: ApiEventMongoSchema },
       { name: 'Webhook', schema: WebhookMongoSchema },
+      { name: 'Environment', schema: EnvironmentMongoSchema },
     ]),    
       ],
   controllers: [AppController],

package/templates/nest/src/simpleapp/generate/commons/middlewares/tenant.middleware.ts.eta

@@ -1,12 +1,12 @@
 /**
  * This file was automatically generated by simpleapp generator. Every
  * MODIFICATION OVERRIDE BY GENERATEOR
- * last change 2024-03-17
+ * last change 2025-08-27
  * Author: Ks Tan
  */
 
 import Base64URL from '@darkwolf/base64url';
-import { BadRequestException, Injectable, Logger, NestMiddleware } from '@nestjs/common';
+import { BadRequestException, Injectable, Logger, NestMiddleware, ServiceUnavailableException } from '@nestjs/common';
 import { InjectModel } from '@nestjs/mongoose';
 import { NextFunction, Request, Response } from 'express';
 import { Model } from 'mongoose';
@@ -17,7 +17,7 @@ import { Miniappinstallation, Webhook } from '../../types';
 import { UserContext } from '../user.context';
 import { ApiKeyService } from './api-key/api-key.service';
 import { HEADER_X_API_KEY, HEADER_X_API_SECRET } from '../constants/header';
-
+import {Environment} from '../../../maintenance/apischemas/environment'
 @Injectable()
 export class TenantMiddleware implements NestMiddleware {
   protected defaultXOrg = Base64URL.encodeText('0-0-0');
@@ -32,6 +32,7 @@ export class TenantMiddleware implements NestMiddleware {
     @InjectModel('Appintegration') private readonly appModel: Model<Appintegration>,
     @InjectModel('Webhook') private readonly webhookModel: Model<Webhook>,
     @InjectModel('Miniappinstallation') private readonly miniAppInstallationModel: Model<Miniappinstallation>,
+    @InjectModel('Environment') private envModel:Model<Environment>,
     private readonly apiKeyService: ApiKeyService,
   ) {}
 
@@ -51,6 +52,13 @@ export class TenantMiddleware implements NestMiddleware {
       return;
     }
 
+    const envs = await this.envModel.find()
+    let maintenanceMode = false
+    if(envs){
+      maintenanceMode = !envs[0].systemEnable  
+    }
+    
+
     let tokenStr: string = req.get('authorization') ?? '';
     tokenStr = tokenStr.replace('Bearer ', '');
     const xOrg = req.get('x-org') ?? this.defaultXOrg;
@@ -61,6 +69,11 @@ export class TenantMiddleware implements NestMiddleware {
       if (tokenStr) {
         await user.setCurrentUserInfo(tokenStr, xOrg, this.webhookModel);
       }
+
+      if(maintenanceMode && !user.isRealmAdmin()){
+        throw new ServiceUnavailableException("System in maintenance mode")
+      }
+
       req['sessionuser'] = user;
       next();
       return;
@@ -74,6 +87,9 @@ export class TenantMiddleware implements NestMiddleware {
         await this.apiKeyService.validate(req, user);
 
         req['sessionuser'] = user;
+        if(maintenanceMode){
+          throw new ServiceUnavailableException("System in maintenance mode")
+        }
         next();
         return;
       } catch (e) {
@@ -110,6 +126,12 @@ export class TenantMiddleware implements NestMiddleware {
 
     try {
       await user.setCurrentUserInfo(tokenStr, xOrg, this.webhookModel);
+
+      if(maintenanceMode && !user.isRealmAdmin()){
+        throw new ServiceUnavailableException("System in maintenance mode")
+      }
+
+
       user.detectMiniAppSdkRequest(req);
       if (user.getId() == '' && this.requireXOrg(req.baseUrl)) {
         this.logger.log('Access deny for user:', req.baseUrl);

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

@@ -337,12 +337,9 @@ export class SimpleAppService<T extends { _id?: string; __v?: number }> {
   }
 
   async createManyWithId(appuser: UserContext, datas: T[]) {
-    if (Array.isArray(datas)) {
-      const dbsession = appuser.getDBSession();
-      if (dbsession && !dbsession.inTransaction()) {
-        dbsession.startTransaction({ readPreference: 'primary' });
-      }
 
+    if (Array.isArray(datas)) {      
+      
       for (let i = 0; i < datas.length; i++) {
         const data = datas[i];
         let isolationFilter: any = { ...appuser.getCreateFilterWithId() };
@@ -353,12 +350,11 @@ export class SimpleAppService<T extends { _id?: string; __v?: number }> {
         await this.validateData(appuser, data);
         this.applyNestedDateTime(appuser, data, 'create');
       }
-      
+
       const dbsession = appuser.getDBSession();
       if (dbsession && !dbsession.inTransaction()) {
         dbsession.startTransaction({ readPreference: 'primary' });
       }
-      const result = await this.doc.insertMany(datas,{session:dbsession});
 
       const result = await this.doc.insertMany(datas, { session: dbsession });
       await this.audittrail.addManyEvents(appuser, this.documentName, 'createMany', datas);
@@ -840,7 +836,7 @@ export class SimpleAppService<T extends { _id?: string; __v?: number }> {
     }
   };
 
-  findIdThenPatch = async (appuser: UserContext, id: string, data: T, session: mongo.ClientSession = undefined,skipLog:boolean=false) => {
+  findIdThenPatch = async (appuser: UserContext, id: string, data: Partial<T>, session: mongo.ClientSession = undefined, skipLog: boolean = false) => {
     const existingdata = await this.findById(appuser, id);
     if (!existingdata) {
       throw new NotFoundException(`${id} not found`, 'not found');
@@ -853,7 +849,8 @@ export class SimpleAppService<T extends { _id?: string; __v?: number }> {
 
     await this.identifyForeignKeys(appuser, data);
 
-    if (this.hooks.beforeUpdate) await this.hooks.beforeUpdate(appuser, id, existingdata, data);
+    //patch not suitable trigger afterupdate
+    // if (this.hooks.beforeUpdate) await this.hooks.beforeUpdate(appuser, id, existingdata, data);
 
     const dbsession = appuser.getDBSession();
     if (dbsession && !dbsession.inTransaction()) {
@@ -864,7 +861,8 @@ export class SimpleAppService<T extends { _id?: string; __v?: number }> {
     // Object.assign(existingdata, data);
     delete data['_id'];
 
-    this.reCalculateValue(data);
+    //patch not suitable trigger afterupdate
+    // this.reCalculateValue(data);
 
     // existingdata['_id']=''
     // console.log("newdata",data)
@@ -883,13 +881,14 @@ export class SimpleAppService<T extends { _id?: string; __v?: number }> {
         new: true,
       });
       //skip audit trail, useful when want to patch x-foreignkey code,label
-      if(!skipLog) {
+      if (!skipLog) {
         await this.audittrail.addEvent(appuser, this.documentName, id, 'patch', data);
       }
       appuser.addUpdatedRecordId(this.documentName, data._id);
 
-      if (this.hooks.afterUpdate) await this.hooks.afterUpdate(appuser, id, existingdata, result);
-      await this.callWebhook(appuser, 'update', result);
+      //patch not suitable trigger afterupdate
+      // if (this.hooks.afterUpdate) await this.hooks.afterUpdate(appuser, id, existingdata, result);
+      // await this.callWebhook(appuser, 'update', result);
       return result; //await this.findById(appuser, id);
     } catch (err) {
       throw new InternalServerErrorException(err.message);
@@ -1040,7 +1039,7 @@ export class SimpleAppService<T extends { _id?: string; __v?: number }> {
   async runDefault(appuser: UserContext): Promise<unknown> {
     return 'Hello this is ' + this.getDocumentType() + ': ' + this.getDocumentName();
   }
-  async identifyForeignKeys(appuser: UserContext, data: T) {
+  async identifyForeignKeys(appuser: UserContext, data: Partial<T>) {
     /**
      * 1. looping schemas identify what foreign key exists
      * 2. loop through record obtain all foreign key value

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

@@ -47,8 +47,8 @@ export type DefaultHooks<T> = {
   beforeUpdate?: (
     appuser: UserContext,
     id: string,
-    data: T,
     existingdata: T,
+    data: T,    
   ) => Promise<void>;
   afterUpdate?: (appuser: UserContext, id: string, prevdata: T,newdata:T) => Promise<void>;
   beforeDelete?: (

package/templates/nest/src/simpleapp/maintenance/apischemas/dbupdate.ts.eta

@@ -0,0 +1,17 @@
+/**
+ * This file was automatically generated by simpleapp generator. Every
+ * MODIFICATION OVERRIDE BY GENERATEOR
+ * last change 2025-08-27
+ * Author: Ks Tan
+ */
+
+import { ApiProperty } from '@nestjs/swagger';
+
+export class UpgradeScript {
+    @ApiProperty({ type: String})
+    id: String
+    @ApiProperty({ type: String})
+    subject:String
+    @ApiProperty({ type: String})
+    description:String
+}

package/templates/nest/src/simpleapp/maintenance/apischemas/environment.ts.eta

@@ -0,0 +1,11 @@
+/**
+ * This file was automatically generated by simpleapp generator. Every
+ * MODIFICATION OVERRIDE BY GENERATEOR
+ * last change 2025-08-27
+ * Author: Ks Tan
+ */
+export class Environment {
+    systemEnable: boolean
+    stopUntil: string
+    maintenanceMessage: string
+};

package/templates/nest/src/simpleapp/maintenance/apischemas/index.ts.eta

@@ -0,0 +1,8 @@
+/**
+ * This file was automatically generated by simpleapp generator. Every
+ * MODIFICATION OVERRIDE BY GENERATEOR
+ * last change 2025-08-27
+ * Author: Ks Tan
+ */
+export * from './dbupdate'
+export * from './environment'

package/templates/nest/src/simpleapp/maintenance/dbupdate/1.00.00/index.ts._eta

@@ -0,0 +1,39 @@
+/**
+ * This file was automatically generated by simpleapp generator. Every
+ * --remove-this-line-to-prevent-override--
+ * last change 2025-08-27
+ * Author: Ks Tan
+ */
+
+import { InternalServerErrorException } from "@nestjs/common"
+import { exec } from "child_process"
+import mongoose, { ClientSession } from "mongoose"
+
+
+const readEnvironment = async () =>{    
+  try {
+    await mongoose.connection.db.collection('environment').aggregate([              
+        
+        ],).toArray() // `toArray` forces execution     
+    return "read environment";
+  } catch (err) {
+    throw err
+  }   
+}
+
+
+export const v1_00_00 = ()=>{
+    const subject = 'Just a sample'
+    const description = `do nothing, only read enironment 
+    `;
+    const execute = async () =>{
+        try{            
+           const res1 = await readEnvironment()
+           
+           return `${res1}`
+        }catch(e){
+            throw e
+        }
+    }
+    return {execute,subject,description}
+}

package/templates/nest/src/simpleapp/maintenance/dbupdate/index.ts._eta

@@ -0,0 +1,8 @@
+/**
+ * This file was automatically generated by simpleapp generator. Every
+ * --remove-this-line-to-prevent-override--
+ * last change 2025-08-27
+ * Author: Ks Tan
+ */
+export { v1_00_00 } from './1.00.00'
+

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

@@ -0,0 +1,72 @@
+/**
+ * This file was automatically generated by simpleapp generator. Every
+ * MODIFICATION OVERRIDE BY GENERATEOR
+ * last change 2025-08-27
+ * Author: Ks Tan
+ */
+import { Controller, Get, Post, Param,Logger,HttpCode } from '@nestjs/common';
+import { MaintenanceService } from './maintenance.service';
+import { ApiTags, ApiBody, ApiResponse, ApiOperation, ApiQuery } from '@nestjs/swagger';
+import { Roles } from 'src/simpleapp/generate/commons/roles/roles.decorator';
+import { Role } from 'src/simpleapp/generate/commons/roles/roles.enum';
+import * as schemas from './apischemas'
+
+@ApiTags('maintenance')
+@Controller('maintenance')
+@Roles(Role.SuperAdmin)
+export class MaintenanceController {
+  private logger = new Logger();
+  constructor(private readonly maintenanceSvc: MaintenanceService) {}
+
+  @Get('/get-updates')
+  @Roles(Role.SuperAdmin)
+    @ApiResponse({
+    status: 200,
+    description: 'Sample 200 response',
+    type: [schemas.UpgradeScript],
+  })
+  async getUpdate() {
+     const result = await this.maintenanceSvc.getUpdates();
+     return result
+  }
+
+  @Post('/run-updates/:id')
+  @HttpCode(200)
+  @Roles(Role.SuperAdmin)
+    @ApiResponse({
+    status: 200,
+    description: 'Sample 200 response',
+    type: [String],
+  })  
+  async runUpdate(@Param('id') id:string) {
+     const result:string = await this.maintenanceSvc.runUpdates(id);
+     return result
+  }
+
+  @Post('/stop-service')
+  @HttpCode(200)
+  @Roles(Role.SuperAdmin)
+    @ApiResponse({
+    status: 200,
+    description: 'Sample 200 response',
+    type: [String],
+  })  
+  async runStopService() {
+     const result:string = await this.maintenanceSvc.runStopService();
+     return result
+  }
+
+  @Post('/start-service')
+  @HttpCode(200)
+  @Roles(Role.SuperAdmin)
+    @ApiResponse({
+    status: 200,
+    description: 'Sample 200 response',
+    type: [String],
+  })  
+  async runStartService() {
+     const result:string = await this.maintenanceSvc.runStartService();
+     return result
+  }
+  
+}

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

@@ -0,0 +1,88 @@
+/**
+ * This file was automatically generated by simpleapp generator. Every
+ * MODIFICATION OVERRIDE BY GENERATEOR
+ * last change 2025-08-27
+ * Author: Ks Tan
+ */
+
+import { BadRequestException, Injectable, InternalServerErrorException } from '@nestjs/common';
+import { Model } from 'mongoose';
+import { InjectModel } from '@nestjs/mongoose';
+import * as dbupdate from  './dbupdate'
+import * as schemas from './apischemas'
+@Injectable()
+export class MaintenanceService {
+
+
+  constructor(@InjectModel('Environment') private sysEnvdoc: Model<schemas.Environment>) {
+    
+    this.initEnv()
+  }
+
+  async initEnv(){
+    const res = await this.sysEnvdoc.find()
+    if(res.length==0){
+      const newdoc = new this.sysEnvdoc({
+        systemEnable:true
+      });
+      await newdoc.save()    
+    }
+    
+  }
+
+
+  async getUpdates() {    
+    const keys = Object.keys(dbupdate)
+    const updatescripts:schemas.UpgradeScript[] = [] 
+    const key =keys[0]
+    // console.log(dbupdate[key]())
+
+
+    keys.forEach((k)=>{
+      const item = dbupdate[k]()
+      if(item.execute && item.subject){
+        updatescripts.push({
+          id: k, 
+          subject:item.subject,
+          description: item.description
+        })
+      }
+    })
+
+    return Promise.resolve(updatescripts);
+  }
+
+  async runUpdates(versionId:string) {
+    try{
+      if(dbupdate[versionId]){
+        const result = await dbupdate[versionId]().execute()        
+        return Promise.resolve(result);
+      }else{
+
+        throw new BadRequestException(`invalid update script ${versionId}`)
+      }
+      
+    }catch(e){
+      throw new InternalServerErrorException(`Error db update (${versionId}): ${e.message}`)
+    }
+
+    
+  }
+
+  async runStopService(){
+    const res = await this.sysEnvdoc.find()
+    if(res.length>0){
+      res[0].systemEnable=false
+      res[0].save() 
+    }
+    return Promise.resolve(`status: ${res[0].systemEnable}`)
+  }
+  async runStartService(){
+    const res = await this.sysEnvdoc.find()
+    if(res.length>0){
+      res[0].systemEnable=true
+      res[0].save() 
+    }
+    return Promise.resolve(`status: ${res[0].systemEnable}`)
+  }
+}

package/templates/nest/src/simpleapp/maintenance/models/environment.model.ts.eta

@@ -0,0 +1,16 @@
+/**
+ * This file was automatically generated by simpleapp generator. Every
+ * MODIFICATION OVERRIDE BY GENERATEOR
+ * last change 2025-08-27
+ * Author: Ks Tan
+ */
+import { Schema } from 'mongoose';
+// import { TenantClientSetting, TenantOwner, TenantOutstandingReminder, Tenant } from '../types/tenant.type';
+const schemasetting = {
+    systemEnable: { type: Boolean}, 
+    stopUntil: { type: String }, 
+    maintenanceMessage: { type: String},     
+};
+
+export const EnvironmentMongoSchema = new Schema(schemasetting, { collection: 'environment' })
+  

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

@@ -10,6 +10,10 @@ import {DocNumberFormatGenerator} from './generate/commons/docnogenerator.servic
 import { AuditTrail } from './generate/commons/audittrail.service';
 import { RunWebhookService } from '../simpleapp/generate/commons/runwebhook.service'
 import { UserResolverService } from './services/userresolver.service';
+import {MaintenanceService} from './maintenance/maintenance.service'
+import {MaintenanceController} from './maintenance/maintenance.controller'
+import {EnvironmentMongoSchema} from './maintenance/models/environment.model'
+
 // auto import modules
 <% for(let i=0;i<it.modules.length; i++){ %>
 <% let obj = it.modules[i]%>
@@ -42,6 +46,7 @@ import additionalModule from './additional.module';
     ...additionalModule.imports,
 
     MongooseModule.forFeature([
+      { name: 'Environment', schema: EnvironmentMongoSchema },
       <% for(let i=0;i<it.modules.length; i++){ %>
         <% let obj = it.modules[i]%>
         { name: '<%= obj.docname %>', schema: <%= obj.docname %>MongoSchema },