@puca/puca-core 9.15.3 → 9.16.0

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
- }, 600);
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
- }, 600);
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
- }, 600);
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.getUserRules({
180
- userRef: user,
181
- });
173
+ const { rules, companies } = await this.cacheGetUserPermissionsPermissions.get(user);
182
174
  user.rules = rules;
183
- user.companies = await this.getUserCompanies({
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;IAKtB,YACmB,iBAAoC,EACpC,wBAA+C,EAC/C,mBAAwC;QAFxC,sBAAiB,GAAjB,iBAAiB,CAAmB;QACpC,6BAAwB,GAAxB,wBAAwB,CAAuB;QAC/C,wBAAmB,GAAnB,mBAAmB,CAAqB;IACvD,CAAC;IAEL,KAAK,CAAC,IAAI;QACR,IAAI,CAAC,iBAAiB,CAAC,gBAAgB,CAAoD;YACzF,SAAS,EAAE,gCAAgC;SAC5C,CAAC,CAAC,QAAQ,CAAC,KAAK,EAAE,EAAE,GAAG,EAAE,EAAE,EAAE;YAC5B,IAAI,CAAC,GAAG,EAAE;gBAmCR,OAAM;aACP;YACD,IAAG,GAAG,CAAC,IAAI,KAAK,iCAAiC,IAAI,GAAG,CAAC,IAAI,KAAK,gBAAgB,EAAE;gBAClF,OAAM;aACP;YAID,IAAI,CAAC,mBAAmB,CAAC,UAAU,CAAC,GAAG,CAAC,KAAK,CAAC,CAAA;QAChD,CAAC,CAAC,CAAA;QAEF,IAAI,CAAC,mBAAmB,GAAG,IAAI,CAAC,mBAAmB,CAAC,GAAG,CACrD,qBAAqB,EACrB,KAAK,EAAE,IAAI,EAAE,EAAE;YACb,MAAM,wBAAwB,GAAG,IAAI,CAAC,iBAAiB,CAAC,WAAW,CAAkB;gBACnF,SAAS,EAAE,gCAAgC;aAC5C,CAAC,CAAA;YAEF,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,MAAM,wBAAwB,CAAC,SAAS,CAAC;gBAC/D,MAAM,EAAE,CAAC,KAAK,CAAC;gBACf,KAAK,EAAE;oBACL,GAAG,EAAE;wBACH;4BACE,EAAE,EAAE,OAAO;4BACX,QAAQ,EAAE,gCAAmB,CAAC,KAAK;4BACnC,EAAE,EAAE,QAAQ;yBACb;wBACD;4BACE,EAAE,EAAE,MAAM;4BACV,QAAQ,EAAE,gCAAmB,CAAC,MAAM;4BACpC,EAAE,EAAE,OAAO;yBACZ;qBACF;iBACF;gBACD,IAAI,EAAE;oBACJ,KAAK,EAAE,CAAC,IAAI,CAAC;oBACb,IAAI,EAAE,iCAAiC;iBACxC;gBACD,IAAI,EAAE,EAAE,QAAQ,EAAE,WAAW,EAAE;gBAC/B,YAAY,EAAE,yBAAY,CAAC,KAAK;aACjC,CAAC,CAAA;YACF,OAAO,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAA;QACtC,CAAC,EAAE,GAAG,CAAC,CAAA;QAGT,MAAM,0BAA0B,GAAG,CAAC,CAAC,QAAQ,CAAC,GAAG,EAAE;YACjD,IAAI,CAAC,aAAa,CAAC,KAAK,EAAE,CAAA;QAC5B,CAAC,EAAE,GAAG,CAAC,CAAA;QAEP,IAAI,CAAC,iBAAiB,CAAC,gBAAgB,CAAC;YACtC,SAAS,EAAE,qBAAqB;SACjC,CAAC,CAAC,QAAQ,CAAC,KAAK,IAAI,EAAE;YACrB,0BAA0B,EAAE,CAAA;QAC9B,CAAC,CAAC,CAAA;QAEF,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC,mBAAmB,CAAC,GAAG,CAC/C,eAAe,EACf,KAAK,IAAI,EAAE;YACT,MAAM,eAAe,GAAG,IAAI,CAAC,iBAAiB,CAAC,WAAW,CAAO,EAAE,SAAS,EAAE,qBAAqB,EAAE,CAAC,CAAA;YACtG,MAAM,EAAE,IAAI,EAAE,QAAQ,EAAE,GAAG,MAAM,eAAe,CAAC,OAAO,CAAC;gBACvD,MAAM,EAAE,CAAC,UAAU,EAAE,QAAQ,CAAC;gBAC9B,IAAI,EAAE,EAAE,QAAQ,EAAE,WAAW,EAAE;aAChC,CAAC,CAAA;YACF,OAAO,QAAQ,CAAA;QACjB,CAAC,EAAE,GAAG,CAAC,CAAA;QAET,IAAI,CAAC,iBAAiB,CAAC,gBAAgB,CAAC;YACtC,SAAS,EAAE,2BAA2B;SACvC,CAAC,CAAC,QAAQ,CAAC,KAAK,EAAE,EAAE,GAAG,EAAE,EAAE,EAAE;YAC5B,IAAI,CAAC,GAAG,EAAE;gBACR,OAAM;aACP;YAED,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC;iBACb,OAAO,CAAC,GAAG,CAAC,EAAE;gBACb,IAAI,CAAC,WAAW,CAAC,UAAU,CAAC,EAAE,GAAG,EAAE,KAAK,EAAE,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,CAAA;YACvD,CAAC,CAAC,CAAA;QACN,CAAC,CAAC,CAAA;QAEF,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC,mBAAmB,CAAC,GAAG,CAC7C,aAAa,EACb,KAAK,EAAE,EAAE,GAAG,EAAE,KAAK,EAAE,EAAE,EAAE;YACvB,MAAM,cAAc,GAAG,IAAI,CAAC,iBAAiB,CAAC,WAAW,CAAO;gBAC9D,SAAS,EAAE,2BAA2B;aACvC,CAAC,CAAC;YACH,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,MAAM,cAAc,CAAC,SAAS,CAAC;gBACrD,MAAM,EAAE,CAAC,UAAU,EAAE,UAAU,EAAE,OAAO,CAAC;gBACzC,IAAI,EAAE;oBACJ,MAAM,EAAE,IAAI;oBACZ,KAAK,EAAE,CAAC,KAAK,CAAC;iBACf;gBACD,KAAK,EAAE;oBACL,GAAG,EAAE;wBACH;4BACE,EAAE,EAAE,GAAG;4BACP,QAAQ,EAAE,gCAAmB,CAAC,KAAK;4BACnC,EAAE,EAAE,QAAQ;yBACb;wBACD;4BACE,EAAE,EAAE;gCACF,QAAQ,EAAE,UAAU;gCACpB,IAAI,EAAE,CAAC,QAAQ,EAAE,SAAS,CAAC;6BAC5B;4BACD,QAAQ,EAAE,gCAAmB,CAAC,MAAM;4BACpC,EAAE,EAAE,SAAS;yBACd;qBACF;iBACF;gBACD,IAAI,EAAE,IAAI;gBACV,YAAY,EAAE,yBAAY,CAAC,KAAK;aACjC,CAAC,CAAC;YAEH,OAAO,KAAK,CAAC,CAAC,CAAC,CAAA;QACjB,CAAC,EAAE,GAAG,CAAC,CAAA;IACX,CAAC;IAED,KAAK,CAAC,aAAa,CAAC,IAAuB;QACzC,MAAM,OAAO,GAAgB,EAAE,CAAA;QAE/B,KAAK,MAAM,IAAI,IAAI,IAAI,CAAC,KAAK,EAAE;YAC7B,OAAO,CAAC,IAAI,CAAC;gBACX,IAAI;gBACJ,KAAK,EAAE,MAAM,IAAI,CAAC,YAAY,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;aAClD,CAAC,CAAA;SACH;QAED,OAAO,OAAO,CAAA;IAChB,CAAC;IAED,KAAK,CAAC,YAAY,CAAC,IAAsB;QAEvC,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,GAAG,EAAE,CAAA;QAC/C,IAAI,IAAI,CAAC,OAAO,CAAC,QAAQ,KAAK,WAAW,EAAE;YACzC,OAAO,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAA;SACrC;QACD,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,MAAM,IAAI,CAAC,wBAAwB,CAAC,gBAAgB,CAAC;YAC3E,IAAI,EAAE,iCAAiC;YACvC,GAAG,EAAE,IAAI,CAAC,OAAO,CAAC,QAAQ;YAC1B,IAAI,EAAE,EAAE,QAAQ,EAAE,WAAW,EAAE;SAChC,CAAC,CAAA;QACF,IAAI,MAAM,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,CAAA;QAEpC,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE;YAClB,MAAM,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAA;SACvC;QAED,IAAI,CAAC,GAAG,CAAC,CAAC;QACV,OAAO,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE;YACxB,MAAM,IAAI,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC;YACvB,QAAQ;iBACL,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,KAAK,IAAI,CAAC;iBAC9B,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC;iBACpB,OAAO,CAAC,EAAE,CAAC,EAAE;gBACZ,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE;oBACjC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,CAAA;iBAChB;YACH,CAAC,CAAC,CAAA;YACJ,CAAC,EAAE,CAAA;SACJ;QAED,OAAO,MAAM,CAAA;IACf,CAAC;IAED,KAAK,CAAC,gBAAgB,CAAC,IAA0B;QAG/C,IAAI,IAAI,CAAC,OAAO,CAAC,QAAQ,KAAK,WAAW,EAAE;SAE1C;QACD,MAAM,EAAE,IAAI,EAAE,SAAS,EAAE,GAAG,MAAM,IAAI,CAAC,wBAAwB,CAAC,gBAAgB,CAAC;YAC/E,IAAI,EAAE,gBAAgB;YACtB,GAAG,EAAE,IAAI,CAAC,OAAO,CAAC,QAAQ;YAC1B,IAAI,EAAE,EAAE,QAAQ,EAAE,WAAW,EAAE;SAChC,CAAC,CAAC;QAEH,OAAO,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,CAAA;IACpC,CAAC;IAED,KAAK,CAAC,WAAW,CAAC,EAAE,GAAG,GAAG,UAAU,EAAE,KAAK,EAAE,eAAe,GAAG,KAAK,EAAmB;QACrF,MAAM,OAAO,GAAW,EAAE,CAAA;QAE1B,KAAK,MAAM,OAAO,IAAI,KAAK,EAAE;YAC3B,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,EAAE,GAAG,EAAE,KAAK,EAAE,OAAO,EAAE,eAAe,EAAE,CAAC,CAAA;YAC5E,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;SACnB;QAED,OAAO,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAA;IAC/B,CAAC;IAED,KAAK,CAAC,UAAU,CAAC,EAAE,eAAe,GAAG,KAAK,EAAE,GAAG,GAAG,UAAU,EAAE,KAAK,EAAkB;QACnF,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,EAAE,GAAG,EAAE,KAAK,EAAE,CAAC,CAAA;QAEvD,IAAG,CAAC,IAAI,EAAE;YACR,OAAO,IAAI,CAAA;SACZ;QAED,IAAI,CAAC,eAAe,EAAE;YACpB,OAAO,IAAI,CAAA;SACZ;QAED,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC;YACpC,OAAO,EAAE,IAAI;SACd,CAAC,CAAA;QAEF,IAAI,CAAC,KAAK,GAAG,KAAK,CAAA;QAElB,IAAI,CAAC,SAAS,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC;YAC3C,OAAO,EAAE,IAAI;SACd,CAAC,CAAA;QAEF,OAAO,IAAI,CAAA;IACb,CAAC;IAED,KAAK,CAAC,gBAAgB,CAAC,EAAE,IAAI,EAAE,eAAe,EAAwB;QACpE,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,mBAAmB,CAAC,GAAG,CAAC,IAAI,CAAC,CAAA;QAE5D,MAAM,OAAO,GAAW,EAAE,CAAA;QAE1B,KAAK,MAAM,OAAO,IAAI,WAAW,EAAE;YACjC,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,EAAE,KAAK,EAAE,OAAO,EAAE,eAAe,EAAE,CAAC,CAAA;YACvE,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;SACnB;QAED,OAAO,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAA;IAC/B,CAAC;CACF;AAnRD,kCAmRC"}
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;IAUtB,YACmB,iBAAoC,EACpC,wBAA+C,EAC/C,mBAAwC;QAFxC,sBAAiB,GAAjB,iBAAiB,CAAmB;QACpC,6BAAwB,GAAxB,wBAAwB,CAAuB;QAC/C,wBAAmB,GAAnB,mBAAmB,CAAqB;QAZ1C,8BAAyB,GAAG,EAAE,CAAA;IAa3C,CAAC;IAEL,KAAK,CAAC,IAAI;QAkDR,IAAI,CAAC,mBAAmB,GAAG,IAAI,CAAC,mBAAmB,CAAC,GAAG,CACrD,qBAAqB,EACrB,KAAK,EAAE,IAAI,EAAE,EAAE;YACb,MAAM,wBAAwB,GAAG,IAAI,CAAC,iBAAiB,CAAC,WAAW,CAAkB;gBACnF,SAAS,EAAE,gCAAgC;aAC5C,CAAC,CAAA;YAEF,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,MAAM,wBAAwB,CAAC,SAAS,CAAC;gBAC/D,MAAM,EAAE,CAAC,KAAK,CAAC;gBACf,KAAK,EAAE;oBACL,GAAG,EAAE;wBACH;4BACE,EAAE,EAAE,OAAO;4BACX,QAAQ,EAAE,gCAAmB,CAAC,KAAK;4BACnC,EAAE,EAAE,QAAQ;yBACb;wBACD;4BACE,EAAE,EAAE,MAAM;4BACV,QAAQ,EAAE,gCAAmB,CAAC,MAAM;4BACpC,EAAE,EAAE,OAAO;yBACZ;qBACF;iBACF;gBACD,IAAI,EAAE;oBACJ,KAAK,EAAE,CAAC,IAAI,CAAC;oBACb,IAAI,EAAE,iCAAiC;iBACxC;gBACD,IAAI,EAAE,EAAE,QAAQ,EAAE,WAAW,EAAE;gBAC/B,YAAY,EAAE,yBAAY,CAAC,KAAK;aACjC,CAAC,CAAA;YACF,OAAO,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAA;QACtC,CAAC,EAAE,IAAI,CAAC,yBAAyB,CAAC,CAAA;QAapC,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC,mBAAmB,CAAC,GAAG,CAC/C,eAAe,EACf,KAAK,IAAI,EAAE;YACT,MAAM,eAAe,GAAG,IAAI,CAAC,iBAAiB,CAAC,WAAW,CAAO,EAAE,SAAS,EAAE,qBAAqB,EAAE,CAAC,CAAA;YACtG,MAAM,EAAE,IAAI,EAAE,QAAQ,EAAE,GAAG,MAAM,eAAe,CAAC,OAAO,CAAC;gBACvD,MAAM,EAAE,CAAC,UAAU,EAAE,QAAQ,CAAC;gBAC9B,IAAI,EAAE,EAAE,QAAQ,EAAE,WAAW,EAAE;aAChC,CAAC,CAAA;YACF,OAAO,QAAQ,CAAA;QACjB,CAAC,EAAE,IAAI,CAAC,yBAAyB,CAAC,CAAA;QAEpC,IAAI,CAAC,iBAAiB,CAAC,gBAAgB,CAAC;YACtC,SAAS,EAAE,2BAA2B;SACvC,CAAC,CAAC,QAAQ,CAAC,KAAK,EAAE,EAAE,GAAG,EAAE,EAAE,EAAE;YAC5B,IAAI,CAAC,GAAG,EAAE;gBACR,OAAM;aACP;YAED,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC;iBACb,OAAO,CAAC,GAAG,CAAC,EAAE;gBACb,IAAI,CAAC,WAAW,CAAC,UAAU,CAAC,EAAE,GAAG,EAAE,KAAK,EAAE,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,CAAA;YACvD,CAAC,CAAC,CAAA;QACN,CAAC,CAAC,CAAA;QAEF,IAAI,CAAC,WAAW,GAAG,IAAI,CAAC,mBAAmB,CAAC,GAAG,CAC7C,aAAa,EACb,KAAK,EAAE,EAAE,GAAG,EAAE,KAAK,EAAE,EAAE,EAAE;YACvB,MAAM,cAAc,GAAG,IAAI,CAAC,iBAAiB,CAAC,WAAW,CAAO;gBAC9D,SAAS,EAAE,2BAA2B;aACvC,CAAC,CAAC;YACH,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,MAAM,cAAc,CAAC,SAAS,CAAC;gBACrD,MAAM,EAAE,CAAC,UAAU,EAAE,UAAU,EAAE,OAAO,CAAC;gBACzC,IAAI,EAAE;oBACJ,MAAM,EAAE,IAAI;oBACZ,KAAK,EAAE,CAAC,KAAK,CAAC;iBACf;gBACD,KAAK,EAAE;oBACL,GAAG,EAAE;wBACH;4BACE,EAAE,EAAE,GAAG;4BACP,QAAQ,EAAE,gCAAmB,CAAC,KAAK;4BACnC,EAAE,EAAE,QAAQ;yBACb;wBACD;4BACE,EAAE,EAAE;gCACF,QAAQ,EAAE,UAAU;gCACpB,IAAI,EAAE,CAAC,QAAQ,EAAE,SAAS,CAAC;6BAC5B;4BACD,QAAQ,EAAE,gCAAmB,CAAC,MAAM;4BACpC,EAAE,EAAE,SAAS;yBACd;qBACF;iBACF;gBACD,IAAI,EAAE,IAAI;gBACV,YAAY,EAAE,yBAAY,CAAC,KAAK;aACjC,CAAC,CAAC;YAEH,OAAO,KAAK,CAAC,CAAC,CAAC,CAAA;QACjB,CAAC,EAAE,IAAI,CAAC,yBAAyB,CAAC,CAAA;QAEpC,IAAI,CAAC,kCAAkC,GAAG,IAAI,CAAC,mBAAmB,CAAC,GAAG,CAAC,8BAA8B,EAAE,KAAK,EAAE,IAAU,EAAE,EAAE;YAC1H,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,YAAY,CAAC;gBACpC,OAAO,EAAE,IAAI;aACd,CAAC,CAAA;YAEF,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC;gBAC5C,OAAO,EAAE,IAAI;aACd,CAAC,CAAA;YAEF,OAAO;gBACL,KAAK;gBACL,SAAS;aACV,CAAA;QAEH,CAAC,EAAE,IAAI,CAAC,yBAAyB,CAAC,CAAA;IACpC,CAAC;IAED,KAAK,CAAC,aAAa,CAAC,IAAuB;QACzC,MAAM,OAAO,GAAgB,EAAE,CAAA;QAE/B,KAAK,MAAM,IAAI,IAAI,IAAI,CAAC,KAAK,EAAE;YAC7B,OAAO,CAAC,IAAI,CAAC;gBACX,IAAI;gBACJ,KAAK,EAAE,MAAM,IAAI,CAAC,YAAY,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC;aAClD,CAAC,CAAA;SACH;QAED,OAAO,OAAO,CAAA;IAChB,CAAC;IAED,KAAK,CAAC,YAAY,CAAC,IAAsB;QAEvC,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,GAAG,EAAE,CAAA;QAC/C,IAAI,IAAI,CAAC,OAAO,CAAC,QAAQ,KAAK,WAAW,EAAE;YACzC,OAAO,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAA;SACrC;QACD,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,MAAM,IAAI,CAAC,wBAAwB,CAAC,gBAAgB,CAAC;YAC3E,IAAI,EAAE,iCAAiC;YACvC,GAAG,EAAE,IAAI,CAAC,OAAO,CAAC,QAAQ;YAC1B,IAAI,EAAE,EAAE,QAAQ,EAAE,WAAW,EAAE;SAChC,CAAC,CAAA;QACF,IAAI,MAAM,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,CAAA;QAEpC,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE;YAClB,MAAM,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAA;SACvC;QAED,IAAI,CAAC,GAAG,CAAC,CAAC;QACV,OAAO,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE;YACxB,MAAM,IAAI,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC;YACvB,QAAQ;iBACL,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,KAAK,IAAI,CAAC;iBAC9B,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC;iBACpB,OAAO,CAAC,EAAE,CAAC,EAAE;gBACZ,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE;oBACjC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,CAAA;iBAChB;YACH,CAAC,CAAC,CAAA;YACJ,CAAC,EAAE,CAAA;SACJ;QAED,OAAO,MAAM,CAAA;IACf,CAAC;IAED,KAAK,CAAC,gBAAgB,CAAC,IAA0B;QAG/C,IAAI,IAAI,CAAC,OAAO,CAAC,QAAQ,KAAK,WAAW,EAAE;SAE1C;QAED,MAAM,EAAE,IAAI,EAAE,SAAS,EAAE,GAAG,MAAM,IAAI,CAAC,wBAAwB,CAAC,gBAAgB,CAAC;YAC/E,IAAI,EAAE,gBAAgB;YACtB,GAAG,EAAE,IAAI,CAAC,OAAO,CAAC,QAAQ;YAC1B,IAAI,EAAE,EAAE,QAAQ,EAAE,WAAW,EAAE;SAChC,CAAC,CAAC;QAEH,OAAO,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,CAAA;IACpC,CAAC;IAED,KAAK,CAAC,WAAW,CAAC,EAAE,GAAG,GAAG,UAAU,EAAE,KAAK,EAAE,eAAe,GAAG,KAAK,EAAmB;QACrF,MAAM,OAAO,GAAW,EAAE,CAAA;QAE1B,KAAK,MAAM,OAAO,IAAI,KAAK,EAAE;YAC3B,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,EAAE,GAAG,EAAE,KAAK,EAAE,OAAO,EAAE,eAAe,EAAE,CAAC,CAAA;YAC5E,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;SACnB;QAED,OAAO,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAA;IAC/B,CAAC;IAED,KAAK,CAAC,UAAU,CAAC,EAAE,eAAe,GAAG,KAAK,EAAE,GAAG,GAAG,UAAU,EAAE,KAAK,EAAkB;QACnF,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,EAAE,GAAG,EAAE,KAAK,EAAE,CAAC,CAAA;QAEvD,IAAI,CAAC,IAAI,EAAE;YACT,OAAO,IAAI,CAAA;SACZ;QAGD,IAAI,CAAC,eAAe,EAAE;YACpB,OAAO,IAAI,CAAA;SACZ;QAED,MAAM,EAAE,KAAK,EAAE,SAAS,EAAE,GAAG,MAAM,IAAI,CAAC,kCAAkC,CAAC,GAAG,CAAC,IAAI,CAAC,CAAA;QAEpF,IAAI,CAAC,KAAK,GAAG,KAAK,CAAA;QAClB,IAAI,CAAC,SAAS,GAAG,SAAS,CAAA;QAE1B,OAAO,IAAI,CAAA;IACb,CAAC;IAED,KAAK,CAAC,gBAAgB,CAAC,EAAE,IAAI,EAAE,eAAe,EAAwB;QACpE,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,mBAAmB,CAAC,GAAG,CAAC,IAAI,CAAC,CAAA;QAE5D,MAAM,OAAO,GAAW,EAAE,CAAA;QAE1B,KAAK,MAAM,OAAO,IAAI,WAAW,EAAE;YACjC,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,EAAE,KAAK,EAAE,OAAO,EAAE,eAAe,EAAE,CAAC,CAAA;YACvE,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;SACnB;QAED,OAAO,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAA;IAC/B,CAAC;CACF;AArSD,kCAqSC"}
@@ -41,7 +41,10 @@ export interface CrudControllerEspecificationEnvironmentDetails {
41
41
  defaultLabel?: string;
42
42
  enumValues?: {
43
43
  items: string[];
44
- };
44
+ } | {
45
+ label: string;
46
+ value: string;
47
+ }[];
45
48
  required?: string;
46
49
  validate?: string;
47
50
  readonly?: string;
@@ -5,6 +5,7 @@ export declare class CacheService<K, R> {
5
5
  private readonly fetch;
6
6
  private readonly lifetimeInSeconds;
7
7
  private readonly envConfigService;
8
+ private readonly logger;
8
9
  private readonly prefix;
9
10
  private readonly memoryCache;
10
11
  constructor(name: string, redisManagerService: RedisManagerService, fetch: (keyObj: K) => Promise<R>, lifetimeInSeconds: number, envConfigService: EnvConfigService);
@@ -1,8 +1,8 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.CacheServiceFactory = exports.CacheService = void 0;
4
- const _ = require("lodash");
5
4
  const crypto_1 = require("crypto");
5
+ const logger_1 = require("../../core/services/logger");
6
6
  class CacheService {
7
7
  constructor(name, redisManagerService, fetch, lifetimeInSeconds, envConfigService) {
8
8
  this.redisManagerService = redisManagerService;
@@ -11,14 +11,7 @@ class CacheService {
11
11
  this.envConfigService = envConfigService;
12
12
  this.memoryCache = new Map();
13
13
  this.prefix = `cache-${name}`;
14
- setInterval(() => {
15
- const now = new Date();
16
- for (const [keyStr, { expires }] of this.memoryCache.entries()) {
17
- if (expires < now) {
18
- this.memoryCache.delete(keyStr);
19
- }
20
- }
21
- });
14
+ this.logger = new logger_1.Logger(CacheService.name + '-' + name);
22
15
  const redisClient = this.redisManagerService.get();
23
16
  const subscriber = redisClient.duplicate();
24
17
  subscriber.on("message", (channel, message) => {
@@ -64,22 +57,51 @@ class CacheService {
64
57
  return await this.fetch(keyObj);
65
58
  }
66
59
  const keyStr = this.buildKeyStr(keyObj);
67
- let memoryCache = this.memoryCache.get(keyStr);
60
+ const redisGet = async () => {
61
+ const data = await this.redisGet(keyStr, keyObj);
62
+ this.memoryCache.set(keyStr, {
63
+ data,
64
+ expires: new Date(Date.now() + this.lifetimeInSeconds * 1000)
65
+ });
66
+ return data;
67
+ };
68
+ const sanitaze = async (data) => {
69
+ while (data === 'loading') {
70
+ await new Promise(resolve => setTimeout(resolve, 50));
71
+ }
72
+ if (data === '<<empty>>') {
73
+ return null;
74
+ }
75
+ return data;
76
+ };
77
+ const memoryCache = this.memoryCache.get(keyStr);
68
78
  if (memoryCache) {
69
79
  if (memoryCache.expires > new Date()) {
70
- return memoryCache.data;
80
+ return await sanitaze(memoryCache.data);
71
81
  }
72
82
  else {
73
- this.memoryCache.delete(keyStr);
74
- memoryCache = null;
83
+ memoryCache.expires = new Date(Date.now() + this.lifetimeInSeconds * 1000);
84
+ redisGet()
85
+ .catch((e) => {
86
+ this.logger.error(e);
87
+ });
88
+ return await sanitaze(memoryCache.data);
75
89
  }
76
90
  }
77
- if (_.get(memoryCache, 'data') === '<<empty>>') {
78
- return null;
91
+ else {
92
+ this.memoryCache.set(keyStr, {
93
+ data: 'loading',
94
+ expires: new Date(Date.now() + this.lifetimeInSeconds * 1000)
95
+ });
96
+ try {
97
+ const result = await redisGet();
98
+ return await sanitaze(result);
99
+ }
100
+ catch (e) {
101
+ this.memoryCache.delete(keyStr);
102
+ throw e;
103
+ }
79
104
  }
80
- const data = await this.redisGet(keyStr, keyObj);
81
- this.memoryCache.set(keyStr, { data, expires: new Date(Date.now() + this.lifetimeInSeconds * 1000) });
82
- return data;
83
105
  }
84
106
  redisGet(keyStr, keyObj) {
85
107
  return new Promise((resolve, reject) => {
@@ -1 +1 @@
1
- {"version":3,"file":"cache.service.js","sourceRoot":"","sources":["../../../src/orm/services/cache.service.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"cache.service.js","sourceRoot":"","sources":["../../../src/orm/services/cache.service.ts"],"names":[],"mappings":"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"}