@simitgroup/simpleapp-generator 2.0.2-b-alpha → 2.0.2-c-alpha

package/templates/nest/src/simple-app/_core/framework/framework.module.ts.eta

@@ -3,10 +3,11 @@ import { SimpleAppInterceptor } from './simple-app.interceptor';
 import { SimpleAppMiddleware } from './simple-app.middleware';
 import { SimpleAppCoreFeaturesModule } from '../features/simple-app-core-features.module';
 import {SimpleAppCoreResourcesModule} from '../resources/core-resources.module'
+import { SimpleAppDbRevertService } from './simple-app-db-revert.service';
 @Module({
   imports: [SimpleAppCoreFeaturesModule,SimpleAppCoreResourcesModule],
   controllers: [],
-  providers: [SimpleAppMiddleware, SimpleAppInterceptor],
-  exports: [SimpleAppCoreFeaturesModule,SimpleAppCoreResourcesModule,SimpleAppMiddleware, SimpleAppInterceptor],
+  providers: [SimpleAppMiddleware, SimpleAppInterceptor,SimpleAppDbRevertService],
+  exports: [SimpleAppCoreFeaturesModule,SimpleAppCoreResourcesModule,SimpleAppMiddleware, SimpleAppInterceptor,SimpleAppDbRevertService],
 })
 export class SimpleAppFrameworkModule {}

package/templates/nest/src/simple-app/_core/framework/schemas/simple-app.schema.ts.eta

