@puca/puca-core 9.15.3 → 9.15.4
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.
|
@@ -33,9 +33,11 @@ export declare class UserService {
|
|
|
33
33
|
private readonly repositoryFactory;
|
|
34
34
|
private readonly selectManyDataRepository;
|
|
35
35
|
private readonly cacheServiceFactory;
|
|
36
|
+
private readonly CACHE_DURATION_IN_SECONDS;
|
|
36
37
|
private cacheGetUsersByRule;
|
|
37
38
|
private cacheAllRules;
|
|
38
39
|
private cacheUserBy;
|
|
40
|
+
private cacheGetUserPermissionsPermissions;
|
|
39
41
|
constructor(repositoryFactory: RepositoryFactory, selectManyDataRepository: SelectManyDataService, cacheServiceFactory: CacheServiceFactory);
|
|
40
42
|
init(): Promise<void>;
|
|
41
43
|
getUsersRules(args: GetUsersRulesArgs): Promise<UserRules[]>;
|
|
@@ -9,19 +9,9 @@ class UserService {
|
|
|
9
9
|
this.repositoryFactory = repositoryFactory;
|
|
10
10
|
this.selectManyDataRepository = selectManyDataRepository;
|
|
11
11
|
this.cacheServiceFactory = cacheServiceFactory;
|
|
12
|
+
this.CACHE_DURATION_IN_SECONDS = 60;
|
|
12
13
|
}
|
|
13
14
|
async init() {
|
|
14
|
-
this.repositoryFactory.getCacheInstance({
|
|
15
|
-
tableName: 'puca_base_api_select_many_data'
|
|
16
|
-
}).onChange(async ({ row }) => {
|
|
17
|
-
if (!row) {
|
|
18
|
-
return;
|
|
19
|
-
}
|
|
20
|
-
if (row.name !== 'system_user_puca_base_api_rules' && row.name !== 'companies_user') {
|
|
21
|
-
return;
|
|
22
|
-
}
|
|
23
|
-
this.cacheGetUsersByRule.invalidate(row.value);
|
|
24
|
-
});
|
|
25
15
|
this.cacheGetUsersByRule = this.cacheServiceFactory.get('cacheGetUsersByRule', async (rule) => {
|
|
26
16
|
const selectManyDataRepository = this.repositoryFactory.getInstance({
|
|
27
17
|
tableName: 'puca_base_api_select_many_data'
|
|
@@ -50,15 +40,7 @@ class UserService {
|
|
|
50
40
|
totalizeMode: repository_1.TotalizeMode.never,
|
|
51
41
|
});
|
|
52
42
|
return _.uniq(users.map(u => u.key));
|
|
53
|
-
},
|
|
54
|
-
const debounceClearCacheAllRules = _.debounce(() => {
|
|
55
|
-
this.cacheAllRules.flush();
|
|
56
|
-
}, 500);
|
|
57
|
-
this.repositoryFactory.getCacheInstance({
|
|
58
|
-
tableName: 'puca_base_api_rules'
|
|
59
|
-
}).onChange(async () => {
|
|
60
|
-
debounceClearCacheAllRules();
|
|
61
|
-
});
|
|
43
|
+
}, this.CACHE_DURATION_IN_SECONDS);
|
|
62
44
|
this.cacheAllRules = this.cacheServiceFactory.get('cacheAllRules', async () => {
|
|
63
45
|
const rulesRepository = this.repositoryFactory.getInstance({ tableName: 'puca_base_api_rules' });
|
|
64
46
|
const { data: allRules } = await rulesRepository.findAll({
|
|
@@ -66,7 +48,7 @@ class UserService {
|
|
|
66
48
|
user: { username: 'puca-user' },
|
|
67
49
|
});
|
|
68
50
|
return allRules;
|
|
69
|
-
},
|
|
51
|
+
}, this.CACHE_DURATION_IN_SECONDS);
|
|
70
52
|
this.repositoryFactory.getCacheInstance({
|
|
71
53
|
tableName: 'puca_base_api_system_user'
|
|
72
54
|
}).onChange(async ({ row }) => {
|
|
@@ -109,7 +91,19 @@ class UserService {
|
|
|
109
91
|
totalizeMode: repository_1.TotalizeMode.never,
|
|
110
92
|
});
|
|
111
93
|
return users[0];
|
|
112
|
-
},
|
|
94
|
+
}, this.CACHE_DURATION_IN_SECONDS);
|
|
95
|
+
this.cacheGetUserPermissionsPermissions = this.cacheServiceFactory.get('cacheGetUserPermissionsRules', async (user) => {
|
|
96
|
+
const rules = await this.getUserRules({
|
|
97
|
+
userRef: user,
|
|
98
|
+
});
|
|
99
|
+
const companies = await this.getUserCompanies({
|
|
100
|
+
userRef: user,
|
|
101
|
+
});
|
|
102
|
+
return {
|
|
103
|
+
rules,
|
|
104
|
+
companies,
|
|
105
|
+
};
|
|
106
|
+
}, this.CACHE_DURATION_IN_SECONDS);
|
|
113
107
|
}
|
|
114
108
|
async getUsersRules(args) {
|
|
115
109
|
const retorno = [];
|
|
@@ -176,13 +170,9 @@ class UserService {
|
|
|
176
170
|
if (!loadPermissions) {
|
|
177
171
|
return user;
|
|
178
172
|
}
|
|
179
|
-
const rules = await this.
|
|
180
|
-
userRef: user,
|
|
181
|
-
});
|
|
173
|
+
const { rules, companies } = await this.cacheGetUserPermissionsPermissions.get(user);
|
|
182
174
|
user.rules = rules;
|
|
183
|
-
user.companies =
|
|
184
|
-
userRef: user,
|
|
185
|
-
});
|
|
175
|
+
user.companies = companies;
|
|
186
176
|
return user;
|
|
187
177
|
}
|
|
188
178
|
async loadUsersByRules({ rule, loadPermissions }) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"user.service.js","sourceRoot":"","sources":["../../../src/core/services/user.service.ts"],"names":[],"mappings":";;;AAAA,4BAA2B;AAK3B,qDAA0D;AAC1D,8DAA4D;AAc5D,MAAa,WAAW;
|
|
1
|
+
{"version":3,"file":"user.service.js","sourceRoot":"","sources":["../../../src/core/services/user.service.ts"],"names":[],"mappings":"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"}
|