@simitgroup/simpleapp-generator 2.0.0-t-alpha → 2.0.0-v-alpha

package/templates/nest/src/main.ts._eta

@@ -1,18 +1,9 @@
-/**
- * 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
- */
-
-import { NestFactory } from '@nestjs/core';
-import { AppModule } from './app.module';
-import { SimpleAppExceptionFilter } from './simple-app/_core/framework/exception-filter';
-import { HttpAdapterHost } from '@nestjs/core';
-import {generatorVersion} from 'src/simple-app/_core/framework/generator-version'
-import { SwaggerModule, DocumentBuilder } from '@nestjs/swagger';
-import { writeFileSync } from 'fs';
 import { LogLevel } from '@nestjs/common';
+import { HttpAdapterHost, NestFactory } from '@nestjs/core';
+import { DocumentBuilder, SwaggerModule } from '@nestjs/swagger';
+import { writeFileSync } from 'fs';
+import { generatorVersion } from 'src/simple-app/_core/framework/generator-version';
+import { AppModule } from './app.module';
 const yaml = require('yaml');
 
 async function bootstrap() {
@@ -21,15 +12,19 @@ async function bootstrap() {
     logger: logs,
   });
 
+  // Handle shutdown signals for docker / kubernetes
+  app.enableShutdownHooks();
+
   // app.enableCors();
   const httpAdapter = app.get(HttpAdapterHost);
   // app.useGlobalFilters(new SimpleAppExceptionFilter(httpAdapter));
 
   const config = new DocumentBuilder()
-    .setTitle(process.env.PROJECT_NAME)
+    .setTitle('simtrain-eco backend api')
     .addServer(process.env.APP_SWAGGER_SERVER_URL)
