rez_core 2.0.43 → 2.0.45
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/auth/strategies/jwt.strategy.d.ts +2 -0
- package/dist/module/auth/strategies/jwt.strategy.js +3 -1
- package/dist/module/auth/strategies/jwt.strategy.js.map +1 -1
- package/dist/module/enterprise/entity/school.entity.d.ts +1 -0
- package/dist/module/enterprise/entity/school.entity.js +4 -0
- package/dist/module/enterprise/entity/school.entity.js.map +1 -1
- package/dist/module/enterprise/repository/school.repository.js +12 -3
- package/dist/module/enterprise/repository/school.repository.js.map +1 -1
- package/dist/module/meta/entity/app-master.entity.d.ts +1 -0
- package/dist/module/meta/entity/app-master.entity.js +4 -0
- package/dist/module/meta/entity/app-master.entity.js.map +1 -1
- package/dist/module/meta/service/app-master.service.d.ts +1 -1
- package/dist/module/meta/service/app-master.service.js +8 -5
- package/dist/module/meta/service/app-master.service.js.map +1 -1
- package/dist/tsconfig.build.tsbuildinfo +1 -1
- package/package.json +1 -1
- package/src/module/auth/strategies/jwt.strategy.ts +4 -0
- package/src/module/enterprise/entity/school.entity.ts +3 -0
- package/src/module/enterprise/repository/school.repository.ts +19 -2
- package/src/module/meta/entity/app-master.entity.ts +3 -0
- package/src/module/meta/service/app-master.service.ts +8 -5
|
@@ -24,7 +24,7 @@ let JwtStrategy = class JwtStrategy extends (0, passport_1.PassportStrategy)(pas
|
|
|
24
24
|
this.configService = configService;
|
|
25
25
|
}
|
|
26
26
|
async validate(payload) {
|
|
27
|
-
const { userId, sessionToken, appcode, email_id, organization_id, enterprise_id, } = payload;
|
|
27
|
+
const { userId, sessionToken, appcode, email_id, organization_id, enterprise_id, level_id, level_type } = payload;
|
|
28
28
|
let userData = {
|
|
29
29
|
id: userId,
|
|
30
30
|
sessionToken: sessionToken,
|
|
@@ -32,6 +32,8 @@ let JwtStrategy = class JwtStrategy extends (0, passport_1.PassportStrategy)(pas
|
|
|
32
32
|
email_id: email_id,
|
|
33
33
|
organization_id: organization_id,
|
|
34
34
|
enterprise_id: enterprise_id,
|
|
35
|
+
level_id: level_id,
|
|
36
|
+
level_type: level_type,
|
|
35
37
|
};
|
|
36
38
|
return { userData };
|
|
37
39
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"jwt.strategy.js","sourceRoot":"","sources":["../../../../src/module/auth/strategies/jwt.strategy.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,+CAAoD;AACpD,+CAAoD;AACpD,2CAAmE;AAKnE,2CAA+C;AAGxC,IAAM,WAAW,GAAjB,MAAM,WAAY,SAAQ,IAAA,2BAAgB,EAAC,uBAAQ,CAAC;IACzD,YAA6B,aAA4B;QACvD,KAAK,CAAC;YACJ,cAAc,EAAE,yBAAU,CAAC,2BAA2B,EAAE;YACxD,gBAAgB,EAAE,KAAK;YACvB,WAAW,EAAE,aAAa,CAAC,GAAG,CAAC,YAAY,CAAC;SAC7C,CAAC,CAAC;QALwB,kBAAa,GAAb,aAAa,CAAe;IAMzD,CAAC;IAED,KAAK,CAAC,QAAQ,CAAC,OAAO;QACpB,MAAM,EACJ,MAAM,EACN,YAAY,EACZ,OAAO,EACP,QAAQ,EACR,eAAe,EACf,aAAa,
|
|
1
|
+
{"version":3,"file":"jwt.strategy.js","sourceRoot":"","sources":["../../../../src/module/auth/strategies/jwt.strategy.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,+CAAoD;AACpD,+CAAoD;AACpD,2CAAmE;AAKnE,2CAA+C;AAGxC,IAAM,WAAW,GAAjB,MAAM,WAAY,SAAQ,IAAA,2BAAgB,EAAC,uBAAQ,CAAC;IACzD,YAA6B,aAA4B;QACvD,KAAK,CAAC;YACJ,cAAc,EAAE,yBAAU,CAAC,2BAA2B,EAAE;YACxD,gBAAgB,EAAE,KAAK;YACvB,WAAW,EAAE,aAAa,CAAC,GAAG,CAAC,YAAY,CAAC;SAC7C,CAAC,CAAC;QALwB,kBAAa,GAAb,aAAa,CAAe;IAMzD,CAAC;IAED,KAAK,CAAC,QAAQ,CAAC,OAAO;QACpB,MAAM,EACJ,MAAM,EACN,YAAY,EACZ,OAAO,EACP,QAAQ,EACR,eAAe,EACf,aAAa,EACb,QAAQ,EACR,UAAU,EACX,GAAG,OAAO,CAAC;QAeZ,IAAI,QAAQ,GAAG;YACb,EAAE,EAAE,MAAM;YACV,YAAY,EAAE,YAAY;YAC1B,OAAO,EAAE,OAAO;YAChB,QAAQ,EAAE,QAAQ;YAClB,eAAe,EAAE,eAAe;YAChC,aAAa,EAAE,aAAa;YAC5B,QAAQ,EAAE,QAAQ;YAClB,UAAU,EAAE,UAAU;SACvB,CAAC;QAEF,OAAO,EAAE,QAAQ,EAAE,CAAC;IACtB,CAAC;CACF,CAAA;AA/CY,kCAAW;sBAAX,WAAW;IADvB,IAAA,mBAAU,GAAE;qCAEiC,sBAAa;GAD9C,WAAW,CA+CvB"}
|
|
@@ -23,6 +23,10 @@ __decorate([
|
|
|
23
23
|
(0, typeorm_1.Column)({ name: 'brand_code', nullable: true }),
|
|
24
24
|
__metadata("design:type", String)
|
|
25
25
|
], SchoolData.prototype, "brand_code", void 0);
|
|
26
|
+
__decorate([
|
|
27
|
+
(0, typeorm_1.Column)({ name: 'location', nullable: true }),
|
|
28
|
+
__metadata("design:type", String)
|
|
29
|
+
], SchoolData.prototype, "location", void 0);
|
|
26
30
|
exports.SchoolData = SchoolData = __decorate([
|
|
27
31
|
(0, typeorm_1.Entity)({ name: 'cr_school' })
|
|
28
32
|
], SchoolData);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"school.entity.js","sourceRoot":"","sources":["../../../../src/module/enterprise/entity/school.entity.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,6EAAuE;AACvE,qCAAyC;AAGlC,IAAM,UAAU,GAAhB,MAAM,UAAW,SAAQ,+BAAU;
|
|
1
|
+
{"version":3,"file":"school.entity.js","sourceRoot":"","sources":["../../../../src/module/enterprise/entity/school.entity.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,6EAAuE;AACvE,qCAAyC;AAGlC,IAAM,UAAU,GAAhB,MAAM,UAAW,SAAQ,+BAAU;CASzC,CAAA;AATY,gCAAU;AAErB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,UAAU,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;4CAC5B;AAGjB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,YAAY,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;8CAC5B;AAGnB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,UAAU,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;4CAC5B;qBARN,UAAU;IADtB,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,WAAW,EAAE,CAAC;GACjB,UAAU,CAStB"}
|
|
@@ -48,10 +48,12 @@ let SchoolRepository = class SchoolRepository {
|
|
|
48
48
|
.select([
|
|
49
49
|
'org.id AS org_id',
|
|
50
50
|
'org.name AS org_name',
|
|
51
|
+
'org.address AS org_address',
|
|
51
52
|
'br.id AS brand_id',
|
|
52
53
|
'br.name AS brand_name',
|
|
53
54
|
'sch.id AS school_id',
|
|
54
55
|
'sch.name AS school_name',
|
|
56
|
+
'sch.location AS school_location',
|
|
55
57
|
])
|
|
56
58
|
.from('cr_school', 'sch')
|
|
57
59
|
.innerJoin('cr_brand', 'br', 'sch.brand_id = br.id')
|
|
@@ -60,11 +62,12 @@ let SchoolRepository = class SchoolRepository {
|
|
|
60
62
|
.getRawMany();
|
|
61
63
|
const result = {};
|
|
62
64
|
for (const row of schools) {
|
|
63
|
-
const { org_id, org_name, brand_id, brand_name, school_id, school_name, } = row;
|
|
65
|
+
const { org_id, org_name, org_address, brand_id, brand_name, school_id, school_name, school_location, } = row;
|
|
64
66
|
if (!result[org_id]) {
|
|
65
67
|
result[org_id] = {
|
|
66
68
|
org_id,
|
|
67
69
|
org_name,
|
|
70
|
+
org_address,
|
|
68
71
|
brands: {},
|
|
69
72
|
};
|
|
70
73
|
}
|
|
@@ -78,6 +81,7 @@ let SchoolRepository = class SchoolRepository {
|
|
|
78
81
|
result[org_id].brands[brand_id].schools.push({
|
|
79
82
|
school_id,
|
|
80
83
|
school_name,
|
|
84
|
+
school_location,
|
|
81
85
|
});
|
|
82
86
|
}
|
|
83
87
|
return Object.values(result).map((org) => ({
|
|
@@ -93,6 +97,7 @@ let SchoolRepository = class SchoolRepository {
|
|
|
93
97
|
'brand.name AS brand_name',
|
|
94
98
|
'school.id AS school_id',
|
|
95
99
|
'school.name AS school_name',
|
|
100
|
+
'school.location AS school_location',
|
|
96
101
|
])
|
|
97
102
|
.from('cr_user_role_mapping', 'urm')
|
|
98
103
|
.innerJoin('cr_brand', 'brand', 'brand.id = urm.level_id')
|
|
@@ -119,7 +124,7 @@ let SchoolRepository = class SchoolRepository {
|
|
|
119
124
|
const allMappings = [...brnMappings, ...schMappings];
|
|
120
125
|
const result = {};
|
|
121
126
|
for (const row of allMappings) {
|
|
122
|
-
const { brand_id, brand_name, school_id, school_name } = row;
|
|
127
|
+
const { brand_id, brand_name, school_id, school_name, school_location, } = row;
|
|
123
128
|
if (!result[brand_id]) {
|
|
124
129
|
result[brand_id] = {
|
|
125
130
|
brand_id,
|
|
@@ -129,7 +134,11 @@ let SchoolRepository = class SchoolRepository {
|
|
|
129
134
|
}
|
|
130
135
|
if (school_id &&
|
|
131
136
|
!result[brand_id].schools.some((s) => s.school_id === school_id)) {
|
|
132
|
-
result[brand_id].schools.push({
|
|
137
|
+
result[brand_id].schools.push({
|
|
138
|
+
school_id,
|
|
139
|
+
school_name,
|
|
140
|
+
school_location,
|
|
141
|
+
});
|
|
133
142
|
}
|
|
134
143
|
}
|
|
135
144
|
return Object.values(result);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"school.repository.js","sourceRoot":"","sources":["../../../../src/module/enterprise/repository/school.repository.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,2CAA4C;AAC5C,6CAAmD;AACnD,qCAAiD;AACjD,2DAAqD;AACrD,yFAAkF;AAG3E,IAAM,gBAAgB,GAAtB,MAAM,gBAAgB;IAC3B,YAEmB,UAAkC,EAClC,UAAsB;QADtB,eAAU,GAAV,UAAU,CAAwB;QAClC,eAAU,GAAV,UAAU,CAAY;IACtC,CAAC;IAEJ,KAAK,CAAC,cAAc,CAAC,KAAa;QAChC,OAAO,MAAM,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC;YAChC,KAAK,EAAE,EAAE,QAAQ,EAAE,KAAK,EAAE;SAC3B,CAAC,CAAC;IACL,CAAC;IAED,KAAK,CAAC,gBAAgB,CAAC,KAAa;QAClC,OAAO,MAAM,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC;YAChC,KAAK,EAAE,EAAE,QAAQ,EAAE,KAAK,EAAE;SAC3B,CAAC,CAAC;IACL,CAAC;IAED,KAAK,CAAC,sBAAsB,CAAC,MAAc,EAAE,OAAe;QAC1D,MAAM,YAAY,GAAG,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC,0CAAe,CAAC,CAAC;QAGpE,MAAM,YAAY,GAAG,MAAM,YAAY;aACpC,kBAAkB,CAAC,KAAK,CAAC;aACzB,KAAK,CAAC,uBAAuB,EAAE,EAAE,MAAM,EAAE,CAAC;aAC1C,QAAQ,CAAC,wBAAwB,EAAE,EAAE,OAAO,EAAE,CAAC;aAC/C,QAAQ,CAAC,6BAA6B,EAAE,EAAE,SAAS,EAAE,KAAK,EAAE,CAAC;aAC7D,UAAU,EAAE,CAAC;QAEhB,OAAO,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC;QAC1B,IAAI,YAAY,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAE5B,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,UAAU;iBAClC,kBAAkB,EAAE;iBACpB,MAAM,CAAC;gBACN,kBAAkB;gBAClB,sBAAsB;gBACtB,mBAAmB;gBACnB,uBAAuB;gBACvB,qBAAqB;gBACrB,yBAAyB;
|
|
1
|
+
{"version":3,"file":"school.repository.js","sourceRoot":"","sources":["../../../../src/module/enterprise/repository/school.repository.ts"],"names":[],"mappings":"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"}
|
|
@@ -43,6 +43,10 @@ __decorate([
|
|
|
43
43
|
(0, typeorm_1.Column)({ name: 'backgroudColor', type: 'varchar', nullable: true }),
|
|
44
44
|
__metadata("design:type", String)
|
|
45
45
|
], AppMaster.prototype, "backgroudColor", void 0);
|
|
46
|
+
__decorate([
|
|
47
|
+
(0, typeorm_1.Column)({ name: 'iconName', type: 'varchar', nullable: true }),
|
|
48
|
+
__metadata("design:type", String)
|
|
49
|
+
], AppMaster.prototype, "iconName", void 0);
|
|
46
50
|
exports.AppMaster = AppMaster = __decorate([
|
|
47
51
|
(0, typeorm_1.Entity)({ name: 'cr_app_master' }),
|
|
48
52
|
__metadata("design:paramtypes", [])
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"app-master.entity.js","sourceRoot":"","sources":["../../../../src/module/meta/entity/app-master.entity.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,qCAAiE;AACjE,6DAAkD;AAG3C,IAAM,SAAS,GAAf,MAAM,SAAU,SAAQ,+BAAU;IACvC;QACE,KAAK,EAAE,CAAC;QACR,IAAI,CAAC,WAAW,GAAG,KAAK,CAAC;IAC3B,CAAC;
|
|
1
|
+
{"version":3,"file":"app-master.entity.js","sourceRoot":"","sources":["../../../../src/module/meta/entity/app-master.entity.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,qCAAiE;AACjE,6DAAkD;AAG3C,IAAM,SAAS,GAAf,MAAM,SAAU,SAAQ,+BAAU;IACvC;QACE,KAAK,EAAE,CAAC;QACR,IAAI,CAAC,WAAW,GAAG,KAAK,CAAC;IAC3B,CAAC;CAsBF,CAAA;AA1BY,8BAAS;AAOpB;IADC,IAAA,gCAAsB,GAAE;;qCACd;AAGX;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;uCAC7C;AAGb;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;wCAC7C;AAGd;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;wCAC7C;AAGd;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,aAAa,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;8CAC7C;AAGpB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,gBAAgB,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;iDAC7C;AAGvB;IADC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,UAAU,EAAE,IAAI,EAAE,SAAS,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;2CAC7C;oBAzBN,SAAS;IADrB,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,eAAe,EAAE,CAAC;;GACrB,SAAS,CA0BrB"}
|
|
@@ -4,5 +4,5 @@ export declare class AppMasterService {
|
|
|
4
4
|
private readonly appMasterRepository;
|
|
5
5
|
private readonly userRoleMappingRepository;
|
|
6
6
|
constructor(appMasterRepository: AppMasterRespository, userRoleMappingRepository: UserRoleMappingRepository);
|
|
7
|
-
getAppMasterDataByAppCode(userId: number): Promise<
|
|
7
|
+
getAppMasterDataByAppCode(userId: number): Promise<any[]>;
|
|
8
8
|
}
|
|
@@ -20,17 +20,20 @@ let AppMasterService = class AppMasterService {
|
|
|
20
20
|
}
|
|
21
21
|
async getAppMasterDataByAppCode(userId) {
|
|
22
22
|
const app_code = await this.userRoleMappingRepository.findDistinctAppcodeByUserId(userId);
|
|
23
|
-
const
|
|
23
|
+
const finalResult = [];
|
|
24
24
|
if (app_code.appcode.length > 0) {
|
|
25
25
|
const resolvedData = await Promise.all(app_code.appcode.map(async (element) => {
|
|
26
26
|
const data = await this.appMasterRepository.getAppMasterDataByAppCode(element);
|
|
27
|
-
return
|
|
27
|
+
return data || [];
|
|
28
28
|
}));
|
|
29
|
-
resolvedData.forEach((
|
|
30
|
-
|
|
29
|
+
resolvedData.flat().forEach((item) => {
|
|
30
|
+
finalResult.push({
|
|
31
|
+
key: item.name,
|
|
32
|
+
details: item,
|
|
33
|
+
});
|
|
31
34
|
});
|
|
32
35
|
}
|
|
33
|
-
return
|
|
36
|
+
return finalResult;
|
|
34
37
|
}
|
|
35
38
|
};
|
|
36
39
|
exports.AppMasterService = AppMasterService;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"app-master.service.js","sourceRoot":"","sources":["../../../../src/module/meta/service/app-master.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA4C;AAC5C,qGAAoG;AACpG,+EAA2E;AAGpE,IAAM,gBAAgB,GAAtB,MAAM,gBAAgB;IAC3B,YACmB,mBAAyC,EACzC,yBAAoD;QADpD,wBAAmB,GAAnB,mBAAmB,CAAsB;QACzC,8BAAyB,GAAzB,yBAAyB,CAA2B;IACpE,CAAC;IAEJ,KAAK,CAAC,yBAAyB,CAAC,MAAc;QAC5C,MAAM,QAAQ,GACZ,MAAM,IAAI,CAAC,yBAAyB,CAAC,2BAA2B,CAAC,MAAM,CAAC,CAAC;QAE3E,MAAM,
|
|
1
|
+
{"version":3,"file":"app-master.service.js","sourceRoot":"","sources":["../../../../src/module/meta/service/app-master.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA4C;AAC5C,qGAAoG;AACpG,+EAA2E;AAGpE,IAAM,gBAAgB,GAAtB,MAAM,gBAAgB;IAC3B,YACmB,mBAAyC,EACzC,yBAAoD;QADpD,wBAAmB,GAAnB,mBAAmB,CAAsB;QACzC,8BAAyB,GAAzB,yBAAyB,CAA2B;IACpE,CAAC;IAEJ,KAAK,CAAC,yBAAyB,CAAC,MAAc;QAC5C,MAAM,QAAQ,GACZ,MAAM,IAAI,CAAC,yBAAyB,CAAC,2BAA2B,CAAC,MAAM,CAAC,CAAC;QAE3E,MAAM,WAAW,GAAU,EAAE,CAAC;QAE9B,IAAI,QAAQ,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAChC,MAAM,YAAY,GAAG,MAAM,OAAO,CAAC,GAAG,CACpC,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,KAAK,EAAE,OAAO,EAAE,EAAE;gBACrC,MAAM,IAAI,GACR,MAAM,IAAI,CAAC,mBAAmB,CAAC,yBAAyB,CAAC,OAAO,CAAC,CAAC;gBACpE,OAAO,IAAI,IAAI,EAAE,CAAC;YACpB,CAAC,CAAC,CACH,CAAC;YAEF,YAAY,CAAC,IAAI,EAAE,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;gBACnC,WAAW,CAAC,IAAI,CAAC;oBACf,GAAG,EAAE,IAAI,CAAC,IAAI;oBACd,OAAO,EAAE,IAAI;iBACd,CAAC,CAAC;YACL,CAAC,CAAC,CAAC;QACL,CAAC;QAED,OAAO,WAAW,CAAC;IACrB,CAAC;CACF,CAAA;AA/BY,4CAAgB;2BAAhB,gBAAgB;IAD5B,IAAA,mBAAU,GAAE;qCAG6B,4CAAoB;QACd,wDAAyB;GAH5D,gBAAgB,CA+B5B"}
|