@@ -24,6 +24,10 @@ export class SearchBody {
 
   sorts?: any[];
   lookup?: Object;
+  pagination?: {
+    pageSize?: number;
+    pageNo?: number;
+  };
 }
 
 export enum IsolationType {
@@ -171,3 +175,5 @@ export class BranchPermission extends Permission {
   @ApiProperty({ type: () => ForeignKey })
   branch: ForeignKey;
 }
+
+export type StepData = {action:string,collection:string,id:string[],data:any[]}

package/templates/nest/src/simple-app/_core/framework/simple-app-db-revert.service.ts.eta

@@ -0,0 +1,101 @@
+/**
+ * This file was automatically generated by simpleapp generator. Every
+ * MODIFICATION OVERRIDE BY GENERATEOR
+ * last change 2025-12-01
+ * Author: Ks Tan
+ */
+
+import { BadRequestException, Injectable, Logger, NestMiddleware, ServiceUnavailableException } from '@nestjs/common';
+import { InjectConnection, InjectModel } from '@nestjs/mongoose';
+import { NextFunction, Request, Response } from 'express';
+import { Model,Connection, ObjectId } from 'mongoose';
+import { UserContext } from '../features/user-context/user.context';
+import { StepData } from './schemas';
+@Injectable()
+export class SimpleAppDbRevertService{
+
+  private readonly logger = new Logger(this.constructor.name);
+
+  constructor(
+    @InjectConnection() private readonly connection: Connection,
+  ) {}
+
+
+  async revertSteps(transSteps:StepData[]){
+    
+    console.log("revert transSteps:",transSteps.length)
+    for(let i = transSteps.length-1; i>=0; i-- ){
+      const step = transSteps[i]
+      console.log("step",step)
+      switch(step.action){
+        case 'create':
+          await this.revertCreate(step)
+        break;        
+        case 'update':
+          await this.revertUpdate(step)
+        break;
+        case 'patch':
+          await this.revertUpdate(step)
+        break;
+        case 'delete':
+          await this.revertDelete(step)
+        break;
+        case 'createMany':
+          await this.revertCreateMany(step)
+        break;
+        case 'updateMany':
+          await this.revertUpdateMany(step)
+        break;
+        case 'patchMany':
+          await this.revertUpdateMany(step)
+        break;
+        case 'deleteMany':
+          await this.revertDeleteMany(step)
+        break;
+        default:
+        break;
+      }
+    }
+  }
+
+  async revertCreate(step:StepData){
+    const collection = this.connection.db.collection(step.collection)
+    await collection.deleteOne({_id:<any>step.id[0]})
+    console.log("revert create",step.collection,step.id)
+  }
+  async revertUpdate(step:StepData){
+    const collection = this.connection.db.collection(step.collection)
+    await collection.updateOne({_id:<any>step.id[0]},step.data[0])
+    console.log("revert update",step.collection,step.id)
+  }
+  
+  async revertDelete(step:StepData){
+    const collection = this.connection.db.collection(step.collection)
+    await collection.insertOne(step.data)
+    console.log("revert delete",step.collection,step.id)
+  }
+
+
+  async revertCreateMany(step:StepData){
+    const collection = this.connection.db.collection(step.collection)
+    await collection.deleteMany({_id: {$in: <any>step.id}})
+    console.log("revert createmany",step.collection,step.id)
+  }
+
+  async revertDeleteMany(step:StepData){
+    const collection = this.connection.db.collection(step.collection)
+    await collection.insertMany(step.data)
+  }
+
+  async revertUpdateMany(step:StepData){
+    const collection = this.connection.db.collection(step.collection)
+    for(let i=0; i < step.id.length;i++){
+      const id = step.id[i]
+      await collection.updateMany({_id: <any>id[i]},step.data[i])
+    }
+    
+  }
+  
+}
+
+

package/templates/nest/src/simple-app/_core/framework/simple-app.interceptor.ts.eta

@@ -6,19 +6,22 @@
  */
 import { Injectable, NestInterceptor, ExecutionContext, CallHandler, BadGatewayException, HttpException } from '@nestjs/common';
 import { Observable, throwError } from 'rxjs';
-import { catchError, tap } from 'rxjs/operators';
+import { catchError, tap, map } from 'rxjs/operators';
 import { Model, Connection, ClientSession } from 'mongoose';
 import { InjectConnection, InjectModel } from '@nestjs/mongoose';
 import { UserContext } from '../features/user-context/user.context';
 import { ApiEvent } from './schemas';
+import { SimpleAppDbRevertService } from './simple-app-db-revert.service';
 @Injectable()
 export class SimpleAppInterceptor implements NestInterceptor {
   constructor(
     @InjectConnection() private readonly connection: Connection,
     @InjectModel('ApiEvent') private apieventmodel: Model<ApiEvent>,
+    private simpleAppDbRevertService:SimpleAppDbRevertService
   ) {}
 
   async intercept(context: ExecutionContext, next: CallHandler): Promise<Observable<any>> {
+    
     //not http request then exclude such as graphql
     if (context.getType() != 'http') {
       // obtain usersession here
@@ -28,10 +31,20 @@ export class SimpleAppInterceptor implements NestInterceptor {
         }),
       );
     }
-
     const req = context.switchToHttp().getRequest();
     const resp = context.switchToHttp().getResponse();
     //console.log("want to get user session:", Object.keys(req))
+
+
+    if (req.url == '/health') {
+      return next.handle().pipe(
+        tap(async () => {
+          //console.log("none http, do nothing at interceptor")
+        }),
+      );
+    }
+
+
     const usersession: UserContext = req['sessionuser'];
     //console.log("after read user session:",usersession)
     const method = req['method'];
@@ -71,10 +84,18 @@ export class SimpleAppInterceptor implements NestInterceptor {
 
     // req['eventObj'] = eventObj;
     return next.handle().pipe(
+      map((data) => {
+        if (data && typeof data === 'object' && 'pagination' in data && 'items' in data) {
+          return data; 
+        }
+        return data;
+      }),
       catchError(async (err, caught) => {
         // console.log('**************catchError at interceptor ',method,url)
-        if (session.inTransaction()) {
-          await session.abortTransaction();
+        if (usersession.inTransaction()) {
+          // await usersession.rollBackTransaction();
+          await usersession.rollBackTransaction(this.simpleAppDbRevertService)
+
           canCommit = false;
         }
 
@@ -86,9 +107,9 @@ export class SimpleAppInterceptor implements NestInterceptor {
         };
 
         eventObj.statusCode = err.status;
-        eventObj.errMsg = responseBody.message ;
+        eventObj.errMsg = responseBody.message;
         eventObj.data = req.body;
-        eventObj.status = 'NG'
+        eventObj.status = 'NG';
         eventObj.errData = responseBody.error;
         resp.status(err?.status ?? 500);
         return responseBody;
@@ -105,16 +126,16 @@ export class SimpleAppInterceptor implements NestInterceptor {
         await eventObj.save();
 
         if (process.env.DRYRUN == 'true') {
-          console.warn('--------dryrun! roll back everything-----------');
-          if (session.inTransaction() && canCommit) {
-            await session.abortTransaction();
+          // console.warn('--------dryrun! roll back everything-----------');
+          if ( canCommit) {            
+            await usersession.rollBackTransaction(this.simpleAppDbRevertService)
           }
         } else {
-          if (session.inTransaction() && canCommit) {
-            await session.commitTransaction(); //.then(()=>session.endSession());
+          if ( canCommit) {
+            await usersession.commitTransaction()
           }
         }
-        await session.endSession()
+        await usersession.endSession();
       }),
     );
   }