@simitgroup/simpleapp-generator 2.0.0-u-alpha → 2.0.0-w-alpha

package/ReleaseNote.md

@@ -1,3 +1,13 @@
+[2.0.0w-alpha]
+
+1. Update api scope
+2. Update search with relation
+
+[2.0.0v-alpha]
+
+1. frontend print toolbar control print button permission
+2. fix generate form use wrong file name
+
 [2.0.0t-alpha]
 
 1. Fix Developer Portal

package/package.json

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

package/templates/basic/miniApi/resource.controller.ts.eta

@@ -120,6 +120,20 @@ export class <%= pascalName %>Controller {
             ) {
                 return await  this.<%= serviceVariable %>.patch(headers, id, resourceDto);
             }
+        <% } else if(action === 'patchMany') { %>
+            @Patch('patchMany')
+            @ApiOperation({ operationId: 'patchMany' })
+            @ApiBody({ type: SimtrainSchema.PatchManyRequestDto, required: true })
+            @ApiResponse({ status: 200, description: 'Success', type: SimtrainSchema.UpdateManyResponseDto })
+            @ApiResponse({ status: 400, description: 'Bad Request' })
+            @ApiResponse({ status: 404, description: 'Not Found' })
+            @ApiResponse({ status: 500, description: 'Internal Error' })
+            async patchMany(
+                @Headers() headers: ApiHeader,
+                @Body() resourceDto: any,
+            ) {
+                return await  this.<%= serviceVariable %>.patchMany(headers, resourceDto);
+            }
         <% } else if(action === 'delete') { %>
             @Delete(':id')
             @ApiOperation({ operationId: 'delete' })

package/templates/basic/miniApi/resource.service.ts.eta

@@ -86,6 +86,12 @@ export class <%= pascalName %>Service {
         const resp = await api.runPatch(id, resourceDto);
         return resp.data;
       }
+    <% } else if(action === 'patchMany') { %>
+      async patchMany(headers: ApiHeader, resourceDto: any) {
+        const api = this.getApi(headers);
+        const resp = await api.runPatchMany(resourceDto);
+        return resp.data;
+      }
     <% } else if(action === 'delete') { %>
       async delete(headers: ApiHeader, id: string) {
         const api = this.getApi(headers);

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

@@ -81,52 +81,6 @@ export class <%= it.typename %>Controller extends SimpleAppController<
   async runDefault(@AppUser() appuser: UserContext) {
     return await this.service.runDefault(appuser)
   }
-  //autocomplete shall above :id
-  @Post('/autocomplete')
-  <%if(superadmindoctype.includes(it.doctype)){%>
-  @Roles(Role.SuperAdmin,Role.<%= `${it.typename}_search`%>)
-  <%}else{%>
-  @Roles(Role.SuperAdmin,Role.SuperUser,Role.User)
-  <%}%>  
-  @ApiResponse({
-    status: 200,
-    description: 'Found',
-    type: schemas.<%= it.typename %>AutoComplete,
-    isArray: true,
-  })
-  @ApiResponse({ status: 500, description: 'Internal error' })
-  @ApiQuery({ name: 'keyword', type:String})
-  @ApiBody({ description: 'Data', type: ()=>Object})
-  @ApiOperation({ operationId: 'autoComplete',description:"retrieve array of {_id, code, name}" })
-  <%~ drawMiniAppScope('autoComplete') %>
-  async autoComplete(@AppUser() appuser: UserContext,
-  @Query('keyword') keyword:string,
-  @Body() data: schemas.<%=it.typename%>,
-  ) {
-    return this._autocomplete(appuser, keyword,data);
-  }
-
-
-
-  @Post()
-  <%if(superadmindoctype.includes(it.doctype)){%>
-  @Roles(Role.SuperAdmin,Role.<%= `${it.typename}_create`%>)
-  <%}else{%>
-  @Roles(Role.SuperAdmin,Role.SuperUser,Role.<%= `${it.typename}_create`%>)
-  <%}%>  
-  @ApiResponse({
-    status: 201,
-    description: 'success',
-    type: schemas.<%= it.typename%>
-  })
-  @ApiResponse({ status: 400, description: 'bad request' })
-  @ApiResponse({ status: 500, description: 'internal error' })
-  @ApiBody({ description: 'Data',type:schemas.<%= it.typename%> })
-  @ApiOperation({ operationId: 'runCreate' })
-  <%~ drawMiniAppScope('create') %>
-  async create(@AppUser() appuser: UserContext,@Body() data: schemas.<%= it.typename%>) {    
-    return await this._create(appuser,data)
-  }
 
   @Post('/search')
   @HttpCode(200)
@@ -149,7 +103,6 @@ export class <%= it.typename %>Controller extends SimpleAppController<
     return await this._search(appuser,data)
   }
 
-
 <% if(simpleappconfig.search !==undefined){%>
 @Post('/fulltextsearch')
   @HttpCode(200)
@@ -171,33 +124,6 @@ export class <%= it.typename %>Controller extends SimpleAppController<
   }
 <%}%>
 
