@simitgroup/simpleapp-generator 1.6.7-o-alpha → 2.0.0-a-alpha

package/templates/nest/src/{simpleapp/profile/profile.controller.ts._eta → simple-app/.core/features/profile/profile.controller.ts.eta}

@@ -1,38 +1,16 @@
 /**
  * This file was automatically generated by simpleapp generator. It is changable.
- * --remove-this-line-to-prevent-override--
- * last change 2024-02-23
+ * MODIFICATION OVERRIDE BY GENERATEOR
  * Author: Ks Tan
  */
-import {
-  Controller,
-  Get,
-  Put,
-  Post,
-  Patch,
-  Delete,
-  Body,
-  Query,
-  Param,
-  Type,
-  Res,
-  HttpStatus,
-  Inject,
-  Injectable,
-  Scope,
-  Req,
-  HttpException,
-  Request,
-  Logger,
-} from '@nestjs/common';
-import { Roles } from '../generate/commons/roles/roles.decorator';
-import { Role } from '../generate/commons/roles/roles.enum';
+import { Controller, Get, Put, Post, Patch, Delete, Body, Query, Param, Type, Res, HttpStatus, Inject, Injectable, Scope, Req, HttpException, Request, Logger } from '@nestjs/common';
+import { Roles } from '../auth/role-guard/roles.decorator';
+import { Role } from '../auth/role-guard/roles.enum';
 import { ApiTags, ApiBody, ApiResponse, ApiOperation } from '@nestjs/swagger';
-import { UserContext } from '../generate/commons/user.context';
+import { UserContext } from '../user-context/user.context';
 import { ProfileService } from './profile.service';
-import { AppUser } from '../generate/commons/decorators/appuser.decorator';
-import { RegTenant } from './profile.types';
-import { RegTenantApiSchema, MyProfileApiSchema } from './profile.apischema';
+import { AppUser } from '../user-context/appuser.decorator';
+import { UserContextInfo, TenantPermission, RegTenant } from './profile.schema';
 @ApiTags('PROFILE')
 @Controller('/profile')
 export class ProfileController {
@@ -49,14 +27,12 @@ export class ProfileController {
   })
   @ApiResponse({
     status: 200,
-    type: () => MyProfileApiSchema,
+    type: () => UserContextInfo,
     description: 'Success',
   })
   @ApiResponse({ status: 401, type: Object, description: 'Undefine profile' })
   async getProfile(@AppUser() appuser: UserContext) {
-    this.logger.debug(
-      `access getProfile API by ${appuser.getUid()},(${appuser.getId()})`,
-    );
+    this.logger.debug(`access getProfile API by ${appuser.getUid()},(${appuser.getId()})`);
     const result = await this.profileservice.getProfile(appuser);
     this.logger.debug('getProfile result is:');
     this.logger.debug(result);
@@ -67,26 +43,26 @@ export class ProfileController {
     }
   }
 
-  @Get('session')
-  @Roles(Role.Everyone, Role.User)
-  @ApiOperation({
-    operationId: 'getSession',
-    description: 'Get current user session',
-  })
-  @ApiResponse({
-    status: 200,
-    type: () => String,
-    description: 'Success',
-  })
-  @ApiResponse({ status: 401, type: Object, description: 'Expired' })
-  async getSession(@AppUser() appuser: UserContext) {
-    const result = await this.profileservice.getSession(appuser);
-    if (result) {
-      return result;
-    } else {
-      throw new HttpException('Forbidden', HttpStatus.FORBIDDEN);
-    }
-  }
+  // @Get('session')
+  // @Roles(Role.Everyone, Role.User)
+  // @ApiOperation({
+  //   operationId: 'getSession',
+  //   description: 'Get current user session',
+  // })
+  // @ApiResponse({
+  //   status: 200,
+  //   type: () => String,
+  //   description: 'Success',
+  // })
+  // @ApiResponse({ status: 401, type: Object, description: 'Expired' })
+  // async getSession(@AppUser() appuser: UserContext) {
+  //   const result = await this.profileservice.getSession(appuser);
+  //   if (result) {
+  //     return result;
+  //   } else {
+  //     throw new HttpException('Forbidden', HttpStatus.FORBIDDEN);
+  //   }
+  // }
 
   @Get('/tenants')
   @Roles(Role.Everyone, Role.User)
