From 462fe15e7f3dfb426f8a1525e7ba7e56714e51c1 Mon Sep 17 00:00:00 2001
From: yangdongsuk <51476641+yangdongsuk@users.noreply.github.com>
Date: Thu, 7 Dec 2023 16:39:40 +0900
Subject: [PATCH] =?UTF-8?q?[Server]=20=ED=81=B4=EB=9D=BC=EC=9D=B4=EC=96=B8?=
 =?UTF-8?q?=ED=8A=B8=EC=99=80=20api=20=EC=97=B0=EB=8F=99=20=EC=9E=91?=
 =?UTF-8?q?=EC=97=85=20(login,=20socket=20history)=20=20(#209)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* feat: socket 빈 히스토리면 [] 보내기

* feat: 로그인시 유저 닉네임도 같이 보내주기
---
 server/src/auth/auth.service.spec.ts                      | 8 +++++++-
 server/src/auth/auth.service.ts                           | 8 ++++++--
 server/src/shared-checklists/shared-checklists.gateway.ts | 4 +---
 3 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/server/src/auth/auth.service.spec.ts b/server/src/auth/auth.service.spec.ts
index 8dd3acf8..9cd1bf79 100644
--- a/server/src/auth/auth.service.spec.ts
+++ b/server/src/auth/auth.service.spec.ts
@@ -199,13 +199,18 @@ describe('AuthService', () => {
         email: 'test@example.com',
         provider: ProviderType.APPLE,
       };
-      const existUser = { email: user.email, userId: 1 } as UserModel;
+      const existUser = {
+        email: user.email,
+        userId: 1,
+        nickname: 'test',
+      } as UserModel;
       jest
         .spyOn(authService, 'authenticateWithEmailAndProvider')
         .mockResolvedValue(existUser);
       jest.spyOn(authService, 'loginUser').mockReturnValue({
         accessToken: 'access_token',
         refreshToken: 'refresh_token',
+        nickname: 'test',
       });
 
       const result = await authService.loginWithEmailAndProvider(user);
@@ -252,6 +257,7 @@ describe('AuthService', () => {
       jest.spyOn(authService, 'loginUser').mockReturnValue({
         accessToken: 'access_token',
         refreshToken: 'refresh_token',
+        nickname: 'NewUser',
       });
 
       const result = await authService.registerUser(user);
diff --git a/server/src/auth/auth.service.ts b/server/src/auth/auth.service.ts
index 3746de9d..2fa8b7ac 100644
--- a/server/src/auth/auth.service.ts
+++ b/server/src/auth/auth.service.ts
@@ -130,11 +130,15 @@ export class AuthService {
    * @returns {{accessToken: string, refreshToken: string}}
    */
 
-  loginUser(user: UserModel): { accessToken: string; refreshToken: string } {
+  loginUser(user: UserModel): {
+    accessToken: string;
+    refreshToken: string;
+    nickname: string;
+  } {
     const accessToken = this.signToken(user, 'access');
     const refreshToken = this.signToken(user, 'refresh');
 
-    return { accessToken, refreshToken };
+    return { accessToken, refreshToken, nickname: user.nickname };
   }
 
   /**
diff --git a/server/src/shared-checklists/shared-checklists.gateway.ts b/server/src/shared-checklists/shared-checklists.gateway.ts
index 07b4ef1d..b64363f3 100644
--- a/server/src/shared-checklists/shared-checklists.gateway.ts
+++ b/server/src/shared-checklists/shared-checklists.gateway.ts
@@ -186,9 +186,7 @@ export class SharedChecklistsGateway
     const historyArray = history.map((item) => JSON.parse(item));
     const flattenedArray = historyArray.flat();
 
-    if (history.length > 0) {
-      this.sendToClient(client, 'history', flattenedArray);
-    }
+    this.sendToClient(client, 'history', flattenedArray);
   }
 
   /**