@simitgroup/simpleapp-generator 2.0.0-p-alpha → 2.0.0-r-alpha

package/ReleaseNote.md

@@ -1,3 +1,11 @@
+[2.0.0r-alpha]
+
+1. Fix Developer Portal
+
+[2.0.0q-alpha]
+
+1. Fixed ts log version
+
 [2.0.0p-alpha]
 
 1. Test

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@simitgroup/simpleapp-generator",
-  "version": "2.0.0p-alpha",
+  "version": "2.0.0r-alpha",
   "description": "frontend nuxtjs and backend nests code generator using jsonschema",
   "main": "dist/index.js",
   "scripts": {
@@ -36,7 +36,7 @@
     "lodash": "^4.17.21",
     "moddle-xml": "^10.1.0",
     "path": "^0.12.7",
-    "tslog": "^4.9.1"
+    "tslog": "4.9.1"
   },
   "bin": {
     "simpleapp-generator": "./dist/index.js"

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

@@ -4,8 +4,8 @@
   const apiName = it.typename.toUpperCase() + 'Api';
   const titleName = titleCase(pascalName);
   const uglyName = upperFirstCase(it.name ?? '');
-  const schemaName = `SimtrainSchema.${uglyName}`;
-  const schemaAutoCompleteName = `SimtrainSchema.${uglyName}AutoComplete`;
+  const schemaName = `SimtrainSchema.${pascalName}Dto`;
+  const schemaAutoCompleteName = `SimtrainSchema.${pascalName}AutoCompleteDto`;
 
   const serviceVariable = it.resourceName + 'Service';
 
@@ -15,15 +15,19 @@
 
     if(systemTypes.includes(tmpTypeName.toLowerCase())){
         tmpTypeName = upperFirstCase(tmpTypeName.toLowerCase());
+        if(typeName.includes('[')){
+            return `[${tmpTypeName}]`;
+        }
+
+        return tmpTypeName;
     } else {
         tmpTypeName = `SimtrainSchema.${tmpTypeName}`;
-    }
+        if(typeName.includes('[')){
+            return `[${tmpTypeName}Dto]`;
+        }
 
-    if(typeName.includes('[')){
-        return `[${tmpTypeName}]`;
+        return `${tmpTypeName}Dto`;
     }
-
-    return tmpTypeName;
   }
 %>
 
@@ -43,7 +47,7 @@ import { ApiTags, ApiBody, ApiResponse, ApiOperation, ApiQuery, PartialType } fr
 import { ApiHeader } from 'src/types/api';
 import { <%= pascalName %>Service } from './<%= kebabName %>.service';
 import { ResourceApiListDto } from '../../dto/resource-api.schema';
-import * as SimtrainSchema from '../../simtrain-schema';
+import * as SimtrainSchema from '../../../../openapi/backend-dto/dtos/Api';
 import { Filter } from 'mongodb';
 
 @ApiTags('<%= titleName %>')
@@ -161,7 +165,7 @@ export class <%= pascalName %>Controller {
                         const partstr = subpath[a];
                         if(partstr.includes(':')) {
                             const paraname = partstr.replace(':','');
-                            paramsWithType.push(`${paraname}: string`);
+                            paramsWithType.push(`@Param('${paraname}') ${paraname}: string`);
                             paramsWithoutType.push(paraname);
                         }
                         }
