@simitgroup/simpleapp-generator 1.4.1-alpha → 1.5.0-alpha

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

@@ -5,21 +5,26 @@
  * Author: Ks Tan
  */
 import { ApiProperty } from '@nestjs/swagger';
+import { Field, ObjectType } from '@nestjs/graphql';
 
 <%Object.keys(it.models).forEach(function(name) { %>
     <% let schema = it.models[name].model %>        
+        @ObjectType()
         export class <%= name %>{            
 
             <% Object.keys(schema).forEach(function(key){%>
                 <% let obj = schema[key] %>
                 <% if(typeof obj == 'string') {%>
+                    @Field()
                     @ApiProperty({type: ()=><%=obj%>})
                     <%= key %>:  <%= obj %>;                
                 <% }else if( Array.isArray( obj)){%>
+                    @Field(type=>[<%=initType(obj[0]) %>])
                     @ApiProperty({type: ()=>[<%=initType(obj[0]) %>] })                    
                     <%= key %>:  <%= obj[0] %>[];
                 
                 <% }else{%>
+                    @Field()                
                     @ApiProperty(<%~ JSON.stringify(obj)%> )
                     <%= key %>:  <%= obj.type %>;
                 <% } %>

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

@@ -34,6 +34,25 @@ import { Response } from 'express';
 import {AppUser} from '../commons/decorators/appuser.decorator'
 import {UserContext} from '../commons/user.context'
 
+<% const getFieldType =(proptype, typename)=>{
+  const systemtypes = ['Boolean','boolean','string','String','number','Number','object','Object','integer','Integer']
+  let tmptypename = typename.replace('[','').replace(']','')
+  
+  if(systemtypes.includes(tmptypename)){
+    
+  }else if(proptype=='schema'){
+    tmptypename= 'schemas.'+tmptypename    
+  }else{ //type
+    tmptypename= 'types.'+tmptypename
+  }
+
+  if(typename.includes('[')){
+    return  proptype=='schema' ?  `[${tmptypename}]` : `${tmptypename}[]`
+  }else{
+    return tmptypename
+  }
+}
+%>
 <% let superadmindoctype = ['tenant','globaluser'] %>
 const doctype = '<%= it.doctype %>'.toUpperCase();
 @ApiTags(doctype)
@@ -149,19 +168,21 @@ export class <%= it.typename %>Controller extends SimpleAppAbstractController<
   <%}%>
   <% if(['post','put','patch'].includes(api.method)){ %>
     @ApiBody({ description: 'Request Body', 
-        type: <%= api.schema
+        type: 
+        <%= api.schema
         ?  (api.schema.includes('[') ?  '[schemas.'+api.schema.replace('[','').replace(']','') + ']' : 'schemas.'+api.schema  )
-        : 'Object'%> })
+        : 'Object'
+        %> 
+        })
   <%}%>  
   @ApiResponse({status: 200,description: '<%=api.description%>' 
-      ,type: <%= api.responseType
-          ?  (api.responseType.includes('[') ?  '[schemas.'+api.responseType.replace('[','').replace(']','') + ']' : 'schemas.'+api.responseType  )
-          : 'Object'%>  })  
+      ,type: <%= getFieldType('schema',api.responseType)%>
+        })  
   @ApiOperation({ operationId: 'run<%=capitalizeFirstLetter(api.action)%>' })
   <% if(api.queryPara && api.queryPara.length>0) {%>
       <%for(let q=0;q<api.queryPara.length; q++){%>
         @ApiQuery({name: "<%=api['queryPara'][q]%>",required: false,type: String})
-      <%}%>
+      <%}%> 
   <%}%>  
   async <%=capitalizeFirstLetter(api.action) %>(
     @AppUser() appuser: UserContext,
@@ -303,8 +324,5 @@ export class <%= it.typename %>Controller extends SimpleAppAbstractController<
   async delete(@AppUser() appuser: UserContext,@Param('id') id: string) {
     return this._delete(appuser,id);
   }
- 
-
-   
- 
+  
 }

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

