rez_core 1.0.48 → 1.0.49
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/.idea/250218_nodejs_core.iml +12 -0
- package/.idea/codeStyles/Project.xml +59 -0
- package/.idea/codeStyles/codeStyleConfig.xml +5 -0
- package/.idea/dataSources.xml +12 -0
- package/.idea/modules.xml +8 -0
- package/.idea/prettier.xml +6 -0
- package/.idea/vcs.xml +6 -0
- package/data/master.xlsx +0 -0
- package/dist/constant/global.constant.d.ts +1 -0
- package/dist/constant/global.constant.js +2 -1
- package/dist/constant/global.constant.js.map +1 -1
- package/dist/module/auth/guards/role.guard.js +3 -3
- package/dist/module/master/service/master.service.js +14 -0
- package/dist/module/master/service/master.service.js.map +1 -1
- package/dist/module/meta/controller/entity.controller.d.ts +6 -2
- package/dist/module/meta/controller/entity.controller.js +13 -6
- package/dist/module/meta/controller/entity.controller.js.map +1 -1
- package/dist/module/module/controller/module-access.controller.d.ts +7 -1
- package/dist/module/module/controller/module-access.controller.js +19 -8
- package/dist/module/module/controller/module-access.controller.js.map +1 -1
- package/dist/module/module/repository/module-access.repository.d.ts +3 -2
- package/dist/module/module/repository/module-access.repository.js +30 -13
- package/dist/module/module/repository/module-access.repository.js.map +1 -1
- package/dist/module/module/service/module-access.service.d.ts +6 -3
- package/dist/module/module/service/module-access.service.js +25 -13
- package/dist/module/module/service/module-access.service.js.map +1 -1
- package/dist/module/user/entity/user-role-mapping.entity.d.ts +1 -0
- package/dist/module/user/entity/user-role-mapping.entity.js +6 -0
- package/dist/module/user/entity/user-role-mapping.entity.js.map +1 -1
- package/dist/module/user/service/role.service.js.map +1 -1
- package/dist/tsconfig.build.tsbuildinfo +1 -1
- package/package.json +1 -1
- package/src/constant/global.constant.ts +2 -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/master/service/master.service.ts +14 -0
- package/src/module/meta/controller/entity.controller.ts +14 -3
- package/src/module/meta/dto/entity-list-data.dto.ts +6 -6
- package/src/module/meta/entity/preference.entity.ts +65 -65
- package/src/module/meta/repository/preference.repository.ts +20 -20
- package/src/module/module/controller/menu.controller.ts +15 -15
- package/src/module/module/controller/module-access.controller.ts +16 -4
- 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 +81 -47
- package/src/module/module/service/module-access.service.ts +39 -19
- 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 +5 -0
- package/src/module/user/entity/user-session.entity.ts +61 -61
- package/src/module/user/repository/userSession.repository.ts +33 -33
- package/src/module/user/service/role.service.ts +1 -0
- package/src/resources/dev.properties.yaml +6 -6
- 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
|
@@ -0,0 +1,12 @@
|
|
|
1
|
+
<?xml version="1.0" encoding="UTF-8"?>
|
|
2
|
+
<module type="WEB_MODULE" version="4">
|
|
3
|
+
<component name="NewModuleRootManager">
|
|
4
|
+
<content url="file://$MODULE_DIR$">
|
|
5
|
+
<excludeFolder url="file://$MODULE_DIR$/.tmp" />
|
|
6
|
+
<excludeFolder url="file://$MODULE_DIR$/temp" />
|
|
7
|
+
<excludeFolder url="file://$MODULE_DIR$/tmp" />
|
|
8
|
+
</content>
|
|
9
|
+
<orderEntry type="inheritedJdk" />
|
|
10
|
+
<orderEntry type="sourceFolder" forTests="false" />
|
|
11
|
+
</component>
|
|
12
|
+
</module>
|
|
@@ -0,0 +1,59 @@
|
|
|
1
|
+
<component name="ProjectCodeStyleConfiguration">
|
|
2
|
+
<code_scheme name="Project" version="173">
|
|
3
|
+
<HTMLCodeStyleSettings>
|
|
4
|
+
<option name="HTML_SPACE_INSIDE_EMPTY_TAG" value="true" />
|
|
5
|
+
</HTMLCodeStyleSettings>
|
|
6
|
+
<JSCodeStyleSettings version="0">
|
|
7
|
+
<option name="FORCE_SEMICOLON_STYLE" value="true" />
|
|
8
|
+
<option name="SPACE_BEFORE_FUNCTION_LEFT_PARENTH" value="false" />
|
|
9
|
+
<option name="USE_DOUBLE_QUOTES" value="false" />
|
|
10
|
+
<option name="FORCE_QUOTE_STYlE" value="true" />
|
|
11
|
+
<option name="ENFORCE_TRAILING_COMMA" value="WhenMultiline" />
|
|
12
|
+
<option name="SPACES_WITHIN_OBJECT_LITERAL_BRACES" value="true" />
|
|
13
|
+
<option name="SPACES_WITHIN_IMPORTS" value="true" />
|
|
14
|
+
</JSCodeStyleSettings>
|
|
15
|
+
<TypeScriptCodeStyleSettings version="0">
|
|
16
|
+
<option name="FORCE_SEMICOLON_STYLE" value="true" />
|
|
17
|
+
<option name="SPACE_BEFORE_FUNCTION_LEFT_PARENTH" value="false" />
|
|
18
|
+
<option name="USE_DOUBLE_QUOTES" value="false" />
|
|
19
|
+
<option name="FORCE_QUOTE_STYlE" value="true" />
|
|
20
|
+
<option name="ENFORCE_TRAILING_COMMA" value="WhenMultiline" />
|
|
21
|
+
<option name="SPACES_WITHIN_OBJECT_LITERAL_BRACES" value="true" />
|
|
22
|
+
<option name="SPACES_WITHIN_IMPORTS" value="true" />
|
|
23
|
+
</TypeScriptCodeStyleSettings>
|
|
24
|
+
<VueCodeStyleSettings>
|
|
25
|
+
<option name="INTERPOLATION_NEW_LINE_AFTER_START_DELIMITER" value="false" />
|
|
26
|
+
<option name="INTERPOLATION_NEW_LINE_BEFORE_END_DELIMITER" value="false" />
|
|
27
|
+
</VueCodeStyleSettings>
|
|
28
|
+
<codeStyleSettings language="HTML">
|
|
29
|
+
<option name="SOFT_MARGINS" value="80" />
|
|
30
|
+
<indentOptions>
|
|
31
|
+
<option name="INDENT_SIZE" value="2" />
|
|
32
|
+
<option name="CONTINUATION_INDENT_SIZE" value="2" />
|
|
33
|
+
<option name="TAB_SIZE" value="2" />
|
|
34
|
+
</indentOptions>
|
|
35
|
+
</codeStyleSettings>
|
|
36
|
+
<codeStyleSettings language="JavaScript">
|
|
37
|
+
<option name="SOFT_MARGINS" value="80" />
|
|
38
|
+
<indentOptions>
|
|
39
|
+
<option name="INDENT_SIZE" value="2" />
|
|
40
|
+
<option name="CONTINUATION_INDENT_SIZE" value="2" />
|
|
41
|
+
<option name="TAB_SIZE" value="2" />
|
|
42
|
+
</indentOptions>
|
|
43
|
+
</codeStyleSettings>
|
|
44
|
+
<codeStyleSettings language="TypeScript">
|
|
45
|
+
<option name="SOFT_MARGINS" value="80" />
|
|
46
|
+
<indentOptions>
|
|
47
|
+
<option name="INDENT_SIZE" value="2" />
|
|
48
|
+
<option name="CONTINUATION_INDENT_SIZE" value="2" />
|
|
49
|
+
<option name="TAB_SIZE" value="2" />
|
|
50
|
+
</indentOptions>
|
|
51
|
+
</codeStyleSettings>
|
|
52
|
+
<codeStyleSettings language="Vue">
|
|
53
|
+
<option name="SOFT_MARGINS" value="80" />
|
|
54
|
+
<indentOptions>
|
|
55
|
+
<option name="CONTINUATION_INDENT_SIZE" value="2" />
|
|
56
|
+
</indentOptions>
|
|
57
|
+
</codeStyleSettings>
|
|
58
|
+
</code_scheme>
|
|
59
|
+
</component>
|
|
@@ -0,0 +1,12 @@
|
|
|
1
|
+
<?xml version="1.0" encoding="UTF-8"?>
|
|
2
|
+
<project version="4">
|
|
3
|
+
<component name="DataSourceManagerImpl" format="xml" multifile-model="true">
|
|
4
|
+
<data-source source="LOCAL" name="@localhost" uuid="9a102608-c415-4802-970e-769555981800">
|
|
5
|
+
<driver-ref>mysql.8</driver-ref>
|
|
6
|
+
<synchronize>true</synchronize>
|
|
7
|
+
<jdbc-driver>com.mysql.cj.jdbc.Driver</jdbc-driver>
|
|
8
|
+
<jdbc-url>jdbc:mysql://localhost:3306</jdbc-url>
|
|
9
|
+
<working-dir>$ProjectFileDir$</working-dir>
|
|
10
|
+
</data-source>
|
|
11
|
+
</component>
|
|
12
|
+
</project>
|
|
@@ -0,0 +1,8 @@
|
|
|
1
|
+
<?xml version="1.0" encoding="UTF-8"?>
|
|
2
|
+
<project version="4">
|
|
3
|
+
<component name="ProjectModuleManager">
|
|
4
|
+
<modules>
|
|
5
|
+
<module fileurl="file://$PROJECT_DIR$/.idea/250218_nodejs_core.iml" filepath="$PROJECT_DIR$/.idea/250218_nodejs_core.iml" />
|
|
6
|
+
</modules>
|
|
7
|
+
</component>
|
|
8
|
+
</project>
|
package/.idea/vcs.xml
ADDED
package/data/master.xlsx
CHANGED
|
Binary file
|
|
@@ -10,6 +10,7 @@ export declare const ENTITYTYPE_LISTMASTER = "LMS";
|
|
|
10
10
|
export declare const ENTITYTYPE_LISTMASTERITEMS = "LMI";
|
|
11
11
|
export declare const ENTITYTYPE_SECTIONMASTER = "SEC";
|
|
12
12
|
export declare const ENTITYTYPE_FIELDMASTER = "FLD";
|
|
13
|
+
export declare const ENTITYTYPE_USRROLMAP = "URM";
|
|
13
14
|
export declare const STORAGETYPE_SINGLEJSON = "singlejson";
|
|
14
15
|
export declare const STORAGETYPE_COLUMN = "column";
|
|
15
16
|
export declare const secretKey: string;
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.ENTITYSTATUS_PUBLISHED = exports.ENTITYSTATUS_TO_BE_PUBLISHED = exports.STATUS_PENDING = exports.STATUS_INACTIVE = exports.STATUS_ACTIVE = exports.secretKey = exports.STORAGETYPE_COLUMN = exports.STORAGETYPE_SINGLEJSON = exports.ENTITYTYPE_FIELDMASTER = exports.ENTITYTYPE_SECTIONMASTER = exports.ENTITYTYPE_LISTMASTERITEMS = exports.ENTITYTYPE_LISTMASTER = exports.ENTITYTYPE_MEDIA = exports.ENTITYTYPE_VIEWMASTER = exports.ENTITYTYPE_PREFERENCEMASTER = exports.ENTITYTYPE_ENTITYTABLECOLUMN = exports.ENTITYTYPE_ENTITYTABLE = exports.ENTITYTYPE_ROLE = exports.ENTITYTYPE_ENTITYMASTER = exports.ENTITYTYPE_USER = void 0;
|
|
3
|
+
exports.ENTITYSTATUS_PUBLISHED = exports.ENTITYSTATUS_TO_BE_PUBLISHED = exports.STATUS_PENDING = exports.STATUS_INACTIVE = exports.STATUS_ACTIVE = exports.secretKey = exports.STORAGETYPE_COLUMN = exports.STORAGETYPE_SINGLEJSON = exports.ENTITYTYPE_USRROLMAP = exports.ENTITYTYPE_FIELDMASTER = exports.ENTITYTYPE_SECTIONMASTER = exports.ENTITYTYPE_LISTMASTERITEMS = exports.ENTITYTYPE_LISTMASTER = exports.ENTITYTYPE_MEDIA = exports.ENTITYTYPE_VIEWMASTER = exports.ENTITYTYPE_PREFERENCEMASTER = exports.ENTITYTYPE_ENTITYTABLECOLUMN = exports.ENTITYTYPE_ENTITYTABLE = exports.ENTITYTYPE_ROLE = exports.ENTITYTYPE_ENTITYMASTER = exports.ENTITYTYPE_USER = void 0;
|
|
4
4
|
exports.ENTITYTYPE_USER = 'USR';
|
|
5
5
|
exports.ENTITYTYPE_ENTITYMASTER = 'EMS';
|
|
6
6
|
exports.ENTITYTYPE_ROLE = 'ROL';
|
|
@@ -13,6 +13,7 @@ exports.ENTITYTYPE_LISTMASTER = 'LMS';
|
|
|
13
13
|
exports.ENTITYTYPE_LISTMASTERITEMS = 'LMI';
|
|
14
14
|
exports.ENTITYTYPE_SECTIONMASTER = 'SEC';
|
|
15
15
|
exports.ENTITYTYPE_FIELDMASTER = 'FLD';
|
|
16
|
+
exports.ENTITYTYPE_USRROLMAP = 'URM';
|
|
16
17
|
exports.STORAGETYPE_SINGLEJSON = 'singlejson';
|
|
17
18
|
exports.STORAGETYPE_COLUMN = 'column';
|
|
18
19
|
exports.secretKey = process.env.secret_key || '';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"global.constant.js","sourceRoot":"","sources":["../../src/constant/global.constant.ts"],"names":[],"mappings":";;;AACa,QAAA,eAAe,GAAG,KAAK,CAAC;AACxB,QAAA,uBAAuB,GAAG,KAAK,CAAC;AAChC,QAAA,eAAe,GAAG,KAAK,CAAC;AACxB,QAAA,sBAAsB,GAAG,KAAK,CAAC;AAC/B,QAAA,4BAA4B,GAAG,KAAK,CAAC;AACrC,QAAA,2BAA2B,GAAG,KAAK,CAAC;AACpC,QAAA,qBAAqB,GAAG,KAAK,CAAC;AAC9B,QAAA,gBAAgB,GAAG,KAAK,CAAC;AACzB,QAAA,qBAAqB,GAAG,KAAK,CAAC;AAC9B,QAAA,0BAA0B,GAAG,KAAK,CAAC;AACnC,QAAA,wBAAwB,GAAG,KAAK,CAAC;AACjC,QAAA,sBAAsB,GAAG,KAAK,CAAC;
|
|
1
|
+
{"version":3,"file":"global.constant.js","sourceRoot":"","sources":["../../src/constant/global.constant.ts"],"names":[],"mappings":";;;AACa,QAAA,eAAe,GAAG,KAAK,CAAC;AACxB,QAAA,uBAAuB,GAAG,KAAK,CAAC;AAChC,QAAA,eAAe,GAAG,KAAK,CAAC;AACxB,QAAA,sBAAsB,GAAG,KAAK,CAAC;AAC/B,QAAA,4BAA4B,GAAG,KAAK,CAAC;AACrC,QAAA,2BAA2B,GAAG,KAAK,CAAC;AACpC,QAAA,qBAAqB,GAAG,KAAK,CAAC;AAC9B,QAAA,gBAAgB,GAAG,KAAK,CAAC;AACzB,QAAA,qBAAqB,GAAG,KAAK,CAAC;AAC9B,QAAA,0BAA0B,GAAG,KAAK,CAAC;AACnC,QAAA,wBAAwB,GAAG,KAAK,CAAC;AACjC,QAAA,sBAAsB,GAAG,KAAK,CAAC;AAC/B,QAAA,oBAAoB,GAAG,KAAK,CAAC;AAG7B,QAAA,sBAAsB,GAAG,YAAY,CAAC;AACtC,QAAA,kBAAkB,GAAG,QAAQ,CAAC;AAG9B,QAAA,SAAS,GAAW,OAAO,CAAC,GAAG,CAAC,UAAU,IAAI,EAAE,CAAC;AAGjD,QAAA,aAAa,GAAG,QAAQ,CAAC;AACzB,QAAA,eAAe,GAAG,UAAU,CAAC;AAC7B,QAAA,cAAc,GAAG,SAAS,CAAC;AAG3B,QAAA,4BAA4B,GAAG,iBAAiB,CAAC;AACjD,QAAA,sBAAsB,GAAG,WAAW,CAAC"}
|
|
@@ -34,9 +34,9 @@ let RolesGuard = class RolesGuard {
|
|
|
34
34
|
}
|
|
35
35
|
const requiredModule = this.reflector.get('moduleCode', context.getHandler());
|
|
36
36
|
const requiredActions = this.reflector.get('actions', context.getHandler());
|
|
37
|
-
const roleAccess = await this.entityManager.query(`SELECT *
|
|
38
|
-
FROM cr_module_access
|
|
39
|
-
WHERE role_id = ${user['role_id']}
|
|
37
|
+
const roleAccess = await this.entityManager.query(`SELECT *
|
|
38
|
+
FROM cr_module_access
|
|
39
|
+
WHERE role_id = ${user['role_id']}
|
|
40
40
|
AND module_code = '${requiredModule}'`);
|
|
41
41
|
if (!roleAccess || roleAccess.length === 0) {
|
|
42
42
|
throw new common_1.ForbiddenException('Access denied: No permissions found for this module');
|
|
@@ -48,6 +48,18 @@ let MasterService = class MasterService {
|
|
|
48
48
|
},
|
|
49
49
|
];
|
|
50
50
|
this.dataSequence = [
|
|
51
|
+
{
|
|
52
|
+
table: 'cr_user',
|
|
53
|
+
unique_fields: ['code'],
|
|
54
|
+
},
|
|
55
|
+
{
|
|
56
|
+
table: 'cr_role',
|
|
57
|
+
unique_fields: ['code'],
|
|
58
|
+
},
|
|
59
|
+
{
|
|
60
|
+
table: 'cr_user_role_mapping',
|
|
61
|
+
unique_fields: ['user_id', 'role_id'],
|
|
62
|
+
},
|
|
51
63
|
{
|
|
52
64
|
table: 'eth_school',
|
|
53
65
|
unique_fields: ['code'],
|
|
@@ -101,12 +113,14 @@ let MasterService = class MasterService {
|
|
|
101
113
|
}
|
|
102
114
|
const entityMasterData = await this.entityMasterService.getEntityByTableName(table);
|
|
103
115
|
const attributes = await this.attributeMasterService.findAttributesByMappedEntityType(entityMasterData?.mapped_entity_type);
|
|
116
|
+
console.log(attributes, "((((((((((((((((((((((((((");
|
|
104
117
|
for (const row of sheetData) {
|
|
105
118
|
if (row.parent_type !== undefined && row.parent_id !== undefined) {
|
|
106
119
|
this.resolveParent(row);
|
|
107
120
|
}
|
|
108
121
|
for (const attribute of attributes) {
|
|
109
122
|
if (attribute.data_source_type === 'entity') {
|
|
123
|
+
console.log(attribute.data_source_type);
|
|
110
124
|
let entityMaster = await this.entityMasterService.getEntityData(attribute.datasource_list);
|
|
111
125
|
const entityData = await this.entityManager.query(`SELECT * FROM ${entityMaster.db_table_name} WHERE code = ? LIMIT 1`, [row[attribute.attribute_key]]);
|
|
112
126
|
row[attribute.attribute_key] = entityData[0].id;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"master.service.js","sourceRoot":"","sources":["../../../../src/module/master/service/master.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA4C;AAC5C,qCAAgD;AAChD,gFAAgE;AAChE,oFAA+E;AAE/E,0FAA0F;AAE1F,gGAAwF;AAQjF,IAAM,aAAa,GAAnB,MAAM,aAAa;IACxB,YACmB,aAA4B,EAC5B,mBAAwC,EACxC,sBAA8C,EAC9C,SAAoB,EACpB,iBAAoC;QAJpC,kBAAa,GAAb,aAAa,CAAe;QAC5B,wBAAmB,GAAnB,mBAAmB,CAAqB;QACxC,2BAAsB,GAAtB,sBAAsB,CAAwB;QAC9C,cAAS,GAAT,SAAS,CAAW;QACpB,sBAAiB,GAAjB,iBAAiB,CAAmB;QAGtC,eAAU,GAAG;YAC5B,kBAAkB;YAClB,qBAAqB;YACrB,gBAAgB;YAChB,sBAAsB;SACvB,CAAC;QACe,aAAQ,GAAG;YAC1B;gBACE,KAAK,EAAE,kBAAkB;gBACzB,aAAa,EAAE,CAAC,oBAAoB,CAAC;aACtC;YACD;gBACE,KAAK,EAAE,qBAAqB;gBAC5B,aAAa,EAAE,CAAC,oBAAoB,EAAE,eAAe,CAAC;aACvD;YACD;gBACE,KAAK,EAAE,gBAAgB;gBACvB,aAAa,EAAE,CAAC,MAAM,CAAC;aACxB;YACD;gBACE,KAAK,EAAE,sBAAsB;gBAC7B,aAAa,EAAE,CAAC,UAAU,EAAE,MAAM,CAAC;aACpC;SACF,CAAC;QAEe,iBAAY,GAAG;YAC9B;gBACE,KAAK,EAAE,YAAY;gBACnB,aAAa,EAAE,CAAC,MAAM,CAAC;aACxB;YACD;gBACE,KAAK,EAAE,oBAAoB;gBAC3B,aAAa,EAAE,CAAC,MAAM,CAAC;aACxB;SACF,CAAC;
|
|
1
|
+
{"version":3,"file":"master.service.js","sourceRoot":"","sources":["../../../../src/module/master/service/master.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -9,8 +9,12 @@ export declare class EntityController {
|
|
|
9
9
|
private entityMasterService;
|
|
10
10
|
constructor(entityService: EntityServiceImpl, reflectionHelper: ReflectionHelper, entityMasterService: EntityMasterService);
|
|
11
11
|
getById(id: number, entityType?: string): Promise<BaseEntity | null | undefined>;
|
|
12
|
-
create(entityData: BaseEntity, entityType: string, res: Response
|
|
13
|
-
|
|
12
|
+
create(entityData: BaseEntity, entityType: string, res: Response, req: Request & {
|
|
13
|
+
user: any;
|
|
14
|
+
}): Promise<Response<any, Record<string, any>> | undefined>;
|
|
15
|
+
update(id: number, entityData: BaseEntity, entityType: string, response: Response, req: Request & {
|
|
16
|
+
user: any;
|
|
17
|
+
}): Promise<Response<any, Record<string, any>> | undefined>;
|
|
14
18
|
getFilterDataWithTabs(entityType: string, listType: string, res: Response, filters?: Record<string, any>, sortColumn?: string, sortOrder?: string, page?: number, size?: number): Promise<Response<any, Record<string, any>>>;
|
|
15
19
|
downloadExcel(entityType: string, listEntityType: string, displayType: string, filterCriteria: Record<string, any>, res: Response): Promise<Response<any, Record<string, any>> | undefined>;
|
|
16
20
|
}
|
|
@@ -21,6 +21,7 @@ const base_entity_entity_1 = require("../entity/base-entity.entity");
|
|
|
21
21
|
const jwt_guard_1 = require("../../auth/guards/jwt.guard");
|
|
22
22
|
const fs = require("fs");
|
|
23
23
|
const path = require("path");
|
|
24
|
+
const global_constant_1 = require("../../../constant/global.constant");
|
|
24
25
|
let EntityController = class EntityController {
|
|
25
26
|
constructor(entityService, reflectionHelper, entityMasterService) {
|
|
26
27
|
this.entityService = entityService;
|
|
@@ -37,7 +38,9 @@ let EntityController = class EntityController {
|
|
|
37
38
|
return await entityService.getEntityData(entityType, id);
|
|
38
39
|
}
|
|
39
40
|
}
|
|
40
|
-
async create(entityData, entityType, res) {
|
|
41
|
+
async create(entityData, entityType, res, req) {
|
|
42
|
+
let requestedUser = req.user;
|
|
43
|
+
let loggedInUser = await this.entityService.getEntityData(global_constant_1.ENTITYTYPE_USER, requestedUser.id);
|
|
41
44
|
if (!entityType) {
|
|
42
45
|
throw new common_1.BadRequestException('Query parameter "entity_type" is required');
|
|
43
46
|
}
|
|
@@ -46,10 +49,12 @@ let EntityController = class EntityController {
|
|
|
46
49
|
if (entityService) {
|
|
47
50
|
return res
|
|
48
51
|
.status(common_1.HttpStatus.OK)
|
|
49
|
-
.json(await entityService.createEntity(entityData,
|
|
52
|
+
.json(await entityService.createEntity(entityData, loggedInUser));
|
|
50
53
|
}
|
|
51
54
|
}
|
|
52
|
-
async update(id, entityData, entityType, response) {
|
|
55
|
+
async update(id, entityData, entityType, response, req) {
|
|
56
|
+
let requestedUser = req.user;
|
|
57
|
+
let loggedInUser = await this.entityService.getEntityData(global_constant_1.ENTITYTYPE_USER, requestedUser.id);
|
|
53
58
|
if (!entityType) {
|
|
54
59
|
throw new common_1.BadRequestException('Query parameter "entity_type" is required');
|
|
55
60
|
}
|
|
@@ -59,7 +64,7 @@ let EntityController = class EntityController {
|
|
|
59
64
|
let existingEntity = await entityService.getEntityData(entityType, id);
|
|
60
65
|
if (!existingEntity) {
|
|
61
66
|
}
|
|
62
|
-
entityData = await entityService.updateEntity(entityData,
|
|
67
|
+
entityData = await entityService.updateEntity(entityData, loggedInUser);
|
|
63
68
|
return response.status(common_1.HttpStatus.OK).json(entityData);
|
|
64
69
|
}
|
|
65
70
|
}
|
|
@@ -102,8 +107,9 @@ __decorate([
|
|
|
102
107
|
__param(0, (0, common_1.Body)()),
|
|
103
108
|
__param(1, (0, common_1.Query)('entity_type')),
|
|
104
109
|
__param(2, (0, common_1.Res)()),
|
|
110
|
+
__param(3, (0, common_1.Req)()),
|
|
105
111
|
__metadata("design:type", Function),
|
|
106
|
-
__metadata("design:paramtypes", [base_entity_entity_1.BaseEntity, String, Object]),
|
|
112
|
+
__metadata("design:paramtypes", [base_entity_entity_1.BaseEntity, String, Object, Object]),
|
|
107
113
|
__metadata("design:returntype", Promise)
|
|
108
114
|
], EntityController.prototype, "create", null);
|
|
109
115
|
__decorate([
|
|
@@ -112,8 +118,9 @@ __decorate([
|
|
|
112
118
|
__param(1, (0, common_1.Body)()),
|
|
113
119
|
__param(2, (0, common_1.Query)('entity_type')),
|
|
114
120
|
__param(3, (0, common_1.Res)()),
|
|
121
|
+
__param(4, (0, common_1.Req)()),
|
|
115
122
|
__metadata("design:type", Function),
|
|
116
|
-
__metadata("design:paramtypes", [Number, base_entity_entity_1.BaseEntity, String, Object]),
|
|
123
|
+
__metadata("design:paramtypes", [Number, base_entity_entity_1.BaseEntity, String, Object, Object]),
|
|
117
124
|
__metadata("design:returntype", Promise)
|
|
118
125
|
], EntityController.prototype, "update", null);
|
|
119
126
|
__decorate([
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"entity.controller.js","sourceRoot":"","sources":["../../../../src/module/meta/controller/entity.controller.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"entity.controller.js","sourceRoot":"","sources":["../../../../src/module/meta/controller/entity.controller.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,9 @@
|
|
|
1
1
|
import { ModuleAccessService } from '../service/module-access.service';
|
|
2
|
+
import { UserService } from '../../user/service/user.service';
|
|
2
3
|
export declare class ModuleAccessController {
|
|
3
4
|
private readonly moduleAccessService;
|
|
4
|
-
|
|
5
|
+
private readonly userService;
|
|
6
|
+
constructor(moduleAccessService: ModuleAccessService, userService: UserService);
|
|
5
7
|
getRoles(): Promise<{
|
|
6
8
|
label: string;
|
|
7
9
|
value: number;
|
|
@@ -37,6 +39,8 @@ export declare class ModuleAccessController {
|
|
|
37
39
|
description?: string;
|
|
38
40
|
status?: 'ACTIVE' | 'INACTIVE';
|
|
39
41
|
copyFromRoleId?: number;
|
|
42
|
+
}, req: Request & {
|
|
43
|
+
user: any;
|
|
40
44
|
}): Promise<{
|
|
41
45
|
success: boolean;
|
|
42
46
|
msg: string;
|
|
@@ -52,6 +56,8 @@ export declare class ModuleAccessController {
|
|
|
52
56
|
description?: string;
|
|
53
57
|
status?: 'ACTIVE' | 'INACTIVE';
|
|
54
58
|
copyFromRoleId?: number;
|
|
59
|
+
}, req: Request & {
|
|
60
|
+
user: any;
|
|
55
61
|
}): Promise<{
|
|
56
62
|
success: boolean;
|
|
57
63
|
msg: string;
|
|
@@ -16,9 +16,12 @@ exports.ModuleAccessController = void 0;
|
|
|
16
16
|
const common_1 = require("@nestjs/common");
|
|
17
17
|
const module_access_service_1 = require("../service/module-access.service");
|
|
18
18
|
const jwt_guard_1 = require("../../auth/guards/jwt.guard");
|
|
19
|
+
const global_constant_1 = require("../../../constant/global.constant");
|
|
20
|
+
const user_service_1 = require("../../user/service/user.service");
|
|
19
21
|
let ModuleAccessController = class ModuleAccessController {
|
|
20
|
-
constructor(moduleAccessService) {
|
|
22
|
+
constructor(moduleAccessService, userService) {
|
|
21
23
|
this.moduleAccessService = moduleAccessService;
|
|
24
|
+
this.userService = userService;
|
|
22
25
|
}
|
|
23
26
|
async getRoles() {
|
|
24
27
|
return this.moduleAccessService.getRoles();
|
|
@@ -37,11 +40,15 @@ let ModuleAccessController = class ModuleAccessController {
|
|
|
37
40
|
async updateModuleAccess(moduleAccessData) {
|
|
38
41
|
return this.moduleAccessService.updateModuleAccess(moduleAccessData);
|
|
39
42
|
}
|
|
40
|
-
async createRole(body) {
|
|
41
|
-
|
|
43
|
+
async createRole(body, req) {
|
|
44
|
+
let requestedUser = req.user;
|
|
45
|
+
let loggedInUser = await this.userService.getEntityData(global_constant_1.ENTITYTYPE_USER, requestedUser.id);
|
|
46
|
+
return this.moduleAccessService.createRole(body, loggedInUser);
|
|
42
47
|
}
|
|
43
|
-
async updateRole(id, body) {
|
|
44
|
-
|
|
48
|
+
async updateRole(id, body, req) {
|
|
49
|
+
let requestedUser = req.user;
|
|
50
|
+
let loggedInUser = await this.userService.getEntityData(global_constant_1.ENTITYTYPE_USER, requestedUser.id);
|
|
51
|
+
return this.moduleAccessService.updateRole(id, body, loggedInUser);
|
|
45
52
|
}
|
|
46
53
|
};
|
|
47
54
|
exports.ModuleAccessController = ModuleAccessController;
|
|
@@ -81,21 +88,25 @@ __decorate([
|
|
|
81
88
|
__decorate([
|
|
82
89
|
(0, common_1.Post)('create-role'),
|
|
83
90
|
__param(0, (0, common_1.Body)()),
|
|
91
|
+
__param(1, (0, common_1.Req)()),
|
|
84
92
|
__metadata("design:type", Function),
|
|
85
|
-
__metadata("design:paramtypes", [Object]),
|
|
93
|
+
__metadata("design:paramtypes", [Object, Object]),
|
|
86
94
|
__metadata("design:returntype", Promise)
|
|
87
95
|
], ModuleAccessController.prototype, "createRole", null);
|
|
88
96
|
__decorate([
|
|
89
97
|
(0, common_1.Post)('update-role/:id'),
|
|
90
98
|
__param(0, (0, common_1.Param)('id')),
|
|
91
99
|
__param(1, (0, common_1.Body)()),
|
|
100
|
+
__param(2, (0, common_1.Req)()),
|
|
92
101
|
__metadata("design:type", Function),
|
|
93
|
-
__metadata("design:paramtypes", [Number, Object]),
|
|
102
|
+
__metadata("design:paramtypes", [Number, Object, Object]),
|
|
94
103
|
__metadata("design:returntype", Promise)
|
|
95
104
|
], ModuleAccessController.prototype, "updateRole", null);
|
|
96
105
|
exports.ModuleAccessController = ModuleAccessController = __decorate([
|
|
97
106
|
(0, common_1.Controller)('module-access'),
|
|
98
107
|
(0, common_1.UseGuards)(jwt_guard_1.JwtAuthGuard),
|
|
99
|
-
|
|
108
|
+
__param(1, (0, common_1.Inject)('UserService')),
|
|
109
|
+
__metadata("design:paramtypes", [module_access_service_1.ModuleAccessService,
|
|
110
|
+
user_service_1.UserService])
|
|
100
111
|
], ModuleAccessController);
|
|
101
112
|
//# sourceMappingURL=module-access.controller.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"module-access.controller.js","sourceRoot":"","sources":["../../../../src/module/module/controller/module-access.controller.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"module-access.controller.js","sourceRoot":"","sources":["../../../../src/module/module/controller/module-access.controller.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,6 +4,7 @@ import { ModuleAccess } from '../entity/module-access.entity';
|
|
|
4
4
|
import { ModuleAction } from '../entity/module-action.entity';
|
|
5
5
|
import { ModuleData } from '../entity/module.entity';
|
|
6
6
|
import { ClockIDGenService } from 'src/utils/service/clockIDGenUtil.service';
|
|
7
|
+
import { UserData } from 'src/module/user/entity/user.entity';
|
|
7
8
|
export declare class ModuleAccessRepository {
|
|
8
9
|
private readonly roleRepo;
|
|
9
10
|
private readonly moduleRepo;
|
|
@@ -43,7 +44,7 @@ export declare class ModuleAccessRepository {
|
|
|
43
44
|
description?: string;
|
|
44
45
|
status?: 'ACTIVE' | 'INACTIVE';
|
|
45
46
|
copyFromRoleId?: number;
|
|
46
|
-
}): Promise<{
|
|
47
|
+
}, loggedInUser: UserData): Promise<{
|
|
47
48
|
success: boolean;
|
|
48
49
|
msg: string;
|
|
49
50
|
role: {
|
|
@@ -58,7 +59,7 @@ export declare class ModuleAccessRepository {
|
|
|
58
59
|
description?: string;
|
|
59
60
|
status?: 'ACTIVE' | 'INACTIVE';
|
|
60
61
|
copyFromRoleId?: number;
|
|
61
|
-
}): Promise<{
|
|
62
|
+
}, loggedInUser: UserData): Promise<{
|
|
62
63
|
success: boolean;
|
|
63
64
|
msg: string;
|
|
64
65
|
role: {
|
|
@@ -31,14 +31,16 @@ let ModuleAccessRepository = class ModuleAccessRepository {
|
|
|
31
31
|
}
|
|
32
32
|
async getRoles() {
|
|
33
33
|
const roles = await this.roleRepo.find();
|
|
34
|
-
return roles.map(role => ({
|
|
34
|
+
return roles.map((role) => ({
|
|
35
35
|
label: role.name,
|
|
36
36
|
value: role.id,
|
|
37
37
|
}));
|
|
38
38
|
}
|
|
39
39
|
async getModules() {
|
|
40
|
-
const modules = await this.moduleRepo.find({
|
|
41
|
-
|
|
40
|
+
const modules = await this.moduleRepo.find({
|
|
41
|
+
where: { module_level: 'MAINMOD' },
|
|
42
|
+
});
|
|
43
|
+
return modules.map((mod) => ({
|
|
42
44
|
label: mod.name,
|
|
43
45
|
value: mod.id,
|
|
44
46
|
}));
|
|
@@ -64,7 +66,9 @@ let ModuleAccessRepository = class ModuleAccessRepository {
|
|
|
64
66
|
async getMenuListing(mainModIds) {
|
|
65
67
|
let mainModules = [];
|
|
66
68
|
if (mainModIds.length === 1 && mainModIds[0] === '-1') {
|
|
67
|
-
mainModules = await this.moduleRepo.find({
|
|
69
|
+
mainModules = await this.moduleRepo.find({
|
|
70
|
+
where: { module_level: 'MAINMOD' },
|
|
71
|
+
});
|
|
68
72
|
}
|
|
69
73
|
else {
|
|
70
74
|
mainModules = await this.moduleRepo.find({
|
|
@@ -83,7 +87,7 @@ let ModuleAccessRepository = class ModuleAccessRepository {
|
|
|
83
87
|
const moduleActions = await this.moduleActionRepo.find();
|
|
84
88
|
const buildHierarchy = (parentWbs) => {
|
|
85
89
|
return modules
|
|
86
|
-
.filter(mod => mod.wbs_code.startsWith(parentWbs + '.') &&
|
|
90
|
+
.filter((mod) => mod.wbs_code.startsWith(parentWbs + '.') &&
|
|
87
91
|
mod.wbs_code.split('.').length === parentWbs.split('.').length + 1)
|
|
88
92
|
.map((mod) => ({
|
|
89
93
|
name: mod.name,
|
|
@@ -137,7 +141,7 @@ let ModuleAccessRepository = class ModuleAccessRepository {
|
|
|
137
141
|
return false;
|
|
138
142
|
}
|
|
139
143
|
}
|
|
140
|
-
async createRole(body) {
|
|
144
|
+
async createRole(body, loggedInUser) {
|
|
141
145
|
const { name, description, status, copyFromRoleId } = body;
|
|
142
146
|
const nameExists = await this.isRoleNameExists(name);
|
|
143
147
|
if (nameExists) {
|
|
@@ -149,14 +153,20 @@ let ModuleAccessRepository = class ModuleAccessRepository {
|
|
|
149
153
|
code,
|
|
150
154
|
description,
|
|
151
155
|
status: status || 'ACTIVE',
|
|
156
|
+
created_by: loggedInUser.id,
|
|
157
|
+
created_date: new Date(),
|
|
152
158
|
});
|
|
153
159
|
const savedRole = await this.roleRepo.save(newRole);
|
|
154
160
|
if (copyFromRoleId) {
|
|
155
|
-
const sourceRole = await this.roleRepo.findOne({
|
|
161
|
+
const sourceRole = await this.roleRepo.findOne({
|
|
162
|
+
where: { id: copyFromRoleId },
|
|
163
|
+
});
|
|
156
164
|
if (!sourceRole) {
|
|
157
165
|
throw new common_1.BadRequestException('Source role not found');
|
|
158
166
|
}
|
|
159
|
-
const sourcePermissions = await this.moduleAccessRepo.find({
|
|
167
|
+
const sourcePermissions = await this.moduleAccessRepo.find({
|
|
168
|
+
where: { role_code: sourceRole.code },
|
|
169
|
+
});
|
|
160
170
|
const clonedPermissions = sourcePermissions.map((perm) => this.moduleAccessRepo.create({
|
|
161
171
|
role_code: code,
|
|
162
172
|
module_code: perm.module_code,
|
|
@@ -177,7 +187,7 @@ let ModuleAccessRepository = class ModuleAccessRepository {
|
|
|
177
187
|
},
|
|
178
188
|
};
|
|
179
189
|
}
|
|
180
|
-
async updateRole(roleId, body) {
|
|
190
|
+
async updateRole(roleId, body, loggedInUser) {
|
|
181
191
|
const { name, description, status, copyFromRoleId } = body;
|
|
182
192
|
const nameExists = await this.isRoleNameExists(name, roleId);
|
|
183
193
|
if (nameExists) {
|
|
@@ -188,16 +198,22 @@ let ModuleAccessRepository = class ModuleAccessRepository {
|
|
|
188
198
|
throw new common_1.BadRequestException('Source role not found');
|
|
189
199
|
}
|
|
190
200
|
role.name = name;
|
|
191
|
-
role.description = description ||
|
|
201
|
+
role.description = description || '';
|
|
192
202
|
role.status = status || 'ACTIVE';
|
|
203
|
+
role.modified_date = new Date();
|
|
204
|
+
role.modified_by = loggedInUser.id;
|
|
193
205
|
await this.roleRepo.save(role);
|
|
194
206
|
if (copyFromRoleId) {
|
|
195
207
|
await this.moduleAccessRepo.delete({ role_code: role.code });
|
|
196
|
-
const sourceRole = await this.roleRepo.findOne({
|
|
208
|
+
const sourceRole = await this.roleRepo.findOne({
|
|
209
|
+
where: { id: copyFromRoleId },
|
|
210
|
+
});
|
|
197
211
|
if (!sourceRole) {
|
|
198
212
|
throw new common_1.BadRequestException('Source role not found');
|
|
199
213
|
}
|
|
200
|
-
const sourcePermissions = await this.moduleAccessRepo.find({
|
|
214
|
+
const sourcePermissions = await this.moduleAccessRepo.find({
|
|
215
|
+
where: { role_code: sourceRole.code },
|
|
216
|
+
});
|
|
201
217
|
const clonedPermissions = sourcePermissions.map((perm) => this.moduleAccessRepo.create({
|
|
202
218
|
role_code: role.code,
|
|
203
219
|
module_code: perm.module_code,
|
|
@@ -219,7 +235,8 @@ let ModuleAccessRepository = class ModuleAccessRepository {
|
|
|
219
235
|
};
|
|
220
236
|
}
|
|
221
237
|
async isRoleNameExists(name, excludeRoleId) {
|
|
222
|
-
const query = this.roleRepo
|
|
238
|
+
const query = this.roleRepo
|
|
239
|
+
.createQueryBuilder('role')
|
|
223
240
|
.where('role.name = :name', { name });
|
|
224
241
|
if (excludeRoleId) {
|
|
225
242
|
query.andWhere('role.id != :excludeRoleId', { excludeRoleId });
|