rez_core 2.0.1 → 2.0.2
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/module/meta/controller/entity.controller.d.ts +1 -1
- package/dist/module/meta/controller/entity.controller.js +14 -11
- package/dist/module/meta/controller/entity.controller.js.map +1 -1
- package/dist/module/meta/service/entity-list.service.d.ts +2 -2
- package/dist/module/meta/service/entity-list.service.js +18 -7
- package/dist/module/meta/service/entity-list.service.js.map +1 -1
- package/dist/module/meta/service/entity-service-impl.service.d.ts +3 -3
- package/dist/module/meta/service/entity-service-impl.service.js +4 -4
- package/dist/module/meta/service/entity-service-impl.service.js.map +1 -1
- package/dist/module/meta/service/entity.service.d.ts +2 -2
- package/dist/module/module/controller/module-access.controller.d.ts +5 -5
- package/dist/module/module/controller/module-access.controller.js +28 -16
- package/dist/module/module/controller/module-access.controller.js.map +1 -1
- package/dist/module/module/repository/module-access.repository.d.ts +10 -6
- package/dist/module/module/repository/module-access.repository.js +45 -29
- package/dist/module/module/repository/module-access.repository.js.map +1 -1
- package/dist/module/module/service/module-access.service.d.ts +9 -5
- package/dist/module/module/service/module-access.service.js +12 -10
- package/dist/module/module/service/module-access.service.js.map +1 -1
- package/dist/module/user/dto/create-user.dto.d.ts +1 -0
- package/dist/module/user/dto/create-user.dto.js.map +1 -1
- package/dist/module/user/service/role.service.d.ts +1 -1
- package/dist/module/user/service/role.service.js +4 -1
- package/dist/module/user/service/role.service.js.map +1 -1
- package/dist/module/user/service/user.service.d.ts +1 -1
- package/dist/module/user/service/user.service.js +4 -1
- package/dist/module/user/service/user.service.js.map +1 -1
- package/dist/tsconfig.build.tsbuildinfo +1 -1
- package/package.json +1 -1
- package/src/module/meta/controller/entity.controller.ts +27 -12
- package/src/module/meta/service/entity-list.service.ts +29 -7
- package/src/module/meta/service/entity-service-impl.service.ts +29 -17
- package/src/module/meta/service/entity.service.ts +2 -1
- package/src/module/module/controller/module-access.controller.ts +48 -21
- package/src/module/module/repository/module-access.repository.ts +69 -50
- package/src/module/module/service/module-access.service.ts +15 -13
- package/src/module/user/dto/create-user.dto.ts +1 -0
- package/src/module/user/service/role.service.ts +5 -1
- package/src/module/user/service/user.service.ts +4 -0
|
@@ -27,77 +27,93 @@ let ModuleAccessRepository = class ModuleAccessRepository {
|
|
|
27
27
|
this.moduleAccessRepo = moduleAccessRepo;
|
|
28
28
|
this.moduleActionRepo = moduleActionRepo;
|
|
29
29
|
}
|
|
30
|
-
async getRoles() {
|
|
31
|
-
const roles = await this.roleRepo.find(
|
|
32
|
-
|
|
30
|
+
async getRoles({ appcode }) {
|
|
31
|
+
const roles = await this.roleRepo.find({
|
|
32
|
+
where: { appcode: appcode },
|
|
33
|
+
});
|
|
34
|
+
return roles.map((role) => ({
|
|
33
35
|
label: role.name,
|
|
34
36
|
value: role.id,
|
|
35
37
|
}));
|
|
36
38
|
}
|
|
37
|
-
async getModules() {
|
|
38
|
-
const modules = await this.moduleRepo.find({
|
|
39
|
-
|
|
39
|
+
async getModules({ appcode }) {
|
|
40
|
+
const modules = await this.moduleRepo.find({
|
|
41
|
+
where: { module_level: 'MAINMOD', appcode: appcode },
|
|
42
|
+
});
|
|
43
|
+
return modules.map((mod) => ({
|
|
40
44
|
label: mod.name,
|
|
41
45
|
value: mod.id,
|
|
42
46
|
}));
|
|
43
47
|
}
|
|
44
|
-
async getAccessListing(roleIds) {
|
|
45
|
-
const roles = await this.roleRepo.find({
|
|
46
|
-
|
|
48
|
+
async getAccessListing(roleIds, appcode) {
|
|
49
|
+
const roles = await this.roleRepo.find({
|
|
50
|
+
where: { id: (0, typeorm_2.In)(roleIds), appcode: appcode },
|
|
51
|
+
});
|
|
52
|
+
const roleCodes = roles.map((role) => role.code);
|
|
47
53
|
const moduleAccesses = await this.moduleAccessRepo.find({
|
|
48
|
-
where: { role_code: (0, typeorm_2.In)(roleCodes) },
|
|
54
|
+
where: { role_code: (0, typeorm_2.In)(roleCodes), appcode: appcode },
|
|
49
55
|
});
|
|
50
|
-
return roles.map(role => ({
|
|
56
|
+
return roles.map((role) => ({
|
|
51
57
|
role_code: role.code,
|
|
52
58
|
name: role.name,
|
|
53
59
|
permission: moduleAccesses
|
|
54
|
-
.filter(access => access.role_code === role.code)
|
|
55
|
-
.map(access => ({
|
|
60
|
+
.filter((access) => access.role_code === role.code)
|
|
61
|
+
.map((access) => ({
|
|
56
62
|
action: access.action_type,
|
|
57
63
|
access: access.access_flag,
|
|
58
64
|
code: access.module_code,
|
|
59
65
|
})),
|
|
60
66
|
}));
|
|
61
67
|
}
|
|
62
|
-
async getMenuListing(mainModIds) {
|
|
68
|
+
async getMenuListing(mainModIds, appcode) {
|
|
63
69
|
const mainModules = mainModIds.length === 1 && mainModIds[0] === '-1'
|
|
64
|
-
? await this.moduleRepo.find({
|
|
65
|
-
|
|
70
|
+
? await this.moduleRepo.find({
|
|
71
|
+
where: { module_level: 'MAINMOD', appcode: appcode },
|
|
72
|
+
})
|
|
73
|
+
: await this.moduleRepo.find({
|
|
74
|
+
where: {
|
|
75
|
+
id: (0, typeorm_2.In)(mainModIds),
|
|
76
|
+
module_level: 'MAINMOD',
|
|
77
|
+
appcode: appcode,
|
|
78
|
+
},
|
|
79
|
+
});
|
|
66
80
|
if (!mainModules.length)
|
|
67
81
|
return [];
|
|
68
|
-
const wbsCodes = mainModules.map(mod => mod.wbs_code);
|
|
82
|
+
const wbsCodes = mainModules.map((mod) => mod.wbs_code);
|
|
69
83
|
const modules = await this.moduleRepo
|
|
70
84
|
.createQueryBuilder('module')
|
|
71
|
-
.where(wbsCodes
|
|
85
|
+
.where(wbsCodes
|
|
86
|
+
.map((code) => `module.wbs_code LIKE :code${code}`)
|
|
87
|
+
.join(' OR '), Object.fromEntries(wbsCodes.map((code) => [`code${code}`, `${code}%`])))
|
|
72
88
|
.getMany();
|
|
73
89
|
const moduleActions = await this.moduleActionRepo.find();
|
|
74
90
|
const buildHierarchy = (parentWbs) => modules
|
|
75
|
-
.filter(mod => mod.wbs_code.startsWith(`${parentWbs}.`) &&
|
|
91
|
+
.filter((mod) => mod.wbs_code.startsWith(`${parentWbs}.`) &&
|
|
76
92
|
mod.wbs_code.split('.').length === parentWbs.split('.').length + 1)
|
|
77
|
-
.map(mod => ({
|
|
93
|
+
.map((mod) => ({
|
|
78
94
|
name: mod.name,
|
|
79
95
|
code: mod.module_code,
|
|
80
96
|
permission: moduleActions
|
|
81
|
-
.filter(action => action.module_code === mod.module_code)
|
|
82
|
-
.map(action => ({
|
|
97
|
+
.filter((action) => action.module_code === mod.module_code)
|
|
98
|
+
.map((action) => ({
|
|
83
99
|
action: action.action_type,
|
|
84
100
|
name: action.action_type,
|
|
85
101
|
})),
|
|
86
102
|
submod: buildHierarchy(mod.wbs_code),
|
|
87
103
|
}));
|
|
88
|
-
return mainModules.map(mod => ({
|
|
104
|
+
return mainModules.map((mod) => ({
|
|
89
105
|
name: mod.name,
|
|
90
106
|
code: mod.module_code,
|
|
91
107
|
permission: moduleActions
|
|
92
|
-
.filter(action => action.module_code === mod.module_code)
|
|
93
|
-
.map(action => ({
|
|
108
|
+
.filter((action) => action.module_code === mod.module_code)
|
|
109
|
+
.map((action) => ({
|
|
94
110
|
action: action.action_type,
|
|
95
111
|
name: action.action_type,
|
|
96
112
|
})),
|
|
97
113
|
submod: buildHierarchy(mod.wbs_code),
|
|
98
114
|
}));
|
|
99
115
|
}
|
|
100
|
-
async updateModuleAccess(accessList) {
|
|
116
|
+
async updateModuleAccess(accessList, appcode) {
|
|
101
117
|
try {
|
|
102
118
|
for (const access of accessList) {
|
|
103
119
|
const existing = await this.moduleAccessRepo.findOne({
|
|
@@ -105,7 +121,7 @@ let ModuleAccessRepository = class ModuleAccessRepository {
|
|
|
105
121
|
role_code: access.role_code,
|
|
106
122
|
module_code: access.module_code,
|
|
107
123
|
action_type: access.action_type,
|
|
108
|
-
appcode: access.
|
|
124
|
+
appcode: access.appcode || appcode,
|
|
109
125
|
},
|
|
110
126
|
});
|
|
111
127
|
if (existing) {
|
|
@@ -133,7 +149,7 @@ let ModuleAccessRepository = class ModuleAccessRepository {
|
|
|
133
149
|
const roles = await this.roleRepo.find({
|
|
134
150
|
where: { id: (0, typeorm_2.In)(roleIds) },
|
|
135
151
|
});
|
|
136
|
-
const roleCodes = roles.map(role => role.code);
|
|
152
|
+
const roleCodes = roles.map((role) => role.code);
|
|
137
153
|
const actions = await this.moduleAccessRepo.find({
|
|
138
154
|
where: {
|
|
139
155
|
module_code: moduleCode,
|
|
@@ -141,7 +157,7 @@ let ModuleAccessRepository = class ModuleAccessRepository {
|
|
|
141
157
|
access_flag: 1,
|
|
142
158
|
},
|
|
143
159
|
});
|
|
144
|
-
const uniqueActions = [...new Set(actions.map(a => a.action_type))];
|
|
160
|
+
const uniqueActions = [...new Set(actions.map((a) => a.action_type))];
|
|
145
161
|
return {
|
|
146
162
|
entity_type: module.entity_type,
|
|
147
163
|
title: module.title,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"module-access.repository.js","sourceRoot":"","sources":["../../../../src/module/module/repository/module-access.repository.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAAiE;AACjE,6CAAmD;AACnD,qCAAyC;AACzC,+DAA0D;AAC1D,yEAA8D;AAC9D,yEAA8D;AAC9D,2DAAqD;AAK9C,IAAM,sBAAsB,GAA5B,MAAM,sBAAsB;IACjC,YAEmB,QAA0B,EAE1B,UAAkC,EAElC,gBAA0C,EAE1C,gBAA0C;QAN1C,aAAQ,GAAR,QAAQ,CAAkB;QAE1B,eAAU,GAAV,UAAU,CAAwB;QAElC,qBAAgB,GAAhB,gBAAgB,CAA0B;QAE1C,qBAAgB,GAAhB,gBAAgB,CAA0B;IAC1D,CAAC;IAEJ,KAAK,CAAC,QAAQ;
|
|
1
|
+
{"version":3,"file":"module-access.repository.js","sourceRoot":"","sources":["../../../../src/module/module/repository/module-access.repository.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,15 +2,19 @@ import { ModuleAccessRepository } from '../repository/module-access.repository';
|
|
|
2
2
|
export declare class ModuleAccessService {
|
|
3
3
|
private readonly moduleAccessRepository;
|
|
4
4
|
constructor(moduleAccessRepository: ModuleAccessRepository);
|
|
5
|
-
getRoles(
|
|
5
|
+
getRoles({ appcode }: {
|
|
6
|
+
appcode: string;
|
|
7
|
+
}): Promise<{
|
|
6
8
|
label: string;
|
|
7
9
|
value: number;
|
|
8
10
|
}[]>;
|
|
9
|
-
getModules(
|
|
11
|
+
getModules({ appcode }: {
|
|
12
|
+
appcode: string;
|
|
13
|
+
}): Promise<{
|
|
10
14
|
label: string;
|
|
11
15
|
value: number;
|
|
12
16
|
}[]>;
|
|
13
|
-
getAccessListing(roleIds: number[]): Promise<{
|
|
17
|
+
getAccessListing(roleIds: number[], appcode: string): Promise<{
|
|
14
18
|
role_code: string;
|
|
15
19
|
name: string;
|
|
16
20
|
permission: {
|
|
@@ -19,7 +23,7 @@ export declare class ModuleAccessService {
|
|
|
19
23
|
code: string;
|
|
20
24
|
}[];
|
|
21
25
|
}[]>;
|
|
22
|
-
getMenuListing(mainModIds: string[]): Promise<{
|
|
26
|
+
getMenuListing(mainModIds: string[], appcode: string): Promise<{
|
|
23
27
|
name: string;
|
|
24
28
|
code: string;
|
|
25
29
|
permission: {
|
|
@@ -28,7 +32,7 @@ export declare class ModuleAccessService {
|
|
|
28
32
|
}[];
|
|
29
33
|
submod: any[];
|
|
30
34
|
}[]>;
|
|
31
|
-
updateModuleAccess(moduleAccessData: any[]): Promise<{
|
|
35
|
+
updateModuleAccess(moduleAccessData: any[], appcode: string): Promise<{
|
|
32
36
|
success: boolean;
|
|
33
37
|
msg: string;
|
|
34
38
|
}>;
|
|
@@ -16,23 +16,25 @@ let ModuleAccessService = class ModuleAccessService {
|
|
|
16
16
|
constructor(moduleAccessRepository) {
|
|
17
17
|
this.moduleAccessRepository = moduleAccessRepository;
|
|
18
18
|
}
|
|
19
|
-
async getRoles() {
|
|
20
|
-
return this.moduleAccessRepository.getRoles();
|
|
19
|
+
async getRoles({ appcode }) {
|
|
20
|
+
return this.moduleAccessRepository.getRoles({ appcode });
|
|
21
21
|
}
|
|
22
|
-
async getModules() {
|
|
23
|
-
return this.moduleAccessRepository.getModules(
|
|
22
|
+
async getModules({ appcode }) {
|
|
23
|
+
return this.moduleAccessRepository.getModules({
|
|
24
|
+
appcode,
|
|
25
|
+
});
|
|
24
26
|
}
|
|
25
|
-
async getAccessListing(roleIds) {
|
|
26
|
-
return this.moduleAccessRepository.getAccessListing(roleIds);
|
|
27
|
+
async getAccessListing(roleIds, appcode) {
|
|
28
|
+
return this.moduleAccessRepository.getAccessListing(roleIds, appcode);
|
|
27
29
|
}
|
|
28
|
-
async getMenuListing(mainModIds) {
|
|
29
|
-
return this.moduleAccessRepository.getMenuListing(mainModIds);
|
|
30
|
+
async getMenuListing(mainModIds, appcode) {
|
|
31
|
+
return this.moduleAccessRepository.getMenuListing(mainModIds, appcode);
|
|
30
32
|
}
|
|
31
|
-
async updateModuleAccess(moduleAccessData) {
|
|
33
|
+
async updateModuleAccess(moduleAccessData, appcode) {
|
|
32
34
|
if (!moduleAccessData || moduleAccessData.length === 0) {
|
|
33
35
|
return { success: false, msg: 'No data provided' };
|
|
34
36
|
}
|
|
35
|
-
const result = await this.moduleAccessRepository.updateModuleAccess(moduleAccessData);
|
|
37
|
+
const result = await this.moduleAccessRepository.updateModuleAccess(moduleAccessData, appcode);
|
|
36
38
|
if (result) {
|
|
37
39
|
return { success: true, msg: 'Module access updated successfully' };
|
|
38
40
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"module-access.service.js","sourceRoot":"","sources":["../../../../src/module/module/service/module-access.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAAyE;AACzE,qFAAgF;AASzE,IAAM,mBAAmB,GAAzB,MAAM,mBAAmB;IAC9B,YACmB,sBAA8C;QAA9C,2BAAsB,GAAtB,sBAAsB,CAAwB;IAC9D,CAAC;IAEJ,KAAK,CAAC,QAAQ;
|
|
1
|
+
{"version":3,"file":"module-access.service.js","sourceRoot":"","sources":["../../../../src/module/module/service/module-access.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAAyE;AACzE,qFAAgF;AASzE,IAAM,mBAAmB,GAAzB,MAAM,mBAAmB;IAC9B,YACmB,sBAA8C;QAA9C,2BAAsB,GAAtB,sBAAsB,CAAwB;IAC9D,CAAC;IAEJ,KAAK,CAAC,QAAQ,CAAC,EAAE,OAAO,EAAuB;QAC7C,OAAO,IAAI,CAAC,sBAAsB,CAAC,QAAQ,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC;IAC3D,CAAC;IAED,KAAK,CAAC,UAAU,CAAC,EAAE,OAAO,EAAuB;QAC/C,OAAO,IAAI,CAAC,sBAAsB,CAAC,UAAU,CAAC;YAC5C,OAAO;SACR,CAAC,CAAC;IACL,CAAC;IAED,KAAK,CAAC,gBAAgB,CAAC,OAAiB,EAAE,OAAe;QACvD,OAAO,IAAI,CAAC,sBAAsB,CAAC,gBAAgB,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;IACxE,CAAC;IAED,KAAK,CAAC,cAAc,CAAC,UAAoB,EAAE,OAAe;QACxD,OAAO,IAAI,CAAC,sBAAsB,CAAC,cAAc,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC;IACzE,CAAC;IAED,KAAK,CAAC,kBAAkB,CACtB,gBAAuB,EACvB,OAAe;QAEf,IAAI,CAAC,gBAAgB,IAAI,gBAAgB,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACvD,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,GAAG,EAAE,kBAAkB,EAAE,CAAC;QACrD,CAAC;QAED,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,sBAAsB,CAAC,kBAAkB,CACjE,gBAAgB,EAChB,OAAO,CACR,CAAC;QAEF,IAAI,MAAM,EAAE,CAAC;YACX,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,GAAG,EAAE,oCAAoC,EAAE,CAAC;QACtE,CAAC;aAAM,CAAC;YACN,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,GAAG,EAAE,gCAAgC,EAAE,CAAC;QACnE,CAAC;IACH,CAAC;IAID,KAAK,CAAC,iBAAiB,CAAC,UAAkB,EAAE,OAAiB;QAC3D,OAAO,IAAI,CAAC,sBAAsB,CAAC,iBAAiB,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC;IAC5E,CAAC;CACF,CAAA;AAhDY,kDAAmB;8BAAnB,mBAAmB;IAD/B,IAAA,mBAAU,GAAE;qCAGgC,iDAAsB;GAFtD,mBAAmB,CAgD/B"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"create-user.dto.js","sourceRoot":"","sources":["../../../../src/module/user/dto/create-user.dto.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,qDAAgE;AAChE,6EAAkE;AAClE,uEAAoE;AACpE,yDAA2C;AAE3C,MAAa,aAAc,SAAQ,+BAAU;IAC3C;QACE,KAAK,EAAE,CAAC;QACR,IAAI,CAAC,WAAW,GAAG,iCAAe,CAAC;IACrC,CAAC;
|
|
1
|
+
{"version":3,"file":"create-user.dto.js","sourceRoot":"","sources":["../../../../src/module/user/dto/create-user.dto.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,qDAAgE;AAChE,6EAAkE;AAClE,uEAAoE;AACpE,yDAA2C;AAE3C,MAAa,aAAc,SAAQ,+BAAU;IAC3C;QACE,KAAK,EAAE,CAAC;QACR,IAAI,CAAC,WAAW,GAAG,iCAAe,CAAC;IACrC,CAAC;CAiDF;AArDD,sCAqDC;AA3CC;IAJC,IAAA,0BAAQ,GAAE;IACV,IAAA,4BAAU,GAAE;IACZ,IAAA,yBAAO,EAAC,qBAAqB,EAAE,EAAE,OAAO,EAAE,wBAAwB,EAAE,CAAC;IACrE,IAAA,0BAAM,GAAE;;iDACU;AAMnB;IAJC,IAAA,0BAAQ,GAAE;IACV,IAAA,4BAAU,GAAE;IACZ,IAAA,yBAAO,EAAC,qBAAqB,EAAE,EAAE,OAAO,EAAE,uBAAuB,EAAE,CAAC;IACpE,IAAA,0BAAM,GAAE;;gDACS;AAQlB;IANC,IAAA,0BAAQ,GAAE;IACV,IAAA,4BAAU,GAAE;IACZ,IAAA,yBAAO,EACN,sEAAsE,EACtE,EAAE,OAAO,EAAE,mBAAmB,EAAE,CACjC;;+CACgB;AAYjB;IAVC,IAAA,0BAAQ,GAAE;IACV,IAAA,4BAAU,GAAE;IACZ,IAAA,yBAAO,EACN,sEAAsE,EACtE;QACE,OAAO,EACL,gJAAgJ;KACnJ,CACF;IACA,IAAA,0BAAM,GAAE;;+CACQ;AAMjB;IAJC,IAAA,0BAAQ,GAAE;IACV,IAAA,4BAAU,GAAE;IACZ,IAAA,yBAAO,EAAC,aAAa,EAAE,EAAE,OAAO,EAAE,4BAA4B,EAAE,CAAC;IACjE,IAAA,0BAAM,GAAE;;6CACM;AAGf;IADC,IAAA,0BAAM,GAAE;;4CACI"}
|
|
@@ -9,6 +9,6 @@ export declare class RoleService extends EntityServiceImpl {
|
|
|
9
9
|
private readonly entityManager;
|
|
10
10
|
private readonly moduleAccessRepo;
|
|
11
11
|
constructor(roleRepository: RoleRepository, entityManager: EntityManager, moduleAccessRepo: Repository<ModuleAccess>);
|
|
12
|
-
createEntity(entityData: BaseEntity, loggedInUser: UserData | null): Promise<BaseEntity>;
|
|
12
|
+
createEntity(entityData: BaseEntity, loggedInUser: UserData | null, manager?: EntityManager, appcode?: string): Promise<BaseEntity>;
|
|
13
13
|
updateEntity(entityData: BaseEntity, loggedInUser: UserData | null): Promise<BaseEntity>;
|
|
14
14
|
}
|
|
@@ -27,8 +27,11 @@ let RoleService = class RoleService extends entity_service_impl_service_1.Entity
|
|
|
27
27
|
this.entityManager = entityManager;
|
|
28
28
|
this.moduleAccessRepo = moduleAccessRepo;
|
|
29
29
|
}
|
|
30
|
-
async createEntity(entityData, loggedInUser) {
|
|
30
|
+
async createEntity(entityData, loggedInUser, manager, appcode) {
|
|
31
31
|
let role = entityData;
|
|
32
|
+
if (appcode) {
|
|
33
|
+
role.appcode = appcode;
|
|
34
|
+
}
|
|
32
35
|
if (await this.roleRepository.isRoleNameExists(role.name, { organization_id: entityData.organization_id })) {
|
|
33
36
|
throw new common_1.BadRequestException('Role name already exists.');
|
|
34
37
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"role.service.js","sourceRoot":"","sources":["../../../../src/module/user/service/role.service.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAAiE;AACjE,gGAAmF;AAInF,uEAA+D;AAC/D,mEAA+D;AAC/D,qCAAoD;AACpD,6CAAmD;AACnD,mFAAwE;AAIjE,IAAM,WAAW,GAAjB,MAAM,WAAY,SAAQ,+CAAiB;IAChD,YACmB,cAA8B,EAC9B,aAA4B,EAE5B,gBAA0C;QAE3D,KAAK,EAAE,CAAC;QALS,mBAAc,GAAd,cAAc,CAAgB;QAC9B,kBAAa,GAAb,aAAa,CAAe;QAE5B,qBAAgB,GAAhB,gBAAgB,CAA0B;IAG7D,CAAC;IAED,KAAK,CAAC,YAAY,CAChB,UAAsB,EACtB,YAA6B;
|
|
1
|
+
{"version":3,"file":"role.service.js","sourceRoot":"","sources":["../../../../src/module/user/service/role.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -14,7 +14,7 @@ export declare class UserService extends EntityServiceImpl {
|
|
|
14
14
|
constructor(userRepository: UserRepository, userRoleMappingService: UserRoleMappingService, clockIDGenService: ClockIDGenService, configService: ConfigService);
|
|
15
15
|
masterKey: any;
|
|
16
16
|
masterIv: any;
|
|
17
|
-
createEntity(entityData: BaseEntity, loggedInUser: UserData | null, manager?: EntityManager): Promise<BaseEntity>;
|
|
17
|
+
createEntity(entityData: BaseEntity, loggedInUser: UserData | null, manager?: EntityManager, appcode?: string): Promise<BaseEntity>;
|
|
18
18
|
getEntityData(entityType: string, id: number): Promise<BaseEntity | null>;
|
|
19
19
|
updateEntity(entityData: BaseEntity, loggedInUserData: UserData): Promise<BaseEntity>;
|
|
20
20
|
findByEmailId(email_id: string, organization_id?: number, appCode?: string): Promise<UserData | null>;
|
|
@@ -31,8 +31,11 @@ let UserService = class UserService extends entity_service_impl_service_1.Entity
|
|
|
31
31
|
this.masterKey = this.configService.get('MASTER_KEY') || '';
|
|
32
32
|
this.masterIv = this.configService.get('MASTER_IV') || '';
|
|
33
33
|
}
|
|
34
|
-
async createEntity(entityData, loggedInUser, manager) {
|
|
34
|
+
async createEntity(entityData, loggedInUser, manager, appcode) {
|
|
35
35
|
let userData = entityData;
|
|
36
|
+
if (appcode) {
|
|
37
|
+
userData.appcode = appcode;
|
|
38
|
+
}
|
|
36
39
|
let existingUser = await this.userRepository.findByEmailId(userData.email_id, loggedInUser?.organization_id);
|
|
37
40
|
if (existingUser) {
|
|
38
41
|
throw new common_1.BadRequestException('User already exists');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"user.service.js","sourceRoot":"","sources":["../../../../src/module/user/service/user.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAAiE;AACjE,gGAAmF;AACnF,uDAAiD;AAEjD,mEAA+D;AAC/D,oFAAgF;AAChF,0FAAkF;AAClF,uEAG2C;AAE3C,2EAAqE;AACrE,iFAAqE;AACrE,yDAAoD;AAGpD,2CAA+C;AAGxC,IAAM,WAAW,GAAjB,MAAM,WAAY,SAAQ,+CAAiB;IAChD,YACU,cAA8B,EAC9B,sBAA8C,EACrC,iBAAoC,EAC7C,aAA4B;QAEpC,KAAK,EAAE,CAAC;QALA,mBAAc,GAAd,cAAc,CAAgB;QAC9B,2BAAsB,GAAtB,sBAAsB,CAAwB;QACrC,sBAAiB,GAAjB,iBAAiB,CAAmB;QAC7C,kBAAa,GAAb,aAAa,CAAe;QAKtC,cAAS,GAAG,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,YAAY,CAAC,IAAI,EAAE,CAAC;QACvD,aAAQ,GAAG,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,WAAW,CAAC,IAAI,EAAE,CAAC;IAHrD,CAAC;IAKD,KAAK,CAAC,YAAY,CAChB,UAAsB,EACtB,YAA6B,EAC7B,OAAuB;
|
|
1
|
+
{"version":3,"file":"user.service.js","sourceRoot":"","sources":["../../../../src/module/user/service/user.service.ts"],"names":[],"mappings":"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"}
|