@@ -170,13 +174,13 @@ export class <%= pascalName %>Controller {
                     if(api.queryPara && api.queryPara.length > 0) {
                         for(let q=0; q < api.queryPara.length; q++) {
                         const qp = api['queryPara'][q];
-                        paramsWithType.push(`${qp}: string`);
+                        paramsWithType.push(`@Query('${qp}') ${qp}: string`);
                         paramsWithoutType.push(qp);
                         }
                     }
 
                     if(hasBody) {
-                        paramsWithType.push(`data: ${getTypeName(api.schema)}`);
+                        paramsWithType.push(`@Body() data: ${getTypeName(api.schema)}`);
                         paramsWithoutType.push('data');
                     }
                 %>
@@ -196,7 +200,7 @@ export class <%= pascalName %>Controller {
                 @ApiResponse({ status: 500, description: 'Internal Error' })
                 async <%= action %>(
                     @Headers() headers: ApiHeader,
-                    <%= paramsWithType.join(',') %>
+                    <%~ paramsWithType.join(',') %>
                 ){
                     return await this.<%= serviceVariable %>.<%= action %>(
                         headers,

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

@@ -2,8 +2,8 @@
   const pascalName = upperFirstCase(it.resourceName);
   const apiName = it.typename.toUpperCase() + 'Api';
   const uglyName = upperFirstCase(it.name ?? '');
-  const schemaName = `SimtrainSchema.${uglyName}`;
-  const schemaAutoCompleteName = `SimtrainSchema.${uglyName}AutoComplete`;
+  const schemaName = `SimtrainSchema.${pascalName}Dto`;
+  const schemaAutoCompleteName = `SimtrainSchema.${pascalName}AutoCompleteDto`;
 
   const getTypeName = (typeName) => {
     const systemTypes = ['boolean', 'string', 'number', 'object', 'integer'];
@@ -11,15 +11,19 @@
 
     if(systemTypes.includes(tmpTypeName.toLowerCase())){
         tmpTypeName = upperFirstCase(tmpTypeName.toLowerCase());
+        if(typeName.includes('[')){
+            return `[${tmpTypeName}]`;
+        }
+
+        return tmpTypeName;
     } else {
         tmpTypeName = `SimtrainSchema.${tmpTypeName}`;
-    }
+        if(typeName.includes('[')){
+            return `[${tmpTypeName}Dto]`;
+        }
 
-    if(typeName.includes('[')){
-        return `[${tmpTypeName}]`;
+        return `${tmpTypeName}Dto`;
     }
-
-    return tmpTypeName;
   }
 %>
 
@@ -29,7 +33,7 @@ import { <%= apiName %> } from 'src/openapi/backend-api';
 import { ApiHeader } from 'src/types/api';
 import { getOpenApiConfig } from 'src/utils/api';
 import { ResourceApiListDto } from '../../dto/resource-api.schema';
-import * as SimtrainSchema from '../../simtrain-schema';
+import * as SimtrainSchema from '../../../../openapi/backend-dto/dtos/Api';
 
 @Injectable()
 export class <%= pascalName %>Service {

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

@@ -7,26 +7,37 @@ 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>,
+    // @InjectModel('Miniapp')
+    // protected miniAppDoc: Model<MiniApp>,
+    protected miniAppService: MiniAppService,
 
-    @InjectModel('Miniappinstallation')
-    protected miniAppInstallationDoc: Model<MiniAppInstallation>,
+    // @InjectModel('Miniappinstallation')
+    // protected miniAppInstallationDoc: Model<MiniAppInstallation>,
+    protected miniAppInstallationService: MiniAppInstallationService,
 
-    @InjectModel('Branch')
-    protected branchDoc: Model<Branch>,
+    // @InjectModel('Branch')
+    // protected branchDoc: Model<Branch>,
+    protected branchService: BranchService,
   ) {}
 
-  async getDemoCompany(developerPortalAppId: string) {
+  async getDemoCompany(appUser: UserContext, developerPortalAppId: string) {
     // Only dev got development.demoXOrg field
-    const miniApp = await this.miniAppDoc.findOne({
+    // const miniApp = await this.miniAppDoc.findOne({
+    //   'developerPortal.appId': developerPortalAppId,
+    //   env: MiniAppEnvEnum.DEV,
+    // });
+    const miniApps = await this.miniAppService.search(appUser, {
       'developerPortal.appId': developerPortalAppId,
       env: MiniAppEnvEnum.DEV,
     });
+    const miniApp = miniApps[0];
     if (miniApp && !_.isEmpty(miniApp?.development?.demoXOrg)) {
       return miniApp.development.demoXOrg;
     }
@@ -35,10 +46,14 @@ export class DeveloperPortalService {
   }
 
   async getInstalledMiniAppXOrgs(appUser: UserContext, developerPortalAppId: string) {
-    const demoXOrg = await this.getDemoCompany(developerPortalAppId);
+    const demoXOrg = await this.getDemoCompany(appUser, developerPortalAppId);
 
     // Only get env === prod one
-    const miniAppInstallations = await this.miniAppInstallationDoc.find({
+    // const miniAppInstallations = await this.miniAppInstallationDoc.find({
+    //   'miniApp.developerPortalAppId': developerPortalAppId,
+    //   'miniApp.env': MiniAppEnvEnum.PROD,
+    // });
+    const miniAppInstallations = await this.miniAppInstallationService.search(appUser, {
       'miniApp.developerPortalAppId': developerPortalAppId,
       'miniApp.env': MiniAppEnvEnum.PROD,
     });
@@ -67,7 +82,8 @@ export class DeveloperPortalService {
     };
 
     // Step 3: Run one query to get all branches
-    const allBranches = await this.branchDoc.find(branchFilter);
+    // const allBranches = await this.branchDoc.find(branchFilter);
+    const allBranches = await this.branchService.search(appUser, 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/mini-app/mini-app.module.ts.eta

@@ -14,11 +14,39 @@ import { SimpleAppSoftwarePolicyModule } from '../policy/policy.module';
 import { MiniAppManagerBridgeService } from './mini-app-manager/mini-app-manager-bridge.service';
 import { MiniAppManagerEnvProductionService } from './mini-app-manager/mini-app-manager-env-production.service';
 import { MiniAppManagerEnvDevelopmentService } from './mini-app-manager/mini-app-manager-env-development.service';
+import { DeveloperPortalController } from './developer-portal/developer-portal.controller';
+import { DeveloperPortalEnvProductionService } from './developer-portal/developer-portal-env-production.service';
+import { DeveloperPortalEnvDevelopmentService } from './developer-portal/developer-portal-env-development.service';
+import { DeveloperPortalBridgeService } from './developer-portal/developer-portal-bridge.service';
+import { DeveloperPortalService } from './developer-portal/developer-portal.service';
+import { BranchModule } from '@resources/branch/branch.module';
+import { PermissionModule } from '@resources/permission/permission.module';
+import { UserModule } from '@resources/user/user.module';
 
 @Module({
-  imports: [SimpleAppSoftwarePolicyModule,MiniAppInstallationModule,MiniAppModule],
-  controllers: [MiniAppManagerController],
-  providers: [MiniAppManagerService,MiniAppManagerPolicyService,MiniAppManagerEnvProductionService,MiniAppManagerEnvDevelopmentService,MiniAppManagerBridgeService],
-  exports: [MiniAppManagerService,MiniAppManagerPolicyService,MiniAppManagerEnvProductionService,MiniAppManagerEnvDevelopmentService,MiniAppManagerBridgeService],
+  imports: [SimpleAppSoftwarePolicyModule, MiniAppInstallationModule, MiniAppModule, BranchModule, PermissionModule, UserModule],
+  controllers: [MiniAppManagerController, DeveloperPortalController],
+  providers: [
+    MiniAppManagerService,
+    MiniAppManagerPolicyService,
+    MiniAppManagerEnvProductionService,
+    MiniAppManagerEnvDevelopmentService,
+    MiniAppManagerBridgeService,
+    DeveloperPortalService,
+    DeveloperPortalBridgeService,
+    DeveloperPortalEnvDevelopmentService,
+    DeveloperPortalEnvProductionService,
+  ],
+  exports: [
+    MiniAppManagerService,
+    MiniAppManagerPolicyService,
+    MiniAppManagerEnvProductionService,
+    MiniAppManagerEnvDevelopmentService,
+    MiniAppManagerBridgeService,
+    DeveloperPortalService,
+    DeveloperPortalBridgeService,
+    DeveloperPortalEnvDevelopmentService,
+    DeveloperPortalEnvProductionService,
+  ],
 })
 export class SimpleAppMiniAppModule {}

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

@@ -526,7 +526,7 @@ export class UserContext extends UserContextInfo {
 
       // console.log("rolegroups",rolegroups)
       for (const group of this.groups) {
-        const roles: Role[] = rolegroups[group]()
+        const roles: Role[] = rolegroups[group]();
         //(<() => Role[]>rolegroups[group])();
         for (let r = 0; r < roles.length; r++) {
           if (!this.roles.includes(roles[r])) {
@@ -535,7 +535,6 @@ export class UserContext extends UserContextInfo {
         }
       }
 
-
       this.moreProps = this.setMoreProps(userProfile);
       // this.package = userProfile['package'];
       // this.appintegration = await this.setAppIntegration();
@@ -1022,39 +1021,61 @@ export class UserContext extends UserContextInfo {
   }
 
   async setUserProfileFromDB() {
-    // const userProfile = await this.obtainProfileFromDB();
-    // if (userProfile) {
-    //   this.logger.debug(`User ${this.uid} exists in tenant (${this.tenantId})`);
-    //   this._id = userProfile._id.toString();
-    //   this.email = userProfile.email ?? '';
-    //   this.uName = userProfile.uname ?? '';
-    //   this.fullName = userProfile.fullname ?? '';
-    //   this.branchCode = userProfile['branchCode'] ?? '';
-    //   this.branchName = userProfile['branchName'] ?? '';
-    //   this.orgCode = userProfile['orgCode'] ?? '';
-    //   this.orgName = userProfile['orgName'] ?? '';
-    //   this.timeZone = userProfile['timeZone'] ?? '';
-    //   this.currency = userProfile['currency'] ?? '';
-    //   this.country = userProfile['country'] ?? '';
-    //   this.offsetMinute = userProfile['offsetMinute'] ?? 0;
-    //   this.orgRecordId = userProfile['orgRecordId'] ?? '';
-    //   this.branchRecordId = userProfile['branchRecordId'] ?? '';
-    //   this.groups = userProfile['groups'] ?? [];
-    //   this.roles = userProfile['roles'] ?? [Role.Everyone, Role.User];
-    //   //more complex
-    //   this.clientSetting = userProfile['clientSetting'] ?? {};
-    //   this.moreProps = this.setMoreProps(userProfile);
-    //   this.package = userProfile['package'];
-    //   // this.appintegration = await this.setAppIntegration();
-    // } else {
-    //   this.logger.debug(`User ${this.uid} not exists in tenant (${this.tenantId})`);
-    //   this.logger.debug(`Set unknown id of current user`);
-    //   this.roles = [Role.Everyone, Role.Unknown];
-    // }
-    // if (this.isRealmAdmin() && !this.roles.includes(Role.SuperAdmin)) {
-    //   this.roles.push(Role.SuperAdmin);
-    // }
-    // this.logger.verbose(`User ${this.uid} have _id (${this.getId()}), groups (${this.groups.join(',')}) and roles (${this.getRoles().join(',')}).`);
+    const userProfile = await this.obtainProfileFromDB();
+    if (userProfile) {
+      this.logger.debug(`User ${this.uid} exists in tenant (${this.tenantId})`);
+
+      this._id = userProfile._id;
+      this.email = userProfile.email ?? '';
+      this.uName = userProfile.uName ?? '';
+      this.fullName = userProfile.fullName ?? '';
+
+      this.branchCode = userProfile['branchCode'] ?? '';
+      this.branchName = userProfile['branchName'] ?? '';
+      this.tenantInfo = userProfile.tenantInfo;
+      this.orgInfo = userProfile.orgInfo;
+      this.branchInfo = userProfile.branchInfo;
+      this.orgCode = userProfile['orgCode'] ?? '';
+      this.orgName = userProfile['orgName'] ?? '';
+      this.timeZone = userProfile['timeZone'] ?? '';
+      this.currency = userProfile['currency'] ?? '';
+      this.country = userProfile['country'] ?? '';
+      this.offsetMinute = userProfile['offsetMinute'] ?? 0;
+      this.orgRecordId = userProfile['orgRecordId'] ?? '';
+      this.branchRecordId = userProfile['branchRecordId'] ?? '';
+      this.invites = userProfile.invites;
+      userProfile['branches'].forEach((b) => {
+        b.xOrg = this.generateXOrg(b.tenantId, b.orgId, b.branchId);
+      });
+      this.branches = userProfile['branches'];
+      this.groups = userProfile['groups'] ?? [];
+      this.clientSetting = userProfile['clientSetting'] ?? {
+        auditTrail: false,
+        disableClassReminder: true,
+        webhook: false,
+        support: false,
+      };
+      this.roles = userProfile['roles'] ?? [Role.Everyone, Role.User];
+
+      for (const group of this.groups) {
+        const roles: Role[] = rolegroups[group]();
+        for (let r = 0; r < roles.length; r++) {
+          if (!this.roles.includes(roles[r])) {
+            this.roles.push(roles[r]);
+          }
+        }
+      }
+
+      this.moreProps = this.setMoreProps(userProfile);
+    } else {
+      this.logger.debug(`User ${this.uid} not exists in tenant (${this.tenantId})`);
+      this.logger.debug(`Set unknown id of current user`);
+      this.roles = [Role.Everyone, Role.Unknown];
+    }
+    if (this.isRealmAdmin() && !this.roles.includes(Role.SuperAdmin)) {
+      this.roles.push(Role.SuperAdmin);
+    }
+    this.logger.verbose(`User ${this.uid} have _id (${this.getId()}), groups (${this.groups.join(',')}) and roles (${this.getRoles().join(',')}).`);
   }
 
   // getAppIntegration = () => this.appintegration;

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

@@ -12,6 +12,8 @@ import {SimpleAppFeaturesModule} from './features/features.module'
 
 import { SimpleAppResourceApiModule } from './apis/resource-api.module';
 import { SimpleAppMiniAppsModule } from './mini-apps/mini-apps.module';
+import { SimpleAppQueueConsumersModule } from './queues/queues.module';
+import { SimpleAppMiniAppScopeModule } from '@core-features/mini-app/mini-app-scope/mini-app-scope.module';
 
 @Module({
   imports: [
@@ -20,7 +22,9 @@ import { SimpleAppMiniAppsModule } from './mini-apps/mini-apps.module';
     SimpleAppEventsModule,
     SimpleAppResourceApiModule,
     SimpleAppFeaturesModule,
-    SimpleAppMiniAppsModule
+    SimpleAppMiniAppsModule,
+    SimpleAppQueueConsumersModule,
+    SimpleAppMiniAppScopeModule,
   ],
   controllers: [],
   providers: [],
@@ -30,7 +34,9 @@ import { SimpleAppMiniAppsModule } from './mini-apps/mini-apps.module';
     SimpleAppEventsModule,
     SimpleAppResourceApiModule,
     SimpleAppFeaturesModule,
-    SimpleAppMiniAppsModule
+    SimpleAppMiniAppsModule,
+    SimpleAppQueueConsumersModule,
+    SimpleAppMiniAppScopeModule,
   ]
 })
 export class SimpleAppModule {}