@simitgroup/simpleapp-generator 2.0.1-m-alpha → 2.0.1-o-alpha

package/ReleaseNote.md

@@ -1,13 +1,24 @@
+[2.0.1o-alpha]
+
+1. fetch branch image url, and fix maintenance mode data
+
+
+[2.0.1n-alpha]
+
+1. Add debug for invalid xorg
+
 [2.0.1m-alpha]
-1. remove s from environment collection name 
+
+1. remove s from environment collection name
 2. return maintenanceMessage when system under maintenance
 3. fix maintenanceMode cannot set in api
-4. 
 
 [2.0.1l-alpha]
+
 1. documentevent collection remove 's'
 
 [2.0.1k-alpha]
+
 1. apilog and documentevent collection remove 's'
 
 [2.0.1j-alpha]

package/package.json

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

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

@@ -63,7 +63,7 @@ export class MaintenanceService {
     }
   }
   async runGetEnvironment(appUser: UserContext) {
-    const res = await this.sysEnvdoc.findOne();    
+    const res = await this.sysEnvdoc.findOne();
     return res;
   }
   async runUpdateEnvironment(appUser: UserContext, data: Environment) {
@@ -71,9 +71,9 @@ export class MaintenanceService {
       systemEnable: data.systemEnable !== undefined ? data.systemEnable : true,
       stopUntil: data.stopUntil ?? '',
       maintenanceMessage: data.maintenanceMessage ?? '',
-      adminEmails: data.adminEmails.map((item) => item.replace(' ', '')) ?? [],
-      billingEmails: data.billingEmails.map((item) => item.replace(' ', '')) ?? [],
-      supportEmails: data.supportEmails.map((item) => item.replace(' ', '')) ?? [],
+      adminEmails: (data.adminEmails ?? []).map((item) => item.replace(' ', '')),
+      billingEmails: (data.billingEmails ?? []).map((item) => item.replace(' ', '')),
+      supportEmails: (data.supportEmails ?? []).map((item) => item.replace(' ', '')),
       taxRate: data.taxRate ?? 0.0,
       taxName: data.taxName ?? '',
       updated: new Date().toISOString(),

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

@@ -18,6 +18,8 @@ import { ProfileModule } from './profile/profile.module';
 import { SimpleAppUserContextModule } from './user-context/user-context.module';
 import { SimpleAppWebhookModule } from './webhook/webhook.module';
 import { AutoIncreamentModule } from './auto-increament/auto-increament.module';
+import { SimpleAppCronModule } from './cron/cron.module';
+
 @Module({
   imports: [
     AutoIncreamentModule,
@@ -31,6 +33,7 @@ import { AutoIncreamentModule } from './auto-increament/auto-increament.module';
     SimpleAppWebhookModule,
     SimpleAppMiniAppModule,
     SimpleAppSoftwarePolicyModule,
+    SimpleAppCronModule
   ],
   controllers: [],
   providers: [],
@@ -46,6 +49,7 @@ import { AutoIncreamentModule } from './auto-increament/auto-increament.module';
     SimpleAppWebhookModule,
     SimpleAppMiniAppModule,
     SimpleAppSoftwarePolicyModule,
+    SimpleAppCronModule
   ],
 })
 export class SimpleAppCoreFeaturesModule {}

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

@@ -432,7 +432,7 @@ export class UserContext extends UserContextInfo {
                       foreignField: 'orgId',
                     },
                   },
-                  { $unwind: '$org' },
+                  { $unwind: { path: '$org', preserveNullAndEmptyArrays: true } },
                 ],
               },
             },
@@ -447,6 +447,7 @@ export class UserContext extends UserContextInfo {
                   branchCode: '$b.branchCode',
                   branchName: '$b.branchName',
                   branchId: '$b.branchId',
+                  imageUrl: '$b.imageUrl',
                 },
 
                 groups: 1,