@@ -0,0 +1,124 @@
+/**
+ * This file was automatically generated by simpleapp generator. It is changable
+ * --remove-this-line-to-prevent-override--
+ * last change 2024-04-17
+ * Author: Ks Tan
+ */
+import { Resolver, Query, Mutation, Args, ID,Context } from '@nestjs/graphql';
+import * as schemas from '../apischemas';
+import { AppUser } from '../commons/decorators/appuser.decorator';
+import { UserContext } from '../commons/user.context';
+import { <%= it.typename %>, <%= it.typename %>Service } from '../../services/<%= it.doctype.toLowerCase() %>.service';
+import { Roles } from '../commons/roles/roles.decorator';
+import { Role } from '../commons/roles/roles.enum';
+
+import { Request } from '@nestjs/common';
+
+<% const getFieldType =(proptype, typename)=>{
+    const systemtypes = ['Boolean','boolean','string','String','number','Number','object','Object','integer','Integer']
+    let tmptypename = typename.replace('[','').replace(']','')
+    
+    if(systemtypes.includes(tmptypename)){
+      
+    }else if(proptype=='schema'){
+      tmptypename= 'schemas.'+tmptypename    
+    }else{ //type
+      tmptypename= 'types.'+tmptypename
+    }
+  
+    if(typename.includes('[')){
+      return  proptype=='schema' ?  `[${tmptypename}]` : `${tmptypename}[]`
+    }else{
+      return tmptypename
+    }
+  }
+  %>
+
+
+<% let superadmindoctype = ['tenant','globaluser'] %>
+@Resolver(() => schemas.<%= it.typename %>)
+export class <%= it.typename %>Resolver {
+    constructor(private readonly service: <%= it.typename %>Service) { }
+
+    <%if(superadmindoctype.includes(it.doctype)){%>
+    @Roles(Role.SuperAdmin,Role.<%= `${it.typename}_search`%>)
+    <%}else{%>
+    @Roles(Role.SuperAdmin,Role.SuperUser,Role.<%= `${it.typename}_search`%>)
+    <%}%>
+    @Query(() => [schemas.<%= it.typename %>])
+    async <%= it.name %>s(@AppUser() appuser: UserContext): Promise<<%= it.typename %>[]> {                
+        
+        return await this.service.search(appuser,undefined,undefined,undefined)
+    }
+
+
+    <%if(superadmindoctype.includes(it.doctype)){%>
+    @Roles(Role.SuperAdmin,Role.<%= `${it.typename}_search`%>)
+    <%}else{%>
+    @Roles(Role.SuperAdmin,Role.SuperUser,Role.<%= `${it.typename}_search`%>)
+    <%}%>
+    @Query(() => schemas.<%= it.typename %>)
+    async <%= it.name %>(@AppUser() appuser: UserContext,@Args('id', { type: () => ID } ) id: string): Promise<<%= it.typename %>> {
+        
+        return await this.service.findById(appuser,id)
+    }
+
+
+
+
+
+
+
+
+
+    /***************************** begin additionalAPI definations *****************************************/
+
+    <% for(let i=0;i<it.apiSettings.length;i++){%>
+    <% let api = it.apiSettings[i] %>
+    <% if(api.method!='get') continue %>
+    <%if(superadmindoctype.includes(it.doctype)){%>
+    @Roles(Role.SuperAdmin,Role.<%= `${it.typename}_${api.action}`%>,
+    <%if(api.requiredRole && api.requiredRole.length>0) { %>
+        <% for(let r=0;r<api.requiredRole.length;r++){%>Role.<%=api.requiredRole[r]%>,<%}%>
+        <%}%>
+    )
+    <%}else{%>
+    @Roles(Role.SuperAdmin,Role.SuperUser,Role.<%= `${it.typename}_${api.action}`%>,
+        <%if(api.requiredRole && api.requiredRole.length>0) { %>
+        <% for(let r=0;r<api.requiredRole.length;r++){%>Role.<%=api.requiredRole[r]%>,<%}%>
+        <%}%>
+        )
+    <%}%>
+      @Query(()=> <%= getFieldType('schema',api.responseType)%>)  
+
+
+
+      async <%= it.name %><%=capitalizeFirstLetter(api.action) %>(
+        @AppUser() appuser: UserContext,        
+        <% if(api.entryPoint && api.entryPoint.includes(':')) {%>
+              <%let subpath = api.entryPoint.split('/')%>
+              <% for(let a=0;a<subpath.length;a++){%>
+                <%const partstr = subpath[a]%>
+                <%if(partstr.includes(':')){%>
+                  <% const paraname = partstr.replace(':','') %>  
+                  @Args('<%=paraname%>') <%=paraname%>: string,
+                <%}%>    
+              <%}%>  
+            <%}%>
+             ){
+        
+          return await this.service.run<%=capitalizeFirstLetter(api.action)%>(appuser,<% if(api.entryPoint && api.entryPoint.includes(':')) {%>
+              <%let subpath = api.entryPoint.split('/')%>
+              <% for(let a=0;a<subpath.length;a++){%>
+                <%const partstr = subpath[a]%>
+                <%if(partstr.includes(':')){%>
+                  <% const paraname = partstr.replace(':','') %>  
+                  <%=paraname%>,
+                <%}%>    
+              <%}%>  
+            <%}%>            
+            )              
+      } 
+    <%}%>
+    /***************************** end additionalAPI definitions *****************************************/
+}

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

