🇺🇦 #StandWithUkraine Fix Bug In MemberService.syncAllWithSlack()

MacPaw · Mar 25, 2022 · c5bd4ce · c5bd4ce
1 parent 55873c8
commit c5bd4ce
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 1 deletion.
diff --git a/services/MemberProvider.ts b/services/MemberProvider.ts
@@ -78,6 +78,15 @@ export class MemberProvider extends PrismaService implements IMemberProvider {
  return record && MemberProvider.getMemberFromRecord(record);
  }
 
+ public async findAnyInSystemBySlackId(slackId: string): Promise<Nullable<Member>> {
+ const record = await this.connection.memberRecord.findFirst({
+ where: { slackId },
+ include: { ...this.globalInclude },
+ });
+
+ return record && MemberProvider.getMemberFromRecord(record);
+ }
+
  public async getAll(): Promise<Member[]> {
  const records = await this.connection.memberRecord.findMany({
  where: { ...this.globalWhere },

diff --git a/services/MemberService.ts b/services/MemberService.ts
@@ -84,6 +84,10 @@ export class MemberService implements IMemberService {
  return this.memberProvider.findBySlackId(slackId);
  }
 
+ public findAnyInSystemBySlackId(slackId: string): Promise<Nullable<Member>> {
+ return this.memberProvider.findAnyInSystemBySlackId(slackId);
+ }
+
  public getAll(): Promise<Member[]> {
  return this.memberProvider.getAll();
  }
@@ -175,7 +179,7 @@ export class MemberService implements IMemberService {
  const slackMembers = await this.slackMemberProvider.getAll();
 
  for (const member of slackMembers) {
- const existing = await this.findBySlackId(member.id);
+ const existing = await this.findAnyInSystemBySlackId(member.id);
 
  if (existing) {
  existing.setName(member.name);

diff --git a/services/interfaces/IMemberProvider.ts b/services/interfaces/IMemberProvider.ts
@@ -8,6 +8,8 @@ export interface IMemberProvider {
 
  findBySlackId(slackId: string): Promise<Nullable<Member>>;
 
+ findAnyInSystemBySlackId(slackId: string): Promise<Nullable<Member>>;
+
  getAll(): Promise<Member[]>;
 
  getAllCheckInNonNull(): Promise<Member[]>;