gemcap-be-common 1.4.1 → 1.4.2

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.
Files changed (19) hide show
  1. package/db/collaterals.db.d.ts +1 -1
  2. package/models/AvailabilitySigns.model.d.ts +11 -11
  3. package/models/AvailabilitySigns.model.js +2 -4
  4. package/models/AvailabilitySigns.model.ts +7 -9
  5. package/models/ReceivableAvailability.model.d.ts +32 -32
  6. package/models/ReceivableAvailability.model.ts +2 -2
  7. package/models/_index.d.ts +6 -6
  8. package/package.json +1 -1
  9. package/services/availability.service.d.ts +5 -5
  10. package/services/availability.service.js +1 -1
  11. package/services/availability.service.ts +6 -7
  12. package/services/compliance-borrowers.service.d.ts +3 -3
  13. package/services/compliance-borrowers.service.js +1 -1
  14. package/services/compliance-borrowers.service.ts +3 -4
  15. package/services/signs.service.d.ts +2 -3
  16. package/services/signs.service.js +8 -9
  17. package/services/signs.service.ts +11 -13
  18. package/services/users.service.ts +1 -1
  19. package/tsconfig.tsbuildinfo +1 -1
package/services/signs.service.ts CHANGED
@@ -8,7 +8,6 @@ import {
8
8
  getAvailabilitySigns,
9
9
  updateAvailabilitySigns,
10
10
  } from '../db/availability.db';
11
- import { IUserLegacyDoc } from '../models/User.model';
12
11
  import {
13
12
  AvailabilitySignsModel,
14
13
  IAvailabilitySignItem,
@@ -51,14 +50,14 @@ export class SignsService {
51
50
  ) {
52
51
  }
53
52
 
54
- keyCloakUsers: IUser[] = null;
53
+ users: IUser[] = null;
55
54
 
56
55
  async fulfillUserList() {
57
- this.keyCloakUsers = await this.usersService.getUserList();
56
+ this.users = await this.usersService.getUserList();
58
57
  }
59
58
 
60
59
  clearUserList() {
61
- this.keyCloakUsers = null;
60
+ this.users = null;
62
61
  }
63
62
 
64
63
  async getAvailabilitySigns(bbcDateId: string): Promise<IAvailabilitySignView> {
@@ -72,7 +71,7 @@ export class SignsService {
72
71
  };
73
72
  }
74
73
  const availabilitySigns = availabilitiesSigns[0];
75
- let keyCloakUsers = this.keyCloakUsers;
74
+ let keyCloakUsers = this.users;
76
75
  if (!keyCloakUsers) {
77
76
  keyCloakUsers = await this.usersService.getUserList();
78
77
  }
@@ -80,19 +79,19 @@ export class SignsService {
80
79
  if (!userSign.userSigned) {
81
80
  return acc;
82
81
  }
83
- const foundUserSigned = keyCloakUsers.find((user) => user.id === userSign.userSigned.keycloakUserId);
82
+ const foundUserSigned = keyCloakUsers.find((user) => user.id === userSign.userSigned.id);
84
83
  if (foundUserSigned) {
85
84
  userSign.userSigned.firstName = foundUserSigned.firstName;
86
85
  userSign.userSigned.lastName = foundUserSigned.lastName;
87
86
  }
88
- userSign.userSigned = (_.pick(userSign.userSigned, ['_id', 'firstName', 'lastName'])) as IUserLegacyDoc;
87
+ userSign.userSigned = (_.pick(userSign.userSigned, ['_id', 'firstName', 'lastName'])) as IUser;
89
88
  if (userSign.userRevoked) {
90
- const foundUserRevoked = keyCloakUsers.find((user) => user.id === userSign.userRevoked.keycloakUserId);
89
+ const foundUserRevoked = keyCloakUsers.find((user) => user.id === userSign.userRevoked.id);
91
90
  if (foundUserRevoked) {
92
91
  userSign.userRevoked.firstName = foundUserRevoked.firstName;
93
92
  userSign.userRevoked.lastName = foundUserRevoked.lastName;
94
93
  }
95
- userSign.userRevoked = (_.pick(userSign.userRevoked, ['_id', 'firstName', 'lastName'])) as IUserLegacyDoc;
94
+ userSign.userRevoked = (_.pick(userSign.userRevoked, ['_id', 'firstName', 'lastName'])) as IUser;
96
95
  }
97
96
  return [...acc, _.pick(userSign, ['userSigned', 'signedAt', 'userRevoked', 'revokedAt'])];
98
97
  }, []);
@@ -103,17 +102,16 @@ export class SignsService {
103
102
  const availability = await findAvailabilitySignsByBBCDateId(bbcDateId);
104
103
  const updatedSigns = availability.signs.map((sign) => {
105
104
  if (sign.userSignedId.toString() === userId && !sign.revokedAt) {
106
- sign.userRevokedId = new mongoose.Types.ObjectId(userIdRevoked);
105
+ sign.userRevokedId = userIdRevoked;
107
106
  sign.revokedAt = new Date();
108
- sign.userRevokedId = new mongoose.Types.ObjectId(userIdRevoked);
109
107
  }
110
108
  return sign;
111
109
  });
112
110
  await updateAvailabilitySigns(bbcDateId, updatedSigns);
113
111
  }
114
112
 
115
- async signAvailability(bbcDateId: string, user: IUserLegacyDoc): Promise<IResult> {
116
- const newSign = <IAvailabilitySignItem>{ userSignedId: user._id, signedAt: new Date() };
113
+ async signAvailability(bbcDateId: string, user: IUser): Promise<IResult> {
114
+ const newSign = <IAvailabilitySignItem>{ userSignedId: user.id, signedAt: new Date() };
117
115
  return await addAvailabilitySign(bbcDateId, newSign);
118
116
  }
119
117
 
package/services/users.service.ts CHANGED
@@ -68,7 +68,7 @@ export class UsersService {
68
68
  return data ?? null;
69
69
  }
70
70
 
71
- async getUserRoles(userId: string) {
71
+ async getUserRoles(userId: string) { // TODO add full description
72
72
  const user = await this.getUserById(userId);
73
73
  return user.roles;
74
74
  }