rez_core 1.0.96 → 1.0.98
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/filter/service/filter.service.js +3 -3
- package/dist/module/filter/service/filter.service.js.map +1 -1
- package/dist/module/master/service/master.service.js +20 -10
- package/dist/module/master/service/master.service.js.map +1 -1
- package/dist/module/user/repository/user.repository.d.ts +2 -2
- package/dist/module/user/repository/user.repository.js +9 -3
- package/dist/module/user/repository/user.repository.js.map +1 -1
- package/dist/module/user/service/user.service.js +3 -3
- 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/filter/service/filter.service.ts +4 -3
- package/src/module/master/service/master.service.ts +24 -14
- package/src/module/user/repository/user.repository.ts +17 -3
- package/src/module/user/service/user.service.ts +15 -17
|
@@ -66,9 +66,9 @@ let FilterService = class FilterService {
|
|
|
66
66
|
}, {});
|
|
67
67
|
const savedFilters = await this.getSavedFilters(savedFilterCode);
|
|
68
68
|
const baseFilters = [
|
|
69
|
-
...(quickFilter || []),
|
|
70
|
-
...savedFilters,
|
|
71
|
-
...(attributeFilter || []),
|
|
69
|
+
...(quickFilter || []).filter(f => f.filter_value !== ""),
|
|
70
|
+
...savedFilters.filter(f => f.filter_value !== ""),
|
|
71
|
+
...(attributeFilter || []).filter(f => f.filter_value !== ""),
|
|
72
72
|
];
|
|
73
73
|
const baseWhere = this.buildWhereClauses(baseFilters, attributeMetaMap);
|
|
74
74
|
const allTabs = await this.gettab_value_counts(tableName, tabs?.columnName, baseWhere);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"filter.service.js","sourceRoot":"","sources":["../../../../src/module/filter/service/filter.service.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"filter.service.js","sourceRoot":"","sources":["../../../../src/module/filter/service/filter.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -103,6 +103,10 @@ let MasterService = class MasterService {
|
|
|
103
103
|
table: 'cr_organization',
|
|
104
104
|
unique_fields: ['code'],
|
|
105
105
|
},
|
|
106
|
+
{
|
|
107
|
+
table: 'eth_academic_year',
|
|
108
|
+
unique_fields: ['code'],
|
|
109
|
+
},
|
|
106
110
|
];
|
|
107
111
|
this.dataSequence = [
|
|
108
112
|
{
|
|
@@ -272,19 +276,25 @@ let MasterService = class MasterService {
|
|
|
272
276
|
const qb = this.entityManager
|
|
273
277
|
.createQueryBuilder()
|
|
274
278
|
.select('*')
|
|
275
|
-
.from(entityMaster.db_table_name, entityMaster.db_table_name)
|
|
276
|
-
|
|
277
|
-
|
|
278
|
-
|
|
279
|
-
|
|
280
|
-
|
|
281
|
-
|
|
282
|
-
|
|
283
|
-
|
|
284
|
-
|
|
279
|
+
.from(entityMaster.db_table_name, entityMaster.db_table_name)
|
|
280
|
+
.where(new typeorm_1.Brackets((qbOr) => {
|
|
281
|
+
uniqueFields.forEach((field, index) => {
|
|
282
|
+
const condition = `${entityMaster.db_table_name}.${field} = :val${index}`;
|
|
283
|
+
const param = { [`val${index}`]: row[field] };
|
|
284
|
+
if (index === 0) {
|
|
285
|
+
qbOr.where(condition, param);
|
|
286
|
+
}
|
|
287
|
+
else {
|
|
288
|
+
qbOr.orWhere(condition, param);
|
|
289
|
+
}
|
|
290
|
+
});
|
|
291
|
+
}))
|
|
292
|
+
.andWhere(`${entityMaster.db_table_name}.organization_id = :orgId`, {
|
|
293
|
+
orgId: loggedInUser.organization_id,
|
|
285
294
|
});
|
|
286
295
|
const existing = await qb.limit(1).getRawOne();
|
|
287
296
|
row.entity_type = entityType;
|
|
297
|
+
row.organization_id = loggedInUser.organization_id;
|
|
288
298
|
if (existing) {
|
|
289
299
|
if (duplicateHandling === 'skip_duplicates') {
|
|
290
300
|
continue;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"master.service.js","sourceRoot":"","sources":["../../../../src/module/master/service/master.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA4C;AAC5C,
|
|
1
|
+
{"version":3,"file":"master.service.js","sourceRoot":"","sources":["../../../../src/module/master/service/master.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,7 +4,7 @@ export declare class UserRepository {
|
|
|
4
4
|
private userRepository;
|
|
5
5
|
constructor(userRepository: Repository<UserData>);
|
|
6
6
|
findById(userId: number): Promise<UserData | null>;
|
|
7
|
-
findByEmailId(email: string): Promise<UserData | null>;
|
|
8
|
-
findByMobile(mobile: string): Promise<UserData | null>;
|
|
7
|
+
findByEmailId(email: string, organization_id?: number): Promise<UserData | null>;
|
|
8
|
+
findByMobile(mobile: string, organization_id?: number): Promise<UserData | null>;
|
|
9
9
|
saveUser(user: UserData): Promise<UserData>;
|
|
10
10
|
}
|
|
@@ -24,16 +24,22 @@ let UserRepository = class UserRepository {
|
|
|
24
24
|
async findById(userId) {
|
|
25
25
|
return this.userRepository.findOne({ where: { id: userId } });
|
|
26
26
|
}
|
|
27
|
-
async findByEmailId(email) {
|
|
27
|
+
async findByEmailId(email, organization_id) {
|
|
28
28
|
if (!email)
|
|
29
29
|
return null;
|
|
30
30
|
const where = { email_id: email };
|
|
31
|
+
if (organization_id !== undefined) {
|
|
32
|
+
where.organization_id = organization_id;
|
|
33
|
+
}
|
|
31
34
|
return this.userRepository.findOne({ where });
|
|
32
35
|
}
|
|
33
|
-
async findByMobile(mobile) {
|
|
36
|
+
async findByMobile(mobile, organization_id) {
|
|
34
37
|
if (!mobile)
|
|
35
38
|
return null;
|
|
36
|
-
const where = { mobile
|
|
39
|
+
const where = { mobile };
|
|
40
|
+
if (organization_id !== undefined) {
|
|
41
|
+
where.organization_id = organization_id;
|
|
42
|
+
}
|
|
37
43
|
return this.userRepository.findOne({ where });
|
|
38
44
|
}
|
|
39
45
|
async saveUser(user) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"user.repository.js","sourceRoot":"","sources":["../../../../src/module/user/repository/user.repository.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"user.repository.js","sourceRoot":"","sources":["../../../../src/module/user/repository/user.repository.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AACA,qCAAqC;AACrC,uDAAiD;AACjD,2CAA4C;AAC5C,6CAAmD;AAG5C,IAAM,cAAc,GAApB,MAAM,cAAc;IACzB,YACsC,cAAoC;QAApC,mBAAc,GAAd,cAAc,CAAsB;IACvE,CAAC;IAEJ,KAAK,CAAC,QAAQ,CAAC,MAAc;QAC3B,OAAO,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,CAAC,CAAC;IAChE,CAAC;IAED,KAAK,CAAC,aAAa,CACjB,KAAa,EACb,eAAwB;QAExB,IAAI,CAAC,KAAK;YAAE,OAAO,IAAI,CAAC;QAExB,MAAM,KAAK,GAAQ,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC;QACvC,IAAI,eAAe,KAAK,SAAS,EAAE,CAAC;YAClC,KAAK,CAAC,eAAe,GAAG,eAAe,CAAC;QAC1C,CAAC;QAED,OAAO,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC;IAChD,CAAC;IAED,KAAK,CAAC,YAAY,CAChB,MAAc,EACd,eAAwB;QAExB,IAAI,CAAC,MAAM;YAAE,OAAO,IAAI,CAAC;QAEzB,MAAM,KAAK,GAAQ,EAAE,MAAM,EAAE,CAAC;QAC9B,IAAI,eAAe,KAAK,SAAS,EAAE,CAAC;YAClC,KAAK,CAAC,eAAe,GAAG,eAAe,CAAC;QAC1C,CAAC;QAED,OAAO,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC;IAChD,CAAC;IAED,KAAK,CAAC,QAAQ,CAAC,IAAc;QAC3B,OAAO,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACxC,CAAC;CACF,CAAA;AAxCY,wCAAc;yBAAd,cAAc;IAD1B,IAAA,mBAAU,GAAE;IAGR,WAAA,IAAA,0BAAgB,EAAC,sBAAQ,CAAC,CAAA;qCAAyB,oBAAU;GAFrD,cAAc,CAwC1B"}
|
|
@@ -33,11 +33,11 @@ let UserService = class UserService extends entity_service_impl_service_1.Entity
|
|
|
33
33
|
}
|
|
34
34
|
async createEntity(entityData, loggedInUser, manager) {
|
|
35
35
|
let userData = entityData;
|
|
36
|
-
let existingUser = await this.userRepository.findByEmailId(userData.email_id);
|
|
36
|
+
let existingUser = await this.userRepository.findByEmailId(userData.email_id, loggedInUser?.organization_id);
|
|
37
37
|
if (existingUser) {
|
|
38
38
|
throw new common_1.BadRequestException('User already exists');
|
|
39
39
|
}
|
|
40
|
-
existingUser = await this.userRepository.findByMobile(userData.mobile);
|
|
40
|
+
existingUser = await this.userRepository.findByMobile(userData.mobile, loggedInUser?.organization_id);
|
|
41
41
|
if (existingUser) {
|
|
42
42
|
throw new common_1.BadRequestException('User already exists');
|
|
43
43
|
}
|
|
@@ -49,7 +49,7 @@ let UserService = class UserService extends entity_service_impl_service_1.Entity
|
|
|
49
49
|
password = encryptUtil_service_1.EncryptUtilService.encryptGCM(userData.password, this.masterKey, this.masterIv);
|
|
50
50
|
}
|
|
51
51
|
else {
|
|
52
|
-
password = encryptUtil_service_1.EncryptUtilService.encryptGCM(
|
|
52
|
+
password = encryptUtil_service_1.EncryptUtilService.encryptGCM('Admin@123', this.masterKey, this.masterIv);
|
|
53
53
|
}
|
|
54
54
|
userData.password = password;
|
|
55
55
|
userData.is_firstlogin = 1;
|
|
@@ -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;QAEvB,IAAI,QAAQ,GAAG,UAA2B,CAAC;QAC3C,IAAI,YAAY,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,aAAa,CACxD,QAAQ,CAAC,QAAQ,
|
|
1
|
+
{"version":3,"file":"user.service.js","sourceRoot":"","sources":["../../../../src/module/user/service/user.service.ts"],"names":[],"mappings":"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"}
|