-    .setDescription(`${process.env.PROJECT_DESCRIPTION} (generator: ${generatorVersion})`)
-    .setVersion(process.env.PROJECT_VERSION)
+    .setDescription(`Internal use only (generator: ${generatorVersion})`)
+    .setVersion('2.0')
+
     .addApiKey(
       {
         in: 'header',
@@ -54,7 +49,7 @@ async function bootstrap() {
     .addApiKey(
       {
         in: 'header',
-        name: 'x-api-key',
+        name: 'x-apikey',
         type: 'apiKey',
         description: 'optional only use for specal case',
       },
@@ -63,7 +58,7 @@ async function bootstrap() {
     .addApiKey(
       {
         in: 'header',
-        name: 'x-api-secret',
+        name: 'x-apisecret',
         type: 'apiKey',
         description: 'optional only use for specal case',
       },

package/templates/nest/src/simple-app/_core/features/mini-app/developer-portal/developer-portal.service.ts.eta

@@ -7,37 +7,26 @@ import { InjectModel } from '@nestjs/mongoose';
 import { Model } from 'mongoose';
 import { UserContext } from 'src/simple-app/_core/features/user-context/user.context';
 import { MiniAppEnvEnum } from 'src/simple-app/_core/resources/mini-app/mini-app.enum';
-import { MiniAppInstallationService } from '@resources/mini-app-installation/mini-app-installation.service';
-import { MiniAppService } from '@resources/mini-app/mini-app.service';
-import { BranchService } from '@resources/branch/branch.service';
 
 @Injectable()
 export class DeveloperPortalService {
   constructor(
-    // @InjectModel('Miniapp')
-    // protected miniAppDoc: Model<MiniApp>,
-    protected miniAppService: MiniAppService,
+    @InjectModel('MiniApp')
+    protected miniAppDoc: Model<MiniApp>,
 
-    // @InjectModel('Miniappinstallation')
-    // protected miniAppInstallationDoc: Model<MiniAppInstallation>,
-    protected miniAppInstallationService: MiniAppInstallationService,
+    @InjectModel('MiniAppInstallation')
+    protected miniAppInstallationDoc: Model<MiniAppInstallation>,
 
-    // @InjectModel('Branch')
-    // protected branchDoc: Model<Branch>,
-    protected branchService: BranchService,
+    @InjectModel('Branch')
+    protected branchDoc: Model<Branch>,
   ) {}
 
   async getDemoCompany(appUser: UserContext, developerPortalAppId: string) {
     // Only dev got development.demoXOrg field
-    // const miniApp = await this.miniAppDoc.findOne({
-    //   'developerPortal.appId': developerPortalAppId,
-    //   env: MiniAppEnvEnum.DEV,
-    // });
-    const miniApps = await this.miniAppService.search(appUser, {
+    const miniApp = await this.miniAppDoc.findOne({
       'developerPortal.appId': developerPortalAppId,
       env: MiniAppEnvEnum.DEV,
     });
-    const miniApp = miniApps[0];
     if (miniApp && !_.isEmpty(miniApp?.development?.demoXOrg)) {
       return miniApp.development.demoXOrg;
     }
@@ -49,11 +38,7 @@ export class DeveloperPortalService {
     const demoXOrg = await this.getDemoCompany(appUser, developerPortalAppId);
 
     // Only get env === prod one
-    // const miniAppInstallations = await this.miniAppInstallationDoc.find({
-    //   'miniApp.developerPortalAppId': developerPortalAppId,
-    //   'miniApp.env': MiniAppEnvEnum.PROD,
-    // });
-    const miniAppInstallations = await this.miniAppInstallationService.search(appUser, {
+    const miniAppInstallations = await this.miniAppInstallationDoc.find({
       'miniApp.developerPortalAppId': developerPortalAppId,
       'miniApp.env': MiniAppEnvEnum.PROD,
     });
@@ -82,8 +67,7 @@ export class DeveloperPortalService {
     };
 
     // Step 3: Run one query to get all branches
-    // const allBranches = await this.branchDoc.find(branchFilter);
-    const allBranches = await this.branchService.search(appUser, branchFilter);
+    const allBranches = await this.branchDoc.find(branchFilter);
 
     // Step 4: Build a lookup map: `${tenantId}-${orgId}-${branchId}` → branch
     const branchMap = new Map<string, Branch>();

package/templates/nest/src/simple-app/_core/features/user-context/user.context.ts.eta

@@ -1150,10 +1150,7 @@ export class UserContext extends UserContextInfo {
     return data;
   }
 
-  isOnlyExecutive = () => {
-    return this.groups.includes(Role.Executive) && this.groups.length == 1;
-  };
-
+  
   offsetDate(date: string): string {
     const timestamp = new Date(date).getTime();
     const offsets = this.getOffsetMinute() * 60000;

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

@@ -8,7 +8,10 @@ import { Controller, Get, Put, Post, Delete, Body, Param, Type } from '@nestjs/c
 // import { ApiTags, ApiBody, ApiResponse, ApiOperation } from '@nestjs/swagger';
 import { UserContext } from '../../features/user-context/user.context';
 import { SearchBody, TextSearchBody,PatchManyRequest } from '../schemas';
+import { UpdateWriteOpResult } from 'mongoose';
+
 const doctype = 'person'.toUpperCase();
+
 type ServiceType = {
   list: Function;
   search: Function;
@@ -22,6 +25,7 @@ type ServiceType = {
   setData: Function;
   getAutoComplete: Function;
   fullTextSearch: Function;
+  patchMany: Function;
 };
 
 // @ApiTags(doctype)
@@ -38,15 +42,19 @@ export class SimpleAppController<TService extends ServiceType, TApiSchema> {
   async _list(appuser: UserContext) {
     return this.service.list(appuser);
   }
+
   async _fulltextsearch(appuser: UserContext, body: TextSearchBody) {
     return this.service.fullTextSearch(appuser, body);
   }
+
   async _search(appuser: UserContext, searchObject: SearchBody) {
     return this.service.search(appuser, searchObject['filter'], searchObject['fields'], searchObject['sorts'], searchObject['lookup']);
   }
+
   async _autocomplete(appuser: UserContext, keyword: string, data?: TApiSchema) {
     return this.service.getAutoComplete(appuser, keyword, data);
   }
+
   async _findOne(appuser: UserContext, id: string) {
     const result = (await this.service.findById(appuser, id)) as TApiSchema;
 
@@ -65,6 +73,7 @@ export class SimpleAppController<TService extends ServiceType, TApiSchema> {
     Object.assign(newdata, data); //
     return this.service.findIdThenUpdate(appuser, id, newdata) as TApiSchema;
   }
+
   async _patch(appuser: UserContext, id: string, data: TApiSchema) {
     const newdata: TApiSchema = {} as TApiSchema; //= { ...data };
     Object.assign(newdata, data); //
@@ -74,8 +83,9 @@ export class SimpleAppController<TService extends ServiceType, TApiSchema> {
   async _delete(appuser: UserContext, id: string) {
     return this.service.findIdThenDelete(appuser, id);
   }
-  async _patchMany(appuser: UserContext, id: string, patchManyData: PatchManyRequest<TApiSchema>) {   
-    return this.service.findIdThenPatch(appuser, id, patchManyData) as TApiSchema;
+
+  async _patchMany(appuser: UserContext, patchManyData: PatchManyRequest<TApiSchema>) {   
+    return this.service.findIdThenPatch(appuser, patchManyData);
   }
 
   async _deleteMany(appuser: UserContext, data: SearchBody) {

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

@@ -23,6 +23,7 @@ import { SimpleAppLogService } from '../../features/log/log.service';
 import { UserContext } from '../../features/user-context/user.context';
 import { RunWebhookService } from '../../features/webhook/run-webhook.service';
 import { DeleteResultType, IsolationType, MoreProjectionType, PatchManyRequest, SchemaFields, TextSearchBody, UniqueKeyExistResponse } from '../schemas';
+import { SearchWithRelation } from './dto/simple-app-search-with-relation.dto';
 
 @Injectable()
 export class SimpleAppService<T extends SchemaFields> {
@@ -106,7 +107,7 @@ export class SimpleAppService<T extends SchemaFields> {
   public isReadOnly(): boolean {
     return false;
   }
-  reCalculateValue(data: T) { }
+  reCalculateValue(data: T) {}
   getIsolationFilter = (appuser: UserContext) => {
     let isolationFilter = {};
     switch (this.isolationtype) {
@@ -221,7 +222,7 @@ export class SimpleAppService<T extends SchemaFields> {
       throw new InternalServerErrorException('first aggregate pipelinestage shall use $match');
     }
   }
-  async aggregate(appuser: UserContext, pipeline: PipelineStage[]) {
+  async aggregate<T = any>(appuser: UserContext, pipeline: PipelineStage[]) {
     if (pipeline[0] && pipeline[0]['$match']) {
       try {
         const isolationFilter = { ...this.getIsolationFilter(appuser) };
@@ -233,7 +234,7 @@ export class SimpleAppService<T extends SchemaFields> {
         // if(appuser.getId() == ''){
         //   console.log(JSON.stringify(pipeline))
         // }
-        const res = await this.doc.aggregate(pipeline, {
+        const res = await this.doc.aggregate<T>(pipeline, {
           session: appuser.getDBSession(),
         });
 
@@ -1304,4 +1305,76 @@ export class SimpleAppService<T extends SchemaFields> {
   async addManyAuditEvents(appUser: UserContext, documentName: string, eventType: string, datas: any) {
     await this.logService.addManyEvents(appUser, documentName, eventType, datas);
   }
+
+  async searchWithRelation<T>(appUser: UserContext, option: SearchWithRelation<T>, allowedRelations: string[]) {
+    // Root Filter
+    const pipeline: PipelineStage[] = [
+      {
+        $match: {
+          ...(option.root?.filter ?? {}),
+        },
+      },
+    ];
+
+    // Relation lookups
+    Object.entries(option.relations).forEach(([relationName, relationOption]) => {
+      // Prevent mini api user lookup sensitive data
+      if (!allowedRelations.includes(relationName)) {
+        throw new BadRequestException(`Not allowed to lookup ${relationName}`);
+      }
+
+      const subPipeline: PipelineStage.Lookup['$lookup']['pipeline'] = [];
+      const foreignField = `${this.documentName}._id`;
+
+      subPipeline.push({
+        $match: {
+          $expr: { $eq: [`$${foreignField}`, '$$resourceId'] },
+        },
+        ...relationOption.filter,
+      });
+
+      // Relation sort
+      if (relationOption.sort) {
+        subPipeline.push({
+          $sort: relationOption.sort,
+        });
+      }
+
+      // Relation projection
+      if (relationOption.projection) {
+        subPipeline.push({
+          $project: {
+            ...(relationOption.projection ?? {}),
+          },
+        });
+      }
+
+      pipeline.push({
+        $lookup: {
+          from: relationName,
+          as: `_${relationName}`,
+          let: { resourceId: '$_id' },
+          pipeline: subPipeline,
+        },
+      });
+    });
+
+    // Root sort
+    if (option.root?.sort) {
+      pipeline.push({
+        $sort: option.root.sort,
+      });
+    }
+
+    // Root Projection
+    if (option.root.projection) {
+      pipeline.push({
+        $project: {
+          ...(option.root?.projection ?? {}),
+        },
+      });
+    }
+
+    return await this.aggregate(appUser, pipeline);
+  }
 }

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

@@ -1,4 +1,4 @@
-import { ApiProperty } from '@nestjs/swagger';
+import { ApiProperty, ApiPropertyOptional } from '@nestjs/swagger';
 import { Field, ObjectType, ID } from '@nestjs/graphql';
 import GraphQLJSON, { GraphQLJSONObject } from 'graphql-type-json';
 
@@ -81,6 +81,17 @@ export class KeyValue {
   id?: string;
 }
 
+@ObjectType()
+export class UploadPhoto {
+  @Field()
+  @ApiPropertyOptional({ type: () => String, nullable: true })
+  filename?: string | null;
+
+  @Field()
+  @ApiProperty({ type: () => String })
+  base64Image: string;
+}
+
 @ObjectType()
 export class ImportErrorMessgeError {
   @Field()

package/templates/nuxt/components/simpleApp/SimpleAppFormToolBar.vue._eta

@@ -48,7 +48,7 @@
           <div v-if="menu.label && menu.type == 'crud'">
             <ButtonAction
               v-if="menu.action == 'print'"
-              :disabled="!canPerform(doc.getDocName(true), 'access')"
+              :disabled="!canPerform(doc.getDocName(true), 'print')"
               @click="emitEvent(menu, $event)"
               :action-name="menu.action"
               >{{ menu.label }}</ButtonAction

package/templates/nuxt/server/api/[xorg]/[...].ts._eta

@@ -5,128 +5,83 @@
  * Author: Ks Tan
  */
 
- 
-import axios, { AxiosRequestConfig } from 'axios';
-import { getServerSession } from '#auth'
-import type { Session } from 'next-auth';
-import * as fs from 'fs'
-export default defineEventHandler(async (event:any) => {
-    type additionalprops = {accessToken?:string} 
-    let session:any=null
-    
-    
-    try {
-        session = await getServerSession(event)
-        
-    } catch (error) {
-        throw createError({ statusText: 'Unauthorized', status: 302 })
-    }
-    if(!session) {
-       throw createError({ statusText: 'Unauthorized', status: 302 })
-    }
-
-    return new Promise<any>(async (resolve, reject) => {       
-        const xOrg = event.context.params?.xorg ?? ''
-        const documentLink = event.context.params?._ ?? ''
-        const accessToken = session?.accessToken;
-        
+import axios, { AxiosRequestConfig } from "axios";
+import { getServerSession } from "#auth";
+export default defineEventHandler(async (event: any) => {
+  let session: any = null;
+  try {
+    session = await getServerSession(event);
+  } catch (error) {
+    throw createError({ statusText: "Unauthorized", status: 302 });
+  }
+  if (!session) {
+    throw createError({ statusText: "Unauthorized", status: 302 });
+  }
 
-        let forwardData: any = {};
-        const req = event.node.req;
-        let bodydata: any
-        let querydata:any
-        querydata = getQuery(event);
-        if(req.method == 'POST' || req.method == 'PUT' || req.method == 'PATCH' ) {
-            bodydata = await readBody(event);
-        } 
+  return new Promise<any>(async (resolve, reject) => {
+    const xOrg = event.context.params?.xorg ?? "";
+    const documentLink = event.context.params?._ ?? "";
+    const accessToken = session?.accessToken;    
+    const req = event.node.req;
+    let bodydata: any;
+    let querydata: any;
+    querydata = getQuery(event);
+    if (req.method == "POST" || req.method == "PUT" || req.method == "PATCH") {
+      bodydata = await readBody(event);
+    }
 
+    const frontEndRes = event.node.res;
+    const url = process.env.SIMPLEAPP_BACKEND_URL + "/" + documentLink;
+    const axiosConfig: AxiosRequestConfig = {
+      method: req.method,
+      url: url,
+      headers: {
+        Authorization: `Bearer ${accessToken}`,
+        "X-Org": xOrg,
+        "X-Mini-App-Code": event.headers.get("x-mini-app-code"),
+        "x-mini-app-dev-portal-app-id": event.headers.get(
+          "x-mini-app-dev-portal-app-id",
+        ),
+      },
+      data: bodydata,
+      params: querydata,
+    };
 
-        const frontEndRes = event.node.res;
-        const url = process.env.SIMPLEAPP_BACKEND_URL + '/' + documentLink;
-        const axiosConfig: AxiosRequestConfig = {
-            method: req.method,
-            url: url,
-            headers: {
-                Authorization: `Bearer ${accessToken}`,
-                'X-Org': xOrg,
-            },
-            data: bodydata,
-            params: querydata,
-        }
-        
-        try{            
-            const res =  await axios(axiosConfig)
-            if (res.headers['content-type'] === 'image/png') {
-                frontEndRes.setHeader('Content-Type', 'image/png');
-                frontEndRes.setHeader('Content-Disposition', 'inline');
-                frontEndRes.end(Buffer.from(res.data, 'binary'));
-            }else if(documentLink.includes('images/')){
-                // console.log(documentLink," Resdata of base64 photo",res.data.length)
-                let imageData
-                frontEndRes.setHeader('Content-Type', 'image/png');
-                
-                // console.log("load image for",documentLink)
-                if( res.data.length){
-                    console.log("obtain base64 from server length:",res.data.length)
-                    imageData = base64ToBuffer(res.data);
-                    
-                }else{
-                    // console.log("server no image, use default image")
-                    const folder = 'assets/images/'
-                    let filename = filename='unknown.png';
-                    const fullpath = folder+filename;
-                    if(fs.existsSync(fullpath)){
-                        imageData = fs.readFileSync(fullpath)
-                    }else{
-                        console.log(fullpath,'does not exists')
-                    }                    
-                }
-                 frontEndRes.end(Buffer.from(imageData, 'binary'));                                
-                
-            }else{
-                frontEndRes.statusCode = res.status;
-                if(res.statusText) {
-                    frontEndRes.statusMessage = res.statusText;
-                }
-                resolve(res.data);
-            }
-        }catch(error){
-            if(!error?.response){
-                console.log("backend server no response ",error.code)              
-                reject({ 
-                    statusMessage:"backendServerDownMessage",
-                    statusCode: 503,                    
-                });            
-            }else if (error.response.status == 401) {
-                return sendRedirect(event, '/login', 302)             
-            }else{
-                const responseCode = error.response.data?.statusCode ? error.response.data.statusCode : error.response.status 
-                const responseMsg = error.response.data ? error.response.data.message : error.response.statusText 
-                // reject(error.data)
-                // console.log("----error.response.data--",responseMsg,error.response.data,error.response.status,responseCode)
-                reject({ 
-                    statusMessage: responseMsg, 
-                    statusCode: responseCode ,
-                    data: error.response.data
-                });         
-                
-            }
+    try {
+      const res = await axios(axiosConfig);
+      for(const k of Object.keys(res.headers)){
+        frontEndRes.setHeader[k]=res.headers[k]
+      }     
+        frontEndRes.statusCode = res.status;
+        if (res.statusText) {
+          frontEndRes.statusMessage = res.statusText;
         }
-    })
-    
-})
-
-
-
-function base64ToBuffer(base64String:string) {
-    // Split the base64 string into parts
-    const parts = base64String.split(',');
-    const contentType = parts[0].split(':')[1];
-    const base64Data = parts[1];
-  
-    // Decode the base64 data
-    const binaryString = atob(base64Data);
-    const buffer = new Buffer.from(binaryString, 'binary');
-  
-    return buffer
-  }
+        resolve(res.data);      
+    } catch (error:any) {
+      console.log("Axios error", error.code, error);
+      if (!error?.response) {
+        console.log("backend server no response ", error.code);
+        reject({
+          statusMessage: "backendServerDownMessage",
+          statusCode: 503,
+        });
+      } else if (error.response.status == 401) {
+        return sendRedirect(event, "/login", 302);
+      } else {
+        const responseCode = error.response.data?.statusCode
+          ? error.response.data.statusCode
+          : error.response.status;
+        const responseMsg = error.response.data
+          ? error.response.data.message
+          : error.response.statusText;
+        // reject(error.data)
+        // console.log("----error.response.data--",responseMsg,error.response.data,error.response.status,responseCode)
+        reject({
+          statusMessage: responseMsg,
+          statusCode: responseCode,
+          data: error.response.data,
+        });
+      }
+    }
+  });
+});

package/templates/nest/src/simple-app/features/print/api/.gitignore.eta

@@ -1,4 +0,0 @@
-wwwroot/*.js
-node_modules
-typings
-dist

package/templates/nest/src/simple-app/features/print/api/.npmignore.eta

@@ -1 +0,0 @@
-# empty npmignore to ensure all required files (e.g., in the dist folder) are published by npm

package/templates/nest/src/simple-app/features/print/api/.openapi-generator/FILES.eta

@@ -1,8 +0,0 @@
-.gitignore
-.npmignore
-api.ts
-base.ts
-common.ts
-configuration.ts
-git_push.sh
-index.ts

package/templates/nest/src/simple-app/features/print/api/.openapi-generator/VERSION.eta

@@ -1 +0,0 @@
-7.4.0

package/templates/nest/src/simple-app/features/print/api/.openapi-generator-ignore.eta

@@ -1,23 +0,0 @@
-# OpenAPI Generator Ignore
-# Generated by openapi-generator https://github.com/openapitools/openapi-generator
-
-# Use this file to prevent files from being overwritten by the generator.
-# The patterns follow closely to .gitignore or .dockerignore.
-
-# As an example, the C# client generator defines ApiClient.cs.
-# You can make changes and tell OpenAPI Generator to ignore just this file by uncommenting the following line:
-#ApiClient.cs
-
-# You can match any string of characters against a directory, file or extension with a single asterisk (*):
-#foo/*/qux
-# The above matches foo/bar/qux and foo/baz/qux, but not foo/bar/baz/qux
-
-# You can recursively match patterns against a directory, file or extension with a double asterisk (**):
-#foo/**/qux
-# This matches foo/bar/qux, foo/baz/qux, and foo/bar/baz/qux
-
-# You can also negate patterns with an exclamation (!).
-# For example, you can ignore all files in a docs folder with the file extension .md:
-#docs/*.md
-# Then explicitly reverse the ignore rule for a single file:
-#!docs/README.md