@@ -5,12 +5,6 @@
  * Author: Ks Tan
  */
 
-/**
- * This file was automatically generated by simpleapp generator.
- 
- * last change 2023-09-23
- * Author: Ks Tan
- */
 import { InjectModel } from '@nestjs/mongoose';
 import { Model } from 'mongoose';
 import { Injectable } from '@nestjs/common';

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

@@ -35,17 +35,19 @@
  * last change 2023-09-09
  * author: Ks Tan
  */
+import { <%= it.typename %> } from '~/simpleapp/generate/openapi';
 
   
   const {$<%= it.typename %>Doc,$listen } = useNuxtApp();
   const doc = $<%= it.typename %>Doc()
   const docdata = doc.getReactiveData();
-  
+  type <%= it.typename %>Key = keyof <%= it.typename %> 
+
   definePageMeta({
     menuPath:'nocategory/<%= it.name %>'    
   });
 
-  const columns= [<%Object.keys(it.jsonschema.properties).forEach(function(key) { %>
+  const columns:<%= it.typename %>Key[] = [<%Object.keys(it.jsonschema.properties).forEach(function(key) { %>
         <%let obj=it.jsonschema.properties[key] %>
         <%let config=it.jsonschema['x-simpleapp-config'] %>
         <%if(skipcolumns.indexOf(key)>=0){%>

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

@@ -35,17 +35,17 @@
  * last change 2023-09-09
  * author: Ks Tan
  */
-
+import { <%= it.typename %> } from '~/simpleapp/generate/openapi';
   
   const {$<%= it.typename %>Doc,$listen } = useNuxtApp();
   const doc = $<%= it.typename %>Doc()
   const docdata = doc.getReactiveData();
-  
+  type <%= it.typename %>Key = keyof <%= it.typename %> 
   definePageMeta({
     menuPath:'nocategory/<%= it.name %>'    
   });
 
-  const columns= [<%Object.keys(it.jsonschema.properties).forEach(function(key) { %>
+  const columns: <%= it.typename %>Key[] = [<%Object.keys(it.jsonschema.properties).forEach(function(key) { %>
         <%let obj=it.jsonschema.properties[key] %>
         <%let config=it.jsonschema['x-simpleapp-config'] %>
         <%if(skipcolumns.indexOf(key)>=0){%>

package/templates/nest/.env._eta

@@ -14,19 +14,19 @@ HTTP_PORT=<%=it.configs.backendPort%>
 BPMN_PATH=./src/simpleapp/workflows/bpmn/
 
 
-OAUTH2_BASEURL=<%=it.configs.oauthSetting.oauthBaseUrl%>
+OAUTH2_BASEURL=<%=it.configs.oauthSetting ? it.configs.oauthSetting.oauthBaseUrl : ''%>
 
-OAUTH2_REALM=<%=it.configs.oauthSetting.oauthRealm%>
+OAUTH2_REALM=<%=it.configs.oauthSetting  ? it.configs.oauthSetting.oauthRealm : ''%>
 
-OAUTH2_CONFIGURL=<%=it.configs.oauthSetting.oauthRealmUrl%>
+OAUTH2_CONFIGURL=<%=it.configs.oauthSetting ? it.configs.oauthSetting.oauthRealmUrl : ''%>
 
-OAUTH2_CLIENTID=<%=it.configs.oauthSetting.oauthClient%>
+OAUTH2_CLIENTID=<%=it.configs.oauthSetting ? it.configs.oauthSetting.oauthClient : ''%>
 
-OAUTH2_CLIENTSECRET=<%=it.configs.oauthSetting.oauthClientSecret%>
+OAUTH2_CLIENTSECRET=<%=it.configs.oauthSetting ? it.configs.oauthSetting.oauthClientSecret : ''%>
 
-OAUTH2_ADMINROLE = <%=it.configs.oauthSetting.adminRole%>
+OAUTH2_ADMINROLE = <%=it.configs.oauthSetting ? it.configs.oauthSetting.adminRole : ''%>
 
-AUTH_SECRET_KEY=<%=it.configs.oauthSetting.oauthAuthSecretKey%>
+AUTH_SECRET_KEY=<%=it.configs.oauthSetting ? it.configs.oauthSetting.oauthAuthSecretKey : 'any'%>
 
 BACKEND_URL=http://localhost:<%=it.configs.backendPort%>
 

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

@@ -1,12 +1,15 @@
 /**
  * This file was automatically generated by simpleapp generator. Every
  * MODIFICATION OVERRIDE BY GENERATEOR
- * last change 2023-10-28
+ * last change 2024-03-17
  * Author: Ks Tan
  */
  
-import { Module, MiddlewareConsumer, NestModule } from '@nestjs/common';
+import { Module, MiddlewareConsumer, NestModule, Provider } from '@nestjs/common';
 import { MongooseModule,MongooseModuleOptions } from '@nestjs/mongoose';
+import { GraphQLModule } from '@nestjs/graphql';
+import { ApolloDriver, ApolloDriverConfig } from '@nestjs/apollo';
+
 import { APP_GUARD,APP_INTERCEPTOR,APP_FILTER } from '@nestjs/core';
 import { ResponseInterceptor } from './simpleapp/generate/commons/interceptors/response.interceptor'
 import {
@@ -21,6 +24,7 @@ import {RolesGuard} from './simpleapp/generate/commons/roles/roles.guard'
 import { ConfigModule } from '@nestjs/config';
 import { ServeStaticModule } from '@nestjs/serve-static';
 import { join } from 'path';
+import { AppResolver } from './app.resolver';
 import { TenantMiddleware } from './simpleapp/generate/commons/middlewares/tenant.middleware';
 import { AppController } from './app.controller';
 import { AppService } from './app.service';
@@ -30,9 +34,16 @@ import { PermissionMongoSchema } from './simpleapp/generate/models/perm.model';
 import { ApiEventMongoSchema } from './simpleapp/generate/models/apievent.model';
 import { EventEmitterModule } from '@nestjs/event-emitter';
 
+
+
+  
 @Module({
   
   imports: [
+    GraphQLModule.forRoot<ApolloDriverConfig>({
+      driver: ApolloDriver,
+      autoSchemaFile: join(process.cwd(), 'src/schema.gql'),
+    }),
     ConfigModule.forRoot(),
     EventEmitterModule.forRoot({
   // set this to `true` to use wildcards
@@ -71,30 +82,20 @@ import { EventEmitterModule } from '@nestjs/event-emitter';
     ]),    
       ],
   controllers: [AppController],
-  providers: [
-    AppService,
-    {
-      provide: APP_GUARD,
-      useClass: AuthGuard,
-    },
-    {
-      provide: APP_GUARD,
-      useClass: ResourceGuard,
-    },
-    {
-      provide: APP_GUARD,
-      useClass: RolesGuard, //use simpleapp own roleguard
-    },
-    {
-      provide: APP_INTERCEPTOR,
-      useClass: ResponseInterceptor,
-    },
-  ],
+  providers: [AppService,AppResolver,  {
+    provide: APP_INTERCEPTOR,
+    useClass: ResponseInterceptor,  
+  },
+    {provide: APP_GUARD,useClass: AuthGuard,},
+    {provide: APP_GUARD,useClass: ResourceGuard,},
+    {provide: APP_GUARD,useClass: RolesGuard,}
+  ],       
 })
 export class AppModule implements NestModule {
   configure(consumer: MiddlewareConsumer) {
     consumer
       .apply(TenantMiddleware)
+      // .exclude('/graphql')
       .exclude('/api-yaml')
       .exclude('/api-json')
       .exclude('/api')

package/templates/nest/src/app.resolver.ts.eta

@@ -0,0 +1,9 @@
+import { Query, Resolver } from '@nestjs/graphql';
+
+@Resolver()
+export class AppResolver {
+  @Query(() => String)
+  sayHello(): string {
+    return 'Hello World!';
+  }
+}

package/templates/nest/src/simpleapp/generate/commons/decorators/appuser.decorator.ts.eta

@@ -1,14 +1,20 @@
 /**
  * This file was automatically generated by simpleapp generator. Every
  * MODIFICATION OVERRIDE BY GENERATEOR
- * last change 2023-10-28
+ * last change 2024-04-17
  * Author: Ks Tan
  */
 import { createParamDecorator, ExecutionContext } from '@nestjs/common';
 
 export const AppUser = createParamDecorator(
-  (data: unknown, ctx: ExecutionContext) => {
-    const request = ctx.switchToHttp().getRequest();
-    return request['sessionuser'];
+  (data: unknown, ctx: ExecutionContext) => {    
+    if (ctx.getType() == 'http') {
+      const request = ctx.switchToHttp().getRequest();
+      return request['sessionuser'];
+    } else if (ctx.getArgs()[2]) {
+      const req = ctx.getArgs()[2].req;
+      return req['sessionuser'];
+    }
+    return undefined;
   },
-);
+);

package/templates/nest/src/simpleapp/generate/commons/interceptors/response.interceptor.ts.eta

@@ -1,7 +1,7 @@
 /**
  * This file was automatically generated by simpleapp generator. Every
  * MODIFICATION OVERRIDE BY GENERATEOR
- * last change 2023-10-28
+ * last change 2023-03-17
  * Author: Ks Tan
  */
 import {
@@ -25,31 +25,41 @@ export class ResponseInterceptor implements NestInterceptor {
     @InjectModel('ApiEvent') private apieventmodel: Model<ApiEvent>,
   ) {}
 
-  
   async intercept(
     context: ExecutionContext,
     next: CallHandler,
   ): Promise<Observable<any>> {
+    
+    //not http request then exclude such as graphql
+    if(context.getType()!='http'){
+      // obtain usersession here        
+      return next.handle().pipe(tap(async () => {
+        //console.log("none http, do nothing at interceptor")
+      }))
+    }
+
+
     const req = context.switchToHttp().getRequest();
     const resp = context.switchToHttp().getResponse();
+    //console.log("want to get user session:", Object.keys(req))
     const usersession: UserContext = req['sessionuser'];
-    
+    //console.log("after read user session:",usersession)
     const method = req['method'];
     const headers = { ...req['headers'] };
     const ip = req['ip'];
     const url = req['url'];
     // let { url, method, headers, body }
     const session = await this.connection.startSession();
-    if(!session['runCount']){
-      session['runCount']=0
-    }else{
-      session['runCount']=session['runCount']+1
-    }    
-    usersession.setDBSession(session)
+    if (!session['runCount']) {
+      session['runCount'] = 0;
+    } else {
+      session['runCount'] = session['runCount'] + 1;
+    }
+    usersession.setDBSession(session);
     // const session: ClientSession = usersession.getDBSession();
     const logid: string = crypto.randomUUID();
     const starttime = new Date();
-    let canCommit = true
+    let canCommit = true;
     //authorization no need
     delete headers['authorization']; //='--removed--'
     const eventdata: ApiEvent = {
@@ -71,37 +81,33 @@ export class ResponseInterceptor implements NestInterceptor {
 
     // req['eventObj'] = eventObj;
     return next.handle().pipe(
-
-      catchError( async(err,caught)=>{
-
+      catchError(async (err, caught) => {
         // console.log('**************catchError at interceptor ',method,url)
-          if (session.inTransaction()) {
-            await session.abortTransaction()
-            canCommit=false
-          }      
-          
-     
-         const responseBody = {
+        if (session.inTransaction()) {
+          await session.abortTransaction();
+          canCommit = false;
+        }
+
+        const responseBody = {
           message: err.message,
           timestamp: new Date().toISOString(),
           path: url,
           error: err.options,
         };
-    
-          // eventObj.statusCode = err.status;
-          // eventObj.errMsg = responseBody.message;
-          // const endtime = new Date();
-          // eventObj.updated = endtime.toISOString();
-          // eventObj.data = req.body;
-          // eventObj.errData = responseBody.error;
-          // eventObj.status = 'NG';
-          // eventObj.duration =
-          // endtime.getTime() - new Date(eventObj.created).getTime();
-          // eventObj.save();
 
-          resp.status(err.status)
-          return responseBody
+        // eventObj.statusCode = err.status;
+        // eventObj.errMsg = responseBody.message;
+        // const endtime = new Date();
+        // eventObj.updated = endtime.toISOString();
+        // eventObj.data = req.body;
+        // eventObj.errData = responseBody.error;
+        // eventObj.status = 'NG';
+        // eventObj.duration =
+        // endtime.getTime() - new Date(eventObj.created).getTime();
+        // eventObj.save();
 
+        resp.status(err.status);
+        return responseBody;
       }),
       tap(async () => {
         // console.log("============interceptor tap",method,url)
@@ -111,17 +117,16 @@ export class ResponseInterceptor implements NestInterceptor {
         eventObj.updated = endtime.toISOString();
         eventObj.status = 'OK';
         eventObj.duration = endtime.getTime() - starttime.getTime();
-        await eventObj.save(); 
-        
+        await eventObj.save();
 
         if (process.env.DRYRUN == 'true') {
           console.warn('--------dryrun! roll back everything-----------');
-          if (session.inTransaction() && canCommit ) {
-            await session.abortTransaction()            
+          if (session.inTransaction() && canCommit) {
+            await session.abortTransaction();
           }
         } else {
-          if (session.inTransaction() && canCommit ) {
-            await session.commitTransaction()//.then(()=>session.endSession());
+          if (session.inTransaction() && canCommit) {
+            await session.commitTransaction(); //.then(()=>session.endSession());
           }
         }
         // session.endSession()

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

@@ -1,7 +1,7 @@
 /**
  * This file was automatically generated by simpleapp generator. Every
  * MODIFICATION OVERRIDE BY GENERATEOR
- * last change 2023-10-28
+ * last change 2024-03-17
  * Author: Ks Tan
  */
 import {
@@ -52,6 +52,19 @@ export class TenantMiddleware implements NestMiddleware {
       next();
       return;
     }
+    const u = new UserContext(this.usermodel, this.permmodel);
+
+    if (req.baseUrl == '/graphql') {
+      let tokenstr: string = req.headers['authorization'] ?? '';
+      tokenstr = tokenstr.replace('Bearer ', '');      
+      const xorg = req.headers['x-org'] ?? this.defaultxorg;      
+      if (tokenstr) {
+        await u.setCurrentUserInfo(tokenstr, xorg);
+      }
+      req['sessionuser'] = u;
+      next();
+      return;
+    }
     this.logger.debug(`running TenantMiddleware for ${req.baseUrl}`);
     if (!req.headers['authorization']) {
       this.logger.log('undefine bearer token');
@@ -62,11 +75,10 @@ export class TenantMiddleware implements NestMiddleware {
         'undefine x-org and require that at ' + req.baseUrl,
         'TenantMiddleware',
       );
-      throw new BadRequestException('undefine header string x-org')
+      throw new BadRequestException('undefine header string x-org');
       // return res.status(401).send('undefine header string x-org');
     }
     // const session = await this.connection.startSession();
-    const u = new UserContext(this.usermodel, this.permmodel);
     // console.log("line 43")
     try {
       let tokenstr: string = req.headers['authorization'];
@@ -95,7 +107,7 @@ export class TenantMiddleware implements NestMiddleware {
       }
     } catch (err) {
       this.logger.error(err);
-      throw new BadRequestException(err,)      
+      throw new BadRequestException(err);
     }
   }
 }