-
-  @Patch('bulk-patch')
-  @ApiResponse({ status: 200, description: 'success',})
-  @Roles(Role.SuperAdmin, Role.SuperUser, Role.<%= it.typename%>_update)
-  @ApiResponse({ status: 404, description: 'Document not found' })
-  @ApiResponse({ status: 500, description: 'Internal error' })
-  @ApiBody({ description: 'Data', type: schemas.PatchManyRequest<schemas.<%= it.typename%>> })
-  @ApiOperation({ operationId: 'runPatchMany' })
-  <%~ drawMiniAppScope('patch-many') %>
-  async patchMany(@AppUser() appuser: UserContext, @Param('id') id: string, @Body() patchManyData: schemas.PatchManyRequest<schemas.<%= it.typename%>>) {
-    return await this._patchMany(appuser, id, patchManyData);
-  }
-
-
-/***************************** start status control api definitions *****************************************/
-<%for(let s=0; s<it.docStatusSettings.length; s++){ %>
-  <%let statusconf = it.docStatusSettings[s]%>
-  <%let statusname = statusconf['status']%>
-  @Post(':id/set-<%=statusname%>')
-  @ApiBody({ description: 'Document data', type: Object })
-  @Roles(Role.SuperAdmin,Role.<%= `${it.typename}_${statusname}`%>)
-  async setStatus<%=capitalizeFirstLetter(statusname)%>(@AppUser() appuser: UserContext,@Param('id') id: string, @Body() data:any,){
-          return await this.service.setDocumentStatus(appuser,id,data,'<%=statusname%>',)
-  }
-<%}%>
-/***************************** end status control api definitions *****************************************/
-
   @Get(':id')  
   <%if(superadmindoctype.includes(it.doctype)){%>
   @Roles(Role.SuperAdmin,Role.<%= `${it.typename}_search`%>)
@@ -221,8 +147,52 @@ export class <%= it.typename %>Controller extends SimpleAppController<
       return data
      }
   }
-  
 
