Merge pull request #91 from boostcampwm-2022/fix/#70-S

Fix/#70-S: 워크스페이스 중복 가입되는 버그 수정

Author: se030

server/apis/workspace/service.test.ts

@@ -57,11 +57,10 @@ describe('create', () => {
 
 describe('join', () => {
   const USER_ID = 1;
+  const WORKSPACE_ID = 1;
+  const WORKSPACE_NAME = 'Wab';
 
   it('유효한 참여코드가 주어진 경우 성공한다.', async () => {
-    const WORKSPACE_ID = 1;
-    const WORKSPACE_NAME = 'Wab';
-
     workspaceModel.findOne.mockResolvedValueOnce({
       id: WORKSPACE_ID,
       name: WORKSPACE_NAME,
@@ -70,6 +69,8 @@ describe('join', () => {
       moms: [],
     });
 
+    workspaceModel.updateOne.mockResolvedValueOnce({ modifiedCount: 1 });
+
     expect(workspaceService.join(USER_ID, VALID_CODE)).resolves.toEqual({
       id: WORKSPACE_ID,
       name: WORKSPACE_NAME,
@@ -91,6 +92,22 @@ describe('join', () => {
     ).rejects.toThrow(InvalidJoinError);
   });
 
+  it('이미 참여한 워크스페이스인 경우 실패한다.', async () => {
+    workspaceModel.findOne.mockResolvedValueOnce({
+      id: WORKSPACE_ID,
+      name: WORKSPACE_NAME,
+      code: VALID_CODE,
+      users: [],
+      moms: [],
+    });
+
+    workspaceModel.updateOne.mockResolvedValueOnce({ modifiedCount: 0 });
+
+    expect(() => workspaceService.join(USER_ID, VALID_CODE)).rejects.toThrow(
+      InvalidJoinError,
+    );
+  });
+
   it('db 업데이트 중 에러가 발생하면 실패한다.', async () => {
     workspaceModel.updateOne.mockRejectedValueOnce(
       new Error('Some error in database operation'),

server/apis/workspace/service.ts

@@ -27,8 +27,16 @@ export const join = async (userId: number, code: string) => {
 
   const { id, name } = workspace;
 
-  await workspaceModel.updateOne({ id }, { $push: { users: userId } });
-  await userModel.updateOne({ id: userId }, { $push: { workspaces: id } });
+  const res = await workspaceModel.updateOne(
+    { id },
+    { $addToSet: { users: userId } },
+  );
+
+  if (!res.modifiedCount) {
+    throw new InvalidJoinError('이미 참여한 워크스페이스에요 ^^');
+  }
+
+  await userModel.updateOne({ id: userId }, { $addToSet: { workspaces: id } });
 
   return { id, name, code };
 };