@@ -672,7 +673,7 @@ export class UserContext extends UserContextInfo {
         this.orgId = value2;
         this.branchId = value3;
       } else {
-        throw new BadRequestException('invalidXorg');
+        throw new BadRequestException(`Failed to set xorg, invalidXorg: ${xOrg}`);
       }
     } catch (err) {
       throw new BadRequestException(err);
@@ -694,7 +695,7 @@ export class UserContext extends UserContextInfo {
           branchId,
         };
       } else {
-        throw new BadRequestException('invalidXorg');
+        throw new BadRequestException(`Failed to decode xorg, invalidXorg: ${xOrg}`);
       }
     } catch (err) {
       throw new BadRequestException(err);
@@ -761,12 +762,12 @@ export class UserContext extends UserContextInfo {
         const result = await res.save({ session: this.dbsession });
         this.logger.log(result, 'accept invitation 1');
         // Set permission of all user under this.user_id
-        const updateresult = await this.permModel.updateMany({ uid: '', user_id: res._id }, { uid: this.getUid() }).session(this.dbsession);
+        const updateresult = await this.permModel.updateMany({ uid: '', userId: res._id }, { uid: this.getUid() }).session(this.dbsession);
         this.logger.log(updateresult, 'update all permission');
         return true;
       } else {
         await this.userModel.deleteOne({ _id: id }).session(this.dbsession);
-        await this.permModel.deleteMany({ uid: '', user_id: res._id }).session(this.dbsession);
+        await this.permModel.deleteMany({ uid: '', userId: res._id }).session(this.dbsession);
         return true;
       }
     } else {
@@ -986,23 +987,18 @@ export class UserContext extends UserContextInfo {
     this.ssoACL = {};
     this.roles = [Role.Everyone, Role.User, Role.SuperUser];
     this.setXOrg(xorg);
-    const pipeLine:PipelineStage[] = [
-      {$match:{ tenantId : -1 }},      
-      {$unionWith: { coll: "organization", pipeline: [ {$match:{orgId: this.orgId}}] } },
-      {$limit:1}
-    ]
+    const pipeLine: PipelineStage[] = [{ $match: { tenantId: -1 } }, { $unionWith: { coll: 'organization', pipeline: [{ $match: { orgId: this.orgId } }] } }, { $limit: 1 }];
 
     // console.log("set as static user", pipeLine)
-    const result:Organization[] = await this.userModel.aggregate(pipeLine).exec();
+    const result: Organization[] = await this.userModel.aggregate(pipeLine).exec();
     // console.log("result",result)
-    if(result && result.length>0){
-      const res = result[0]
-      this.currency = res.currency
-      this.country = res.country
-      this.timeZone = res.timeZone
-      this.offsetMinute = res.offsetMinute
+    if (result && result.length > 0) {
+      const res = result[0];
+      this.currency = res.currency;
+      this.country = res.country;
+      this.timeZone = res.timeZone;
+      this.offsetMinute = res.offsetMinute;
     }
-
   };
 
   setGuestToken(tokenStr: string) {

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

@@ -0,0 +1,10 @@
+import { Module } from '@nestjs/common';
+@Module({
+  imports: [],
+  controllers: [],
+  providers: [
+    
+  ],
+  exports: [],
+})
+export class CronModule {}

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

@@ -13,6 +13,7 @@ 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';
+import { CronModule } from './crons/cron.module';
 
 @Module({
   imports: [
@@ -24,6 +25,7 @@ import { SimpleAppMiniAppScopeModule } from '@core-features/mini-app/mini-app-sc
     SimpleAppMiniAppsModule,
     SimpleAppQueueConsumersModule,
     SimpleAppMiniAppScopeModule,
+    CronModule
   ],
   controllers: [],
   providers: [],
@@ -36,6 +38,7 @@ import { SimpleAppMiniAppScopeModule } from '@core-features/mini-app/mini-app-sc
     SimpleAppMiniAppsModule,
     SimpleAppQueueConsumersModule,
     SimpleAppMiniAppScopeModule,
+    CronModule
   ]
 })
 export class SimpleAppModule {}

package/templates/nuxt/plugins/20.simpleapp-userstore.ts.eta

@@ -103,6 +103,31 @@ export default defineNuxtPlugin(async (nuxtApp) => {
             
             this.invites = res.invites;
             this.moreProps = res.moreProps;
+            
+            if (res.branches && Array.isArray(res.branches)) {
+              const currentBranch = res.branches.find(
+                (b: any) => b.branchId === res.branchId
+              );
+              
+              if (currentBranch) {
+                this.branchCode = currentBranch.branchCode;
+                this.branchName = currentBranch.branchName;
+                this.branchRecordId = currentBranch.branch?._id || currentBranch.branchRecordId;
+                this.orgCode = currentBranch.orgCode;
+                this.orgName = currentBranch.orgName;
+                
+                if (currentBranch.branch) {
+                  this.branchInfo = {
+                    ...this.branchInfo,
+                    _id: currentBranch.branch._id,
+                    branchId: currentBranch.branchId,
+                    branchCode: currentBranch.branchCode,
+                    branchName: currentBranch.branchName,
+                    imageUrl: currentBranch.branch.imageUrl,
+                  };
+                }
+              }
+            }
             // this.package = res.moreProps.package;
             // this.appintegration.einvoice = res.appintegration.einvoice;
             // this.appintegration.simbiz6 = res.appintegration.simbiz6;