Merge pull request #26 from tonalty/added-photolink

feat:addedphotolink
tonalty · Jul 12, 2024 · 3625681 · 3625681
2 parents 61c8ffa + 2027117
commit 3625681
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 19 deletions.
diff --git a/src/communities/communityUser.service.ts b/src/communities/communityUser.service.ts
@@ -110,27 +110,33 @@ export class CommunityUserService {
 
   async createOrUpdateCommunityUser(userId: number, chatId: number, isAdmin: boolean): Promise<CommunityUserDto> {
     const communityTitle = await this.communityService.getCommunityTitle(chatId);
-    const result = await this.communityUserModel.findOneAndUpdate(
-      { userId: userId, chatId: chatId },
-      {
-        $setOnInsert: {
-          userId: userId,
-          chatId: chatId,
-          communityName: communityTitle,
-          points: 0,
+    const result = await this.communityUserModel
+      .findOneAndUpdate(
+        { userId: userId, chatId: chatId },
+        {
+          $setOnInsert: {
+            userId: userId,
+            chatId: chatId,
+            communityName: communityTitle,
+            points: 0,
+          },
+          $set: {
+            // $set happens if the document is found and if it's not found
+            isAdmin: isAdmin,
+          },
         },
-        $set: {
-          // $set happens if the document is found and if it's not found
-          isAdmin: isAdmin,
+        {
+          upsert: true,
+          new: true,
         },
-      },
-      {
-        upsert: true,
-        new: true,
-      },
-    );
+      )
+      .lean();
+
+    const community = await this.communityService.getCommunity(chatId);
+
     this.logger.log(`Created or updated a new community user. userId: ${userId}, chatId ${chatId}`);
-    return new CommunityUserDto(result);
+
+    return new CommunityUserDto(Object.assign({}, { ...result, photoLink: community.photoLink }));
   }
 
   isChatMemberAdmin(chatMember: ChatMember): boolean {

diff --git a/src/communities/dto/CommunityUserDto.ts b/src/communities/dto/CommunityUserDto.ts
@@ -1,13 +1,19 @@
 import { CommunityUser } from 'src/data/communityUser.entity';
 
+export interface ExtendedCommunityUser extends CommunityUser {
+  photoLink?: string;
+}
+
 export class CommunityUserDto {
   communityName: string;
   points: number;
   isAdmin: boolean;
+  photoLink?: string;
 
-  constructor(communityUser: CommunityUser) {
+  constructor(communityUser: ExtendedCommunityUser) {
     this.communityName = communityUser.communityName;
     this.points = communityUser.points;
     this.isAdmin = communityUser.isAdmin;
+    this.photoLink = communityUser.photoLink;
   }
 }