@simitgroup/simpleapp-generator 2.0.1-c-alpha → 2.0.1-e-alpha

package/ReleaseNote.md

@@ -1,3 +1,11 @@
+[2.0.1e-alpha]
+
+1. Fix developer portal cannot create app
+
+[2.0.1d-alpha]
+
+1. Compulsory index tenantId for mongodb sharding
+
 [2.0.1c-alpha]
 
 1. Reopen searchWithRelation code

package/package.json

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

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

@@ -8,7 +8,7 @@ export const <%= capitalizeFirstLetter(it.typename) %>MongoSchema = SchemaFactor
 .pre('save', function(next) {
     this.increment();
     return next();
-})
+}) .index({ 'tenantId': 1 })
 
   <% const config = it.jsonschema['x-simpleapp-config']%>   
   <% if(config['uniqueKey']) {%>

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

@@ -1,16 +1,16 @@
-import { BadRequestException, Injectable, InternalServerErrorException } from '@nestjs/common';
+import { Injectable, InternalServerErrorException } from '@nestjs/common';
 import { MiniAppManagerEnvDevelopmentService } from '../mini-app-manager/mini-app-manager-env-development.service';
 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 { 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';
 import { InjectModel } from '@nestjs/mongoose';
 import { Model } from 'mongoose';
-import { DeveloperPortalService } from './developer-portal.service';
+import { TenantLicenseEnum } from '@resources/tenant/tenant.enum';
 
 @Injectable()
 export class DeveloperPortalEnvDevelopmentService {
@@ -36,9 +36,8 @@ export class DeveloperPortalEnvDevelopmentService {
 
   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.setLicense(TenantLicenseEnum.ENTERPRISE); // else cannot install mini app
 
     const miniApp = await this.findMiniApp(developerPortalAppId, MiniAppManagerEnvEnum.DEV);
     if (!miniApp) {
@@ -76,12 +75,12 @@ export class DeveloperPortalEnvDevelopmentService {
     const users = await this.userService.search(appUser, {
       email: appUser.getEmail(),
     });
-
     if (users && users.length > 0) {
       return;
     }
 
     const user = await this.createUserRecordInDemoCompany(appUser, demoCompany);
+    appUser.setId(user._id);
     await this.assignPermissionToDemoDeveloper(appUser, demoCompany, user);
   }
 

package/templates/nest/src/simple-app/_core/features/profile/profile.service.ts.eta

@@ -94,7 +94,7 @@ export class ProfileService {
     const countryName = timezonedata['name'];
     const currencyCode = countryToCurrency[countryCode];
 
-    appuser.getDBSession().startTransaction();
+    appuser.getDBSession().startTransaction({readConcern:{level:"snapshot"},writeConcern:{w:"majority"}, readPreference: 'primary' });
     const tenantdata: Tenant = {
       tenantId: 1,
       tenantName: tenantName,

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

@@ -29,6 +29,7 @@ import { ModifiedRecords } from '../../framework/schemas';
 import { Role } from '../auth/role-guard/roles.enum';
 import { Environment } from '@core-features/maintenance/schemas';
 import * as rolegroups from '../auth/role-guard/roles.group';
+import { TenantLicenseEnum } from '@resources/tenant/tenant.enum';
 
 // import systemWebHooks from '../../webhooks';
 @Injectable({ scope: Scope.REQUEST })
@@ -141,7 +142,7 @@ export class UserContext extends UserContextInfo {
   ) {
     super();
   }
-  getEnvironment = ()=> this.systemEnvironment
+  getEnvironment = () => this.systemEnvironment;
   setDBSession = (dbsession: ClientSession) => {
     this.dbsession = dbsession;
   };
@@ -204,6 +205,18 @@ export class UserContext extends UserContextInfo {
 
   getMiniApiTokenInfo = () => this.miniApiTokenInfo;
 
+  setId = (id: string) => {
+    this._id = id;
+  };
+
+  setLicense = (license: TenantLicenseEnum) => {
+    if (!this.tenantInfo) {
+      this.tenantInfo = {} as any;
+    }
+
+    this.tenantInfo.license = license;
+  };
+
   setMiniApiToken = (token: string) => {
     this.miniApiToken = token;
   };
@@ -526,7 +539,7 @@ export class UserContext extends UserContextInfo {
         webhook: false,
         support: false,
       };
-      this.roles = userProfile['roles'] ?? [Role.Everyone, Role.User,Role.CustomField_search,Role.QueueJob_search];
+      this.roles = userProfile['roles'] ?? [Role.Everyone, Role.User, Role.CustomField_search, Role.QueueJob_search];
 
       if (this.tenantInfo?.owner?.uid === this.uid) {
         this.roles.push(Role.TenantOwner);
@@ -1099,7 +1112,7 @@ export class UserContext extends UserContextInfo {
     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(',')}).`);
+    // 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/_core/framework/base/simple-app.service.ts.eta

@@ -357,106 +357,7 @@ export class SimpleAppService<T extends SchemaFields> {
     }
   }
 
-  // seems no use, and confusing
-  // async createManyWithId(appuser: UserContext, datas: T[]) {
-  //   if (Array.isArray(datas)) {
-  //     for (let i = 0; i < datas.length; i++) {
-  //       const data = datas[i];
-  //       let isolationFilter: any = { ...appuser.getCreateFilterWithId() };
-  //       isolationFilter = this.polishIsolationFilter(isolationFilter, data);
-
-  //       Object.assign(data, isolationFilter);
-  //       this.reCalculateValue(data);
-  //       await this.validateData(appuser, data);
-  //       this.applyNestedDateTime(appuser, data, 'create');
-  //     }
-
-  //     const dbsession = appuser.getDBSession();
-  //     if (dbsession && !dbsession.inTransaction()) {
-  //       dbsession.startTransaction({ readPreference: 'primary' });
-  //     }
-
-  //     const result = await this.doc.insertMany(datas, { session: dbsession });
-  //     await this.addManyAuditEvents(appuser, this.documentName, 'createMany', datas);
-  //     for (let i = 0; i < datas.length; i++) {
-  //       appuser.addInsertedRecordId(this.documentName, datas[i]._id);
-  //     }
-  //     return result;
-  //   } else {
-  //     throw new BadRequestException(this.getDocumentType() + ': create many only support array');
-  //   }
-  // }
-
-  /**
-   * create many from array with hooks (temporary used for generate sample data only)
-   * @param appuser
-   * @param datas
-   */
-  //seems nobody use. also confusing
-  // async createManyWithHook(appuser: UserContext, datas: T[]) {
-  //   if (Array.isArray(datas)) {
-  //     for (let i = 0; i < datas.length; i++) {
-  //       const data = datas[i];
-
-  //       let result;
-  //       const dbsession = appuser.getDBSession();
-  //       if (dbsession && !dbsession.inTransaction()) {
-  //         dbsession.startTransaction({ readPreference: 'primary' });
-  //       }
-
-  //       if (this.withDocNumberFormat && !data[this.documentIdentityCode]) {
-  //         await this.genNewDocNo(appuser, data);
-  //       }
-
-  //       let isolationFilter: any = { ...appuser.getCreateFilterWithId() };
-  //       isolationFilter = this.polishIsolationFilter(isolationFilter, data);
-
-  //       Object.assign(data, isolationFilter);
-  //       this.reCalculateValue(data);
-  //       await this.validateData(appuser, data);
-  //       this.applyNestedDateTime(appuser, data, 'create');
-
-  //       //new way of hook
-  //       await this.runEvent(appuser, this.setHookName('beforeCreate'), { data: data }, false);
-
-  //       const newdoc = new this.doc(data);
-
-  //       try {
-  //         result = await newdoc.save({ session: dbsession });
-  //         await this.addAuditEvent(appuser, this.documentName, result._id, 'create', data);
-  //         appuser.addInsertedRecordId(this.documentName, result._id);
-  //       } catch (err) {
-  //         this.logger.error(err);
-  //         throw new ProcessErrorException('ERR_CREATE_MANY',err.message,{
-  //           err:err
-  //         })
-  //         // const processdata = await this.runEvent(appuser, 'processdata.processError', {
-  //         //   err: err,
-  //         // });
-
-  //         // if (!processdata) {
-  //         //   throw new InternalServerErrorException(err);
-  //         // } else {
-  //         //   throw new CustomException(processdata.code, processdata.msg);
-  //         // }
-  //       }
-
-  //       try {
-  //         //new way of hook
-  //         await this.runEvent(appuser, this.setHookName('afterCreate'), { data: data }, false);
-  //         await this.callWebhook(appuser, 'create', result);
-
-  //         // return result as T;
-  //       } catch (err) {
-  //         throw new InternalServerErrorException(`createHook ${this.documentType} error: ${JSON.stringify(err)}`, `${this.documentType} createHook error`);
-  //       }
-  //     }
-  //   } else {
-  //     throw new BadRequestException(this.getDocumentType() + ': create many only support array');
-  //   }
-  //   return 'ok';
-  // }
-
+ 
   /**
    * create many from array, for performance reason it submit all item in 1 go, so it won't implement hooks
    * @param appuser
@@ -476,7 +377,7 @@ export class SimpleAppService<T extends SchemaFields> {
       }
       const dbsession = appuser.getDBSession();
       if (dbsession && !dbsession.inTransaction()) {
-        dbsession.startTransaction({ readPreference: 'primary' });
+        dbsession.startTransaction({readConcern:{level:"snapshot"},writeConcern:{w:"majority"}, readPreference: 'primary' });
       }
 
       try {
@@ -495,71 +396,6 @@ export class SimpleAppService<T extends SchemaFields> {
     }
   }
 
-  //seems nobody use, also confusing
-  // async createWithId(appuser: UserContext, data: T) {
-  //   let result;
-
-  //   if (!data._id) {
-  //     data._id = crypto.randomUUID();
-  //   }
-  //   const dbsession = appuser.getDBSession();
-  //   if (dbsession && !dbsession.inTransaction()) {
-  //     dbsession.startTransaction({ readPreference: 'primary' });
-  //   }
-
-  //   this.logger.debug('this.withDocNumberFormat :' + this.withDocNumberFormat + '  && ' + '!data[this.documentIdentityCode] ==' + !data[this.documentIdentityCode]);
-  //   if (this.withDocNumberFormat && !data[this.documentIdentityCode]) {
-  //     await this.genNewDocNo(appuser, data);
-  //   }
-
-  //   let isolationFilter: any = { ...appuser.getCreateFilterWithId() };
-  //   isolationFilter = this.polishIsolationFilter(isolationFilter, data);
-
-  //   this.logger.debug('isolationFilter', 'SimpleAppService');
-  //   this.logger.debug(isolationFilter, 'SimpleAppService');
-  //   this.logger.debug('Create data before isolation', 'SimpleAppService');
-  //   this.logger.debug(data, 'SimpleAppService');
-  //   Object.assign(data, isolationFilter);
-  //   this.reCalculateValue(data);
-  //   await this.validateData(appuser, data);
-  //   this.logger.debug(data, `after create validation`);
-  //   this.applyNestedDateTime(appuser, data, 'create');
-
-  //   //new way of hook
-
-  //   await this.runEvent(appuser, this.setHookName('beforeCreate'), { data: data }, false);
-
-  //   this.logger.debug(data, `Create Record ${this.documentName}`);
-  //   const newdoc = new this.doc(data);
-  //   await this.identifyForeignKeys(appuser, data);
-  //   try {
-  //     result = await newdoc.save({ session: dbsession });
-  //     await this.addAuditEvent(appuser, this.documentName, result._id, 'create', data);
-  //     appuser.addInsertedRecordId(this.documentName, result._id);
-  //   } catch (err) {
-  //     this.logger.error(err);
-  //     const processdata = await this.runEvent(appuser, 'processdata.processError', {
-  //       err: err,
-  //     });
-
-  //     if (!processdata) {
-  //       throw new InternalServerErrorException(err);
-  //     } else {
-  //       throw new CustomException(processdata.code, processdata.msg);
-  //     }
-  //   }
-
-  //   try {
-  //     //new way of hook
-  //     await this.runEvent(appuser, this.setHookName('afterCreate'), { data: result }, false);
-
-  //     await this.callWebhook(appuser, 'create', result);
-  //     return result as T;
-  //   } catch (err) {
-  //     throw new InternalServerErrorException(`createHook ${this.documentType} error: ${JSON.stringify(err)}`, `${this.documentType} createHook error`);
-  //   }
-  // }
-
   async create(appuser: UserContext, data: T, noStartTransaction: boolean = false) {
     let result;
 
@@ -568,7 +404,7 @@ export class SimpleAppService<T extends SchemaFields> {
     }
     const dbsession = appuser.getDBSession();
     if (dbsession && !dbsession.inTransaction() && !noStartTransaction) {
-      dbsession.startTransaction({ readPreference: 'primary' });
+      dbsession.startTransaction({readConcern:{level:"snapshot"},writeConcern:{w:"majority"}, readPreference: 'primary' });
     }
 
     this.logger.debug('this.withDocNumberFormat :' + this.withDocNumberFormat + '  && ' + '!data[this.documentIdentityCode] ==' + !data[this.documentIdentityCode]);
@@ -714,7 +550,7 @@ export class SimpleAppService<T extends SchemaFields> {
     }
     const dbsession = appuser.getDBSession();
     if (dbsession && !dbsession.inTransaction()) {
-      dbsession.startTransaction({ readPreference: 'primary' });
+      dbsession.startTransaction({readConcern:{level:"snapshot"},writeConcern:{w:"majority"}, readPreference: 'primary' });
     }
 
     let dependency;
@@ -793,7 +629,7 @@ export class SimpleAppService<T extends SchemaFields> {
 
       const dbsession = appuser.getDBSession();
       if (dbsession && !dbsession.inTransaction() && !noStartTransaction) {
-        dbsession.startTransaction({ readPreference: 'primary' });
+        dbsession.startTransaction({readConcern:{level:"snapshot"},writeConcern:{w:"majority"}, readPreference: 'primary' });
       }
       // try {
       Object.assign(data, appuser.getUpdateFilter());
@@ -852,7 +688,7 @@ export class SimpleAppService<T extends SchemaFields> {
 
       const dbsession = appuser.getDBSession();
       if (dbsession && !dbsession.inTransaction()) {
-        dbsession.startTransaction({ readPreference: 'primary' });
+        dbsession.startTransaction({readConcern:{level:"snapshot"},writeConcern:{w:"majority"}, readPreference: 'primary' });
       }
       // try {
       // Object.assign(data, appuser.getUpdateFilter());
@@ -908,7 +744,7 @@ export class SimpleAppService<T extends SchemaFields> {
       await this.runEvent(appuser, this.setHookName('beforePatch'), { id: id, patchData: data, prevData: existingdata }, false);
       const dbsession = appuser.getDBSession();
       if (dbsession && !dbsession.inTransaction()) {
-        dbsession.startTransaction({ readPreference: 'primary' });
+        dbsession.startTransaction({readConcern:{level:"snapshot"},writeConcern:{w:"majority"}, readPreference: 'primary' });
       }
       // try {
       Object.assign(data, appuser.getUpdateFilter());
@@ -963,7 +799,7 @@ export class SimpleAppService<T extends SchemaFields> {
     // Get DB Session
     const dbsession = appuser.getDBSession();
     if (dbsession && !dbsession.inTransaction()) {
-      dbsession.startTransaction({ readPreference: 'primary' });
+      dbsession.startTransaction({readConcern:{level:"snapshot"},writeConcern:{w:"majority"}, readPreference: 'primary' });
     }
 
     const result = await this.doc.updateMany(isolationFilter, { $set: patch }, { session: dbsession });