+  //autocomplete shall above :id
+  @Post('/autocomplete')
+  <%if(superadmindoctype.includes(it.doctype)){%>
+  @Roles(Role.SuperAdmin,Role.<%= `${it.typename}_search`%>)
+  <%}else{%>
+  @Roles(Role.SuperAdmin,Role.SuperUser,Role.User)
+  <%}%>  
+  @ApiResponse({
+    status: 200,
+    description: 'Found',
+    type: schemas.<%= it.typename %>AutoComplete,
+    isArray: true,
+  })
+  @ApiResponse({ status: 500, description: 'Internal error' })
+  @ApiQuery({ name: 'keyword', type:String})
+  @ApiBody({ description: 'Data', type: ()=>Object})
+  @ApiOperation({ operationId: 'autoComplete',description:"retrieve array of {_id, code, name}" })
+  <%~ drawMiniAppScope('autoComplete') %>
+  async autoComplete(@AppUser() appuser: UserContext,
+  @Query('keyword') keyword:string,
+  @Body() data: schemas.<%=it.typename%>,
+  ) {
+    return this._autocomplete(appuser, keyword,data);
+  }
+
+  @Post()
+  <%if(superadmindoctype.includes(it.doctype)){%>
+  @Roles(Role.SuperAdmin,Role.<%= `${it.typename}_create`%>)
+  <%}else{%>
+  @Roles(Role.SuperAdmin,Role.SuperUser,Role.<%= `${it.typename}_create`%>)
+  <%}%>  
+  @ApiResponse({
+    status: 201,
+    description: 'success',
+    type: schemas.<%= it.typename%>
+  })
+  @ApiResponse({ status: 400, description: 'bad request' })
+  @ApiResponse({ status: 500, description: 'internal error' })
+  @ApiBody({ description: 'Data',type:schemas.<%= it.typename%> })
+  @ApiOperation({ operationId: 'runCreate' })
+  <%~ drawMiniAppScope('create') %>
+  async create(@AppUser() appuser: UserContext,@Body() data: schemas.<%= it.typename%>) {    
+    return await this._create(appuser,data)
+  }
+  
   @Put(':id')
   @ApiResponse({
     status: 200,
@@ -241,6 +211,7 @@ export class <%= it.typename %>Controller extends SimpleAppController<
   async update(@AppUser() appuser: UserContext,@Param('id') id: string, @Body() data: schemas.<%= it.typename%>) {    
     return await this._update(appuser,id, data) ;
   }
+
   @Patch(':id')
   @ApiResponse({
     status: 200,
@@ -260,6 +231,18 @@ export class <%= it.typename %>Controller extends SimpleAppController<
     return await this._patch(appuser,id, data) ;
   }
 
+  @Patch('bulk-patch')
+  @ApiResponse({ status: 200, description: 'success', type: schemas.UpdateManyResponse})
+  @Roles(Role.SuperAdmin, Role.SuperUser, Role.<%= it.typename%>_update)
+  @ApiResponse({ status: 404, description: 'Document not found' })
+  @ApiResponse({ status: 500, description: 'Internal error' })
+  @ApiBody({ description: 'Data', type: schemas.PatchManyRequest<schemas.<%= it.typename%>> })
+  @ApiOperation({ operationId: 'runPatchMany' })
+  <%~ drawMiniAppScope('patch-many') %>
+  async patchMany(@AppUser() appuser: UserContext, @Body() patchManyData: schemas.PatchManyRequest<schemas.<%= it.typename%>>) {
+    return await this._patchMany(appuser, patchManyData);
+  }
+
   @Delete(':id')
   <%if(superadmindoctype.includes(it.doctype)){%>
   @Roles(Role.SuperAdmin,Role.<%= `${it.typename}_delete`%>)
@@ -279,6 +262,17 @@ export class <%= it.typename %>Controller extends SimpleAppController<
     return this._delete(appuser,id);
   }
 
-
+/***************************** start status control api definitions *****************************************/
+<%for(let s=0; s<it.docStatusSettings.length; s++){ %>
+  <%let statusconf = it.docStatusSettings[s]%>
+  <%let statusname = statusconf['status']%>
+  @Post(':id/set-<%=statusname%>')
+  @ApiBody({ description: 'Document data', type: Object })
+  @Roles(Role.SuperAdmin,Role.<%= `${it.typename}_${statusname}`%>)
+  async setStatus<%=capitalizeFirstLetter(statusname)%>(@AppUser() appuser: UserContext,@Param('id') id: string, @Body() data:any,){
+          return await this.service.setDocumentStatus(appuser,id,data,'<%=statusname%>',)
+  }
+<%}%>
+/***************************** end status control api definitions *****************************************/
 
 }

package/templates/basic/nuxt/pages.form.vue.eta

@@ -146,10 +146,10 @@
  */
  import { SimpleAppInputType,FormCrudEvent } from "~/types";
  import { <%= it.typename %> } from "~/simpleapp/generate/types";
-import { <%= it.typename %>Doc} from "~/simpleapp/docs/<%= capitalizeFirstLetter(it.name) %>Doc"
+import { <%= capitalizeFirstLetter(it.name) %>Doc} from "~/simpleapp/docs/<%= capitalizeFirstLetter(it.name) %>Doc"
 
 
- const props = defineProps<{ _id?: string, doc?: <%= it.typename %>Doc , paras?:<%= it.typename %>}>();
+ const props = defineProps<{ _id?: string, doc?: <%= capitalizeFirstLetter(it.name) %>Doc , paras?:<%= it.typename %>}>();
  const doc = props.doc ??  useNuxtApp().$<%= capitalizeFirstLetter(it.name) %>Doc()
  const data = doc.getReactiveData(); 
  const emits = defineEmits(["after"]);

package/templates/basic/nuxt/pages.landing.vue.eta

@@ -19,8 +19,8 @@
 import { <%= it.typename %> } from '~/simpleapp/generate/openapi';
 
   
-  const {$<%= it.typename %>Doc,$listen } = useNuxtApp();
-  const doc = $<%= it.typename %>Doc()
+  const {$<%= capitalizeFirstLetter(it.name) %>Doc,$listen } = useNuxtApp();
+  const doc = $<%= capitalizeFirstLetter(it.name) %>Doc()
   const docdata = doc.getReactiveData();
   type <%= it.typename %>Key = keyof <%= it.typename %> 
 

package/templates/miniApi/src/constants/api-scopes.ts.eta

@@ -46,6 +46,11 @@
           description = `Update specific fields of an existing ${resourceTitleName} record.`;
           break;
 
+        case 'patchMany':
+          method = 'patch';
+          description = `Update specific fields of existing ${resourceTitleName} records.`;
+          break;
+
         case 'delete':
           method = 'delete';
           description = `Delete an existing ${resourceTitleName} record.`;
@@ -89,6 +94,19 @@ const scopes = {
       <%= resourceName %>: <%~ JSON.stringify(availableApis) %>,
     <% } %>
   <% }); %>
+
+  // --- Custom ---
+  
+  onlinePayment: {
+    requestOnlinePayment: {
+      method: "post",
+      description: "Make online payment request",
+    },
+    checkStatus: {
+      method: "get",
+      description: "Check online payment status",
+    },
+  },
 };
 
 export default scopes;

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/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

@@ -1324,11 +1324,10 @@ export class SimpleAppService<T extends SchemaFields> {
       }
 
       const subPipeline: PipelineStage.Lookup['$lookup']['pipeline'] = [];
-      const foreignField = `${this.documentName}._id`;
 
       subPipeline.push({
         $match: {
-          $expr: { $eq: [`$${foreignField}`, '$$resourceId'] },
+          $expr: { $eq: [`$${relationOption.foreignField}`, '$$localValue'] },
         },
         ...relationOption.filter,
       });
@@ -1351,9 +1350,9 @@ export class SimpleAppService<T extends SchemaFields> {
 
       pipeline.push({
         $lookup: {
-          from: relationName,
+          from: relationName.toLowerCase(),
           as: `_${relationName}`,
-          let: { resourceId: '$_id' },
+          let: { localValue: `$${relationOption.localField}` },
           pipeline: subPipeline,
         },
       });

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