@@ -96,14 +72,12 @@ export class ProfileController {
   })
   @ApiResponse({
     status: 200,
-    type: () => [MyProfileApiSchema],
+    type: () => [TenantPermission],
     description: 'Success',
   })
   @ApiResponse({ status: 401, type: Object, description: 'Undefine profile' })
   async getAllTenants(@AppUser() appuser: UserContext) {
-    this.logger.debug(
-      `access getAllTenants API by ${appuser.getUid()},(${appuser.getId()})`,
-    );
+    this.logger.debug(`access getAllTenants API by ${appuser.getUid()},(${appuser.getId()})`);
     const result = await this.profileservice.getAllTenants(appuser);
     this.logger.debug('getProfile result is:');
     this.logger.debug(result);
@@ -116,7 +90,7 @@ export class ProfileController {
 
   @Post('/tenant')
   @Roles(Role.Everyone)
-  @ApiBody({ description: 'create tenant name', type: RegTenantApiSchema })
+  @ApiBody({ description: 'create tenant name', type: RegTenant})
   @ApiOperation({
     operationId: 'createTenant',
     description: 'create new tenant',
@@ -129,13 +103,7 @@ export class ProfileController {
     @Body('utcOffset') utcOffset: number,
     @Body('businessType') businessType: string,
   ) {
-    const result = await this.profileservice.createTenant(
-      appuser,
-      tenantName,
-      timeZone,
-      utcOffset,
-      businessType,
-    );
+    const result = await this.profileservice.createTenant(appuser, tenantName, timeZone, utcOffset, businessType);
     if (result) {
       return result;
     } else {
@@ -150,16 +118,8 @@ export class ProfileController {
     description: 'accept or reject invitation to tenant',
   })
   @ApiResponse({ status: 201, type: Object, description: 'Success' })
-  async decideInvitation(
-    @AppUser() appuser: UserContext,
-    @Param('id') id: string,
-    @Param('decision') decision: string,
-  ) {
-    const result = await this.profileservice.decideInvitation(
-      appuser,
-      id,
-      decision,
-    );
+  async decideInvitation(@AppUser() appuser: UserContext, @Param('id') id: string, @Param('decision') decision: string) {
+    const result = await this.profileservice.decideInvitation(appuser, id, decision);
     if (result) {
       return result;
     } else {
@@ -173,14 +133,8 @@ export class ProfileController {
     description: 'complete specific tour guide',
   })
   @ApiResponse({ status: 201, type: Object, description: 'Success' })
-  async runTourComplete(
-    @AppUser() appuser: UserContext,
-    @Param('guidename') guidename: string,
-  ) {
-    const result = await this.profileservice.runTourComplete(
-      appuser,
-      guidename,
-    );
+  async runTourComplete(@AppUser() appuser: UserContext, @Param('guidename') guidename: string) {
+    const result = await this.profileservice.runTourComplete(appuser, guidename);
     if (result) {
       return result;
     } else {

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

@@ -0,0 +1,22 @@
+/**
+ * This file was automatically generated by simpleapp generator. Every
+ * MODIFICATION OVERRIDE BY GENERATEOR
+ * last change 2024-04-02
+ * Author: Ks Tan
+ */
+import { Module } from '@nestjs/common';
+import { MongooseModule } from '@nestjs/mongoose';
+import { ProfileService } from './profile.service';
+import { ProfileController } from './profile.controller';
+import {UserModule} from '../../resources/user/user.module'
+import {PermissionModule} from '../../resources/permission/permission.module'
+import {TenantModule} from '../../resources/tenant/tenant.module'
+import {BranchModule} from '../../resources/branch/branch.module'
+import {OrganizationModule} from '../../resources/organization/organization.module'
+@Module({
+  imports: [UserModule,PermissionModule,TenantModule,OrganizationModule,BranchModule],
+  controllers: [ProfileController],
+  providers: [ProfileService],
+  exports: [ProfileService],
+})
+export class ProfileModule {}

package/templates/nest/src/simple-app/.core/features/profile/profile.schema.ts.eta

@@ -0,0 +1,165 @@
+import { ApiProperty } from '@nestjs/swagger';
+import { ForeignKey } from '../../framework/schemas';
+import { Branch } from 'src/simple-app/.core/resources/branch/branch.schema';
+import { Permission } from 'src/simple-app/.core/resources/permission/permission.schema';
+import { Role } from '../auth/role-guard/roles.enum';
+
+export class UserContextInfo {
+  @ApiProperty({ type: String })
+  _id: string;
+  @ApiProperty({ type: String })
+  uid: string;
+  @ApiProperty({ type: String })
+  sessionId: string;
+  @ApiProperty({ type: String })
+  xOrg: string;
+
+  @ApiProperty({ type: Number })
+  tenantId: number;
+  @ApiProperty({ type: Number })
+  orgId: number;
+  @ApiProperty({ type: String })
+  orgRecordId: string;
+  @ApiProperty({ type: Number })
+  branchId: number;
+  @ApiProperty({ type: String })
+  branchRecordId: string;
+  @ApiProperty({ type: String })
+  branchCode: string;
+  @ApiProperty({ type: String })
+  branchName: string;
+  @ApiProperty({ type: String })
+  orgCode: string;
+  @ApiProperty({ type: String })
+  orgName: string;
+  @ApiProperty({ type: String })
+  timeZone: string;
+  @ApiProperty({ type: String })
+  currency: string;
+  @ApiProperty({ type: String })
+  country: string;
+  @ApiProperty({ type: Number })
+  offsetMinute: number;
+  @ApiProperty({ type: String })
+  email: string;
+  @ApiProperty({ type: String })
+  uName: string;
+  @ApiProperty({ type: String })
+  fullName: string;
+  @ApiProperty({ type: [String], description: "List of user's group in product " })
+  groups: string[];
+
+  @ApiProperty({ type: [String], description: 'List of task, or authority of the user can do' })
+  roles: Role[];
+
+  @ApiProperty({ type: () => [ProfileUserInvites], description: 'Provide invitation id to user, to authorize join the tenant' })
+  invites: ProfileUserInvites[];
+
+  @ApiProperty({ type: () => [ProfileUserBranch], description: 'List of branch the user can access in current tenant' })
+  branches: ProfileUserBranch[];
+
+  @ApiProperty({ type: () => Object, description: 'Store all the rest of useful fields regarding user or branch' })
+  moreProps?: Record<string, any>;
+}
+
+export class ProfileUserInvites {
+  @ApiProperty({ type: String })
+  _id: string; // uid record id
+  @ApiProperty({ type: String })
+  created: string;
+  @ApiProperty({ type: Number })
+  tenantId: number;
+  @ApiProperty({ type: String })
+  tenantName: string;
+}
+
+export class BranchMinInfo {
+  @ApiProperty({ type: String })
+  branchId:string
+  @ApiProperty({ type: String })
+  branchCode:string
+  @ApiProperty({ type: String })
+  branchName:string
+}
+export class ProfileUserBranch {
+  @ApiProperty({ type: String })
+  permissionId: string;
+  @ApiProperty({ type: Number })
+  tenantId: number;
+  @ApiProperty({ type: Number })
+  orgId: number;
+  @ApiProperty({ type: Number })
+  branchId: number;
+  @ApiProperty({ type: [String], description: "List of user's group" })
+  groups: string[];
+  @ApiProperty({ type: BranchMinInfo })
+  branch: BranchMinInfo;
+  @ApiProperty({ type: String })
+  orgRecordId: String;
+  @ApiProperty({ type: String })
+  xOrg: String;
+}
+
+export class TenantPermission {
+  @ApiProperty({ type: String })
+  tenantName: string;
+  @ApiProperty({ type: () => ProfileUserBranch })
+  permissions: ProfileUserBranch[];
+}
+
+export class RegTenant {
+  @ApiProperty({
+    type: String,
+    required: true,
+    examples: ['my company 1'],
+    default: '',
+  })
+  tenantName: String;
+  @ApiProperty({
+    type: String,
+    required: true,
+    examples: ['Asia/Kuala_Lumpur'],
+    default: '',
+  })
+  timeZone: String;
+  @ApiProperty({
+    type: Number,
+    required: true,
+    examples: [0, -460],
+  })
+  utcOffset: Number;
+}
+/****************------unchecked schema------********************/
+
+// export class ProfileSchema {
+//   @ApiProperty({ type: String })
+//   _id: String;
+//   @ApiProperty({ type: Number })
+//   tenantId: number;
+//   @ApiProperty({ type: Number })
+//   'orgId': number;
+//   @ApiProperty({ type: Number })
+//   'branchId': number;
+//   @ApiProperty({ type: String })
+//   'email': String;
+//   @ApiProperty({ type: Number })
+//   'uid': String;
+//   @ApiProperty({ type: Number })
+//   'fullName': String;
+//   @ApiProperty({ type: Number })
+//   'group': String;
+//   @ApiProperty({ type: () => [String] })
+//   'roles': String[];
+
+//   @ApiProperty({ type: () => [ProfileUserBranch] })
+//   'branches': ProfileUserBranch[];
+//   @ApiProperty({ type: () => [ProfileUserInvites] })
+//   'invites': ProfileUserInvites[];
+//   @ApiProperty({ type: String })
+//   'time': String;
+// }
+
+// export class BranchPermission extends Permission {
+//   @ApiProperty({ type: () => ForeignKey })
+//   branch: ForeignKey;
+// }

package/templates/nest/src/{simpleapp/profile/profile.service.ts._eta → simple-app/.core/features/profile/profile.service.ts.eta}

@@ -1,29 +1,29 @@
 /**
  * This file was automatically generated by simpleapp generator. It is changable.
- * --remove-this-line-to-prevent-override--
- * last change 2024-02-23
+ * MODIFICATION OVERRIDE BY GENERATEOR
  * Author: Ks Tan
  */
-import { UserService, User } from './../services/user.service';
+
 import countrytimezone from 'countries-and-timezones';
 import countryToCurrency, { Currencies, Countries } from 'country-to-currency';
-import {
-  Injectable,
-  Scope,
-  Inject,
-  Logger,
-  BadRequestException,
-  InternalServerErrorException,
-} from '@nestjs/common';
-import { UserContext } from '../generate/commons/user.context';
-import { RegTenant } from './profile.types';
+import { Injectable, Scope, Inject, Logger, BadRequestException, InternalServerErrorException } from '@nestjs/common';
+import { UserContext } from '../user-context/user.context';
+// import { RegTenant } from './profile.types';
 import * as mongoose from 'mongoose';
 import { InjectConnection } from '@nestjs/mongoose';
-import { TenantService, Tenant } from '../services/tenant.service';
-import { OrganizationService, Organization } from '../services/org.service';
-import { BranchService, Branch } from '../services/branch.service';
-import { PermissionService, Permission } from './../services/perm.service';
+import { TenantService } from '../../resources/tenant/tenant.service';
+import { OrganizationService } from '../../resources/organization/organization.service';
+import { BranchService } from '../../resources/branch/branch.service';
+import { UserService } from '../../resources/user/user.service';
+import { PermissionService } from '../../resources/permission/permission.service';
+
+import { Tenant } from '../../resources/tenant/tenant.schema';
+import { Organization } from '../../resources/organization/organization.schema';
+import { Branch } from '../../resources/branch/branch.schema';
+import { User } from '../../resources/user/user.schema';
+import { Permission } from '../../resources/permission/permission.schema'
 
+import { UserContextInfo } from './profile.schema';
 const Base64URL = require('@darkwolf/base64url');
 @Injectable()
 export class ProfileService {
@@ -45,11 +45,8 @@ export class ProfileService {
    */
   async getProfile(appuser: UserContext) {
     const accessTenantId = appuser.getTenantId();
-    this.logger.verbose(
-      `get userprofile for ${appuser.getUid()} for tenantId ${accessTenantId}`,
-      'getProfile',
-    );
-    const userinfo = await appuser.getUserInfo();
+    this.logger.verbose(`get userprofile for ${appuser.getUid()} for tenantId ${accessTenantId}`, 'getProfile');
+    const userinfo: UserContextInfo = await appuser.getUserInfo();
 
     if (userinfo._id == '') {
       this.logger.warn('unknown _id for ', appuser.getUid());
@@ -83,17 +80,11 @@ export class ProfileService {
     }
     const createresult = await this.usersvc.create(appuser, data);
     const userinfo = await appuser.getUserInfo();
-    userinfo._id = createresult._id;
+    userinfo._id = createresult._id.toString();
     return userinfo;
   }
 
-  async createTenant(
-    appuser: UserContext,
-    tenantName: string,
-    timeZone: string,
-    utcOffset: number,
-    businessType: string,
-  ) {
+  async createTenant(appuser: UserContext, tenantName: string, timeZone: string, utcOffset: number, businessType: string) {
     // try{
     const timezonedata = countrytimezone.getCountriesForTimezone(timeZone)[0];
     const countryCode = timezonedata['id'];
@@ -151,6 +142,16 @@ export class ProfileService {
       branchId: 1,
       branchCode: 'HQ',
       branchName: tenantName,
+      companyName: tenantName,
+      registrationNo: '',
+      paymentRemark: '',
+      invoiceRemark: '',
+      cnRemark: '',
+      refundRemark: '',
+      workStart: '09:00:00',
+      workEnd: '22:00:00',
+      workingHours: [],
+      offdays: ['sat', 'sun'],
       street1: '11,my street 1',
       street2: 'my street 2',
       postcode: '11111',
@@ -210,26 +211,14 @@ export class ProfileService {
 
     //tenant owner shall map to userId for that tenant
 
-    const tenantUpdateData = await this.tenantsvc.findById(
-      appuser,
-      tenantResult._id,
-    );
-    this.logger.log(
-      tenantUpdateData,
-      `update tenant owner(${tenantResult._id})`,
-    );
+    const tenantUpdateData = await this.tenantsvc.findById(appuser, tenantResult._id);
+    this.logger.log(tenantUpdateData, `update tenant owner(${tenantResult._id})`);
     tenantUpdateData.owner._id = userRecordId;
-    const updateTenantOwnerResult = await this.tenantsvc.findIdThenUpdate(
-      appuser,
-      tenantResult._id,
-      tenantUpdateData,
-    );
+    const updateTenantOwnerResult = await this.tenantsvc.findIdThenUpdate(appuser, tenantResult._id, tenantUpdateData);
     if (!updateTenantOwnerResult) {
       throw new BadRequestException('Update tenant owner failed');
     }
-    const xorg: string = Base64URL.encodeText(
-      `${tenantResult.tenantId}-${orgResult.orgId}-${branchResult.branchId}`,
-    );
+    const xorg: string = Base64URL.encodeText(`${tenantResult.tenantId}-${orgResult.orgId}-${branchResult.branchId}`);
     const finalresult = {
       xOrg: xorg,
       tenantId: tenantResult.tenantId,
@@ -262,8 +251,7 @@ export class ProfileService {
   }
 
   async runTourComplete(appuser: UserContext, guideName: string) {
-    if (!guideName || guideName == '')
-      throw new BadRequestException('undefine guideName');
+    if (!guideName || guideName == '') throw new BadRequestException('undefine guideName');
 
     const user = await this.usersvc.findById(appuser, appuser.getId());
     if (!Array.isArray(user.completedTours)) {