@simitgroup/simpleapp-generator 2.0.0-i-alpha → 2.0.0-k-alpha

package/ReleaseNote.md

@@ -1,3 +1,9 @@
+[2.0.0k-alpha]
+1. change .core/.resources become _core/_resources to prevent vscode cant index
+
+[2.0.0j-alpha]
+1. fix webhook no trigger
+
 [2.0.0i-alpha]
 1. fix some document no print api available
 

package/dist/generate.js

@@ -335,9 +335,9 @@ const generateSchema = (docname, doctype, rendertype, allmodels) => {
                 // log.info("process nest: ",docname," :",filename)
                 if (autogeneratetypes.includes(filecategory)) {
                     //multiple files in folder, append s at folder name
-                    let storein = `${backendTargetFolder}/.resources/${resourceFileName}`;
+                    let storein = `${backendTargetFolder}/_resources/${resourceFileName}`;
                     if (systemResources.includes(docname)) {
-                        storein = `${backendTargetFolder}/.core/resources/${resourceFileName}`;
+                        storein = `${backendTargetFolder}/_core/resources/${resourceFileName}`;
                     }
                     const targetfile = `${storein}/${resourceFileName}.${filecategory}.${filetype}`;
                     if (!(0, fs_1.existsSync)(storein)) {

package/package.json

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

package/src/generate.ts

@@ -360,9 +360,9 @@ const generateSchema = (
         // log.info("process nest: ",docname," :",filename)
         if (autogeneratetypes.includes(filecategory)) {
           //multiple files in folder, append s at folder name
-          let storein = `${backendTargetFolder}/.resources/${resourceFileName}`;
+          let storein = `${backendTargetFolder}/_resources/${resourceFileName}`;
           if(systemResources.includes(docname)){
-            storein=`${backendTargetFolder}/.core/resources/${resourceFileName}`
+            storein=`${backendTargetFolder}/_core/resources/${resourceFileName}`
           }
           const targetfile = `${storein}/${resourceFileName}.${filecategory}.${filetype}`;
           if (!existsSync(storein)) {

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

@@ -37,12 +37,12 @@
 import { Controller, Get, Put, Patch, Post, Delete, Body, Query, Param, Type, Res, Req, HttpStatus, HttpCode, NotFoundException } from '@nestjs/common';
 
 import { ApiTags, ApiBody, ApiResponse, ApiOperation, ApiQuery } from '@nestjs/swagger';
-import { Roles } from 'src/simple-app/.core/features/auth/role-guard/roles.decorator';
-import { Role } from 'src/simple-app/.core/features/auth/role-guard/roles.enum';
+import { Roles } from 'src/simple-app/_core/features/auth/role-guard/roles.decorator';
+import { Role } from 'src/simple-app/_core/features/auth/role-guard/roles.enum';
 import { Response } from 'express';
-import { AppUser } from 'src/simple-app/.core/features/user-context/appuser.decorator';
-import { UserContext } from 'src/simple-app/.core/features/user-context/user.context';
-import { MiniAppScope } from 'src/simple-app/.core/features/mini-app/mini-app-scope/mini-app-scope.decorator';
+import { AppUser } from 'src/simple-app/_core/features/user-context/appuser.decorator';
+import { UserContext } from 'src/simple-app/_core/features/user-context/user.context';
+import { MiniAppScope } from 'src/simple-app/_core/features/mini-app/mini-app-scope/mini-app-scope.decorator';
 import { <%= it.typename%>ApiService } from './<%= camelToKebab(it.resourceName)%>-api.service';
 import * as schema from './<%= camelToKebab(it.resourceName)%>-api.schema'
 

package/templates/basic/nest/api.module.ts.eta

@@ -9,9 +9,9 @@
 <%
 
 const kebabname =  camelToKebab(it.resourceName) 
-let filepath = `src/simple-app/.resources/${kebabname}/${kebabname}.module`
+let filepath = `src/simple-app/_resources/${kebabname}/${kebabname}.module`
 if(getSystemResources().includes(it.resourceName.toLowerCase())){
-    filepath = `src/simple-app/.core/resources/${kebabname}/${kebabname}.module`
+    filepath = `src/simple-app/_core/resources/${kebabname}/${kebabname}.module`
 }
 %>
 

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

@@ -5,11 +5,11 @@
  * Author: Ks Tan
  */
 import { Resolver, Query, Mutation, Args, ID,Context } from '@nestjs/graphql';
-import { AppUser } from 'src/simple-app/.core/features/user-context/appuser.decorator';
-import { UserContext } from 'src/simple-app/.core/features/user-context/user.context';
+import { AppUser } from 'src/simple-app/_core/features/user-context/appuser.decorator';
+import { UserContext } from 'src/simple-app/_core/features/user-context/user.context';
 import { <%= it.typename %>ApiService } from './<%= camelToKebab(it.resourceName) %>-api.service';
-import { Roles } from 'src/simple-app/.core/features/auth/role-guard/roles.decorator';
-import { Role } from 'src/simple-app/.core/features/auth/role-guard/roles.enum';
+import { Roles } from 'src/simple-app/_core/features/auth/role-guard/roles.decorator';
+import { Role } from 'src/simple-app/_core/features/auth/role-guard/roles.enum';
 import { Request } from '@nestjs/common';
 
 import * as schema from './<%= camelToKebab(it.resourceName)%>-api.schema'

package/templates/basic/nest/api.schema.ts.eta

@@ -11,9 +11,9 @@ import GraphQLJSON, { GraphQLJSONObject } from 'graphql-type-json';
 
 <%
 const kebabname =  camelToKebab(it.resourceName) 
-let filepath = `src/simple-app/.resources/${kebabname}/${kebabname}.schema`
+let filepath = `src/simple-app/_resources/${kebabname}/${kebabname}.schema`
 if(getSystemResources().includes(it.resourceName.toLowerCase())){
-    filepath = `src/simple-app/.core/resources/${kebabname}/${kebabname}.schema`
+    filepath = `src/simple-app/_core/resources/${kebabname}/${kebabname}.schema`
 }
 %>
 

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

@@ -25,15 +25,15 @@
   }
   
 const kebabname =  camelToKebab(it.resourceName) 
-let filepath = `src/simple-app/.resources/${kebabname}/${kebabname}.service`
+let filepath = `src/simple-app/_resources/${kebabname}/${kebabname}.service`
 if(getSystemResources().includes(it.resourceName.toLowerCase())){
-    filepath = `src/simple-app/.core/resources/${kebabname}/${kebabname}.service`
+    filepath = `src/simple-app/_core/resources/${kebabname}/${kebabname}.service`
 }
 %>
 
 
 import { Injectable } from '@nestjs/common';
-import { UserContext } from 'src/simple-app/.core/features/user-context/user.context';
+import { UserContext } from 'src/simple-app/_core/features/user-context/user.context';
 import * as schema from './<%= camelToKebab(it.resourceName)%>-api.schema'
 import { <%= it.typename%>Service }from '<%= filepath%>'; 
 
@@ -72,9 +72,9 @@ export class <%= (it.typename)%>ApiService  {
          ){
 
            <%if(api.action=='getPhoto'){%>
-            const resultResult:Buffer= Buffer.from("DummyStringConvertAsPhoto");
+            const resultResult:Buffer= Buffer.from("DummyStringConvertAsPhoto"); 
           <%}else{%>
-            const resultResult:<%= getFieldType('type',api.responseType,api.action)%> = <%= api.responseType.substr(0,1)=='[' ? '[]' : '{}'%>
+            const resultResult:<%= getFieldType('type',api.responseType,api.action)%> = <%= api.responseType.substr(0,1)=='[' ? '[]' : '{}'%> 
           <%}%>
             return resultResult
     

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

@@ -8,13 +8,13 @@
 import { Controller, Get, Put, Patch, Post, Delete, Body, Query, Param, Type, Res, Req, HttpStatus, HttpCode, NotFoundException } from '@nestjs/common';
 import { Response } from 'express';
 
-import { SimpleAppController } from 'src/simple-app/.core/framework/base/simple-app.controller';
+import { SimpleAppController } from 'src/simple-app/_core/framework/base/simple-app.controller';
 import { ApiTags, ApiBody, ApiResponse, ApiOperation, ApiQuery } from '@nestjs/swagger';
-import { Roles } from 'src/simple-app/.core/features/auth/role-guard/roles.decorator';
-import { Role } from 'src/simple-app/.core/features/auth/role-guard/roles.enum';
-import { AppUser } from 'src/simple-app/.core/features/user-context/appuser.decorator';
-import { UserContext } from 'src/simple-app/.core/features/user-context/user.context';
-import { MiniAppScope } from 'src/simple-app/.core/features/mini-app/mini-app-scope/mini-app-scope.decorator';
+import { Roles } from 'src/simple-app/_core/features/auth/role-guard/roles.decorator';
+import { Role } from 'src/simple-app/_core/features/auth/role-guard/roles.enum';
+import { AppUser } from 'src/simple-app/_core/features/user-context/appuser.decorator';
+import { UserContext } from 'src/simple-app/_core/features/user-context/user.context';
+import { MiniAppScope } from 'src/simple-app/_core/features/mini-app/mini-app-scope/mini-app-scope.decorator';
 
 import { <%= it.typename %>Service } from './<%= camelToKebab(it.resourceName) %>.service';
 import * as schemas from './<%= camelToKebab(it.resourceName) %>.schema';

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

@@ -9,7 +9,7 @@ for(const fname of fnames){
     export enum <%=it.typename%><%= upperFirstCase(fname)%>Enum{
         <%for(const val of obj.enum){        
 %>
-            <%= val.toUpperCase()%> = '<%= val %>',        
+            '<%= val.toUpperCase()%>' = '<%= val %>',        
         <%}%>
     }
    <%}%>

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

@@ -11,9 +11,9 @@ import { <%= it.typename%>Controller } from './<%= camelToKebab(it.resourceName)
 import { <%= it.typename%>MongoSchema } from './<%= camelToKebab(it.resourceName)%>.model';
 import { <%= it.typename%>Resolver } from './<%= camelToKebab(it.resourceName)%>.resolver';
 
-import { SimpleAppDocumentNoFormatModule} from 'src/simple-app/.core/features/document-no-format/document-no-format.module';
-import { SimpleAppLogModule } from 'src/simple-app/.core/features/log/log.module';
-import { SimpleAppWebhookModule } from 'src/simple-app/.core/features/webhook/webhook.module';
+import { SimpleAppDocumentNoFormatModule} from 'src/simple-app/_core/features/document-no-format/document-no-format.module';
+import { SimpleAppLogModule } from 'src/simple-app/_core/features/log/log.module';
+import { SimpleAppWebhookModule } from 'src/simple-app/_core/features/webhook/webhook.module';
 @Module({
   imports: [ SimpleAppDocumentNoFormatModule,SimpleAppLogModule,SimpleAppWebhookModule,
     MongooseModule.forFeature([

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

@@ -10,10 +10,10 @@ import { Request } from '@nestjs/common';
 import * as schemas from './<%= camelToKebab(it.resourceName) %>.schema';
 import { <%= it.typename %>Service } from './<%= camelToKebab(it.resourceName) %>.service';
 
-import { AppUser } from 'src/simple-app/.core/features/user-context/appuser.decorator';
-import { UserContext } from 'src/simple-app/.core/features/user-context/user.context';
-import { Roles } from 'src/simple-app/.core/features/auth/role-guard/roles.decorator';
-import { Role } from 'src/simple-app/.core/features/auth/role-guard/roles.enum';
+import { AppUser } from 'src/simple-app/_core/features/user-context/appuser.decorator';
+import { UserContext } from 'src/simple-app/_core/features/user-context/user.context';
+import { Roles } from 'src/simple-app/_core/features/auth/role-guard/roles.decorator';
+import { Role } from 'src/simple-app/_core/features/auth/role-guard/roles.enum';
 
 
 

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

@@ -10,7 +10,7 @@ import GraphQLJSON, { GraphQLJSONObject } from 'graphql-type-json';
 import { Prop, Schema, SchemaFactory } from '@nestjs/mongoose';
 import * as mongoose from 'mongoose';
 
-export * from 'src/simple-app/.core/framework/schemas';
+export * from 'src/simple-app/_core/framework/schemas';
 
 <% 
   const getFieldType =(proptype, typename,actionname)=>{

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

@@ -7,22 +7,22 @@
  */
  
 
-import { UserContext } from 'src/simple-app/.core/features/user-context/user.context'
-import * as sharelibs from 'src/simple-app/.core/share-libs'
+import { UserContext } from 'src/simple-app/_core/features/user-context/user.context'
+import * as sharelibs from 'src/simple-app/_core/share-libs'
 import { Injectable,Inject,forwardRef } from '@nestjs/common';
 import { InjectModel } from '@nestjs/mongoose';
 import jsonpath from 'jsonpath'
 import { Model } from 'mongoose';
 import {<%= it.typename%>JsonSchema } from './<%= camelToKebab(it.resourceName) %>.jsonschema'
-import { SimpleAppService } from 'src/simple-app/.core/framework/base/simple-app.service';
-import { IsolationType } from 'src/simple-app/.core/framework/schemas';
+import { SimpleAppService } from 'src/simple-app/_core/framework/base/simple-app.service';
+import { IsolationType } from 'src/simple-app/_core/framework/schemas';
 import { EventEmitter2 } from '@nestjs/event-emitter';
-import { SimpleAppDocumentNoFormatService } from 'src/simple-app/.core/features/document-no-format/document-no-format.service';
+import { SimpleAppDocumentNoFormatService } from 'src/simple-app/_core/features/document-no-format/document-no-format.service';
 
 import * as defaultValue from './<%= camelToKebab(it.resourceName) %>.default'
 import * as schema from './<%= camelToKebab(it.resourceName) %>.schema';
-import { SimpleAppLogService } from 'src/simple-app/.core/features/log/log.service';
-import { RunWebhookService } from 'src/simple-app/.core/features/webhook/run-webhook.service';
+import { SimpleAppLogService } from 'src/simple-app/_core/features/log/log.service';
+import { RunWebhookService } from 'src/simple-app/_core/features/webhook/run-webhook.service';
 //export * from './<%= camelToKebab(it.resourceName) %>.schema';
 
 
@@ -48,7 +48,7 @@ export class <%= it.typename %>Service extends SimpleAppService<schema.<%= it.ty
   protected foreignkeys = <%~ JSON.stringify(it.foreignkeys)%>;
     constructor(
         @InjectModel('<%= it.typename %>')  mydoc: Model<schema.<%= it.typename %>>,
-        @Inject(forwardRef(() => EventEmitter2)) event2:EventEmitter2,
+        event2:EventEmitter2,
         docNoGen:SimpleAppDocumentNoFormatService,
         logSvc: SimpleAppLogService,
         webhookSvc:RunWebhookService

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

@@ -8,7 +8,7 @@ import { EventEmitter2 } from '@nestjs/event-emitter';
 import { InjectModel } from '@nestjs/mongoose';
 import { Model } from 'mongoose';
 import { Injectable } from '@nestjs/common';
-import { UserContext } from 'src/simple-app/.core/commons/user.context';
+import { UserContext } from 'src/simple-app/_core/commons/user.context';
 import { <%= it.typename %>Entity } from './<%= camelToKebab(it.resourceName) %>.entity';
 import * as schema from './<%= camelToKebab(it.resourceName) %>.schema';
 export { <%= it.typename %>} from './<%= camelToKebab(it.resourceName) %>.schema';

package/templates/basic/nuxt/simpleapp.doc.ts.eta

@@ -5,7 +5,7 @@
  * Author: Ks Tan
  */
 
-import  {<%=it.typename%>Client} from "../generate/clients/<%=upperFirstCase(it.name)%>Client"
-export class <%=it.typename%>Doc extends <%=it.typename%>Client{
+import  {<%=upperFirstCase(it.name)%>Client} from "../generate/clients/<%=upperFirstCase(it.name)%>Client"
+export class <%=upperFirstCase(it.name)%>Doc extends <%=upperFirstCase(it.name)%>Client{
 
 }

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

@@ -21,13 +21,13 @@ import { EventEmitterModule } from '@nestjs/event-emitter';
 import { BullModule } from '@nestjs/bullmq';
 
 import { SimpleAppModule } from './simple-app/simple-app.module';
-import { SimpleAppInterceptor } from './simple-app/.core/framework/simple-app.interceptor';
-import { SimpleAppMiddleware } from './simple-app/.core/framework/simple-app.middleware';
-import { CustomKeycloakGuard } from './simple-app/.core/features/auth/keycloak/keycloak.guard';
-import { RolesGuard } from './simple-app/.core/features/auth/role-guard/roles.guard';
+import { SimpleAppInterceptor } from './simple-app/_core/framework/simple-app.interceptor';
+import { SimpleAppMiddleware } from './simple-app/_core/framework/simple-app.middleware';
+import { CustomKeycloakGuard } from './simple-app/_core/features/auth/keycloak/keycloak.guard';
+import { RolesGuard } from './simple-app/_core/features/auth/role-guard/roles.guard';
 
 
-// import { UserModule } from './simple-app/.core/resources/user/user.module';
+// import { UserModule } from './simple-app/_core/resources/user/user.module';
 
 @Module({
   imports: [

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

@@ -7,7 +7,7 @@
 
 import { NestFactory } from '@nestjs/core';
 import { AppModule } from './app.module';
-import { SimpleAppExceptionFilter } from './simple-app/.core/framework/exception-filter';
+import { SimpleAppExceptionFilter } from './simple-app/_core/framework/exception-filter';
 import { HttpAdapterHost } from '@nestjs/core';
 
 import { SwaggerModule, DocumentBuilder } from '@nestjs/swagger';

package/templates/nest/src/simple-app/{.core → _core}/features/auto-increament/auto-increament.schema.ts.eta

@@ -10,7 +10,7 @@ import GraphQLJSON, { GraphQLJSONObject } from 'graphql-type-json';
 import { Prop, Schema, SchemaFactory } from '@nestjs/mongoose';
 import * as mongoose from 'mongoose';
 
-export * from 'src/simple-app/.core/framework/schemas';
+export * from 'src/simple-app/_core/framework/schemas';
 
 @ObjectType()
 @Schema({ collection: 'autoincreament' })

package/templates/nest/src/simple-app/{.core → _core}/features/auto-increament/auto-increament.service.ts.eta

@@ -5,7 +5,7 @@
  * Author: Ks Tan
  * Last Modified By: Yong Xiang
  */
-import { UserContext } from 'src/simple-app/.core/features/user-context/user.context';
+import { UserContext } from 'src/simple-app/_core/features/user-context/user.context';
 import { Injectable, Inject, forwardRef } from '@nestjs/common';
 import { InjectModel } from '@nestjs/mongoose';
 import { Model } from 'mongoose';

package/templates/nest/src/simple-app/{.core → _core}/features/cron/cron-system/cron-system.module.ts.eta

@@ -3,13 +3,17 @@ import { MongooseModule } from '@nestjs/mongoose';
 import { CronSystemService } from './cron-system.service';
 import { SimpleAppLogModule } from '../../log/log.module';
 import { ApiEventMongoSchema } from '../../log/schemas';
-import { QueueJobMongoSchema } from 'src/simple-app/.resources/queue-job/queue-job.model';
+import { QueueJobMongoSchema } from '@resources/queue-job/queue-job.model';
 import { SimpleAppUserContextModule } from '../../user-context/user-context.module';
 @Module({
-  imports: [SimpleAppUserContextModule,SimpleAppLogModule,MongooseModule.forFeature([
-      { name: 'ApiEvent', schema: ApiEventMongoSchema },     
-      { name: 'QueueJob', schema: QueueJobMongoSchema },     
-    ])],
+  imports: [
+    SimpleAppUserContextModule,
+    SimpleAppLogModule,
+    MongooseModule.forFeature([
+      { name: 'ApiEvent', schema: ApiEventMongoSchema },
+      { name: 'QueueJob', schema: QueueJobMongoSchema },
+    ]),
+  ],
   controllers: [],
   providers: [CronSystemService],
   exports: [CronSystemService],

package/templates/nest/src/simple-app/{.core → _core}/features/cron/cron-system/cron-system.service.ts.eta

@@ -2,7 +2,7 @@ import { Inject, Injectable, forwardRef } from '@nestjs/common';
 import { InjectModel } from '@nestjs/mongoose';
 import { Cron } from '@nestjs/schedule';
 import { Model } from 'mongoose';
-import { UserContext } from 'src/simple-app/.core/features/user-context/user.context';
+import { UserContext } from 'src/simple-app/_core/features/user-context/user.context';
 import {SimpleAppCronBaseClass} from '../base/cron.base'
 import {ApiEvent,QueueJob} from './schemas'
 import { SimpleAppRobotUserService } from "../../user-context/robot-user.service";

package/templates/nest/src/simple-app/_core/features/cron/cron-system/schemas/index.ts.eta

@@ -0,0 +1,2 @@
+export { ApiEvent } from 'src/simple-app/_core/features/log/schemas';
+export { QueueJob } from '@resources/queue-job/queue-job.schema';

package/templates/nest/src/simple-app/{.core → _core}/features/document-no-format/document-no-format.controller.ts.eta

@@ -6,7 +6,7 @@ import { Response } from 'express';
 import { AppUser } from '../user-context/appuser.decorator';
 import { UserContext } from '../user-context/user.context';
 import { MiniAppScope } from '../mini-app/mini-app-scope/mini-app-scope.decorator';
-import { DocumentNoFormatService } from './document-no-format.service';
+import { SimpleAppDocumentNoFormatService } from './document-no-format.service';
 // import {} from '../doc-no-g'
 import * as schema from './document-no-format.schema';
 
@@ -14,7 +14,7 @@ const apiname = 'docno'.toUpperCase();
 @ApiTags(apiname)
 @Controller(apiname.toLowerCase() + '-api')
 export class DocumentNoFormatController {
-  constructor(private service: DocumentNoFormatService) {}
+  constructor(private service: SimpleAppDocumentNoFormatService) {}
 
   @Get('/listdocformats/:doctype')
   @Roles(Role.SuperAdmin, Role.SuperUser, Role.User)

package/templates/nest/src/simple-app/{.core → _core}/features/document-no-format/document-no-format.schema.ts.eta

@@ -4,7 +4,7 @@ import GraphQLJSON, { GraphQLJSONObject } from 'graphql-type-json';
 import { Prop, Schema, SchemaFactory } from '@nestjs/mongoose';
 import * as mongoose from 'mongoose';
 
-export * from 'src/simple-app/.core/framework/schemas';
+export * from 'src/simple-app/_core/framework/schemas';
 
 // // @ObjectType()
 @Schema({ collection: 'documentnoformatbranch' })

package/templates/nest/src/simple-app/{.core → _core}/features/maintenance/maintenance.controller.ts.eta

@@ -7,11 +7,11 @@
 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/simple-app/.core/features/auth/role-guard/roles.decorator';
-import { Role } from 'src/simple-app/.core/features/auth/role-guard/roles.enum';
+import { Roles } from 'src/simple-app/_core/features/auth/role-guard/roles.decorator';
+import { Role } from 'src/simple-app/_core/features/auth/role-guard/roles.enum';
 import * as schemas from './schemas';
-import { UserContext } from 'src/simple-app/.core/features/user-context/user.context';
-import { AppUser } from 'src/simple-app/.core/features/user-context/appuser.decorator';
+import { UserContext } from 'src/simple-app/_core/features/user-context/user.context';
+import { AppUser } from 'src/simple-app/_core/features/user-context/appuser.decorator';
 @ApiTags('maintenance')
 @Controller('maintenance')
 @Roles(Role.SuperAdmin)

package/templates/nest/src/simple-app/{.core → _core}/features/maintenance/maintenance.service.ts.eta

@@ -8,9 +8,9 @@
 import { BadRequestException, Injectable, InternalServerErrorException } from '@nestjs/common';
 import { Model } from 'mongoose';
 import { InjectModel } from '@nestjs/mongoose';
-import * as dbupdate from './db-update';
+import * as dbupdate from 'src/simple-app/config/db-update';
 import * as schemas from './schemas';
-import { UserContext } from 'src/simple-app/.core/features/user-context/user.context';
+import { UserContext } from 'src/simple-app/_core/features/user-context/user.context';
 @Injectable()
 export class MaintenanceService {
   constructor(@InjectModel('Environment') private sysEnvdoc: Model<schemas.Environment>) {

package/templates/nest/src/simple-app/{.core/features/mini-app/developer-portal/developer-portal-bridge.service.ts.eta.eta → _core/features/mini-app/developer-portal/developer-portal-bridge.service.ts.eta}

@@ -1,10 +1,10 @@
 import { BadRequestException, Injectable, NotFoundException } from '@nestjs/common';
-import { UserContext } from 'src/simpleapp/generate/commons/user.context';
 import _ from 'lodash';
 import { InjectModel } from '@nestjs/mongoose';
 import { Model } from 'mongoose';
-import { Miniapp } from 'src/simpleapp/generate/apischemas';
-import { DynamicParam } from 'src/simpleapp/generate/types';
+import { MiniApp } from '@resources/mini-app/mini-app.schema';
+import { UserContext } from 'src/simple-app/_core/features/user-context/user.context';
+import { DynamicParam } from 'src/simple-app/_core/framework/schemas';
 import { DeveloperPortalEnvDevelopmentService } from './developer-portal-env-development.service';
 import { DeveloperPortalEnvProductionService } from './developer-portal-env-production.service';
 import { DeveloperPortalService } from './developer-portal.service';
@@ -17,11 +17,11 @@ export class DeveloperPortalBridgeService {
     private readonly service: DeveloperPortalService,
   ) {}
 
-  async runDeveloperPublishDev(appUser: UserContext, developerPortalAppId: string, dto: Miniapp) {
+  async runDeveloperPublishDev(appUser: UserContext, developerPortalAppId: string, dto: MiniApp) {
     return await this.devService.publish(appUser, developerPortalAppId, dto);
   }
 
-  async runDeveloperPublish(appUser: UserContext, developerPortalAppId: string, dto: Miniapp) {
+  async runDeveloperPublish(appUser: UserContext, developerPortalAppId: string, dto: MiniApp) {
     return await this.prodService.publish(appUser, developerPortalAppId, dto);
   }
 

package/templates/nest/src/simple-app/{.core → _core}/features/mini-app/developer-portal/developer-portal-env-development.service.ts.eta

@@ -1,9 +1,10 @@
 import { BadRequestException, Injectable, InternalServerErrorException } from '@nestjs/common';
 import { MiniAppManagerEnvDevelopmentService } from '../mini-app-manager/mini-app-manager-env-development.service';
-import { UserService } from 'src/simpleapp/services/user.service';
-import { PermissionService } from 'src/simpleapp/services/perm.service';
-import { UserContext } from 'src/simpleapp/generate/commons/user.context';
-import { Miniapp, User } from 'src/simpleapp/generate/types';
+import { UserService } from '@resources/user/user.service';
+import { PermissionService } from '@resources/permission/permission.service';
+import { UserContext } from 'src/simple-app/_core/features/user-context/user.context';
+import { MiniApp } from '@resources/mini-app/mini-app.schema';
+import {  User } from '@resources/user/user.schema';
 import _ from 'lodash';
 import { MiniAppError } from '../mini-app-manager/mini-app-manager.error';
 import { MiniAppManagerEnvEnum } from '../mini-app-manager/mini-app-manager.enum';
@@ -18,8 +19,8 @@ export class DeveloperPortalEnvDevelopmentService {
     private readonly permissionService: PermissionService,
     private readonly miniAppManagerService: MiniAppManagerEnvDevelopmentService,
 
-    @InjectModel('Miniapp')
-    protected miniAppDoc: Model<Miniapp>,
+    @InjectModel('MiniApp')
+    protected miniAppDoc: Model<MiniApp>,
   ) {
     // super(miniAppDoc);
   }
@@ -33,11 +34,11 @@ export class DeveloperPortalEnvDevelopmentService {
     return miniApp;
   }
 
-  async publish(appUser: UserContext, developerPortalAppId: string, dto: Miniapp) {
+  async publish(appUser: UserContext, developerPortalAppId: string, dto: MiniApp) {
     this.assertDemoCompanyDefined();
 
     appUser.setAsStaticUser(dto.author.uid, dto.author.email, dto.author.name, dto.author.email, process.env.DEMO_COMPANY_XORG);
-    appUser.setPackage('enterprise'); // else cannot install mini app
+    // appUser.setPackage('enterprise'); // else cannot install mini app
 
     const miniApp = await this.findMiniApp(developerPortalAppId, MiniAppManagerEnvEnum.DEV);
     if (!miniApp) {
@@ -47,7 +48,7 @@ export class DeveloperPortalEnvDevelopmentService {
     }
   }
 
-  async createMiniApp(appUser: UserContext, developerPortalAppId: string, dto: Miniapp) {
+  async createMiniApp(appUser: UserContext, developerPortalAppId: string, dto: MiniApp) {
     await this.inviteDeveloperToDemoCompany(appUser);
     const miniApp = await this.miniAppManagerService.createMiniApp(appUser, developerPortalAppId, dto);
     await this.miniAppManagerService.runInstallMiniApp(appUser, miniApp);
@@ -55,7 +56,7 @@ export class DeveloperPortalEnvDevelopmentService {
     return miniApp;
   }
 
-  async updateMiniApp(appUser: UserContext, miniApp: Miniapp, dto: Miniapp) {
+  async updateMiniApp(appUser: UserContext, miniApp: MiniApp, dto: MiniApp) {
     const updatedMiniApp = await this.miniAppManagerService.updateMiniApp(appUser, miniApp, dto);
 
     return updatedMiniApp;

package/templates/nest/src/simple-app/{.core → _core}/features/mini-app/developer-portal/developer-portal-env-production.service.ts.eta

@@ -1,6 +1,6 @@
 import { Injectable } from '@nestjs/common';
-import { UserContext } from 'src/simpleapp/generate/commons/user.context';
-import { Miniapp } from 'src/simpleapp/generate/types';
+import { UserContext } from 'src/simple-app/_core/features/user-context/user.context';
+import { MiniApp } from '@resources/mini-app/mini-app.schema';
 import _ from 'lodash';
 import { MiniAppManagerEnvEnum } from '../mini-app-manager/mini-app-manager.enum';
 import { InjectModel } from '@nestjs/mongoose';
@@ -13,8 +13,8 @@ export class DeveloperPortalEnvProductionService {
   constructor(
     private readonly miniAppManagerService: MiniAppManagerEnvProductionService,
 
-    @InjectModel('Miniapp')
-    protected miniAppDoc: Model<Miniapp>,
+    @InjectModel('MiniApp')
+    protected miniAppDoc: Model<MiniApp>,
   ) {
     // super(miniAppDoc);
   }
@@ -28,7 +28,7 @@ export class DeveloperPortalEnvProductionService {
     return miniApp;
   }
 
-  async publish(appUser: UserContext, developerPortalAppId: string, dto: Miniapp) {
+  async publish(appUser: UserContext, developerPortalAppId: string, dto: MiniApp) {
     const miniApp = await this.findMiniApp(developerPortalAppId, MiniAppManagerEnvEnum.PROD);
 
     if (!miniApp) {
@@ -38,11 +38,11 @@ export class DeveloperPortalEnvProductionService {
     }
   }
 
-  async createMiniApp(appUser: UserContext, developerPortalAppId: string, dto: Miniapp) {
+  async createMiniApp(appUser: UserContext, developerPortalAppId: string, dto: MiniApp) {
     return await this.miniAppManagerService.createMiniApp(appUser, developerPortalAppId, dto);
   }
 
-  async updateMiniApp(appUser: UserContext, miniApp: Miniapp, dto: Miniapp) {
+  async updateMiniApp(appUser: UserContext, miniApp: MiniApp, dto: MiniApp) {
     const updatedMiniApp = await this.miniAppManagerService.updateMiniApp(appUser, miniApp, dto);
 
     return updatedMiniApp;

package/templates/nest/src/simple-app/{.core → _core}/features/mini-app/developer-portal/developer-portal.controller.ts.eta

@@ -1,12 +1,12 @@
 import { Body, Controller, Get, Param, Post, Put } from '@nestjs/common';
 import { ApiTags, ApiBody, ApiResponse, ApiOperation } from '@nestjs/swagger';
-import { AppUser } from 'src/simpleapp/generate/commons/decorators/appuser.decorator';
-import { Roles } from 'src/simpleapp/generate/commons/roles/roles.decorator';
-import { Role } from 'src/simpleapp/generate/commons/roles/roles.enum';
-import { UserContext } from 'src/simpleapp/generate/commons/user.context';
-import * as schemas from '../../../simpleapp/generate/apischemas';
+import { AppUser } from 'src/simple-app/_core/features/user-context/appuser.decorator';
+import { Roles } from 'src/simple-app/_core/features/auth/role-guard/roles.decorator';
+import { Role } from 'src/simple-app/_core/features/auth/role-guard/roles.enum';
+import { UserContext } from 'src/simple-app/_core/features/user-context/user.context';
 import { DeveloperPortalBridgeService } from './developer-portal-bridge.service';
 import { DeveloperPortalInstalledXOrgsResponse } from './developer-portal.schema';
+import {MiniApp} from '@resources/mini-app/mini-app.schema'
 
 @ApiTags('DEVELOPERPORTAL')
 @Controller('developer')
@@ -15,19 +15,19 @@ export class DeveloperPortalController {
 
   @Post('publish-dev/:developerPortalAppId')
   @Roles(Role.SuperAdmin, Role.SuperUser)
-  @ApiBody({ description: 'Request Body', type: schemas.Miniapp })
+  @ApiBody({ description: 'Request Body', type: MiniApp })
   @ApiOperation({ operationId: 'runDeveloperPublishDev' })
-  @ApiResponse({ status: 200, type: schemas.Miniapp })
-  async developerPublishDev(@AppUser() appUser: UserContext, @Param('developerPortalAppId') developerPortalAppId: string, @Body() dto: schemas.Miniapp) {
+  @ApiResponse({ status: 200, type: MiniApp })
+  async developerPublishDev(@AppUser() appUser: UserContext, @Param('developerPortalAppId') developerPortalAppId: string, @Body() dto: MiniApp) {
     return await this.service.runDeveloperPublishDev(appUser, developerPortalAppId, dto);
   }
 
   @Post('publish/:developerPortalAppId')
   @Roles(Role.SuperAdmin, Role.SuperUser)
-  @ApiBody({ description: 'Request Body', type: schemas.Miniapp })
+  @ApiBody({ description: 'Request Body', type: MiniApp })
   @ApiOperation({ operationId: 'runDeveloperPublish' })
-  @ApiResponse({ status: 200, type: schemas.Miniapp })
-  async developerPublish(@AppUser() appUser: UserContext, @Param('developerPortalAppId') developerPortalAppId: string, @Body() dto: schemas.Miniapp) {
+  @ApiResponse({ status: 200, type: MiniApp })
+  async developerPublish(@AppUser() appUser: UserContext, @Param('developerPortalAppId') developerPortalAppId: string, @Body() dto: MiniApp) {
     return await this.service.runDeveloperPublish(appUser, developerPortalAppId, dto);
   }