rez_core 1.0.42 → 1.0.44
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/constant/global.constant.d.ts +2 -0
- package/dist/constant/global.constant.js +3 -1
- package/dist/constant/global.constant.js.map +1 -1
- package/dist/module/auth/guards/role.guard.js +3 -3
- package/dist/module/listmaster/controller/list-master.controller.js +4 -4
- package/dist/module/listmaster/controller/list-master.controller.js.map +1 -1
- package/dist/module/listmaster/entity/list-master.entity.d.ts +3 -6
- package/dist/module/listmaster/entity/list-master.entity.js +3 -15
- package/dist/module/listmaster/entity/list-master.entity.js.map +1 -1
- package/dist/module/listmaster/listmaster.module.js +2 -0
- package/dist/module/listmaster/listmaster.module.js.map +1 -1
- package/dist/module/listmaster/service/list-master.service.js +13 -5
- package/dist/module/listmaster/service/list-master.service.js.map +1 -1
- package/dist/module/master/controller/master.controller.d.ts +1 -1
- package/dist/module/master/controller/master.controller.js +5 -5
- package/dist/module/master/controller/master.controller.js.map +1 -1
- package/dist/module/master/service/master.service.d.ts +3 -8
- package/dist/module/master/service/master.service.js +60 -94
- package/dist/module/master/service/master.service.js.map +1 -1
- package/dist/module/meta/entity/attribute-master.entity.d.ts +1 -0
- package/dist/module/meta/entity/attribute-master.entity.js +5 -1
- package/dist/module/meta/entity/attribute-master.entity.js.map +1 -1
- package/dist/module/meta/entity/entity-master.entity.d.ts +1 -1
- package/dist/module/meta/entity/entity-master.entity.js +1 -1
- package/dist/module/meta/entity/entity-master.entity.js.map +1 -1
- package/dist/module/meta/entity/view-master.entity.d.ts +11 -0
- package/dist/module/meta/entity/view-master.entity.js +55 -0
- package/dist/module/meta/entity/view-master.entity.js.map +1 -0
- package/dist/module/meta/service/view-master.service.d.ts +10 -0
- package/dist/module/meta/service/view-master.service.js +35 -0
- package/dist/module/meta/service/view-master.service.js.map +1 -0
- package/dist/module/module/controller/module-access.controller.d.ts +14 -0
- package/dist/module/module/controller/module-access.controller.js +11 -0
- package/dist/module/module/controller/module-access.controller.js.map +1 -1
- package/dist/module/module/repository/module-access.repository.d.ts +15 -0
- package/dist/module/module/repository/module-access.repository.js +66 -12
- package/dist/module/module/repository/module-access.repository.js.map +1 -1
- package/dist/module/module/service/module-access.service.d.ts +14 -0
- package/dist/module/module/service/module-access.service.js +11 -0
- package/dist/module/module/service/module-access.service.js.map +1 -1
- package/dist/module/third-party-module/entity/third-party-api-registry.entity.d.ts +15 -0
- package/dist/module/third-party-module/entity/third-party-api-registry.entity.js +72 -0
- package/dist/module/third-party-module/entity/third-party-api-registry.entity.js.map +1 -0
- package/dist/module/third-party-module/repository/third-party-api-registry.repository.d.ts +7 -0
- package/dist/module/third-party-module/repository/third-party-api-registry.repository.js +38 -0
- package/dist/module/third-party-module/repository/third-party-api-registry.repository.js.map +1 -0
- package/dist/module/third-party-module/service/api-registry.service.d.ts +6 -0
- package/dist/module/third-party-module/service/api-registry.service.js +28 -0
- package/dist/module/third-party-module/service/api-registry.service.js.map +1 -0
- package/dist/module/third-party-module/third-party.module.d.ts +2 -0
- package/dist/module/third-party-module/third-party.module.js +25 -0
- package/dist/module/third-party-module/third-party.module.js.map +1 -0
- package/dist/tsconfig.build.tsbuildinfo +1 -1
- package/package.json +3 -1
- package/src/constant/global.constant.ts +4 -0
- package/src/module/auth/guards/jwt.guard.ts +22 -22
- package/src/module/auth/guards/role.guard.ts +68 -68
- package/src/module/auth/services/jwt.service.ts +11 -11
- package/src/module/auth/strategies/local.strategy.ts +13 -13
- package/src/module/dev/dev.module.ts +12 -12
- package/src/module/dev/service/dev.service.ts +7 -7
- package/src/module/enterprise/entity/enterprise.entity.ts +37 -37
- package/src/module/enterprise/entity/organization.entity.ts +80 -80
- package/src/module/listmaster/controller/list-master.controller.ts +3 -3
- package/src/module/listmaster/entity/list-master.entity.ts +3 -12
- package/src/module/listmaster/listmaster.module.ts +2 -0
- package/src/module/listmaster/service/list-master.service.ts +23 -9
- package/src/module/master/controller/master.controller.ts +14 -6
- package/src/module/master/service/master.service.ts +75 -120
- package/src/module/meta/dto/entity-list-data.dto.ts +6 -6
- package/src/module/meta/entity/attribute-master.entity.ts +4 -1
- package/src/module/meta/entity/entity-master.entity.ts +3 -1
- package/src/module/meta/entity/preference.entity.ts +65 -65
- package/src/module/meta/entity/view-master.entity.ts +32 -0
- package/src/module/meta/repository/preference.repository.ts +20 -20
- package/src/module/meta/service/view-master.service.ts +41 -0
- package/src/module/module/controller/menu.controller.ts +15 -15
- package/src/module/module/controller/module-access.controller.ts +26 -10
- package/src/module/module/entity/module-access.entity.ts +22 -22
- package/src/module/module/entity/module-action.entity.ts +19 -19
- package/src/module/module/repository/module-access.repository.ts +95 -36
- package/src/module/module/service/module-access.service.ts +20 -0
- package/src/module/third-party-module/entity/third-party-api-registry.entity.ts +43 -0
- package/src/module/third-party-module/repository/third-party-api-registry.repository.ts +20 -0
- package/src/module/third-party-module/service/api-registry.service.ts +13 -0
- package/src/module/third-party-module/third-party.module.ts +12 -0
- package/src/module/user/controller/user.controller.ts +28 -28
- package/src/module/user/dto/update-user.dto.ts +4 -4
- package/src/module/user/entity/user-role-mapping.entity.ts +21 -21
- package/src/module/user/entity/user-session.entity.ts +61 -61
- package/src/module/user/repository/userSession.repository.ts +33 -33
- package/src/utils/service/encryptUtil.service.ts +97 -97
- package/src/utils/service/excelUtil.service.ts +15 -15
- package/src/utils/service/reflection-helper.service.ts +53 -53
- package/.idea/250218_nodejs_core.iml +0 -12
- package/.idea/codeStyles/Project.xml +0 -59
- package/.idea/codeStyles/codeStyleConfig.xml +0 -5
- package/.idea/dataSources.xml +0 -12
- package/.idea/modules.xml +0 -8
- package/.idea/prettier.xml +0 -6
- package/.idea/vcs.xml +0 -6
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "rez_core",
|
|
3
|
-
"version": "1.0.
|
|
3
|
+
"version": "1.0.44",
|
|
4
4
|
"description": "",
|
|
5
5
|
"author": "",
|
|
6
6
|
"private": false,
|
|
@@ -21,6 +21,7 @@
|
|
|
21
21
|
"prepare": "husky"
|
|
22
22
|
},
|
|
23
23
|
"dependencies": {
|
|
24
|
+
"@nestjs/axios": "^4.0.0",
|
|
24
25
|
"@nestjs/common": "^11.0.1",
|
|
25
26
|
"@nestjs/config": "^4.0.1",
|
|
26
27
|
"@nestjs/core": "^11.0.1",
|
|
@@ -31,6 +32,7 @@
|
|
|
31
32
|
"@nestjs/typeorm": "^11.0.0",
|
|
32
33
|
"250218_nodejs_core": "file:",
|
|
33
34
|
"aws-sdk": "^2.1692.0",
|
|
35
|
+
"axios": "^1.9.0",
|
|
34
36
|
"bcrypt": "^5.1.1",
|
|
35
37
|
"class-transformer": "^0.5.1",
|
|
36
38
|
"class-validator": "^0.14.1",
|
|
@@ -20,3 +20,7 @@ export const secretKey: string = process.env.secret_key || '';
|
|
|
20
20
|
export const STATUS_ACTIVE = 'ACTIVE';
|
|
21
21
|
export const STATUS_INACTIVE = 'INACTIVE';
|
|
22
22
|
export const STATUS_PENDING = 'PENDING';
|
|
23
|
+
|
|
24
|
+
// Entity Status
|
|
25
|
+
export const ENTITYSTATUS_TO_BE_PUBLISHED = 'to_be_published';
|
|
26
|
+
export const ENTITYSTATUS_PUBLISHED = 'published';
|
|
@@ -1,22 +1,22 @@
|
|
|
1
|
-
import { ExecutionContext, Injectable } from '@nestjs/common';
|
|
2
|
-
import { AuthGuard } from '@nestjs/passport';
|
|
3
|
-
import { Reflector } from '@nestjs/core';
|
|
4
|
-
import { Observable } from 'rxjs';
|
|
5
|
-
|
|
6
|
-
@Injectable()
|
|
7
|
-
export class JwtAuthGuard extends AuthGuard('jwt') {
|
|
8
|
-
constructor(private reflector: Reflector) {
|
|
9
|
-
super();
|
|
10
|
-
}
|
|
11
|
-
|
|
12
|
-
canActivate(
|
|
13
|
-
context: ExecutionContext,
|
|
14
|
-
): Promise<boolean> | boolean | Observable<boolean> {
|
|
15
|
-
const isPublic = this.reflector.getAllAndOverride('isPublic', [
|
|
16
|
-
context.getHandler(),
|
|
17
|
-
context.getClass(),
|
|
18
|
-
]);
|
|
19
|
-
if (isPublic) return true;
|
|
20
|
-
return super.canActivate(context);
|
|
21
|
-
}
|
|
22
|
-
}
|
|
1
|
+
import { ExecutionContext, Injectable } from '@nestjs/common';
|
|
2
|
+
import { AuthGuard } from '@nestjs/passport';
|
|
3
|
+
import { Reflector } from '@nestjs/core';
|
|
4
|
+
import { Observable } from 'rxjs';
|
|
5
|
+
|
|
6
|
+
@Injectable()
|
|
7
|
+
export class JwtAuthGuard extends AuthGuard('jwt') {
|
|
8
|
+
constructor(private reflector: Reflector) {
|
|
9
|
+
super();
|
|
10
|
+
}
|
|
11
|
+
|
|
12
|
+
canActivate(
|
|
13
|
+
context: ExecutionContext,
|
|
14
|
+
): Promise<boolean> | boolean | Observable<boolean> {
|
|
15
|
+
const isPublic = this.reflector.getAllAndOverride('isPublic', [
|
|
16
|
+
context.getHandler(),
|
|
17
|
+
context.getClass(),
|
|
18
|
+
]);
|
|
19
|
+
if (isPublic) return true;
|
|
20
|
+
return super.canActivate(context);
|
|
21
|
+
}
|
|
22
|
+
}
|
|
@@ -1,68 +1,68 @@
|
|
|
1
|
-
import {
|
|
2
|
-
CanActivate,
|
|
3
|
-
ExecutionContext,
|
|
4
|
-
ForbiddenException,
|
|
5
|
-
Injectable,
|
|
6
|
-
UnauthorizedException,
|
|
7
|
-
} from '@nestjs/common';
|
|
8
|
-
import { Reflector } from '@nestjs/core';
|
|
9
|
-
import { UserData } from '../../user/entity/user.entity';
|
|
10
|
-
import { InjectEntityManager } from '@nestjs/typeorm';
|
|
11
|
-
import { EntityManager } from 'typeorm';
|
|
12
|
-
|
|
13
|
-
@Injectable()
|
|
14
|
-
export class RolesGuard implements CanActivate {
|
|
15
|
-
constructor(
|
|
16
|
-
private reflector: Reflector,
|
|
17
|
-
@InjectEntityManager() private entityManager: EntityManager,
|
|
18
|
-
) {}
|
|
19
|
-
|
|
20
|
-
async canActivate(context: ExecutionContext) {
|
|
21
|
-
const request = context
|
|
22
|
-
.switchToHttp()
|
|
23
|
-
.getRequest<Request & { user: any }>();
|
|
24
|
-
const object = request.user;
|
|
25
|
-
|
|
26
|
-
const users: UserData = await this.entityManager.query(
|
|
27
|
-
`SELECT * FROM cr_user WHERE id = ${object.userId} LIMIT 1`,
|
|
28
|
-
);
|
|
29
|
-
|
|
30
|
-
const user = users[0];
|
|
31
|
-
if (!user || !user['role_id']) {
|
|
32
|
-
throw new UnauthorizedException('User not authorized');
|
|
33
|
-
}
|
|
34
|
-
|
|
35
|
-
const requiredModule = this.reflector.get<string>(
|
|
36
|
-
'moduleCode',
|
|
37
|
-
context.getHandler(),
|
|
38
|
-
);
|
|
39
|
-
const requiredActions = this.reflector.get<string>(
|
|
40
|
-
'actions',
|
|
41
|
-
context.getHandler(),
|
|
42
|
-
);
|
|
43
|
-
|
|
44
|
-
const roleAccess = await this.entityManager.query(
|
|
45
|
-
`SELECT *
|
|
46
|
-
FROM cr_module_access
|
|
47
|
-
WHERE role_id = ${user['role_id']}
|
|
48
|
-
AND module_code = '${requiredModule}'`,
|
|
49
|
-
);
|
|
50
|
-
|
|
51
|
-
if (!roleAccess || roleAccess.length === 0) {
|
|
52
|
-
throw new ForbiddenException(
|
|
53
|
-
'Access denied: No permissions found for this module',
|
|
54
|
-
);
|
|
55
|
-
}
|
|
56
|
-
|
|
57
|
-
const hasAccess = roleAccess.some(
|
|
58
|
-
(access) =>
|
|
59
|
-
requiredActions.includes(access.action_type) &&
|
|
60
|
-
access.access_flag === 1,
|
|
61
|
-
);
|
|
62
|
-
|
|
63
|
-
if (!hasAccess) {
|
|
64
|
-
throw new ForbiddenException('Access denied: Insufficient permissions.');
|
|
65
|
-
}
|
|
66
|
-
return true;
|
|
67
|
-
}
|
|
68
|
-
}
|
|
1
|
+
import {
|
|
2
|
+
CanActivate,
|
|
3
|
+
ExecutionContext,
|
|
4
|
+
ForbiddenException,
|
|
5
|
+
Injectable,
|
|
6
|
+
UnauthorizedException,
|
|
7
|
+
} from '@nestjs/common';
|
|
8
|
+
import { Reflector } from '@nestjs/core';
|
|
9
|
+
import { UserData } from '../../user/entity/user.entity';
|
|
10
|
+
import { InjectEntityManager } from '@nestjs/typeorm';
|
|
11
|
+
import { EntityManager } from 'typeorm';
|
|
12
|
+
|
|
13
|
+
@Injectable()
|
|
14
|
+
export class RolesGuard implements CanActivate {
|
|
15
|
+
constructor(
|
|
16
|
+
private reflector: Reflector,
|
|
17
|
+
@InjectEntityManager() private entityManager: EntityManager,
|
|
18
|
+
) {}
|
|
19
|
+
|
|
20
|
+
async canActivate(context: ExecutionContext) {
|
|
21
|
+
const request = context
|
|
22
|
+
.switchToHttp()
|
|
23
|
+
.getRequest<Request & { user: any }>();
|
|
24
|
+
const object = request.user;
|
|
25
|
+
|
|
26
|
+
const users: UserData = await this.entityManager.query(
|
|
27
|
+
`SELECT * FROM cr_user WHERE id = ${object.userId} LIMIT 1`,
|
|
28
|
+
);
|
|
29
|
+
|
|
30
|
+
const user = users[0];
|
|
31
|
+
if (!user || !user['role_id']) {
|
|
32
|
+
throw new UnauthorizedException('User not authorized');
|
|
33
|
+
}
|
|
34
|
+
|
|
35
|
+
const requiredModule = this.reflector.get<string>(
|
|
36
|
+
'moduleCode',
|
|
37
|
+
context.getHandler(),
|
|
38
|
+
);
|
|
39
|
+
const requiredActions = this.reflector.get<string>(
|
|
40
|
+
'actions',
|
|
41
|
+
context.getHandler(),
|
|
42
|
+
);
|
|
43
|
+
|
|
44
|
+
const roleAccess = await this.entityManager.query(
|
|
45
|
+
`SELECT *
|
|
46
|
+
FROM cr_module_access
|
|
47
|
+
WHERE role_id = ${user['role_id']}
|
|
48
|
+
AND module_code = '${requiredModule}'`,
|
|
49
|
+
);
|
|
50
|
+
|
|
51
|
+
if (!roleAccess || roleAccess.length === 0) {
|
|
52
|
+
throw new ForbiddenException(
|
|
53
|
+
'Access denied: No permissions found for this module',
|
|
54
|
+
);
|
|
55
|
+
}
|
|
56
|
+
|
|
57
|
+
const hasAccess = roleAccess.some(
|
|
58
|
+
(access) =>
|
|
59
|
+
requiredActions.includes(access.action_type) &&
|
|
60
|
+
access.access_flag === 1,
|
|
61
|
+
);
|
|
62
|
+
|
|
63
|
+
if (!hasAccess) {
|
|
64
|
+
throw new ForbiddenException('Access denied: Insufficient permissions.');
|
|
65
|
+
}
|
|
66
|
+
return true;
|
|
67
|
+
}
|
|
68
|
+
}
|
|
@@ -1,11 +1,11 @@
|
|
|
1
|
-
import { Injectable } from '@nestjs/common';
|
|
2
|
-
import { JwtService } from '@nestjs/jwt';
|
|
3
|
-
|
|
4
|
-
@Injectable()
|
|
5
|
-
export class JwtAuthService {
|
|
6
|
-
constructor(private readonly jwtService: JwtService) {}
|
|
7
|
-
|
|
8
|
-
generateJwt(payload: any): string {
|
|
9
|
-
return this.jwtService.sign(payload);
|
|
10
|
-
}
|
|
11
|
-
}
|
|
1
|
+
import { Injectable } from '@nestjs/common';
|
|
2
|
+
import { JwtService } from '@nestjs/jwt';
|
|
3
|
+
|
|
4
|
+
@Injectable()
|
|
5
|
+
export class JwtAuthService {
|
|
6
|
+
constructor(private readonly jwtService: JwtService) {}
|
|
7
|
+
|
|
8
|
+
generateJwt(payload: any): string {
|
|
9
|
+
return this.jwtService.sign(payload);
|
|
10
|
+
}
|
|
11
|
+
}
|
|
@@ -1,13 +1,13 @@
|
|
|
1
|
-
import { PassportStrategy } from '@nestjs/passport';
|
|
2
|
-
import { AuthService } from '../services/auth.service';
|
|
3
|
-
import { Injectable } from '@nestjs/common';
|
|
4
|
-
import { Strategy } from 'passport-jwt';
|
|
5
|
-
|
|
6
|
-
@Injectable()
|
|
7
|
-
export class LocalStrategy extends PassportStrategy(Strategy) {
|
|
8
|
-
constructor(private authService: AuthService) {
|
|
9
|
-
super({
|
|
10
|
-
usernameField: 'email',
|
|
11
|
-
});
|
|
12
|
-
}
|
|
13
|
-
}
|
|
1
|
+
import { PassportStrategy } from '@nestjs/passport';
|
|
2
|
+
import { AuthService } from '../services/auth.service';
|
|
3
|
+
import { Injectable } from '@nestjs/common';
|
|
4
|
+
import { Strategy } from 'passport-jwt';
|
|
5
|
+
|
|
6
|
+
@Injectable()
|
|
7
|
+
export class LocalStrategy extends PassportStrategy(Strategy) {
|
|
8
|
+
constructor(private authService: AuthService) {
|
|
9
|
+
super({
|
|
10
|
+
usernameField: 'email',
|
|
11
|
+
});
|
|
12
|
+
}
|
|
13
|
+
}
|
|
@@ -1,12 +1,12 @@
|
|
|
1
|
-
import { Module } from '@nestjs/common';
|
|
2
|
-
import { EntityModule } from '../meta/entity.module';
|
|
3
|
-
import { UserModule } from '../user/user.module';
|
|
4
|
-
import { ModuleModule } from '../module/module.module';
|
|
5
|
-
import { DevService } from './service/dev.service';
|
|
6
|
-
|
|
7
|
-
@Module({
|
|
8
|
-
imports: [EntityModule, UserModule, ModuleModule],
|
|
9
|
-
controllers: [],
|
|
10
|
-
providers: [DevService],
|
|
11
|
-
})
|
|
12
|
-
export class DevModule {}
|
|
1
|
+
import { Module } from '@nestjs/common';
|
|
2
|
+
import { EntityModule } from '../meta/entity.module';
|
|
3
|
+
import { UserModule } from '../user/user.module';
|
|
4
|
+
import { ModuleModule } from '../module/module.module';
|
|
5
|
+
import { DevService } from './service/dev.service';
|
|
6
|
+
|
|
7
|
+
@Module({
|
|
8
|
+
imports: [EntityModule, UserModule, ModuleModule],
|
|
9
|
+
controllers: [],
|
|
10
|
+
providers: [DevService],
|
|
11
|
+
})
|
|
12
|
+
export class DevModule {}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
|
-
import { Injectable } from '@nestjs/common';
|
|
2
|
-
import { UserService } from '../../user/service/user.service';
|
|
3
|
-
|
|
4
|
-
@Injectable()
|
|
5
|
-
export class DevService {
|
|
6
|
-
constructor(private readonly userService: UserService) {}
|
|
7
|
-
}
|
|
1
|
+
import { Injectable } from '@nestjs/common';
|
|
2
|
+
import { UserService } from '../../user/service/user.service';
|
|
3
|
+
|
|
4
|
+
@Injectable()
|
|
5
|
+
export class DevService {
|
|
6
|
+
constructor(private readonly userService: UserService) {}
|
|
7
|
+
}
|
|
@@ -1,37 +1,37 @@
|
|
|
1
|
-
import { Column, Entity, PrimaryGeneratedColumn } from 'typeorm';
|
|
2
|
-
|
|
3
|
-
@Entity({ name: 'cr_enterprise' })
|
|
4
|
-
export class EnterpriseData {
|
|
5
|
-
@PrimaryGeneratedColumn({ name: 'id', type: 'bigint' })
|
|
6
|
-
id: number;
|
|
7
|
-
|
|
8
|
-
@Column({ name: 'entity_type', type: 'varchar', nullable: true, length: 50 })
|
|
9
|
-
entityType: string;
|
|
10
|
-
|
|
11
|
-
@Column({ name: 'code', type: 'varchar', nullable: true, length: 50 })
|
|
12
|
-
code: string;
|
|
13
|
-
|
|
14
|
-
@Column({ name: 'name', type: 'varchar', nullable: true, length: 50 })
|
|
15
|
-
name: string;
|
|
16
|
-
|
|
17
|
-
@Column({ name: 'status', type: 'varchar', nullable: true, length: 50 })
|
|
18
|
-
status: string;
|
|
19
|
-
|
|
20
|
-
@Column({ name: 'created_by', type: 'int', nullable: true })
|
|
21
|
-
createdBy: number;
|
|
22
|
-
|
|
23
|
-
@Column({ name: 'modified_by', type: 'int', nullable: true })
|
|
24
|
-
modifiedBy: number;
|
|
25
|
-
|
|
26
|
-
@Column({ name: 'created_date', type: 'datetime', nullable: true })
|
|
27
|
-
createdDate: Date;
|
|
28
|
-
|
|
29
|
-
@Column({ name: 'modified_date', type: 'datetime', nullable: true })
|
|
30
|
-
modifiedDate: Date;
|
|
31
|
-
|
|
32
|
-
@Column({ name: 'app_code', type: 'varchar', nullable: true, length: 50 })
|
|
33
|
-
appCode: string;
|
|
34
|
-
|
|
35
|
-
@Column({ name: 'app_url_name', type: 'varchar', nullable: true, length: 50 })
|
|
36
|
-
appUrlName: string;
|
|
37
|
-
}
|
|
1
|
+
import { Column, Entity, PrimaryGeneratedColumn } from 'typeorm';
|
|
2
|
+
|
|
3
|
+
@Entity({ name: 'cr_enterprise' })
|
|
4
|
+
export class EnterpriseData {
|
|
5
|
+
@PrimaryGeneratedColumn({ name: 'id', type: 'bigint' })
|
|
6
|
+
id: number;
|
|
7
|
+
|
|
8
|
+
@Column({ name: 'entity_type', type: 'varchar', nullable: true, length: 50 })
|
|
9
|
+
entityType: string;
|
|
10
|
+
|
|
11
|
+
@Column({ name: 'code', type: 'varchar', nullable: true, length: 50 })
|
|
12
|
+
code: string;
|
|
13
|
+
|
|
14
|
+
@Column({ name: 'name', type: 'varchar', nullable: true, length: 50 })
|
|
15
|
+
name: string;
|
|
16
|
+
|
|
17
|
+
@Column({ name: 'status', type: 'varchar', nullable: true, length: 50 })
|
|
18
|
+
status: string;
|
|
19
|
+
|
|
20
|
+
@Column({ name: 'created_by', type: 'int', nullable: true })
|
|
21
|
+
createdBy: number;
|
|
22
|
+
|
|
23
|
+
@Column({ name: 'modified_by', type: 'int', nullable: true })
|
|
24
|
+
modifiedBy: number;
|
|
25
|
+
|
|
26
|
+
@Column({ name: 'created_date', type: 'datetime', nullable: true })
|
|
27
|
+
createdDate: Date;
|
|
28
|
+
|
|
29
|
+
@Column({ name: 'modified_date', type: 'datetime', nullable: true })
|
|
30
|
+
modifiedDate: Date;
|
|
31
|
+
|
|
32
|
+
@Column({ name: 'app_code', type: 'varchar', nullable: true, length: 50 })
|
|
33
|
+
appCode: string;
|
|
34
|
+
|
|
35
|
+
@Column({ name: 'app_url_name', type: 'varchar', nullable: true, length: 50 })
|
|
36
|
+
appUrlName: string;
|
|
37
|
+
}
|
|
@@ -1,80 +1,80 @@
|
|
|
1
|
-
import { Column, Entity, PrimaryGeneratedColumn } from 'typeorm';
|
|
2
|
-
|
|
3
|
-
@Entity({ name: 'cr_organization' })
|
|
4
|
-
export class OrganizationData {
|
|
5
|
-
@PrimaryGeneratedColumn({ name: 'id', type: 'int' })
|
|
6
|
-
id: number;
|
|
7
|
-
|
|
8
|
-
@Column({ name: 'enterprise_id', type: 'int' })
|
|
9
|
-
enterprise_id: number;
|
|
10
|
-
|
|
11
|
-
@Column({ name: 'code', nullable: true })
|
|
12
|
-
code: string;
|
|
13
|
-
|
|
14
|
-
@Column({ name: 'app_code', nullable: true })
|
|
15
|
-
appCode: string;
|
|
16
|
-
|
|
17
|
-
@Column({ name: 'name', nullable: true })
|
|
18
|
-
name: string;
|
|
19
|
-
|
|
20
|
-
@Column({ name: 'status', type: 'varchar', nullable: true })
|
|
21
|
-
status: string;
|
|
22
|
-
|
|
23
|
-
@Column({ name: 'seq_no', nullable: true })
|
|
24
|
-
seq_no: number;
|
|
25
|
-
|
|
26
|
-
@Column({ name: 'created_by', nullable: true })
|
|
27
|
-
created_by: number;
|
|
28
|
-
|
|
29
|
-
@Column({ name: 'modified_by', nullable: true })
|
|
30
|
-
modified_by: number;
|
|
31
|
-
|
|
32
|
-
@Column({ name: 'created_date', nullable: true })
|
|
33
|
-
created_date: Date;
|
|
34
|
-
|
|
35
|
-
@Column({ name: 'parent_id', nullable: true })
|
|
36
|
-
parent_id: number;
|
|
37
|
-
|
|
38
|
-
@Column({ name: 'modified_date', nullable: true })
|
|
39
|
-
modified_date: Date;
|
|
40
|
-
|
|
41
|
-
@Column({ name: 'contact_number', nullable: true })
|
|
42
|
-
contact_number: string;
|
|
43
|
-
|
|
44
|
-
@Column({ name: 'email', nullable: true })
|
|
45
|
-
emailId: string;
|
|
46
|
-
|
|
47
|
-
@Column({ name: 'entity_type', nullable: true })
|
|
48
|
-
entity_type: string;
|
|
49
|
-
|
|
50
|
-
@Column({ name: 'primary_contact_name', nullable: true })
|
|
51
|
-
primary_contact_name: string;
|
|
52
|
-
|
|
53
|
-
@Column({ name: 'address', nullable: true })
|
|
54
|
-
address: string;
|
|
55
|
-
|
|
56
|
-
@Column({ name: 'gstin', nullable: true })
|
|
57
|
-
gstin: string;
|
|
58
|
-
|
|
59
|
-
@Column({ name: 'company_pan_number', nullable: true })
|
|
60
|
-
company_pan_number: string;
|
|
61
|
-
|
|
62
|
-
@Column({ name: 'bankacc_benef_name', nullable: true })
|
|
63
|
-
bankacc_benef_name: string;
|
|
64
|
-
|
|
65
|
-
@Column({ name: 'bankacc_bank_name', nullable: true })
|
|
66
|
-
bankacc_bank_name: string;
|
|
67
|
-
|
|
68
|
-
@Column({ name: 'bankacc_account_number', nullable: true })
|
|
69
|
-
bankaccAccountNumber: string;
|
|
70
|
-
|
|
71
|
-
@Column({ name: 'bankacc_branch_IFSC', nullable: true })
|
|
72
|
-
bankacc_account_number: string;
|
|
73
|
-
|
|
74
|
-
@Column({
|
|
75
|
-
name: 'organization_type',
|
|
76
|
-
type: 'varchar',
|
|
77
|
-
nullable: true,
|
|
78
|
-
})
|
|
79
|
-
organization_type: string;
|
|
80
|
-
}
|
|
1
|
+
import { Column, Entity, PrimaryGeneratedColumn } from 'typeorm';
|
|
2
|
+
|
|
3
|
+
@Entity({ name: 'cr_organization' })
|
|
4
|
+
export class OrganizationData {
|
|
5
|
+
@PrimaryGeneratedColumn({ name: 'id', type: 'int' })
|
|
6
|
+
id: number;
|
|
7
|
+
|
|
8
|
+
@Column({ name: 'enterprise_id', type: 'int' })
|
|
9
|
+
enterprise_id: number;
|
|
10
|
+
|
|
11
|
+
@Column({ name: 'code', nullable: true })
|
|
12
|
+
code: string;
|
|
13
|
+
|
|
14
|
+
@Column({ name: 'app_code', nullable: true })
|
|
15
|
+
appCode: string;
|
|
16
|
+
|
|
17
|
+
@Column({ name: 'name', nullable: true })
|
|
18
|
+
name: string;
|
|
19
|
+
|
|
20
|
+
@Column({ name: 'status', type: 'varchar', nullable: true })
|
|
21
|
+
status: string;
|
|
22
|
+
|
|
23
|
+
@Column({ name: 'seq_no', nullable: true })
|
|
24
|
+
seq_no: number;
|
|
25
|
+
|
|
26
|
+
@Column({ name: 'created_by', nullable: true })
|
|
27
|
+
created_by: number;
|
|
28
|
+
|
|
29
|
+
@Column({ name: 'modified_by', nullable: true })
|
|
30
|
+
modified_by: number;
|
|
31
|
+
|
|
32
|
+
@Column({ name: 'created_date', nullable: true })
|
|
33
|
+
created_date: Date;
|
|
34
|
+
|
|
35
|
+
@Column({ name: 'parent_id', nullable: true })
|
|
36
|
+
parent_id: number;
|
|
37
|
+
|
|
38
|
+
@Column({ name: 'modified_date', nullable: true })
|
|
39
|
+
modified_date: Date;
|
|
40
|
+
|
|
41
|
+
@Column({ name: 'contact_number', nullable: true })
|
|
42
|
+
contact_number: string;
|
|
43
|
+
|
|
44
|
+
@Column({ name: 'email', nullable: true })
|
|
45
|
+
emailId: string;
|
|
46
|
+
|
|
47
|
+
@Column({ name: 'entity_type', nullable: true })
|
|
48
|
+
entity_type: string;
|
|
49
|
+
|
|
50
|
+
@Column({ name: 'primary_contact_name', nullable: true })
|
|
51
|
+
primary_contact_name: string;
|
|
52
|
+
|
|
53
|
+
@Column({ name: 'address', nullable: true })
|
|
54
|
+
address: string;
|
|
55
|
+
|
|
56
|
+
@Column({ name: 'gstin', nullable: true })
|
|
57
|
+
gstin: string;
|
|
58
|
+
|
|
59
|
+
@Column({ name: 'company_pan_number', nullable: true })
|
|
60
|
+
company_pan_number: string;
|
|
61
|
+
|
|
62
|
+
@Column({ name: 'bankacc_benef_name', nullable: true })
|
|
63
|
+
bankacc_benef_name: string;
|
|
64
|
+
|
|
65
|
+
@Column({ name: 'bankacc_bank_name', nullable: true })
|
|
66
|
+
bankacc_bank_name: string;
|
|
67
|
+
|
|
68
|
+
@Column({ name: 'bankacc_account_number', nullable: true })
|
|
69
|
+
bankaccAccountNumber: string;
|
|
70
|
+
|
|
71
|
+
@Column({ name: 'bankacc_branch_IFSC', nullable: true })
|
|
72
|
+
bankacc_account_number: string;
|
|
73
|
+
|
|
74
|
+
@Column({
|
|
75
|
+
name: 'organization_type',
|
|
76
|
+
type: 'varchar',
|
|
77
|
+
nullable: true,
|
|
78
|
+
})
|
|
79
|
+
organization_type: string;
|
|
80
|
+
}
|
|
@@ -6,9 +6,9 @@ export class ListMasterController {
|
|
|
6
6
|
|
|
7
7
|
constructor(private readonly service: ListMasterService) {}
|
|
8
8
|
|
|
9
|
-
@Get('
|
|
10
|
-
getDropdownData(@Param('type') type: string) {
|
|
11
|
-
return this.service.getDropdownOptions(type);
|
|
9
|
+
@Get('/getDropdownData/:type')
|
|
10
|
+
async getDropdownData(@Param('type') type: string) {
|
|
11
|
+
return await this.service.getDropdownOptions(type);
|
|
12
12
|
}
|
|
13
13
|
|
|
14
14
|
}
|
|
@@ -9,27 +9,18 @@ export class ListMasterData extends BaseEntity {
|
|
|
9
9
|
this.entity_type = ENTITYTYPE_LISTMASTER;
|
|
10
10
|
}
|
|
11
11
|
|
|
12
|
-
@PrimaryGeneratedColumn()
|
|
13
|
-
id: number;
|
|
14
|
-
|
|
15
12
|
@Column()
|
|
16
13
|
type: string;
|
|
17
14
|
|
|
18
15
|
@Column()
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
@Column()
|
|
22
|
-
status: string;
|
|
23
|
-
|
|
24
|
-
@Column()
|
|
25
|
-
sortby: string;
|
|
16
|
+
sort_by: string;
|
|
26
17
|
|
|
27
18
|
@Column()
|
|
28
|
-
|
|
19
|
+
is_factory: number;
|
|
29
20
|
|
|
30
21
|
@Column()
|
|
31
22
|
source: string;
|
|
32
23
|
|
|
33
24
|
@Column({ nullable: true })
|
|
34
|
-
|
|
25
|
+
source_list: string;
|
|
35
26
|
}
|
|
@@ -6,9 +6,11 @@ import { ListMasterRepository } from './repository/list-master.repository';
|
|
|
6
6
|
import { ListMasterItemsRepository } from './repository/list-master-items.repository';
|
|
7
7
|
import { ListMasterService } from './service/list-master.service';
|
|
8
8
|
import { EntityModule } from '../meta/entity.module';
|
|
9
|
+
import { ListMasterController } from './controller/list-master.controller';
|
|
9
10
|
|
|
10
11
|
@Module({
|
|
11
12
|
imports: [TypeOrmModule.forFeature([ListMasterData, ListMasterItems]),EntityModule],
|
|
12
13
|
providers: [ListMasterRepository, ListMasterItemsRepository, ListMasterService],
|
|
14
|
+
controllers: [ListMasterController]
|
|
13
15
|
})
|
|
14
16
|
export class ListMasterModule {}
|
|
@@ -1,5 +1,9 @@
|
|
|
1
1
|
import { EntityServiceImpl } from '../../meta/service/entity-service-impl.service';
|
|
2
|
-
import {
|
|
2
|
+
import {
|
|
3
|
+
BadRequestException,
|
|
4
|
+
Injectable,
|
|
5
|
+
NotFoundException,
|
|
6
|
+
} from '@nestjs/common';
|
|
3
7
|
import { ListMasterItemsRepository } from '../repository/list-master-items.repository';
|
|
4
8
|
import { ListMasterRepository } from '../repository/list-master.repository';
|
|
5
9
|
|
|
@@ -19,7 +23,7 @@ export class ListMasterService extends EntityServiceImpl {
|
|
|
19
23
|
|
|
20
24
|
switch (config.source) {
|
|
21
25
|
case 'entity':
|
|
22
|
-
return this.fetchFromEntity(
|
|
26
|
+
return this.fetchFromEntity(type);
|
|
23
27
|
|
|
24
28
|
case 'master':
|
|
25
29
|
return this.listItemsRepo.findItemsByType(type);
|
|
@@ -33,12 +37,22 @@ export class ListMasterService extends EntityServiceImpl {
|
|
|
33
37
|
}
|
|
34
38
|
}
|
|
35
39
|
|
|
36
|
-
private async fetchFromEntity(
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
+
private async fetchFromEntity(sourceList: string) {
|
|
41
|
+
let result: { label: string; value: number }[] = [];
|
|
42
|
+
if (sourceList) {
|
|
43
|
+
const entityMaster =
|
|
44
|
+
await this.entityMasterService.getEntityData(sourceList);
|
|
45
|
+
|
|
46
|
+
let baseEntities = await super.getEntityList(
|
|
47
|
+
entityMaster.mapped_entity_type,
|
|
48
|
+
);
|
|
49
|
+
baseEntities.forEach((entity) => {
|
|
50
|
+
result.push({
|
|
51
|
+
label: entity.name,
|
|
52
|
+
value: parseInt(String(entity.id)),
|
|
53
|
+
});
|
|
54
|
+
});
|
|
40
55
|
}
|
|
41
|
-
|
|
42
|
-
throw new NotFoundException(`Entity source ${sourcelist} not handled yet`);
|
|
56
|
+
return result;
|
|
43
57
|
}
|
|
44
|
-
}
|
|
58
|
+
}
|