Merge pull request #568 from boostcampwm2023/BE/feature/#567

그룹 기록 추가 API 응답에 user info를 추가해서 반환한다.
boostcampwm2023 · Dec 11, 2023 · 2d4546a · 2d4546a
2 parents 1db5fc6 + b598889
commit 2d4546a
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 12 deletions.
diff --git a/BE/src/group/achievement/application/group-achievement.service.spec.ts b/BE/src/group/achievement/application/group-achievement.service.spec.ts
@@ -197,7 +197,10 @@ describe('GroupAchievementService Test', () => {
         expect(groupAchievementResponse.category.id).toEqual(groupCategory.id);
         expect(groupAchievementResponse.category.achieveCount).toEqual(1);
         expect(groupAchievementResponse.category.name).toEqual('category');
-        expect(groupAchievementResponse.userCode).toEqual(user1.userCode);
+        expect(groupAchievementResponse.user.userCode).toEqual(user1.userCode);
+        expect(groupAchievementResponse.user.avatarUrl).toEqual(
+          user1.avatarUrl,
+        );
         expect(groupAchievementResponse.imageUrl).toEqual(image.imageUrl);
         expect(groupAchievementResponse.createdAt).toBeDefined();
       });
@@ -231,7 +234,10 @@ describe('GroupAchievementService Test', () => {
         expect(groupAchievementResponse.category.id).toEqual(-1);
         expect(groupAchievementResponse.category.achieveCount).toEqual(1);
         expect(groupAchievementResponse.category.name).toEqual('미설정');
-        expect(groupAchievementResponse.userCode).toEqual(user1.userCode);
+        expect(groupAchievementResponse.user.userCode).toEqual(user1.userCode);
+        expect(groupAchievementResponse.user.avatarUrl).toEqual(
+          user1.avatarUrl,
+        );
         expect(groupAchievementResponse.imageUrl).toEqual(image.imageUrl);
         expect(groupAchievementResponse.createdAt).toBeDefined();
       });
@@ -328,7 +334,8 @@ describe('GroupAchievementService Test', () => {
         expect(groupAchievementResponse.category.id).toEqual(groupCategory.id);
         expect(groupAchievementResponse.category.achieveCount).toEqual(1);
         expect(groupAchievementResponse.category.name).toEqual('category');
-        expect(groupAchievementResponse.userCode).toEqual(user.userCode);
+        expect(groupAchievementResponse.user.userCode).toEqual(user.userCode);
+        expect(groupAchievementResponse.user.avatarUrl).toEqual(user.avatarUrl);
         expect(groupAchievementResponse.imageUrl).toEqual(image.imageUrl);
         expect(groupAchievementResponse.createdAt).toBeDefined();
       });
@@ -365,8 +372,8 @@ describe('GroupAchievementService Test', () => {
         expect(groupAchievementResponse.category.id).toEqual(-1);
         expect(groupAchievementResponse.category.achieveCount).toEqual(1);
         expect(groupAchievementResponse.category.name).toEqual('미설정');
-        expect(groupAchievementResponse.userCode).toEqual(user.userCode);
-        expect(groupAchievementResponse.imageUrl).toEqual(image.imageUrl);
+        expect(groupAchievementResponse.user.userCode).toEqual(user.userCode);
+        expect(groupAchievementResponse.user.avatarUrl).toEqual(user.avatarUrl);
         expect(groupAchievementResponse.createdAt).toBeDefined();
       });
     });
@@ -407,7 +414,8 @@ describe('GroupAchievementService Test', () => {
         expect(groupAchievementResponse.category.id).toEqual(groupCategory.id);
         expect(groupAchievementResponse.category.achieveCount).toEqual(1);
         expect(groupAchievementResponse.category.name).toEqual('category');
-        expect(groupAchievementResponse.userCode).toEqual(user.userCode);
+        expect(groupAchievementResponse.user.userCode).toEqual(user.userCode);
+        expect(groupAchievementResponse.user.avatarUrl).toEqual(user.avatarUrl);
         expect(groupAchievementResponse.imageUrl).toEqual(image.imageUrl);
         expect(groupAchievementResponse.createdAt).toBeDefined();
       });
@@ -444,7 +452,8 @@ describe('GroupAchievementService Test', () => {
         expect(groupAchievementResponse.category.id).toEqual(-1);
         expect(groupAchievementResponse.category.achieveCount).toEqual(1);
         expect(groupAchievementResponse.category.name).toEqual('미설정');
-        expect(groupAchievementResponse.userCode).toEqual(user.userCode);
+        expect(groupAchievementResponse.user.userCode).toEqual(user.userCode);
+        expect(groupAchievementResponse.user.avatarUrl).toEqual(user.avatarUrl);
         expect(groupAchievementResponse.imageUrl).toEqual(image.imageUrl);
         expect(groupAchievementResponse.createdAt).toBeDefined();
       });

diff --git a/BE/src/group/achievement/controller/group-achievement.controller.spec.ts b/BE/src/group/achievement/controller/group-achievement.controller.spec.ts
@@ -197,6 +197,7 @@ describe('GroupAchievementController', () => {
         createdAt: new Date(),
         achieveCount: 2,
         userCode: user.userCode,
+        avatarUrl: user.avatarUrl,
       });
 
       when(
@@ -488,6 +489,7 @@ describe('GroupAchievementController', () => {
         createdAt: new Date(),
         achieveCount: 2,
         userCode: user.userCode,
+        avatarUrl: user.avatarUrl,
       });
 
       when(

diff --git a/BE/src/group/achievement/dto/group-achievement-detail-response.ts b/BE/src/group/achievement/dto/group-achievement-detail-response.ts
@@ -1,13 +1,16 @@
 import { ApiProperty } from '@nestjs/swagger';
-import { IGroupAchievementDetail } from '../index';
+import { IGroupAchievementDetail, UserInfo } from '../index';
 import { AchievementDetailResponse } from '../../../achievement/dto/achievement-detail-response';
 
 export class GroupAchievementDetailResponse extends AchievementDetailResponse {
-  @ApiProperty({ description: 'usercode' })
-  userCode: string;
+  @ApiProperty({ description: 'user', type: UserInfo })
+  user: UserInfo;
 
   constructor(achievementDetail: IGroupAchievementDetail) {
     super(achievementDetail);
-    this.userCode = achievementDetail.userCode;
+    this.user = new UserInfo(
+      achievementDetail.userCode,
+      achievementDetail.avatarUrl,
+    );
   }
 }
diff --git a/BE/src/group/achievement/entities/group-achievement.repository.ts b/BE/src/group/achievement/entities/group-achievement.repository.ts
@@ -58,9 +58,9 @@ export class GroupAchievementRepository extends TransactionalRepository<GroupAch
     const groupAchievementEntitySelectQueryBuilder =
       await this.achievementDetailQuery(achievementId, groupId);
     const result = await groupAchievementEntitySelectQueryBuilder
+      .addSelect('user.avatarUrl', 'avatarUrl')
       .andWhere('groupAchievement.user_id = :userId', { userId })
       .getRawOne<IGroupAchievementDetail>();
-
     if (result.id) return new GroupAchievementDetailResponse(result);
     return null;
   }

diff --git a/BE/src/group/achievement/index.ts b/BE/src/group/achievement/index.ts
@@ -4,6 +4,7 @@ import { GroupCategory } from '../category/domain/group.category';
 
 export interface IGroupAchievementDetail extends IAchievementDetail {
   userCode: string;
+  avatarUrl: string;
 }
 
 export interface IGroupAchievementListDetail {