From 5ba7419894e395c1aa37297e5e85d7a60d380393 Mon Sep 17 00:00:00 2001
From: JJ503 <63184334+JJ503@users.noreply.github.com>
Date: Tue, 6 Feb 2024 14:02:35 +0900
Subject: [PATCH 01/10] =?UTF-8?q?chore:=20thymleaf=20=EB=9D=BC=EC=9D=B4?=
 =?UTF-8?q?=EB=B8=8C=EB=9F=AC=EB=A6=AC=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 build.gradle | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/build.gradle b/build.gradle
index 5c4f11d5..c592fc67 100644
--- a/build.gradle
+++ b/build.gradle
@@ -59,6 +59,9 @@ dependencies {
 	// fcm
 	implementation 'com.google.firebase:firebase-admin:6.8.1'
 
+	// thymeleaf
+	implementation 'org.springframework.boot:spring-boot-starter-thymeleaf'
+
 	// etc
 	implementation 'org.springframework.boot:spring-boot-starter-validation'
 	implementation 'org.springframework.boot:spring-boot-starter-web'

From 014dfa95a3ece485377bfbe625dcf8e2b258d7c5 Mon Sep 17 00:00:00 2001
From: JJ503 <63184334+JJ503@users.noreply.github.com>
Date: Tue, 6 Feb 2024 22:20:18 +0900
Subject: [PATCH 02/10] =?UTF-8?q?feat:=20=EC=82=AC=EC=9A=A9=EC=9E=90=20?=
 =?UTF-8?q?=EC=83=9D=EC=84=B1=20=EA=B8=B0=EB=8A=A5=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../admin/application/AdminPageService.java   | 45 ++++++++++++
 .../admin/controller/AdminPageController.java | 48 +++++++++++++
 .../controller/dto/CreateUserRequest.java     |  6 ++
 .../AuthenticationWebMvcConfiguration.java    |  3 +-
 src/main/resources/templates/admin/test.html  | 69 +++++++++++++++++++
 .../application/AdminPageServiceTest.java     | 27 ++++++++
 .../AdminPageServiceTestFixture.java          | 15 ++++
 .../controller/AdminPageControllerTest.java   | 67 ++++++++++++++++++
 .../AdminPageControllerTestFixture.java       | 16 +++++
 9 files changed, 295 insertions(+), 1 deletion(-)
 create mode 100644 src/main/java/com/backend/blooming/admin/application/AdminPageService.java
 create mode 100644 src/main/java/com/backend/blooming/admin/controller/AdminPageController.java
 create mode 100644 src/main/java/com/backend/blooming/admin/controller/dto/CreateUserRequest.java
 create mode 100644 src/main/resources/templates/admin/test.html
 create mode 100644 src/test/java/com/backend/blooming/admin/application/AdminPageServiceTest.java
 create mode 100644 src/test/java/com/backend/blooming/admin/application/AdminPageServiceTestFixture.java
 create mode 100644 src/test/java/com/backend/blooming/admin/controller/AdminPageControllerTest.java
 create mode 100644 src/test/java/com/backend/blooming/admin/controller/AdminPageControllerTestFixture.java

diff --git a/src/main/java/com/backend/blooming/admin/application/AdminPageService.java b/src/main/java/com/backend/blooming/admin/application/AdminPageService.java
new file mode 100644
index 00000000..d24f81f0
--- /dev/null
+++ b/src/main/java/com/backend/blooming/admin/application/AdminPageService.java
@@ -0,0 +1,45 @@
+package com.backend.blooming.admin.application;
+
+import com.backend.blooming.admin.controller.dto.CreateUserRequest;
+import com.backend.blooming.authentication.infrastructure.oauth.OAuthType;
+import com.backend.blooming.themecolor.domain.ThemeColor;
+import com.backend.blooming.user.domain.Email;
+import com.backend.blooming.user.domain.Name;
+import com.backend.blooming.user.domain.User;
+import com.backend.blooming.user.infrastructure.repository.UserRepository;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.UUID;
+
+@Service
+@Transactional
+@RequiredArgsConstructor
+public class AdminPageService {
+
+    private static final String DEFAULT_EMAIL = "test@email.com";
+    private final UserRepository userRepository;
+
+    public Long createUser(final CreateUserRequest request) {
+        final User user = User.builder()
+                              .oAuthId(UUID.randomUUID().toString())
+                              .oAuthType(OAuthType.KAKAO)
+                              .name(new Name(request.name()))
+                              .email(processEmail(request.email()))
+                              .color(ThemeColor.valueOf(request.theme()))
+                              .statusMessage(request.statusMessage())
+                              .build();
+
+        return userRepository.save(user)
+                             .getId();
+    }
+
+    private Email processEmail(final String email) {
+        if (email.isEmpty()) {
+            return new Email(DEFAULT_EMAIL);
+        }
+
+        return new Email(email);
+    }
+}
diff --git a/src/main/java/com/backend/blooming/admin/controller/AdminPageController.java b/src/main/java/com/backend/blooming/admin/controller/AdminPageController.java
new file mode 100644
index 00000000..c5861dbe
--- /dev/null
+++ b/src/main/java/com/backend/blooming/admin/controller/AdminPageController.java
@@ -0,0 +1,48 @@
+package com.backend.blooming.admin.controller;
+
+import com.backend.blooming.admin.application.AdminPageService;
+import com.backend.blooming.admin.controller.dto.CreateUserRequest;
+import com.backend.blooming.themecolor.domain.ThemeColor;
+import jakarta.validation.Valid;
+import lombok.RequiredArgsConstructor;
+import org.springframework.context.annotation.Profile;
+import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import java.util.Arrays;
+import java.util.List;
+
+@Profile("test | local | dev")
+@Controller
+@RequestMapping("/admin")
+@RequiredArgsConstructor
+public class AdminPageController {
+
+    private final AdminPageService adminPageService;
+
+    @GetMapping
+    public String adminPage(final Model model) {
+        model.addAttribute("themes", getThemes());
+
+        return "/admin/test";
+    }
+
+    private static List<String> getThemes() {
+        return Arrays.stream(ThemeColor.values())
+                     .map(ThemeColor::name)
+                     .toList();
+    }
+
+    @PostMapping("/user")
+    public ResponseEntity<Void> createUser(@RequestBody @Valid CreateUserRequest createUserRequest) {
+        adminPageService.createUser(createUserRequest);
+
+        return ResponseEntity.noContent()
+                             .build();
+    }
+}
diff --git a/src/main/java/com/backend/blooming/admin/controller/dto/CreateUserRequest.java b/src/main/java/com/backend/blooming/admin/controller/dto/CreateUserRequest.java
new file mode 100644
index 00000000..d0fb19c1
--- /dev/null
+++ b/src/main/java/com/backend/blooming/admin/controller/dto/CreateUserRequest.java
@@ -0,0 +1,6 @@
+package com.backend.blooming.admin.controller.dto;
+
+import jakarta.validation.constraints.NotEmpty;
+
+public record CreateUserRequest(@NotEmpty String name, String email, String theme, String statusMessage) {
+}
diff --git a/src/main/java/com/backend/blooming/authentication/configuration/AuthenticationWebMvcConfiguration.java b/src/main/java/com/backend/blooming/authentication/configuration/AuthenticationWebMvcConfiguration.java
index ba9d45b3..34be0559 100644
--- a/src/main/java/com/backend/blooming/authentication/configuration/AuthenticationWebMvcConfiguration.java
+++ b/src/main/java/com/backend/blooming/authentication/configuration/AuthenticationWebMvcConfiguration.java
@@ -21,7 +21,8 @@ public class AuthenticationWebMvcConfiguration implements WebMvcConfigurer {
     public void addInterceptors(final InterceptorRegistry registry) {
         registry.addInterceptor(authenticationInterceptor)
                 .addPathPatterns("/**")
-                .excludePathPatterns("/auth/**");
+                .excludePathPatterns("/auth/**")
+                .excludePathPatterns("/admin/**");
     }
 
     @Override
diff --git a/src/main/resources/templates/admin/test.html b/src/main/resources/templates/admin/test.html
new file mode 100644
index 00000000..0ef38331
--- /dev/null
+++ b/src/main/resources/templates/admin/test.html
@@ -0,0 +1,69 @@
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:th="http://www.thymeleaf.org" lang="ko">
+
+<head>
+    <meta charset="UTF-8">
+    <title>블루밍 어드민 테스트</title>
+    <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.1/dist/css/bootstrap.min.css"
+          integrity="sha384-4bw+/aepP/YC94hEpVNVgiZdgIC5+VKNBQNGCHeKRQN+PtmoHDEXuppvnDJzQIu9" crossorigin="anonymous">
+</head>
+<body>
+<div class="container">
+    <h1 class="my-5 mb-5">블루밍 관리자 테스트 페이지</h1>
+
+    <h3>사용자 생성</h3>
+    <form class="row g-3" id="userCreateForm">
+        <div class="col-12">
+            <label for="inputName" class="form-label">닉네임</label>
+            <input type="text" class="form-control" id="inputName" name="name" required="true" placeholder="필수 입력">
+        </div>
+        <div class="col-12">
+            <label for="inputEmail" class="form-label">이메일</label>
+            <input type="text" class="form-control" id="inputEmail" name="email" placeholder="미입력시 랜덤으로 부여됩니다">
+        </div>
+        <div class="col-md-6">
+            <label for="inputTheme" class="form-label">테마 색상</label>
+            <select class="form-select" id="inputTheme" name="theme">
+                <th:block th:each="theme : ${themes}">
+                    <option th:value="${theme}" th:text="${theme}">
+                    </option>
+                </th:block>
+            </select>
+        </div>
+        <div class="col-md-6">
+            <label for="inputStatusMessage" class="form-label">상태 메시지</label>
+            <input type="text" class="form-control" id="inputStatusMessage" name="statusMessage" placeholder="미입력시 공백">
+        </div>
+        <div class="col-12">
+            <button type="submit" class="btn btn-primary">사용자 생성</button>
+        </div>
+    </form>
+</div>
+</body>
+<script>
+    const formElement = document.getElementById("userCreateForm");
+    formElement.addEventListener("submit", submitForm);
+
+    function submitForm(e) {
+        e.preventDefault()
+        const formData = new FormData(formElement);
+        console.log(formData)
+
+        fetch(`/admin/user`, {
+            method : 'POST',
+            headers: {
+                'Content-Type': 'application/json'
+            },
+            body   : JSON.stringify(Object.fromEntries(formData))
+        }).then(response => {
+            if (response.ok) {
+                alert("사용자 생성 성공")
+            } else {
+                alert("사용자 생성 실패 : " + response.message)
+            }
+        }).catch(error => {
+            alert("사용자 생성 실패 : " + error.message)
+        });
+    }
+</script>
+</html>
diff --git a/src/test/java/com/backend/blooming/admin/application/AdminPageServiceTest.java b/src/test/java/com/backend/blooming/admin/application/AdminPageServiceTest.java
new file mode 100644
index 00000000..bb5608ee
--- /dev/null
+++ b/src/test/java/com/backend/blooming/admin/application/AdminPageServiceTest.java
@@ -0,0 +1,27 @@
+package com.backend.blooming.admin.application;
+
+import com.backend.blooming.configuration.IsolateDatabase;
+import org.junit.jupiter.api.DisplayNameGeneration;
+import org.junit.jupiter.api.DisplayNameGenerator;
+import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+@IsolateDatabase
+@DisplayNameGeneration(DisplayNameGenerator.ReplaceUnderscores.class)
+@SuppressWarnings("NonAsciiCharacters")
+class AdminPageServiceTest extends AdminPageServiceTestFixture {
+
+    @Autowired
+    private AdminPageService adminPageService;
+
+    @Test
+    void 사용자를_생성한다() {
+        // when
+        final Long actual = adminPageService.createUser(사용자_생성_요청);
+
+        // then
+        assertThat(actual).isPositive();
+    }
+}
diff --git a/src/test/java/com/backend/blooming/admin/application/AdminPageServiceTestFixture.java b/src/test/java/com/backend/blooming/admin/application/AdminPageServiceTestFixture.java
new file mode 100644
index 00000000..32f2832e
--- /dev/null
+++ b/src/test/java/com/backend/blooming/admin/application/AdminPageServiceTestFixture.java
@@ -0,0 +1,15 @@
+package com.backend.blooming.admin.application;
+
+import com.backend.blooming.admin.controller.dto.CreateUserRequest;
+import com.backend.blooming.themecolor.domain.ThemeColor;
+
+@SuppressWarnings("NonAsciiCharacters")
+public class AdminPageServiceTestFixture {
+
+    protected CreateUserRequest 사용자_생성_요청 = new CreateUserRequest(
+            "사용자",
+            "test@email.com",
+            ThemeColor.INDIGO.name(),
+            "상태 메시지"
+    );
+}
diff --git a/src/test/java/com/backend/blooming/admin/controller/AdminPageControllerTest.java b/src/test/java/com/backend/blooming/admin/controller/AdminPageControllerTest.java
new file mode 100644
index 00000000..a6b69258
--- /dev/null
+++ b/src/test/java/com/backend/blooming/admin/controller/AdminPageControllerTest.java
@@ -0,0 +1,67 @@
+package com.backend.blooming.admin.controller;
+
+import com.backend.blooming.admin.application.AdminPageService;
+import com.backend.blooming.authentication.infrastructure.jwt.TokenProvider;
+import com.backend.blooming.authentication.presentation.argumentresolver.AuthenticatedThreadLocal;
+import com.backend.blooming.user.infrastructure.repository.UserRepository;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import org.junit.jupiter.api.DisplayNameGeneration;
+import org.junit.jupiter.api.DisplayNameGenerator;
+import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.autoconfigure.restdocs.AutoConfigureRestDocs;
+import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest;
+import org.springframework.boot.test.mock.mockito.MockBean;
+import org.springframework.context.annotation.Import;
+import org.springframework.http.MediaType;
+import org.springframework.test.web.servlet.MockMvc;
+
+import static org.mockito.BDDMockito.given;
+import static org.springframework.restdocs.mockmvc.RestDocumentationRequestBuilders.get;
+import static org.springframework.restdocs.mockmvc.RestDocumentationRequestBuilders.post;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.model;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.view;
+
+@WebMvcTest(AdminPageController.class)
+@Import(AuthenticatedThreadLocal.class)
+@MockBean({TokenProvider.class, UserRepository.class})
+@AutoConfigureRestDocs
+@DisplayNameGeneration(DisplayNameGenerator.ReplaceUnderscores.class)
+@SuppressWarnings("NonAsciiCharacters")
+class AdminPageControllerTest extends AdminPageControllerTestFixture {
+
+    @Autowired
+    private MockMvc mockMvc;
+
+    @MockBean
+    private AdminPageService adminPageService;
+
+    @Autowired
+    private ObjectMapper objectMapper;
+
+    @Test
+    void 관리자_페이지를_로드한다() throws Exception {
+        // when & then
+        mockMvc.perform(get("/admin"))
+               .andExpectAll(
+                       status().isOk(),
+                       view().name("/admin/test"),
+                       model().attributeExists("themes")
+               );
+    }
+
+    @Test
+    void 사용자를_생성한다() throws Exception {
+        // given
+        given(adminPageService.createUser(사용자_생성_요청)).willReturn(사용자_아아디);
+
+        // when & then
+        mockMvc.perform(post("/admin/user")
+                .contentType(MediaType.APPLICATION_JSON)
+                .content(objectMapper.writeValueAsString(사용자_생성_요청))
+        ).andExpectAll(
+                status().isOk()
+        );
+    }
+}
diff --git a/src/test/java/com/backend/blooming/admin/controller/AdminPageControllerTestFixture.java b/src/test/java/com/backend/blooming/admin/controller/AdminPageControllerTestFixture.java
new file mode 100644
index 00000000..46f9c26c
--- /dev/null
+++ b/src/test/java/com/backend/blooming/admin/controller/AdminPageControllerTestFixture.java
@@ -0,0 +1,16 @@
+package com.backend.blooming.admin.controller;
+
+import com.backend.blooming.admin.controller.dto.CreateUserRequest;
+import com.backend.blooming.themecolor.domain.ThemeColor;
+
+@SuppressWarnings("NonAsciiCharacters")
+public class AdminPageControllerTestFixture {
+
+    protected CreateUserRequest 사용자_생성_요청 = new CreateUserRequest(
+            "사용자",
+            "test@email.com",
+            ThemeColor.INDIGO.name(),
+            "상태 메시지"
+    );
+    protected Long 사용자_아아디 = 1L;
+}

From 883c81359b18f94d56aeb72a7f649f26f8bed881 Mon Sep 17 00:00:00 2001
From: JJ503 <63184334+JJ503@users.noreply.github.com>
Date: Tue, 6 Feb 2024 23:19:17 +0900
Subject: [PATCH 03/10] =?UTF-8?q?feat:=20=EC=B9=9C=EA=B5=AC=20=EC=9A=94?=
 =?UTF-8?q?=EC=B2=AD=20=EC=A4=91=20=EB=B3=B8=EC=9D=B8=EC=97=90=EA=B2=8C=20?=
 =?UTF-8?q?=EC=9A=94=EC=B2=AD=ED=95=98=EB=8A=94=20=EA=B2=BD=EC=9A=B0?=
 =?UTF-8?q?=EC=97=90=20=EB=8C=80=ED=95=9C=20=EC=98=88=EC=99=B8=20=EC=B2=98?=
 =?UTF-8?q?=EB=A6=AC=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../blooming/exception/ExceptionMessage.java  |  1 +
 .../exception/GlobalExceptionHandler.java     |  6 +-
 .../friend/application/FriendService.java     | 11 ++--
 .../AlreadyRequestedFriendException.java      | 11 ----
 .../FriendRequestNotAllowedException.java     | 26 ++++++++
 .../friend/application/FriendServiceTest.java | 15 +++--
 .../presentation/FriendControllerTest.java    | 59 ++++++++++++++-----
 7 files changed, 93 insertions(+), 36 deletions(-)
 delete mode 100644 src/main/java/com/backend/blooming/friend/application/exception/AlreadyRequestedFriendException.java
 create mode 100644 src/main/java/com/backend/blooming/friend/application/exception/FriendRequestNotAllowedException.java

diff --git a/src/main/java/com/backend/blooming/exception/ExceptionMessage.java b/src/main/java/com/backend/blooming/exception/ExceptionMessage.java
index e79bdd38..a907eae5 100644
--- a/src/main/java/com/backend/blooming/exception/ExceptionMessage.java
+++ b/src/main/java/com/backend/blooming/exception/ExceptionMessage.java
@@ -31,6 +31,7 @@ public enum ExceptionMessage {
     NOT_FOUND_DEVICE_TOKEN("디바이스 토큰을 찾을 수 없습니다."),
 
     // 친구
+    SELF_REQUEST_NOT_ALLOWED("자신에게는 친구 요청할 수 없습니다."),
     ALREADY_REQUESTED_FRIEND("이미 친구를 요청한 사용자입니다."),
     NOT_FOUND_FRIEND_REQUEST("해당 친구 요청을 조회할 수 없습니다."),
     FRIEND_ACCEPTANCE_FORBIDDEN("친구 요청을 수락할 권한이 없습니다."),
diff --git a/src/main/java/com/backend/blooming/exception/GlobalExceptionHandler.java b/src/main/java/com/backend/blooming/exception/GlobalExceptionHandler.java
index 3ff0b32e..ce273486 100644
--- a/src/main/java/com/backend/blooming/exception/GlobalExceptionHandler.java
+++ b/src/main/java/com/backend/blooming/exception/GlobalExceptionHandler.java
@@ -4,9 +4,9 @@
 import com.backend.blooming.authentication.infrastructure.exception.OAuthException;
 import com.backend.blooming.authentication.infrastructure.exception.UnsupportedOAuthTypeException;
 import com.backend.blooming.exception.dto.ExceptionResponse;
-import com.backend.blooming.friend.application.exception.AlreadyRequestedFriendException;
 import com.backend.blooming.friend.application.exception.DeleteFriendForbiddenException;
 import com.backend.blooming.friend.application.exception.FriendAcceptanceForbiddenException;
+import com.backend.blooming.friend.application.exception.FriendRequestNotAllowedException;
 import com.backend.blooming.friend.application.exception.NotFoundFriendRequestException;
 import com.backend.blooming.goal.application.exception.InvalidGoalException;
 import com.backend.blooming.goal.application.exception.NotFoundGoalException;
@@ -131,9 +131,9 @@ public ResponseEntity<ExceptionResponse> handleNotFoundGoalException(
                              .body(new ExceptionResponse(exception.getMessage()));
     }
 
-    @ExceptionHandler(AlreadyRequestedFriendException.class)
+    @ExceptionHandler(FriendRequestNotAllowedException.class)
     public ResponseEntity<ExceptionResponse> handleAlreadyRequestedFriendException(
-            final AlreadyRequestedFriendException exception
+            final FriendRequestNotAllowedException exception
     ) {
         logger.warn(String.format(LOG_MESSAGE_FORMAT, exception.getClass().getSimpleName(), exception.getMessage()));
 
diff --git a/src/main/java/com/backend/blooming/friend/application/FriendService.java b/src/main/java/com/backend/blooming/friend/application/FriendService.java
index 8c83726e..873ede69 100644
--- a/src/main/java/com/backend/blooming/friend/application/FriendService.java
+++ b/src/main/java/com/backend/blooming/friend/application/FriendService.java
@@ -2,9 +2,9 @@
 
 import com.backend.blooming.friend.application.dto.FriendType;
 import com.backend.blooming.friend.application.dto.ReadFriendsDto;
-import com.backend.blooming.friend.application.exception.AlreadyRequestedFriendException;
 import com.backend.blooming.friend.application.exception.DeleteFriendForbiddenException;
 import com.backend.blooming.friend.application.exception.FriendAcceptanceForbiddenException;
+import com.backend.blooming.friend.application.exception.FriendRequestNotAllowedException;
 import com.backend.blooming.friend.application.exception.NotFoundFriendRequestException;
 import com.backend.blooming.friend.domain.Friend;
 import com.backend.blooming.friend.infrastructure.repository.FriendRepository;
@@ -28,7 +28,7 @@ public class FriendService {
     private final NotificationService notificationService;
 
     public Long request(final Long userId, final Long friendId) {
-        validateFriendStatus(userId, friendId);
+        validateRequestFriend(userId, friendId);
 
         final User user = getUser(userId);
         final User friendUser = getUser(friendId);
@@ -40,9 +40,12 @@ public Long request(final Long userId, final Long friendId) {
         return friend.getId();
     }
 
-    private void validateFriendStatus(final Long userId, final Long friendId) {
+    private void validateRequestFriend(final Long userId, final Long friendId) {
+        if (userId.equals(friendId)) {
+            throw new FriendRequestNotAllowedException.SelfRequestNotAllowedException();
+        }
         if (friendRepository.existsByRequestFriend(userId, friendId)) {
-            throw new AlreadyRequestedFriendException();
+            throw new FriendRequestNotAllowedException.AlreadyRequestedFriendException();
         }
     }
 
diff --git a/src/main/java/com/backend/blooming/friend/application/exception/AlreadyRequestedFriendException.java b/src/main/java/com/backend/blooming/friend/application/exception/AlreadyRequestedFriendException.java
deleted file mode 100644
index 0b7bfdfd..00000000
--- a/src/main/java/com/backend/blooming/friend/application/exception/AlreadyRequestedFriendException.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package com.backend.blooming.friend.application.exception;
-
-import com.backend.blooming.exception.BloomingException;
-import com.backend.blooming.exception.ExceptionMessage;
-
-public class AlreadyRequestedFriendException extends BloomingException {
-
-    public AlreadyRequestedFriendException() {
-        super(ExceptionMessage.ALREADY_REQUESTED_FRIEND);
-    }
-}
diff --git a/src/main/java/com/backend/blooming/friend/application/exception/FriendRequestNotAllowedException.java b/src/main/java/com/backend/blooming/friend/application/exception/FriendRequestNotAllowedException.java
new file mode 100644
index 00000000..111f867d
--- /dev/null
+++ b/src/main/java/com/backend/blooming/friend/application/exception/FriendRequestNotAllowedException.java
@@ -0,0 +1,26 @@
+package com.backend.blooming.friend.application.exception;
+
+import com.backend.blooming.exception.BloomingException;
+import com.backend.blooming.exception.ExceptionMessage;
+
+public class FriendRequestNotAllowedException extends BloomingException {
+
+
+    private FriendRequestNotAllowedException(final ExceptionMessage exceptionMessage) {
+        super(exceptionMessage);
+    }
+
+    public static class SelfRequestNotAllowedException extends FriendRequestNotAllowedException {
+
+        public SelfRequestNotAllowedException() {
+            super(ExceptionMessage.SELF_REQUEST_NOT_ALLOWED);
+        }
+    }
+
+    public static class AlreadyRequestedFriendException extends FriendRequestNotAllowedException {
+
+        public AlreadyRequestedFriendException() {
+            super(ExceptionMessage.ALREADY_REQUESTED_FRIEND);
+        }
+    }
+}
diff --git a/src/test/java/com/backend/blooming/friend/application/FriendServiceTest.java b/src/test/java/com/backend/blooming/friend/application/FriendServiceTest.java
index bc15e6b4..aa0208ff 100644
--- a/src/test/java/com/backend/blooming/friend/application/FriendServiceTest.java
+++ b/src/test/java/com/backend/blooming/friend/application/FriendServiceTest.java
@@ -2,16 +2,16 @@
 
 import com.backend.blooming.configuration.IsolateDatabase;
 import com.backend.blooming.friend.application.dto.ReadFriendsDto;
-import com.backend.blooming.friend.application.exception.AlreadyRequestedFriendException;
 import com.backend.blooming.friend.application.exception.DeleteFriendForbiddenException;
 import com.backend.blooming.friend.application.exception.FriendAcceptanceForbiddenException;
+import com.backend.blooming.friend.application.exception.FriendRequestNotAllowedException;
 import com.backend.blooming.friend.application.exception.NotFoundFriendRequestException;
 import com.backend.blooming.friend.domain.Friend;
 import com.backend.blooming.friend.infrastructure.repository.FriendRepository;
 import com.backend.blooming.notification.domain.Notification;
 import com.backend.blooming.notification.infrastructure.repository.NotificationRepository;
 import com.backend.blooming.user.application.exception.NotFoundUserException;
-import org.assertj.core.api.SoftAssertions;
+import org.assertj.core.api.*;
 import org.junit.jupiter.api.DisplayNameGeneration;
 import org.junit.jupiter.api.DisplayNameGenerator;
 import org.junit.jupiter.api.Test;
@@ -76,18 +76,25 @@ class FriendServiceTest extends FriendServiceTestFixture {
                 .isInstanceOf(NotFoundUserException.class);
     }
 
+    @Test
+    void 본인에게_친구_요청할_경우_예외가_발생한다() {
+        // when & than
+        assertThatThrownBy(() -> friendService.request(사용자_아이디, 사용자_아이디))
+                .isInstanceOf(FriendRequestNotAllowedException.SelfRequestNotAllowedException.class);
+    }
+
     @Test
     void 이미_친구_요청을_보낸_사용자에게_다시_친구_요청할_경우_예외가_발생한다() {
         // when & then
         assertThatThrownBy(() -> friendService.request(사용자_아이디, 이미_친구_요청을_받은_사용자_아이디))
-                .isInstanceOf(AlreadyRequestedFriendException.class);
+                .isInstanceOf(FriendRequestNotAllowedException.AlreadyRequestedFriendException.class);
     }
 
     @Test
     void 이미_친구_요청이_온_사용자에게_친구_요청할_경우_예외가_발생한다() {
         // when & then
         assertThatThrownBy(() -> friendService.request(이미_친구_요청을_받은_사용자_아이디, 사용자_아이디))
-                .isInstanceOf(AlreadyRequestedFriendException.class);
+                .isInstanceOf(FriendRequestNotAllowedException.AlreadyRequestedFriendException.class);
     }
 
     @Test
diff --git a/src/test/java/com/backend/blooming/friend/presentation/FriendControllerTest.java b/src/test/java/com/backend/blooming/friend/presentation/FriendControllerTest.java
index 35862ec8..8db8bbf4 100644
--- a/src/test/java/com/backend/blooming/friend/presentation/FriendControllerTest.java
+++ b/src/test/java/com/backend/blooming/friend/presentation/FriendControllerTest.java
@@ -5,9 +5,9 @@
 import com.backend.blooming.common.RestDocsConfiguration;
 import com.backend.blooming.friend.application.FriendService;
 import com.backend.blooming.friend.application.dto.FriendType;
-import com.backend.blooming.friend.application.exception.AlreadyRequestedFriendException;
 import com.backend.blooming.friend.application.exception.DeleteFriendForbiddenException;
 import com.backend.blooming.friend.application.exception.FriendAcceptanceForbiddenException;
+import com.backend.blooming.friend.application.exception.FriendRequestNotAllowedException;
 import com.backend.blooming.friend.application.exception.NotFoundFriendRequestException;
 import com.backend.blooming.user.application.exception.NotFoundUserException;
 import com.backend.blooming.user.infrastructure.repository.UserRepository;
@@ -105,12 +105,31 @@ class FriendControllerTest extends FriendControllerTestFixture {
         ).andDo(print());
     }
 
+    @Test
+    void 본인에게_친구_요청시_400_예외를_발생시킨다() throws Exception {
+        // given
+        given(tokenProvider.parseToken(액세스_토큰_타입, 액세스_토큰)).willReturn(사용자_토큰_정보);
+        given(userRepository.existsByIdAndDeletedIsFalse(사용자_아이디)).willReturn(true);
+        given(friendService.request(사용자_아이디, 사용자_아이디))
+                .willThrow(new FriendRequestNotAllowedException.SelfRequestNotAllowedException());
+
+        // when & then
+        mockMvc.perform(post("/friends/{requestedUserId}", 사용자_아이디)
+                .header("X-API-VERSION", 1)
+                .header(HttpHeaders.AUTHORIZATION, 액세스_토큰)
+        ).andExpectAll(
+                status().isBadRequest(),
+                jsonPath("$.message").exists()
+        ).andDo(print());
+    }
+
     @Test
     void 이미_친구인_사용자에게_친구_요청시_400_예외를_발생시킨다() throws Exception {
         // given
         given(tokenProvider.parseToken(액세스_토큰_타입, 액세스_토큰)).willReturn(사용자_토큰_정보);
         given(userRepository.existsByIdAndDeletedIsFalse(사용자_아이디)).willReturn(true);
-        given(friendService.request(사용자_아이디, 이미_친구인_사용자_아이디)).willThrow(new AlreadyRequestedFriendException());
+        given(friendService.request(사용자_아이디, 이미_친구인_사용자_아이디))
+                .willThrow(new FriendRequestNotAllowedException.AlreadyRequestedFriendException());
 
         // when & then
         mockMvc.perform(post("/friends/{requestedUserId}", 이미_친구인_사용자_아이디)
@@ -161,10 +180,14 @@ class FriendControllerTest extends FriendControllerTestFixture {
                                 fieldWithPath("friends").type(JsonFieldType.ARRAY).description("친구 요청을 보낸 사용자 목록"),
                                 fieldWithPath("friends.[].id").type(JsonFieldType.NUMBER).description("친구 요청 아이디"),
                                 fieldWithPath("friends.[].friend.id").type(JsonFieldType.NUMBER).description("사용자 아이디"),
-                                fieldWithPath("friends.[].friend.email").type(JsonFieldType.STRING).description("사용자 이메일"),
-                                fieldWithPath("friends.[].friend.name").type(JsonFieldType.STRING).description("사용자 이름"),
-                                fieldWithPath("friends.[].friend.color").type(JsonFieldType.STRING).description("사용자 테마 색상"),
-                                fieldWithPath("friends.[].friend.statusMessage").type(JsonFieldType.STRING).description("사용자 상태 메시지"),
+                                fieldWithPath("friends.[].friend.email").type(JsonFieldType.STRING)
+                                                                        .description("사용자 이메일"),
+                                fieldWithPath("friends.[].friend.name").type(JsonFieldType.STRING)
+                                                                       .description("사용자 이름"),
+                                fieldWithPath("friends.[].friend.color").type(JsonFieldType.STRING)
+                                                                        .description("사용자 테마 색상"),
+                                fieldWithPath("friends.[].friend.statusMessage").type(JsonFieldType.STRING)
+                                                                                .description("사용자 상태 메시지"),
                                 fieldWithPath("friends.[].isFriends").type(JsonFieldType.BOOLEAN).description("친구 여부")
                         )
                 )
@@ -210,10 +233,14 @@ class FriendControllerTest extends FriendControllerTestFixture {
                                 fieldWithPath("friends").type(JsonFieldType.ARRAY).description("친구 요청을 받은 사용자 목록"),
                                 fieldWithPath("friends.[].id").type(JsonFieldType.NUMBER).description("친구 요청 아이디"),
                                 fieldWithPath("friends.[].friend.id").type(JsonFieldType.NUMBER).description("사용자 아이디"),
-                                fieldWithPath("friends.[].friend.email").type(JsonFieldType.STRING).description("사용자 이메일"),
-                                fieldWithPath("friends.[].friend.name").type(JsonFieldType.STRING).description("사용자 이름"),
-                                fieldWithPath("friends.[].friend.color").type(JsonFieldType.STRING).description("사용자 테마 색상"),
-                                fieldWithPath("friends.[].friend.statusMessage").type(JsonFieldType.STRING).description("사용자 상태 메시지"),
+                                fieldWithPath("friends.[].friend.email").type(JsonFieldType.STRING)
+                                                                        .description("사용자 이메일"),
+                                fieldWithPath("friends.[].friend.name").type(JsonFieldType.STRING)
+                                                                       .description("사용자 이름"),
+                                fieldWithPath("friends.[].friend.color").type(JsonFieldType.STRING)
+                                                                        .description("사용자 테마 색상"),
+                                fieldWithPath("friends.[].friend.statusMessage").type(JsonFieldType.STRING)
+                                                                                .description("사용자 상태 메시지"),
                                 fieldWithPath("friends.[].isFriends").type(JsonFieldType.BOOLEAN).description("친구 여부")
                         )
                 )
@@ -259,10 +286,14 @@ class FriendControllerTest extends FriendControllerTestFixture {
                                 fieldWithPath("friends").type(JsonFieldType.ARRAY).description("서로 친구인 사용자 목록"),
                                 fieldWithPath("friends.[].id").type(JsonFieldType.NUMBER).description("친구 요청 아이디"),
                                 fieldWithPath("friends.[].friend.id").type(JsonFieldType.NUMBER).description("사용자 아이디"),
-                                fieldWithPath("friends.[].friend.email").type(JsonFieldType.STRING).description("사용자 이메일"),
-                                fieldWithPath("friends.[].friend.name").type(JsonFieldType.STRING).description("사용자 이름"),
-                                fieldWithPath("friends.[].friend.color").type(JsonFieldType.STRING).description("사용자 테마 색상"),
-                                fieldWithPath("friends.[].friend.statusMessage").type(JsonFieldType.STRING).description("사용자 상태 메시지"),
+                                fieldWithPath("friends.[].friend.email").type(JsonFieldType.STRING)
+                                                                        .description("사용자 이메일"),
+                                fieldWithPath("friends.[].friend.name").type(JsonFieldType.STRING)
+                                                                       .description("사용자 이름"),
+                                fieldWithPath("friends.[].friend.color").type(JsonFieldType.STRING)
+                                                                        .description("사용자 테마 색상"),
+                                fieldWithPath("friends.[].friend.statusMessage").type(JsonFieldType.STRING)
+                                                                                .description("사용자 상태 메시지"),
                                 fieldWithPath("friends.[].isFriends").type(JsonFieldType.BOOLEAN).description("친구 여부")
                         )
                 )

From cd2268c52a2b32b5b03ff7b5804d0af9d4b4a42c Mon Sep 17 00:00:00 2001
From: JJ503 <63184334+JJ503@users.noreply.github.com>
Date: Tue, 6 Feb 2024 23:25:08 +0900
Subject: [PATCH 04/10] =?UTF-8?q?feat:=20=EC=B9=9C=EA=B5=AC=20=EC=9A=94?=
 =?UTF-8?q?=EC=B2=AD=20=EA=B8=B0=EB=8A=A5=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../admin/controller/AdminPageController.java |  23 +++-
 .../controller/dto/RequestFriendRequest.java  |  15 +++
 src/main/resources/templates/admin/test.html  | 117 +++++++++++++-----
 .../controller/AdminPageControllerTest.java   |  20 ++-
 .../AdminPageControllerTestFixture.java       |   5 +
 5 files changed, 144 insertions(+), 36 deletions(-)
 create mode 100644 src/main/java/com/backend/blooming/admin/controller/dto/RequestFriendRequest.java

diff --git a/src/main/java/com/backend/blooming/admin/controller/AdminPageController.java b/src/main/java/com/backend/blooming/admin/controller/AdminPageController.java
index c5861dbe..32ad87e9 100644
--- a/src/main/java/com/backend/blooming/admin/controller/AdminPageController.java
+++ b/src/main/java/com/backend/blooming/admin/controller/AdminPageController.java
@@ -2,7 +2,11 @@
 
 import com.backend.blooming.admin.application.AdminPageService;
 import com.backend.blooming.admin.controller.dto.CreateUserRequest;
+import com.backend.blooming.admin.controller.dto.RequestFriendRequest;
+import com.backend.blooming.friend.application.FriendService;
 import com.backend.blooming.themecolor.domain.ThemeColor;
+import com.backend.blooming.user.domain.User;
+import com.backend.blooming.user.infrastructure.repository.UserRepository;
 import jakarta.validation.Valid;
 import lombok.RequiredArgsConstructor;
 import org.springframework.context.annotation.Profile;
@@ -24,10 +28,13 @@
 public class AdminPageController {
 
     private final AdminPageService adminPageService;
+    private final UserRepository userRepository;
+    private final FriendService friendService;
 
     @GetMapping
     public String adminPage(final Model model) {
         model.addAttribute("themes", getThemes());
+        model.addAttribute("users", getUsers());
 
         return "/admin/test";
     }
@@ -38,9 +45,21 @@ private static List<String> getThemes() {
                      .toList();
     }
 
+    private List<User> getUsers() {
+        return userRepository.findAll();
+    }
+
     @PostMapping("/user")
-    public ResponseEntity<Void> createUser(@RequestBody @Valid CreateUserRequest createUserRequest) {
-        adminPageService.createUser(createUserRequest);
+    public ResponseEntity<Void> createUser(@RequestBody @Valid CreateUserRequest request) {
+        adminPageService.createUser(request);
+
+        return ResponseEntity.noContent()
+                             .build();
+    }
+
+    @PostMapping("/friend/request")
+    public ResponseEntity<Void> requestFriend(@RequestBody RequestFriendRequest request) {
+        friendService.request(request.requestUser(), request.requestedUser());
 
         return ResponseEntity.noContent()
                              .build();
diff --git a/src/main/java/com/backend/blooming/admin/controller/dto/RequestFriendRequest.java b/src/main/java/com/backend/blooming/admin/controller/dto/RequestFriendRequest.java
new file mode 100644
index 00000000..edd506ae
--- /dev/null
+++ b/src/main/java/com/backend/blooming/admin/controller/dto/RequestFriendRequest.java
@@ -0,0 +1,15 @@
+package com.backend.blooming.admin.controller.dto;
+
+import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.Positive;
+
+public record RequestFriendRequest(
+        @NotEmpty
+        @Positive
+        Long requestUser,
+
+        @NotEmpty
+        @Positive
+        Long requestedUser
+) {
+}
diff --git a/src/main/resources/templates/admin/test.html b/src/main/resources/templates/admin/test.html
index 0ef38331..9515f85d 100644
--- a/src/main/resources/templates/admin/test.html
+++ b/src/main/resources/templates/admin/test.html
@@ -11,42 +11,71 @@
 <div class="container">
     <h1 class="my-5 mb-5">블루밍 관리자 테스트 페이지</h1>
 
-    <h3>사용자 생성</h3>
-    <form class="row g-3" id="userCreateForm">
-        <div class="col-12">
-            <label for="inputName" class="form-label">닉네임</label>
-            <input type="text" class="form-control" id="inputName" name="name" required="true" placeholder="필수 입력">
-        </div>
-        <div class="col-12">
-            <label for="inputEmail" class="form-label">이메일</label>
-            <input type="text" class="form-control" id="inputEmail" name="email" placeholder="미입력시 랜덤으로 부여됩니다">
-        </div>
-        <div class="col-md-6">
-            <label for="inputTheme" class="form-label">테마 색상</label>
-            <select class="form-select" id="inputTheme" name="theme">
-                <th:block th:each="theme : ${themes}">
-                    <option th:value="${theme}" th:text="${theme}">
-                    </option>
-                </th:block>
-            </select>
-        </div>
-        <div class="col-md-6">
-            <label for="inputStatusMessage" class="form-label">상태 메시지</label>
-            <input type="text" class="form-control" id="inputStatusMessage" name="statusMessage" placeholder="미입력시 공백">
-        </div>
-        <div class="col-12">
-            <button type="submit" class="btn btn-primary">사용자 생성</button>
-        </div>
-    </form>
+    <div class="mb-5">
+        <h3>사용자 생성</h3>
+        <form class="row g-3" id="userCreateForm">
+            <div class="col-12">
+                <label for="inputName" class="form-label">닉네임</label>
+                <input type="text" class="form-control" id="inputName" name="name" required="true" placeholder="필수 입력">
+            </div>
+            <div class="col-12">
+                <label for="inputEmail" class="form-label">이메일</label>
+                <input type="text" class="form-control" id="inputEmail" name="email" placeholder="미입력시 랜덤으로 부여됩니다">
+            </div>
+            <div class="col-md-6">
+                <label for="inputTheme" class="form-label">테마 색상</label>
+                <select class="form-select" id="inputTheme" name="theme">
+                    <th:block th:each="theme : ${themes}">
+                        <option th:value="${theme}" th:text="${theme}">
+                        </option>
+                    </th:block>
+                </select>
+            </div>
+            <div class="col-md-6">
+                <label for="inputStatusMessage" class="form-label">상태 메시지</label>
+                <input type="text" class="form-control" id="inputStatusMessage" name="statusMessage"
+                       placeholder="미입력시 공백">
+            </div>
+            <div class="col-12">
+                <button type="submit" class="btn btn-primary">사용자 생성</button>
+            </div>
+        </form>
+    </div>
+    <div class="mb-5">
+        <h3>친구 요청 생성</h3>
+        <form class="row g-3" id="friendRequestForm">
+            <div class="col-md-6">
+                <label for="inputRequest" class="form-label">친구 요청 하는 사람</label>
+                <select class="form-select" id="inputRequest" name="requestUser">
+                    <th:block th:each="user : ${users}">
+                        <option th:value="${user.id}" th:text="${user.name}">
+                        </option>
+                    </th:block>
+                </select>
+            </div>
+            <div class="col-md-6">
+                <label for="inputRequested" class="form-label">친구 요청 받는 사람</label>
+                <select class="form-select" id="inputRequested" name="requestedUser">
+                    <th:block th:each="user : ${users}">
+                        <option th:value="${user.id}" th:text="${user.name}">
+                        </option>
+                    </th:block>
+                </select>
+            </div>
+            <div class="col-12">
+                <button type="submit" class="btn btn-primary">친구 요청</button>
+            </div>
+        </form>
+    </div>
 </div>
 </body>
 <script>
-    const formElement = document.getElementById("userCreateForm");
-    formElement.addEventListener("submit", submitForm);
+    const userFormElement = document.getElementById("userCreateForm");
+    userFormElement.addEventListener("submit", submitUserForm);
 
-    function submitForm(e) {
+    function submitUserForm(e) {
         e.preventDefault()
-        const formData = new FormData(formElement);
+        const formData = new FormData(userFormElement);
         console.log(formData)
 
         fetch(`/admin/user`, {
@@ -61,9 +90,35 @@ <h3>사용자 생성</h3>
             } else {
                 alert("사용자 생성 실패 : " + response.message)
             }
+            location.reload()
         }).catch(error => {
             alert("사용자 생성 실패 : " + error.message)
         });
     }
+
+    const formFriendRequestElement = document.getElementById("friendRequestForm");
+    formFriendRequestElement.addEventListener("submit", submitFriendRequestForm);
+
+    function submitFriendRequestForm(e) {
+        e.preventDefault()
+        const formData = new FormData(formFriendRequestElement);
+        console.log(formData)
+
+        fetch(`/admin/friend/request`, {
+            method : 'POST',
+            headers: {
+                'Content-Type': 'application/json'
+            },
+            body   : JSON.stringify(Object.fromEntries(formData))
+        }).then(response => {
+            if (response.ok) {
+                alert("친구 요청 성공")
+            } else {
+                alert("친구 요청 실패 : " + response.message)
+            }
+        }).catch(error => {
+            alert("친구 요청 실패 : " + error.message)
+        });
+    }
 </script>
 </html>
diff --git a/src/test/java/com/backend/blooming/admin/controller/AdminPageControllerTest.java b/src/test/java/com/backend/blooming/admin/controller/AdminPageControllerTest.java
index a6b69258..a3667207 100644
--- a/src/test/java/com/backend/blooming/admin/controller/AdminPageControllerTest.java
+++ b/src/test/java/com/backend/blooming/admin/controller/AdminPageControllerTest.java
@@ -3,6 +3,7 @@
 import com.backend.blooming.admin.application.AdminPageService;
 import com.backend.blooming.authentication.infrastructure.jwt.TokenProvider;
 import com.backend.blooming.authentication.presentation.argumentresolver.AuthenticatedThreadLocal;
+import com.backend.blooming.friend.application.FriendService;
 import com.backend.blooming.user.infrastructure.repository.UserRepository;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import org.junit.jupiter.api.DisplayNameGeneration;
@@ -37,6 +38,9 @@ class AdminPageControllerTest extends AdminPageControllerTestFixture {
     @MockBean
     private AdminPageService adminPageService;
 
+    @MockBean
+    private FriendService friendService;
+
     @Autowired
     private ObjectMapper objectMapper;
 
@@ -60,8 +64,18 @@ class AdminPageControllerTest extends AdminPageControllerTestFixture {
         mockMvc.perform(post("/admin/user")
                 .contentType(MediaType.APPLICATION_JSON)
                 .content(objectMapper.writeValueAsString(사용자_생성_요청))
-        ).andExpectAll(
-                status().isOk()
-        );
+        ).andExpect(status().isNoContent());
+    }
+
+    @Test
+    void 친구_신청한다() throws Exception {
+        // given
+        given(friendService.request(친구_요청_하는_사용자_아이디, 친구_요청_받는_사용자_아이디)).willReturn(친구_생성_아이디);
+
+        // when & then
+        mockMvc.perform(post("/admin/friend/request")
+                .contentType(MediaType.APPLICATION_JSON)
+                .content(objectMapper.writeValueAsString(친구_요청))
+        ).andExpect(status().isNoContent());
     }
 }
diff --git a/src/test/java/com/backend/blooming/admin/controller/AdminPageControllerTestFixture.java b/src/test/java/com/backend/blooming/admin/controller/AdminPageControllerTestFixture.java
index 46f9c26c..42a7dca2 100644
--- a/src/test/java/com/backend/blooming/admin/controller/AdminPageControllerTestFixture.java
+++ b/src/test/java/com/backend/blooming/admin/controller/AdminPageControllerTestFixture.java
@@ -1,6 +1,7 @@
 package com.backend.blooming.admin.controller;
 
 import com.backend.blooming.admin.controller.dto.CreateUserRequest;
+import com.backend.blooming.admin.controller.dto.RequestFriendRequest;
 import com.backend.blooming.themecolor.domain.ThemeColor;
 
 @SuppressWarnings("NonAsciiCharacters")
@@ -13,4 +14,8 @@ public class AdminPageControllerTestFixture {
             "상태 메시지"
     );
     protected Long 사용자_아아디 = 1L;
+    protected Long 친구_생성_아이디 = 1L;
+    protected Long 친구_요청_하는_사용자_아이디 = 1L;
+    protected Long 친구_요청_받는_사용자_아이디 = 2L;
+    protected RequestFriendRequest 친구_요청 = new RequestFriendRequest(친구_요청_하는_사용자_아이디, 친구_요청_받는_사용자_아이디);
 }

From 6cff0f1dca02390425f1a0e37c8b30a08897afa6 Mon Sep 17 00:00:00 2001
From: JJ503 <63184334+JJ503@users.noreply.github.com>
Date: Wed, 7 Feb 2024 01:48:24 +0900
Subject: [PATCH 05/10] =?UTF-8?q?feat:=20=EC=B9=9C=EA=B5=AC=20=EC=83=81?=
 =?UTF-8?q?=ED=83=9C=20=EB=B3=80=EA=B2=BD=20=EA=B8=B0=EB=8A=A5=20=EC=B6=94?=
 =?UTF-8?q?=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../admin/controller/AdminPageController.java | 50 ++++++++++-
 .../admin/controller/dto/FriendStatus.java    |  8 ++
 .../controller/dto/UpdateFriendRequest.java   | 18 ++++
 .../InvalidFriendStatusException.java         | 11 +++
 .../blooming/exception/ExceptionMessage.java  |  5 +-
 .../repository/FriendRepository.java          | 45 +++++-----
 src/main/resources/templates/admin/test.html  | 82 +++++++++++++++++--
 .../controller/AdminPageControllerTest.java   | 47 ++++++++++-
 .../AdminPageControllerTestFixture.java       | 23 +++++-
 .../repository/FriendRepositoryTest.java      | 12 +++
 .../FriendRepositoryTestFixture.java          | 11 ++-
 11 files changed, 278 insertions(+), 34 deletions(-)
 create mode 100644 src/main/java/com/backend/blooming/admin/controller/dto/FriendStatus.java
 create mode 100644 src/main/java/com/backend/blooming/admin/controller/dto/UpdateFriendRequest.java
 create mode 100644 src/main/java/com/backend/blooming/admin/controller/exception/InvalidFriendStatusException.java

diff --git a/src/main/java/com/backend/blooming/admin/controller/AdminPageController.java b/src/main/java/com/backend/blooming/admin/controller/AdminPageController.java
index 32ad87e9..da50ff50 100644
--- a/src/main/java/com/backend/blooming/admin/controller/AdminPageController.java
+++ b/src/main/java/com/backend/blooming/admin/controller/AdminPageController.java
@@ -2,8 +2,13 @@
 
 import com.backend.blooming.admin.application.AdminPageService;
 import com.backend.blooming.admin.controller.dto.CreateUserRequest;
+import com.backend.blooming.admin.controller.dto.FriendStatus;
 import com.backend.blooming.admin.controller.dto.RequestFriendRequest;
+import com.backend.blooming.admin.controller.dto.UpdateFriendRequest;
+import com.backend.blooming.admin.controller.exception.InvalidFriendStatusException;
 import com.backend.blooming.friend.application.FriendService;
+import com.backend.blooming.friend.application.exception.NotFoundFriendRequestException;
+import com.backend.blooming.friend.infrastructure.repository.FriendRepository;
 import com.backend.blooming.themecolor.domain.ThemeColor;
 import com.backend.blooming.user.domain.User;
 import com.backend.blooming.user.infrastructure.repository.UserRepository;
@@ -14,6 +19,7 @@
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PatchMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -30,6 +36,7 @@ public class AdminPageController {
     private final AdminPageService adminPageService;
     private final UserRepository userRepository;
     private final FriendService friendService;
+    private final FriendRepository friendRepository;
 
     @GetMapping
     public String adminPage(final Model model) {
@@ -57,11 +64,52 @@ public ResponseEntity<Void> createUser(@RequestBody @Valid CreateUserRequest req
                              .build();
     }
 
-    @PostMapping("/friend/request")
+    @PostMapping("/friend")
     public ResponseEntity<Void> requestFriend(@RequestBody RequestFriendRequest request) {
         friendService.request(request.requestUser(), request.requestedUser());
 
         return ResponseEntity.noContent()
                              .build();
     }
+
+    @PatchMapping("/friend")
+    public ResponseEntity<Void> updateFriendStatus(@RequestBody UpdateFriendRequest request) {
+        final Long friendId = getFriendId(request);
+        updateByStatus(request, friendId);
+
+        return ResponseEntity.noContent()
+                             .build();
+    }
+
+    private Long getFriendId(final UpdateFriendRequest request) {
+        final Long friendId = friendRepository.findByRequestUserIdAndRequestedUserId(
+                request.requestUser(),
+                request.requestedUser()
+        );
+
+        if (friendId == null) {
+            throw new NotFoundFriendRequestException();
+        }
+
+        return friendId;
+    }
+
+    private void updateByStatus(final UpdateFriendRequest request, final Long friendId) {
+        final FriendStatus friendStatus = FriendStatus.valueOf(request.status());
+
+        if (FriendStatus.FRIEND.equals(friendStatus)) {
+            friendService.accept(request.requestedUser(), friendId);
+            return;
+        }
+        if (FriendStatus.DELETE_BY_REQUEST.equals(friendStatus)) {
+            friendService.delete(request.requestUser(), friendId);
+            return;
+        }
+        if (FriendStatus.DELETE_BY_REQUESTED.equals(friendStatus)) {
+            friendService.delete(request.requestedUser(), friendId);
+            return;
+        }
+
+        throw new InvalidFriendStatusException();
+    }
 }
diff --git a/src/main/java/com/backend/blooming/admin/controller/dto/FriendStatus.java b/src/main/java/com/backend/blooming/admin/controller/dto/FriendStatus.java
new file mode 100644
index 00000000..36b48df0
--- /dev/null
+++ b/src/main/java/com/backend/blooming/admin/controller/dto/FriendStatus.java
@@ -0,0 +1,8 @@
+package com.backend.blooming.admin.controller.dto;
+
+public enum FriendStatus {
+
+    FRIEND,
+    DELETE_BY_REQUEST,
+    DELETE_BY_REQUESTED
+}
diff --git a/src/main/java/com/backend/blooming/admin/controller/dto/UpdateFriendRequest.java b/src/main/java/com/backend/blooming/admin/controller/dto/UpdateFriendRequest.java
new file mode 100644
index 00000000..4ac91a44
--- /dev/null
+++ b/src/main/java/com/backend/blooming/admin/controller/dto/UpdateFriendRequest.java
@@ -0,0 +1,18 @@
+package com.backend.blooming.admin.controller.dto;
+
+import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.Positive;
+
+public record UpdateFriendRequest(
+        @NotEmpty
+        @Positive
+        Long requestUser,
+
+        @NotEmpty
+        @Positive
+        Long requestedUser,
+
+        @NotEmpty
+        String status
+) {
+}
diff --git a/src/main/java/com/backend/blooming/admin/controller/exception/InvalidFriendStatusException.java b/src/main/java/com/backend/blooming/admin/controller/exception/InvalidFriendStatusException.java
new file mode 100644
index 00000000..cf290818
--- /dev/null
+++ b/src/main/java/com/backend/blooming/admin/controller/exception/InvalidFriendStatusException.java
@@ -0,0 +1,11 @@
+package com.backend.blooming.admin.controller.exception;
+
+import com.backend.blooming.exception.BloomingException;
+import com.backend.blooming.exception.ExceptionMessage;
+
+public class InvalidFriendStatusException extends BloomingException {
+
+    public InvalidFriendStatusException() {
+        super(ExceptionMessage.INVALID_FRIEND_STATUS);
+    }
+}
diff --git a/src/main/java/com/backend/blooming/exception/ExceptionMessage.java b/src/main/java/com/backend/blooming/exception/ExceptionMessage.java
index a907eae5..cdde140a 100644
--- a/src/main/java/com/backend/blooming/exception/ExceptionMessage.java
+++ b/src/main/java/com/backend/blooming/exception/ExceptionMessage.java
@@ -45,7 +45,10 @@ public enum ExceptionMessage {
     INVALID_GOAL_PERIOD("시작 날짜가 종료 날짜 이후입니다."),
     INVALID_GOAL_DAYS("골 날짜 수가 범위 밖입니다.(범위: 1~100)"),
     INVALID_USERS_SIZE("골에 참여하는 친구가 5명 초과입니다."),
-    INVALID_USER_TO_PARTICIPATE("골에 참여할 수 없는 사용자입니다. 골에는 친구인 사용자만 초대할 수 있습니다.");
+    INVALID_USER_TO_PARTICIPATE("골에 참여할 수 없는 사용자입니다. 골에는 친구인 사용자만 초대할 수 있습니다."),
+
+    // 관리자 페이지
+    INVALID_FRIEND_STATUS("잘못된 친구 상태입니다.");
 
     private final String message;
 }
diff --git a/src/main/java/com/backend/blooming/friend/infrastructure/repository/FriendRepository.java b/src/main/java/com/backend/blooming/friend/infrastructure/repository/FriendRepository.java
index 7cfb07fa..69d3f354 100644
--- a/src/main/java/com/backend/blooming/friend/infrastructure/repository/FriendRepository.java
+++ b/src/main/java/com/backend/blooming/friend/infrastructure/repository/FriendRepository.java
@@ -9,40 +9,47 @@
 public interface FriendRepository extends JpaRepository<Friend, Long> {
 
     @Query("""
-                SELECT EXISTS(
-                    SELECT 1
-                    FROM Friend f
-                    WHERE (f.requestUser.id = :requestUserId AND f.requestedUser.id = :requestedUserId)
-                    OR (f.requestUser.id = :requestedUserId AND f.requestedUser.id = :requestUserId)
-                ) as exist
+            SELECT EXISTS(
+                SELECT 1
+                FROM Friend f
+                WHERE (f.requestUser.id = :requestUserId AND f.requestedUser.id = :requestedUserId)
+                OR (f.requestUser.id = :requestedUserId AND f.requestedUser.id = :requestUserId)
+            ) as exist
             """)
     boolean existsByRequestFriend(final Long requestUserId, final Long requestedUserId);
 
     @Query("""
-                SELECT f
-                FROM Friend f
-                JOIN FETCH f.requestedUser
-                WHERE f.requestUser.id = :userId AND f.isFriends = FALSE
+            SELECT f
+            FROM Friend f
+            JOIN FETCH f.requestedUser
+            WHERE f.requestUser.id = :userId AND f.isFriends = FALSE
             """)
     List<Friend> findAllByRequestUserId(final Long userId);
 
     @Query("""
-                SELECT f
-                FROM Friend f
-                JOIN FETCH f.requestUser
-                WHERE f.requestedUser.id = :userId AND f.isFriends = FALSE
+            SELECT f
+            FROM Friend f
+            JOIN FETCH f.requestUser
+            WHERE f.requestedUser.id = :userId AND f.isFriends = FALSE
             """)
     List<Friend> findAllByRequestedUserId(final Long userId);
 
     @Query("""
-                SELECT f
-                FROM Friend f
-                JOIN FETCH f.requestUser
-                JOIN FETCH f.requestedUser
-                WHERE (f.requestUser.id = :userId OR f.requestedUser.id = :userId) AND f.isFriends = TRUE
+            SELECT f
+            FROM Friend f
+            JOIN FETCH f.requestUser
+            JOIN FETCH f.requestedUser
+            WHERE (f.requestUser.id = :userId OR f.requestedUser.id = :userId) AND f.isFriends = TRUE
             """)
     List<Friend> findAllByUserIdAndIsFriends(final Long userId);
 
+    @Query("""
+            SELECT f.id
+            FROM Friend f
+            WHERE f.requestUser.id = :requestId AND f.requestedUser.id = :requestedId
+            """)
+    Long findByRequestUserIdAndRequestedUserId(final Long requestId, final Long requestedId);
+
     @Query("""
             SELECT COUNT (f)
                 FROM Friend f
diff --git a/src/main/resources/templates/admin/test.html b/src/main/resources/templates/admin/test.html
index 9515f85d..10ee20d8 100644
--- a/src/main/resources/templates/admin/test.html
+++ b/src/main/resources/templates/admin/test.html
@@ -63,7 +63,41 @@ <h3>친구 요청 생성</h3>
                 </select>
             </div>
             <div class="col-12">
-                <button type="submit" class="btn btn-primary">친구 요청</button>
+                <button type="submit" class="btn btn-primary">상태 변경</button>
+            </div>
+        </form>
+    </div>
+    <div class="mb-5">
+        <h3>친구 요청 상태 변경</h3>
+        <form class="row g-3" id="friendStatusUpdateForm">
+            <div class="col-md-6">
+                <label for="inputRequest2" class="form-label">친구 요청자</label>
+                <select class="form-select" id="inputRequest2" name="requestUser">
+                    <th:block th:each="user : ${users}">
+                        <option th:value="${user.id}" th:text="${user.name}">
+                        </option>
+                    </th:block>
+                </select>
+            </div>
+            <div class="col-md-6">
+                <label for="inputRequested2" class="form-label">친구 요청 수신자</label>
+                <select class="form-select" id="inputRequested2" name="requestedUser">
+                    <th:block th:each="user : ${users}">
+                        <option th:value="${user.id}" th:text="${user.name}">
+                        </option>
+                    </th:block>
+                </select>
+            </div>
+            <div class="col-md-6">
+                <label for="inputStatus" class="form-label">친구 상태</label>
+                <select class="form-select" id="inputStatus" name="status">
+                    <option value="FRIEND">친구 수락</option>
+                    <option value="DELETE_BY_REQUESTED">친구 거절</option>
+                    <option value="DELETE_BY_REQUEST">친구 요청 취소</option>
+                </select>
+            </div>
+            <div class="col-12">
+                <button type="submit" class="btn btn-primary">상태 변경</button>
             </div>
         </form>
     </div>
@@ -76,7 +110,6 @@ <h3>친구 요청 생성</h3>
     function submitUserForm(e) {
         e.preventDefault()
         const formData = new FormData(userFormElement);
-        console.log(formData)
 
         fetch(`/admin/user`, {
             method : 'POST',
@@ -88,7 +121,11 @@ <h3>친구 요청 생성</h3>
             if (response.ok) {
                 alert("사용자 생성 성공")
             } else {
-                alert("사용자 생성 실패 : " + response.message)
+                response.json().then(data => {
+                    alert("사용자 생성 실패 : " + data.message);
+                }).catch(error => {
+                    alert("사용자 생성 실패 : " + error.message);
+                });
             }
             location.reload()
         }).catch(error => {
@@ -102,9 +139,8 @@ <h3>친구 요청 생성</h3>
     function submitFriendRequestForm(e) {
         e.preventDefault()
         const formData = new FormData(formFriendRequestElement);
-        console.log(formData)
 
-        fetch(`/admin/friend/request`, {
+        fetch(`/admin/friend`, {
             method : 'POST',
             headers: {
                 'Content-Type': 'application/json'
@@ -114,11 +150,45 @@ <h3>친구 요청 생성</h3>
             if (response.ok) {
                 alert("친구 요청 성공")
             } else {
-                alert("친구 요청 실패 : " + response.message)
+                response.json().then(data => {
+                    alert("친구 요청 실패 : " + data.message);
+                }).catch(error => {
+                    alert("친구 요청 실패 : " + error.message);
+                });
             }
+            location.reload()
         }).catch(error => {
             alert("친구 요청 실패 : " + error.message)
         });
     }
+
+    const formFriendStatusUpdateElement = document.getElementById("friendStatusUpdateForm");
+    formFriendStatusUpdateElement.addEventListener("submit", submitFriendStatusUpdateForm);
+
+    function submitFriendStatusUpdateForm(e) {
+        e.preventDefault()
+        const formData = new FormData(formFriendStatusUpdateElement);
+
+        fetch(`/admin/friend`, {
+            method : 'PATCH',
+            headers: {
+                'Content-Type': 'application/json'
+            },
+            body   : JSON.stringify(Object.fromEntries(formData))
+        }).then(response => {
+            if (response.ok) {
+                alert("친구 상태 변경 성공")
+            } else {
+                response.json().then(data => {
+                    alert("친구 상태 변경 실패 : " + data.message);
+                }).catch(error => {
+                    alert("친구 상태 변경 실패 : " + error.message);
+                });
+            }
+            location.reload()
+        }).catch(error => {
+            alert("친구 상태 변경 실패 : " + error.message)
+        });
+    }
 </script>
 </html>
diff --git a/src/test/java/com/backend/blooming/admin/controller/AdminPageControllerTest.java b/src/test/java/com/backend/blooming/admin/controller/AdminPageControllerTest.java
index a3667207..c0079437 100644
--- a/src/test/java/com/backend/blooming/admin/controller/AdminPageControllerTest.java
+++ b/src/test/java/com/backend/blooming/admin/controller/AdminPageControllerTest.java
@@ -1,14 +1,18 @@
 package com.backend.blooming.admin.controller;
 
 import com.backend.blooming.admin.application.AdminPageService;
+import com.backend.blooming.admin.controller.dto.UpdateFriendRequest;
 import com.backend.blooming.authentication.infrastructure.jwt.TokenProvider;
 import com.backend.blooming.authentication.presentation.argumentresolver.AuthenticatedThreadLocal;
 import com.backend.blooming.friend.application.FriendService;
+import com.backend.blooming.friend.infrastructure.repository.FriendRepository;
 import com.backend.blooming.user.infrastructure.repository.UserRepository;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import org.junit.jupiter.api.DisplayNameGeneration;
 import org.junit.jupiter.api.DisplayNameGenerator;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.autoconfigure.restdocs.AutoConfigureRestDocs;
 import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest;
@@ -17,9 +21,13 @@
 import org.springframework.http.MediaType;
 import org.springframework.test.web.servlet.MockMvc;
 
+import java.util.stream.Stream;
+
 import static org.mockito.BDDMockito.given;
 import static org.springframework.restdocs.mockmvc.RestDocumentationRequestBuilders.get;
+import static org.springframework.restdocs.mockmvc.RestDocumentationRequestBuilders.patch;
 import static org.springframework.restdocs.mockmvc.RestDocumentationRequestBuilders.post;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.model;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.view;
@@ -41,6 +49,9 @@ class AdminPageControllerTest extends AdminPageControllerTestFixture {
     @MockBean
     private FriendService friendService;
 
+    @MockBean
+    private FriendRepository friendRepository;
+
     @Autowired
     private ObjectMapper objectMapper;
 
@@ -73,9 +84,43 @@ class AdminPageControllerTest extends AdminPageControllerTestFixture {
         given(friendService.request(친구_요청_하는_사용자_아이디, 친구_요청_받는_사용자_아이디)).willReturn(친구_생성_아이디);
 
         // when & then
-        mockMvc.perform(post("/admin/friend/request")
+        mockMvc.perform(post("/admin/friend")
                 .contentType(MediaType.APPLICATION_JSON)
                 .content(objectMapper.writeValueAsString(친구_요청))
         ).andExpect(status().isNoContent());
     }
+
+    @ParameterizedTest
+    @MethodSource
+    void 친구_상태를_수정한다(final UpdateFriendRequest 친구_상태_수정_요청) throws Exception {
+        // given
+        given(friendRepository.findByRequestUserIdAndRequestedUserId(친구_요청_하는_사용자_아이디, 친구_요청_받는_사용자_아이디))
+                .willReturn(친구_아이디);
+
+        // when & then
+        mockMvc.perform(patch("/admin/friend")
+                .contentType(MediaType.APPLICATION_JSON)
+                .content(objectMapper.writeValueAsString(친구_상태_수정_요청))
+        ).andExpect(status().isNoContent());
+    }
+
+    public static Stream<UpdateFriendRequest> 친구_상태를_수정한다() {
+        return Stream.of(친구_상태_친구로_수정_요청, 친구_상태_요청_취소로_수정_요청, 친구_상태_거절로_수정_요청);
+    }
+
+    @Test
+    void 친구_상태_수정시_존재하지_않는_친구_사이라면_404_예외를_발생시킨다() throws Exception {
+        // given
+        given(friendRepository.findByRequestUserIdAndRequestedUserId(친구_요청_하는_사용자_아이디, 친구_요청_받는_사용자_아이디))
+                .willReturn(null);
+
+        // when & then
+        mockMvc.perform(patch("/admin/friend")
+                .contentType(MediaType.APPLICATION_JSON)
+                .content(objectMapper.writeValueAsString(친구_상태_친구로_수정_요청))
+        ).andExpectAll(
+                status().isNotFound(),
+                jsonPath("$.message").exists()
+        );
+    }
 }
diff --git a/src/test/java/com/backend/blooming/admin/controller/AdminPageControllerTestFixture.java b/src/test/java/com/backend/blooming/admin/controller/AdminPageControllerTestFixture.java
index 42a7dca2..5e7fbb96 100644
--- a/src/test/java/com/backend/blooming/admin/controller/AdminPageControllerTestFixture.java
+++ b/src/test/java/com/backend/blooming/admin/controller/AdminPageControllerTestFixture.java
@@ -1,7 +1,9 @@
 package com.backend.blooming.admin.controller;
 
 import com.backend.blooming.admin.controller.dto.CreateUserRequest;
+import com.backend.blooming.admin.controller.dto.FriendStatus;
 import com.backend.blooming.admin.controller.dto.RequestFriendRequest;
+import com.backend.blooming.admin.controller.dto.UpdateFriendRequest;
 import com.backend.blooming.themecolor.domain.ThemeColor;
 
 @SuppressWarnings("NonAsciiCharacters")
@@ -15,7 +17,24 @@ public class AdminPageControllerTestFixture {
     );
     protected Long 사용자_아아디 = 1L;
     protected Long 친구_생성_아이디 = 1L;
-    protected Long 친구_요청_하는_사용자_아이디 = 1L;
-    protected Long 친구_요청_받는_사용자_아이디 = 2L;
+    protected static Long 친구_요청_하는_사용자_아이디 = 1L;
+    protected static Long 친구_요청_받는_사용자_아이디 = 2L;
     protected RequestFriendRequest 친구_요청 = new RequestFriendRequest(친구_요청_하는_사용자_아이디, 친구_요청_받는_사용자_아이디);
+    protected static UpdateFriendRequest 친구_상태_친구로_수정_요청 = new UpdateFriendRequest(
+            친구_요청_하는_사용자_아이디,
+            친구_요청_받는_사용자_아이디,
+            FriendStatus.FRIEND.name()
+    );
+    protected static UpdateFriendRequest 친구_상태_요청_취소로_수정_요청 = new UpdateFriendRequest(
+            친구_요청_하는_사용자_아이디,
+            친구_요청_받는_사용자_아이디,
+            FriendStatus.DELETE_BY_REQUEST.name()
+    );
+    protected static UpdateFriendRequest 친구_상태_거절로_수정_요청 = new UpdateFriendRequest(
+            친구_요청_하는_사용자_아이디,
+            친구_요청_받는_사용자_아이디,
+            FriendStatus.DELETE_BY_REQUESTED.name()
+    );
+    protected Long 친구_아이디 = 1L;
+
 }
diff --git a/src/test/java/com/backend/blooming/friend/infrastructure/repository/FriendRepositoryTest.java b/src/test/java/com/backend/blooming/friend/infrastructure/repository/FriendRepositoryTest.java
index d18db96f..bd7e4a5b 100644
--- a/src/test/java/com/backend/blooming/friend/infrastructure/repository/FriendRepositoryTest.java
+++ b/src/test/java/com/backend/blooming/friend/infrastructure/repository/FriendRepositoryTest.java
@@ -95,6 +95,18 @@ class FriendRepositoryTest extends FriendRepositoryTestFixture {
         });
     }
 
+    @Test
+    void 친구_요청자와_친구_요청_수신자_아이디에_대한_친구_아이디를_반환한다() {
+        // when
+        final Long actual = friendRepository.findByRequestUserIdAndRequestedUserId(
+                친구가_있는_사용자.getId(),
+                친구인_사용자1.getId()
+        );
+
+        // then
+        assertThat(actual).isEqualTo(사용자와_친구요청1의_친구_아이디);
+    }
+
     @Test
     void 입력받은_아이디_목록_중_현재_로그인한_사용자와_서로_친구_관계인_사용자_수를_반환한다() {
         // when
diff --git a/src/test/java/com/backend/blooming/friend/infrastructure/repository/FriendRepositoryTestFixture.java b/src/test/java/com/backend/blooming/friend/infrastructure/repository/FriendRepositoryTestFixture.java
index 1d3c845f..63212dfb 100644
--- a/src/test/java/com/backend/blooming/friend/infrastructure/repository/FriendRepositoryTestFixture.java
+++ b/src/test/java/com/backend/blooming/friend/infrastructure/repository/FriendRepositoryTestFixture.java
@@ -26,6 +26,7 @@ public class FriendRepositoryTestFixture {
     protected User 친구_요청을_받은_사용자;
     protected User 친구_요청을_받은적_없는_사용자;
     protected User 친구가_있는_사용자;
+    protected User 친구인_사용자1;
     protected Friend 보낸_친구_요청1;
     protected Friend 보낸_친구_요청2;
     protected Friend 보낸_친구_요청3;
@@ -39,6 +40,7 @@ public class FriendRepositoryTestFixture {
     protected List<Long> 골_초대받은_사용자_아이디_목록 = new ArrayList<>();
     protected Long 친구인_사용자_아이디;
     protected Long 친구가_아닌_사용자_아이디;
+    protected Long 사용자와_친구요청1의_친구_아이디;
 
     @BeforeEach
     void setUpFixture() {
@@ -72,7 +74,7 @@ void setUpFixture() {
                                         .name(new Name("사용자5"))
                                         .email(new Email("user5@email.com"))
                                         .build();
-        final User 친구인_사용자1 = User.builder()
+        친구인_사용자1 = User.builder()
                                   .oAuthId("23456")
                                   .oAuthType(OAuthType.KAKAO)
                                   .name(new Name("친구1"))
@@ -111,9 +113,9 @@ void setUpFixture() {
         받은_친구_요청3 = new Friend(친구_요청을_받은_사용자3, 친구_요청을_받은_사용자);
 
         친구가_있는_사용자 = 친구_요청을_받은_사용자3;
-        친구인_요청1 = new Friend(친구_요청을_받은_사용자3, 친구인_사용자1);
-        친구인_요청2 = new Friend(친구인_사용자2, 친구_요청을_받은_사용자3);
-        친구인_요청3 = new Friend(친구_요청을_받은_사용자3, 친구인_사용자3);
+        친구인_요청1 = new Friend(친구가_있는_사용자, 친구인_사용자1);
+        친구인_요청2 = new Friend(친구인_사용자2, 친구가_있는_사용자);
+        친구인_요청3 = new Friend(친구가_있는_사용자, 친구인_사용자3);
 
         final Friend 현재_로그인한_사용자와_친구인_상태 = new Friend(친구인_사용자1, 친구인_사용자2);
         final Friend 현재_로그인한_사용자와_친구인_상태2 = new Friend(친구인_사용자1, 친구인_사용자3);
@@ -129,6 +131,7 @@ void setUpFixture() {
                 현재_로그인한_사용자와_친구인_상태,
                 현재_로그인한_사용자와_친구인_상태2
         ));
+        사용자와_친구요청1의_친구_아이디 = 친구인_요청1.getId();
 
         친구인_요청1.acceptRequest();
         친구인_요청2.acceptRequest();

From b14c153c00fdb629128644339f55e6b124788816 Mon Sep 17 00:00:00 2001
From: JJ503 <63184334+JJ503@users.noreply.github.com>
Date: Wed, 7 Feb 2024 02:09:29 +0900
Subject: [PATCH 06/10] =?UTF-8?q?test:=20=EB=B6=80=EC=A1=B1=ED=95=9C=20?=
 =?UTF-8?q?=ED=85=8C=EC=8A=A4=ED=8A=B8=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../admin/application/AdminPageService.java   |  2 +-
 .../application/AdminPageServiceTest.java     | 34 ++++++++++++++++---
 .../AdminPageServiceTestFixture.java          |  6 ++++
 3 files changed, 37 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/backend/blooming/admin/application/AdminPageService.java b/src/main/java/com/backend/blooming/admin/application/AdminPageService.java
index d24f81f0..9f627352 100644
--- a/src/main/java/com/backend/blooming/admin/application/AdminPageService.java
+++ b/src/main/java/com/backend/blooming/admin/application/AdminPageService.java
@@ -36,7 +36,7 @@ public Long createUser(final CreateUserRequest request) {
     }
 
     private Email processEmail(final String email) {
-        if (email.isEmpty()) {
+        if (email == null || email.isEmpty()) {
             return new Email(DEFAULT_EMAIL);
         }
 
diff --git a/src/test/java/com/backend/blooming/admin/application/AdminPageServiceTest.java b/src/test/java/com/backend/blooming/admin/application/AdminPageServiceTest.java
index bb5608ee..6b96a067 100644
--- a/src/test/java/com/backend/blooming/admin/application/AdminPageServiceTest.java
+++ b/src/test/java/com/backend/blooming/admin/application/AdminPageServiceTest.java
@@ -1,13 +1,14 @@
 package com.backend.blooming.admin.application;
 
 import com.backend.blooming.configuration.IsolateDatabase;
+import com.backend.blooming.user.domain.User;
+import com.backend.blooming.user.infrastructure.repository.UserRepository;
+import org.assertj.core.api.SoftAssertions;
 import org.junit.jupiter.api.DisplayNameGeneration;
 import org.junit.jupiter.api.DisplayNameGenerator;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 
-import static org.assertj.core.api.Assertions.assertThat;
-
 @IsolateDatabase
 @DisplayNameGeneration(DisplayNameGenerator.ReplaceUnderscores.class)
 @SuppressWarnings("NonAsciiCharacters")
@@ -15,13 +16,38 @@ class AdminPageServiceTest extends AdminPageServiceTestFixture {
 
     @Autowired
     private AdminPageService adminPageService;
+    @Autowired
+    private UserRepository userRepository;
 
     @Test
-    void 사용자를_생성한다() {
+    void 사용자를_저장한다() {
         // when
         final Long actual = adminPageService.createUser(사용자_생성_요청);
 
         // then
-        assertThat(actual).isPositive();
+        final User user = userRepository.findById(actual).get();
+        SoftAssertions.assertSoftly(softAssertions -> {
+            softAssertions.assertThat(actual).isPositive();
+            softAssertions.assertThat(user.getName()).isEqualTo(사용자_생성_요청.name());
+            softAssertions.assertThat(user.getEmail()).isEqualTo(사용자_생성_요청.email());
+            softAssertions.assertThat(user.getColor().name()).isEqualTo(사용자_생성_요청.theme());
+            softAssertions.assertThat(user.getStatusMessage()).isEqualTo(사용자_생성_요청.statusMessage());
+        });
+    }
+
+    @Test
+    void 사용자_생성시_이메일이_없다면_기본_이메일로_저장한다() {
+        // when
+        final Long actual = adminPageService.createUser(이메일_없이_사용자_생성_요청);
+
+        // then
+        final User user = userRepository.findById(actual).get();
+        SoftAssertions.assertSoftly(softAssertions -> {
+            softAssertions.assertThat(actual).isPositive();
+            softAssertions.assertThat(user.getName()).isEqualTo(사용자_생성_요청.name());
+            softAssertions.assertThat(user.getEmail()).isEqualTo("test@email.com");
+            softAssertions.assertThat(user.getColor().name()).isEqualTo(사용자_생성_요청.theme());
+            softAssertions.assertThat(user.getStatusMessage()).isEqualTo(사용자_생성_요청.statusMessage());
+        });
     }
 }
diff --git a/src/test/java/com/backend/blooming/admin/application/AdminPageServiceTestFixture.java b/src/test/java/com/backend/blooming/admin/application/AdminPageServiceTestFixture.java
index 32f2832e..d56f7801 100644
--- a/src/test/java/com/backend/blooming/admin/application/AdminPageServiceTestFixture.java
+++ b/src/test/java/com/backend/blooming/admin/application/AdminPageServiceTestFixture.java
@@ -12,4 +12,10 @@ public class AdminPageServiceTestFixture {
             ThemeColor.INDIGO.name(),
             "상태 메시지"
     );
+    protected CreateUserRequest 이메일_없이_사용자_생성_요청 = new CreateUserRequest(
+            "사용자",
+            null,
+            ThemeColor.INDIGO.name(),
+            "상태 메시지"
+    );
 }

From f36a655b6d0dbf85b5cb50caa337576c1fde48bf Mon Sep 17 00:00:00 2001
From: JJ503 <63184334+JJ503@users.noreply.github.com>
Date: Wed, 7 Feb 2024 19:19:03 +0900
Subject: [PATCH 07/10] =?UTF-8?q?feat:=20=EA=B3=A8=20=EC=83=9D=EC=84=B1=20?=
 =?UTF-8?q?=EA=B8=B0=EB=8A=A5=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../admin/controller/AdminPageController.java | 23 ++++++
 .../controller/dto/CreateGoalRequest.java     | 29 +++++++
 src/main/resources/templates/admin/test.html  | 82 ++++++++++++++++++-
 .../controller/AdminPageControllerTest.java   | 78 +++++++++++++++++-
 .../AdminPageControllerTestFixture.java       | 63 +++++++++++++-
 5 files changed, 271 insertions(+), 4 deletions(-)
 create mode 100644 src/main/java/com/backend/blooming/admin/controller/dto/CreateGoalRequest.java

diff --git a/src/main/java/com/backend/blooming/admin/controller/AdminPageController.java b/src/main/java/com/backend/blooming/admin/controller/AdminPageController.java
index da50ff50..88684b35 100644
--- a/src/main/java/com/backend/blooming/admin/controller/AdminPageController.java
+++ b/src/main/java/com/backend/blooming/admin/controller/AdminPageController.java
@@ -1,6 +1,7 @@
 package com.backend.blooming.admin.controller;
 
 import com.backend.blooming.admin.application.AdminPageService;
+import com.backend.blooming.admin.controller.dto.CreateGoalRequest;
 import com.backend.blooming.admin.controller.dto.CreateUserRequest;
 import com.backend.blooming.admin.controller.dto.FriendStatus;
 import com.backend.blooming.admin.controller.dto.RequestFriendRequest;
@@ -9,6 +10,8 @@
 import com.backend.blooming.friend.application.FriendService;
 import com.backend.blooming.friend.application.exception.NotFoundFriendRequestException;
 import com.backend.blooming.friend.infrastructure.repository.FriendRepository;
+import com.backend.blooming.goal.application.GoalService;
+import com.backend.blooming.goal.application.dto.CreateGoalDto;
 import com.backend.blooming.themecolor.domain.ThemeColor;
 import com.backend.blooming.user.domain.User;
 import com.backend.blooming.user.infrastructure.repository.UserRepository;
@@ -37,6 +40,7 @@ public class AdminPageController {
     private final UserRepository userRepository;
     private final FriendService friendService;
     private final FriendRepository friendRepository;
+    private final GoalService goalService;
 
     @GetMapping
     public String adminPage(final Model model) {
@@ -112,4 +116,23 @@ private void updateByStatus(final UpdateFriendRequest request, final Long friend
 
         throw new InvalidFriendStatusException();
     }
+
+    @PostMapping("/goal")
+    public ResponseEntity<Void> createGoal(@RequestBody @Valid CreateGoalRequest request) {
+        goalService.createGoal(convertToDto(request));
+
+        return ResponseEntity.noContent()
+                             .build();
+    }
+
+    private CreateGoalDto convertToDto(final CreateGoalRequest request) {
+        return new CreateGoalDto(
+                request.name(),
+                request.memo(),
+                request.startDate(),
+                request.endDate(),
+                request.manager(),
+                List.of(request.manager(), request.team())
+        );
+    }
 }
diff --git a/src/main/java/com/backend/blooming/admin/controller/dto/CreateGoalRequest.java b/src/main/java/com/backend/blooming/admin/controller/dto/CreateGoalRequest.java
new file mode 100644
index 00000000..cf9f0e81
--- /dev/null
+++ b/src/main/java/com/backend/blooming/admin/controller/dto/CreateGoalRequest.java
@@ -0,0 +1,29 @@
+package com.backend.blooming.admin.controller.dto;
+
+import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Positive;
+
+import java.time.LocalDate;
+
+public record CreateGoalRequest(
+        @NotEmpty(message = "이름이 입력되지 않았습니다.")
+        String name,
+
+        String memo,
+
+        @NotNull(message = "시작일이 입력되지 않았습니다.")
+        LocalDate startDate,
+
+        @NotNull(message = "종료일이 입력되지 않았습니다.")
+        LocalDate endDate,
+
+        @NotNull(message = "골 생성자가 설정되지 않았습니다.")
+        @Positive(message = "골 생성자의 아이디가 잘못됐습니다.")
+        Long manager,
+
+        @NotNull(message = "팀원이 설정되지 않았습니다.")
+        @Positive(message = "팀원의 아이디가 잘못됐습니다.")
+        Long team
+) {
+}
diff --git a/src/main/resources/templates/admin/test.html b/src/main/resources/templates/admin/test.html
index 10ee20d8..61e4e652 100644
--- a/src/main/resources/templates/admin/test.html
+++ b/src/main/resources/templates/admin/test.html
@@ -16,7 +16,7 @@ <h3>사용자 생성</h3>
         <form class="row g-3" id="userCreateForm">
             <div class="col-12">
                 <label for="inputName" class="form-label">닉네임</label>
-                <input type="text" class="form-control" id="inputName" name="name" required="true" placeholder="필수 입력">
+                <input type="text" class="form-control" id="inputName" name="name" required placeholder="필수 입력">
             </div>
             <div class="col-12">
                 <label for="inputEmail" class="form-label">이메일</label>
@@ -101,9 +101,53 @@ <h3>친구 요청 상태 변경</h3>
             </div>
         </form>
     </div>
+
+    <div class="mb-5">
+        <h3>골 생성</h3>
+        <form class="row g-3" id="goalCreateForm">
+            <div class="col-12">
+                <label for="inputGoalName" class="form-label">골 이름</label>
+                <input type="text" class="form-control" id="inputGoalName" name="name" required placeholder="필수 입력">
+            </div>
+            <div class="col-12">
+                <label for="inputMemo" class="form-label">골 메모</label>
+                <input type="text" class="form-control" id="inputMemo" name="email" placeholder="미입력시 공백입니다">
+            </div>
+            <div class="col-md-6">
+                <label for="inputStartDate" class="form-label">시작 날짜</label>
+                <input type="date" class="form-control" id="inputStartDate" name="startDate" max="2099-12-31" required>
+            </div>
+            <div class="col-md-6">
+                <label for="inputEndDate" class="form-label">종료 날짜</label>
+                <input type="date" class="form-control" id="inputEndDate" name="endDate" max="2099-12-31" required>
+            </div>
+            <div class="col-md-6">
+                <label for="inputManager" class="form-label">골 생성자 선택</label>
+                <select class="form-select" id="inputManager" name="manager" required>
+                    <th:block th:each="user : ${users}">
+                        <option th:value="${user.id}" th:text="${user.name}">
+                        </option>
+                    </th:block>
+                </select>
+            </div>
+            <div class="col-md-6">
+                <label for="inputTeam" class="form-label">팀원 선택 (한 명만)</label>
+                <select class="form-select" id="inputTeam" name="team" required>
+                    <th:block th:each="user : ${users}">
+                        <option th:value="${user.id}" th:text="${user.name}">
+                        </option>
+                    </th:block>
+                </select>
+            </div>
+            <div class="col-12">
+                <button type="submit" class="btn btn-primary">골 생성</button>
+            </div>
+        </form>
+    </div>
 </div>
 </body>
 <script>
+    // 사용자 생성 관련 로직
     const userFormElement = document.getElementById("userCreateForm");
     userFormElement.addEventListener("submit", submitUserForm);
 
@@ -133,6 +177,7 @@ <h3>친구 요청 상태 변경</h3>
         });
     }
 
+    // 친구 신청 관련 로직
     const formFriendRequestElement = document.getElementById("friendRequestForm");
     formFriendRequestElement.addEventListener("submit", submitFriendRequestForm);
 
@@ -162,6 +207,7 @@ <h3>친구 요청 상태 변경</h3>
         });
     }
 
+    // 친구 상태 변경 관련 로직
     const formFriendStatusUpdateElement = document.getElementById("friendStatusUpdateForm");
     formFriendStatusUpdateElement.addEventListener("submit", submitFriendStatusUpdateForm);
 
@@ -190,5 +236,39 @@ <h3>친구 요청 상태 변경</h3>
             alert("친구 상태 변경 실패 : " + error.message)
         });
     }
+
+    // 골 생성 관련 로직
+    var today = new Date();
+    document.getElementById('inputStartDate').value = today.toISOString().substring(0, 10);
+    document.getElementById('inputEndDate').value = new Date(today.setDate(today.getDate() + 5)).toISOString().substring(0, 10);
+
+    const formGoalCreateElement = document.getElementById("goalCreateForm");
+    formGoalCreateElement.addEventListener("submit", submitGoalCreateForm);
+
+    function submitGoalCreateForm(e) {
+        e.preventDefault()
+        const formData = new FormData(formGoalCreateElement);
+
+        fetch(`/admin/goal`, {
+            method : 'POST',
+            headers: {
+                'Content-Type': 'application/json'
+            },
+            body   : JSON.stringify(Object.fromEntries(formData))
+        }).then(response => {
+            if (response.ok) {
+                alert("골 생성 성공")
+            } else {
+                response.json().then(data => {
+                    alert("골 생성 실패 : " + data.message);
+                }).catch(error => {
+                    alert("골 생성 실패 : " + error.message);
+                });
+            }
+            location.reload()
+        }).catch(error => {
+            alert("골 생성 실패 : " + error.message)
+        });
+    }
 </script>
 </html>
diff --git a/src/test/java/com/backend/blooming/admin/controller/AdminPageControllerTest.java b/src/test/java/com/backend/blooming/admin/controller/AdminPageControllerTest.java
index c0079437..3ec47da0 100644
--- a/src/test/java/com/backend/blooming/admin/controller/AdminPageControllerTest.java
+++ b/src/test/java/com/backend/blooming/admin/controller/AdminPageControllerTest.java
@@ -6,6 +6,7 @@
 import com.backend.blooming.authentication.presentation.argumentresolver.AuthenticatedThreadLocal;
 import com.backend.blooming.friend.application.FriendService;
 import com.backend.blooming.friend.infrastructure.repository.FriendRepository;
+import com.backend.blooming.goal.application.GoalService;
 import com.backend.blooming.user.infrastructure.repository.UserRepository;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import org.junit.jupiter.api.DisplayNameGeneration;
@@ -14,7 +15,6 @@
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.MethodSource;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.autoconfigure.restdocs.AutoConfigureRestDocs;
 import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest;
 import org.springframework.boot.test.mock.mockito.MockBean;
 import org.springframework.context.annotation.Import;
@@ -35,7 +35,6 @@
 @WebMvcTest(AdminPageController.class)
 @Import(AuthenticatedThreadLocal.class)
 @MockBean({TokenProvider.class, UserRepository.class})
-@AutoConfigureRestDocs
 @DisplayNameGeneration(DisplayNameGenerator.ReplaceUnderscores.class)
 @SuppressWarnings("NonAsciiCharacters")
 class AdminPageControllerTest extends AdminPageControllerTestFixture {
@@ -52,6 +51,9 @@ class AdminPageControllerTest extends AdminPageControllerTestFixture {
     @MockBean
     private FriendRepository friendRepository;
 
+    @MockBean
+    private GoalService goalService;
+
     @Autowired
     private ObjectMapper objectMapper;
 
@@ -123,4 +125,76 @@ class AdminPageControllerTest extends AdminPageControllerTestFixture {
                 jsonPath("$.message").exists()
         );
     }
+
+    @Test
+    void 골을_생성한다() throws Exception {
+        // given
+        given(goalService.createGoal(골_생성_요청_dto)).willReturn(골_아이디);
+
+        // when & then
+        mockMvc.perform(post("/admin/goal")
+                .contentType(MediaType.APPLICATION_JSON)
+                .content(objectMapper.writeValueAsString(골_생성_요청))
+        ).andExpect(status().isNoContent());
+    }
+
+    @Test
+    void 골을_생성시_골_이름이_없다면_400_예외를_발생시킨다() throws Exception {
+        // when & then
+        mockMvc.perform(post("/admin/goal")
+                .contentType(MediaType.APPLICATION_JSON)
+                .content(objectMapper.writeValueAsString(이름이_없는_골_생성_요청))
+        ).andExpectAll(
+                status().isBadRequest(),
+                jsonPath("$.message").exists()
+        );
+    }
+
+    @Test
+    void 골을_생성시_시작_날짜가_없다면_400_예외를_발생시킨다() throws Exception {
+        // when & then
+        mockMvc.perform(post("/admin/goal")
+                .contentType(MediaType.APPLICATION_JSON)
+                .content(objectMapper.writeValueAsString(시작_날짜가_없는_골_생성_요청))
+        ).andExpectAll(
+                status().isBadRequest(),
+                jsonPath("$.message").exists()
+        );
+    }
+
+    @Test
+    void 골을_생성시_종료_날짜가_없다면_400_예외를_발생시킨다() throws Exception {
+        // when & then
+        mockMvc.perform(post("/admin/goal")
+                .contentType(MediaType.APPLICATION_JSON)
+                .content(objectMapper.writeValueAsString(종료_날짜가_없는_골_생성_요청))
+        ).andExpectAll(
+                status().isBadRequest(),
+                jsonPath("$.message").exists()
+        );
+    }
+
+    @Test
+    void 골을_생성시_생성자가_없다면_400_예외를_발생시킨다() throws Exception {
+        // when & then
+        mockMvc.perform(post("/admin/goal")
+                .contentType(MediaType.APPLICATION_JSON)
+                .content(objectMapper.writeValueAsString(골_생성자_아이디가_없는_골_생성_요청))
+        ).andExpectAll(
+                status().isBadRequest(),
+                jsonPath("$.message").exists()
+        );
+    }
+
+    @Test
+    void 골을_생성시_팀원이_없다면_400_예외를_발생시킨다() throws Exception {
+        // when & then
+        mockMvc.perform(post("/admin/goal")
+                .contentType(MediaType.APPLICATION_JSON)
+                .content(objectMapper.writeValueAsString(팀원_아이디가_없는_골_생성_요청))
+        ).andExpectAll(
+                status().isBadRequest(),
+                jsonPath("$.message").exists()
+        );
+    }
 }
diff --git a/src/test/java/com/backend/blooming/admin/controller/AdminPageControllerTestFixture.java b/src/test/java/com/backend/blooming/admin/controller/AdminPageControllerTestFixture.java
index 5e7fbb96..7f828895 100644
--- a/src/test/java/com/backend/blooming/admin/controller/AdminPageControllerTestFixture.java
+++ b/src/test/java/com/backend/blooming/admin/controller/AdminPageControllerTestFixture.java
@@ -1,11 +1,16 @@
 package com.backend.blooming.admin.controller;
 
+import com.backend.blooming.admin.controller.dto.CreateGoalRequest;
 import com.backend.blooming.admin.controller.dto.CreateUserRequest;
 import com.backend.blooming.admin.controller.dto.FriendStatus;
 import com.backend.blooming.admin.controller.dto.RequestFriendRequest;
 import com.backend.blooming.admin.controller.dto.UpdateFriendRequest;
+import com.backend.blooming.goal.application.dto.CreateGoalDto;
 import com.backend.blooming.themecolor.domain.ThemeColor;
 
+import java.time.LocalDate;
+import java.util.List;
+
 @SuppressWarnings("NonAsciiCharacters")
 public class AdminPageControllerTestFixture {
 
@@ -36,5 +41,61 @@ public class AdminPageControllerTestFixture {
             FriendStatus.DELETE_BY_REQUESTED.name()
     );
     protected Long 친구_아이디 = 1L;
-
+    protected CreateGoalRequest 골_생성_요청 = new CreateGoalRequest(
+            "골 이름",
+            "메모",
+            LocalDate.now(),
+            LocalDate.now().plusDays(2),
+            1L,
+            2L
+    );
+    protected CreateGoalDto 골_생성_요청_dto = new CreateGoalDto(
+            골_생성_요청.name(),
+            골_생성_요청.memo(),
+            골_생성_요청.startDate(),
+            골_생성_요청.endDate(),
+            골_생성_요청.manager(),
+            List.of(골_생성_요청.manager(), 골_생성_요청.team())
+    );
+    protected Long 골_아이디 = 1L;
+    protected CreateGoalRequest 이름이_없는_골_생성_요청 = new CreateGoalRequest(
+            null,
+            골_생성_요청.memo(),
+            골_생성_요청.startDate(),
+            골_생성_요청.endDate(),
+            골_생성_요청.manager(),
+            골_생성_요청.team()
+    );
+    protected CreateGoalRequest 시작_날짜가_없는_골_생성_요청 = new CreateGoalRequest(
+            골_생성_요청.name(),
+            골_생성_요청.memo(),
+            null,
+            골_생성_요청.endDate(),
+            골_생성_요청.manager(),
+            골_생성_요청.team()
+    );
+    protected CreateGoalRequest 종료_날짜가_없는_골_생성_요청 = new CreateGoalRequest(
+            골_생성_요청.name(),
+            골_생성_요청.memo(),
+            골_생성_요청.startDate(),
+            null,
+            골_생성_요청.manager(),
+            골_생성_요청.team()
+    );
+    protected CreateGoalRequest 골_생성자_아이디가_없는_골_생성_요청 = new CreateGoalRequest(
+            골_생성_요청.name(),
+            골_생성_요청.memo(),
+            골_생성_요청.startDate(),
+            골_생성_요청.endDate(),
+            null,
+            골_생성_요청.team()
+    );
+    protected CreateGoalRequest 팀원_아이디가_없는_골_생성_요청 = new CreateGoalRequest(
+            골_생성_요청.name(),
+            골_생성_요청.memo(),
+            골_생성_요청.startDate(),
+            골_생성_요청.endDate(),
+            골_생성_요청.manager(),
+            null
+    );
 }

From d00f387d2e49d9c268be7b00ab6a2271b01f35f8 Mon Sep 17 00:00:00 2001
From: JJ503 <63184334+JJ503@users.noreply.github.com>
Date: Wed, 7 Feb 2024 19:36:15 +0900
Subject: [PATCH 08/10] =?UTF-8?q?refactor:=20valid=20=EA=B4=80=EB=A0=A8=20?=
 =?UTF-8?q?=EC=98=88=EC=99=B8=20=EB=A9=94=EC=8B=9C=EC=A7=80=20=EC=B6=94?=
 =?UTF-8?q?=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../admin/controller/dto/CreateUserRequest.java        |  8 +++++++-
 .../admin/controller/dto/RequestFriendRequest.java     |  8 ++++----
 .../admin/controller/dto/UpdateFriendRequest.java      | 10 +++++-----
 3 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/src/main/java/com/backend/blooming/admin/controller/dto/CreateUserRequest.java b/src/main/java/com/backend/blooming/admin/controller/dto/CreateUserRequest.java
index d0fb19c1..c590b93d 100644
--- a/src/main/java/com/backend/blooming/admin/controller/dto/CreateUserRequest.java
+++ b/src/main/java/com/backend/blooming/admin/controller/dto/CreateUserRequest.java
@@ -2,5 +2,11 @@
 
 import jakarta.validation.constraints.NotEmpty;
 
-public record CreateUserRequest(@NotEmpty String name, String email, String theme, String statusMessage) {
+public record CreateUserRequest(
+        @NotEmpty(message = "사용자 이름을 입력되지 않았습니다.")
+        String name,
+        String email,
+        String theme,
+        String statusMessage
+) {
 }
diff --git a/src/main/java/com/backend/blooming/admin/controller/dto/RequestFriendRequest.java b/src/main/java/com/backend/blooming/admin/controller/dto/RequestFriendRequest.java
index edd506ae..b41b6f7b 100644
--- a/src/main/java/com/backend/blooming/admin/controller/dto/RequestFriendRequest.java
+++ b/src/main/java/com/backend/blooming/admin/controller/dto/RequestFriendRequest.java
@@ -4,12 +4,12 @@
 import jakarta.validation.constraints.Positive;
 
 public record RequestFriendRequest(
-        @NotEmpty
-        @Positive
+        @NotEmpty(message = "친구 요청자가 입력되지 않았습니다.")
+        @Positive(message = "친구 요청자의 아이디가 잘못됐습니다.")
         Long requestUser,
 
-        @NotEmpty
-        @Positive
+        @NotEmpty(message = "친구 요청 수신자가 입력되지 않았습니다.")
+        @Positive(message = "친구 요청 수신자의 아이디가 잘못됐습니다.")
         Long requestedUser
 ) {
 }
diff --git a/src/main/java/com/backend/blooming/admin/controller/dto/UpdateFriendRequest.java b/src/main/java/com/backend/blooming/admin/controller/dto/UpdateFriendRequest.java
index 4ac91a44..6ce79146 100644
--- a/src/main/java/com/backend/blooming/admin/controller/dto/UpdateFriendRequest.java
+++ b/src/main/java/com/backend/blooming/admin/controller/dto/UpdateFriendRequest.java
@@ -4,15 +4,15 @@
 import jakarta.validation.constraints.Positive;
 
 public record UpdateFriendRequest(
-        @NotEmpty
-        @Positive
+        @NotEmpty(message = "친구 요청자가 입력되지 않았습니다.")
+        @Positive(message = "친구 요청자의 아이디가 잘못됐습니다.")
         Long requestUser,
 
-        @NotEmpty
-        @Positive
+        @NotEmpty(message = "친구 요청 수신자가 입력되지 않았습니다.")
+        @Positive(message = "친구 요청 수신자의 아이디가 잘못됐습니다.")
         Long requestedUser,
 
-        @NotEmpty
+        @NotEmpty(message = "친구 요청 상태가 입력되지 않았습니다.")
         String status
 ) {
 }

From 1f07fe65943da72e1e440a7caef7683beb86582f Mon Sep 17 00:00:00 2001
From: JJ503 <63184334+JJ503@users.noreply.github.com>
Date: Wed, 7 Feb 2024 19:38:14 +0900
Subject: [PATCH 09/10] =?UTF-8?q?test:=20=EB=B6=88=ED=95=84=EC=9A=94?=
 =?UTF-8?q?=ED=95=9C=20=ED=85=8C=EC=8A=A4=ED=8A=B8=20=EC=A0=9C=EA=B1=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/AdminPageControllerTest.java   | 60 -------------------
 .../AdminPageControllerTestFixture.java       | 40 -------------
 2 files changed, 100 deletions(-)

diff --git a/src/test/java/com/backend/blooming/admin/controller/AdminPageControllerTest.java b/src/test/java/com/backend/blooming/admin/controller/AdminPageControllerTest.java
index 3ec47da0..2dd2a443 100644
--- a/src/test/java/com/backend/blooming/admin/controller/AdminPageControllerTest.java
+++ b/src/test/java/com/backend/blooming/admin/controller/AdminPageControllerTest.java
@@ -137,64 +137,4 @@ class AdminPageControllerTest extends AdminPageControllerTestFixture {
                 .content(objectMapper.writeValueAsString(골_생성_요청))
         ).andExpect(status().isNoContent());
     }
-
-    @Test
-    void 골을_생성시_골_이름이_없다면_400_예외를_발생시킨다() throws Exception {
-        // when & then
-        mockMvc.perform(post("/admin/goal")
-                .contentType(MediaType.APPLICATION_JSON)
-                .content(objectMapper.writeValueAsString(이름이_없는_골_생성_요청))
-        ).andExpectAll(
-                status().isBadRequest(),
-                jsonPath("$.message").exists()
-        );
-    }
-
-    @Test
-    void 골을_생성시_시작_날짜가_없다면_400_예외를_발생시킨다() throws Exception {
-        // when & then
-        mockMvc.perform(post("/admin/goal")
-                .contentType(MediaType.APPLICATION_JSON)
-                .content(objectMapper.writeValueAsString(시작_날짜가_없는_골_생성_요청))
-        ).andExpectAll(
-                status().isBadRequest(),
-                jsonPath("$.message").exists()
-        );
-    }
-
-    @Test
-    void 골을_생성시_종료_날짜가_없다면_400_예외를_발생시킨다() throws Exception {
-        // when & then
-        mockMvc.perform(post("/admin/goal")
-                .contentType(MediaType.APPLICATION_JSON)
-                .content(objectMapper.writeValueAsString(종료_날짜가_없는_골_생성_요청))
-        ).andExpectAll(
-                status().isBadRequest(),
-                jsonPath("$.message").exists()
-        );
-    }
-
-    @Test
-    void 골을_생성시_생성자가_없다면_400_예외를_발생시킨다() throws Exception {
-        // when & then
-        mockMvc.perform(post("/admin/goal")
-                .contentType(MediaType.APPLICATION_JSON)
-                .content(objectMapper.writeValueAsString(골_생성자_아이디가_없는_골_생성_요청))
-        ).andExpectAll(
-                status().isBadRequest(),
-                jsonPath("$.message").exists()
-        );
-    }
-
-    @Test
-    void 골을_생성시_팀원이_없다면_400_예외를_발생시킨다() throws Exception {
-        // when & then
-        mockMvc.perform(post("/admin/goal")
-                .contentType(MediaType.APPLICATION_JSON)
-                .content(objectMapper.writeValueAsString(팀원_아이디가_없는_골_생성_요청))
-        ).andExpectAll(
-                status().isBadRequest(),
-                jsonPath("$.message").exists()
-        );
-    }
 }
diff --git a/src/test/java/com/backend/blooming/admin/controller/AdminPageControllerTestFixture.java b/src/test/java/com/backend/blooming/admin/controller/AdminPageControllerTestFixture.java
index 7f828895..816e0969 100644
--- a/src/test/java/com/backend/blooming/admin/controller/AdminPageControllerTestFixture.java
+++ b/src/test/java/com/backend/blooming/admin/controller/AdminPageControllerTestFixture.java
@@ -58,44 +58,4 @@ public class AdminPageControllerTestFixture {
             List.of(골_생성_요청.manager(), 골_생성_요청.team())
     );
     protected Long 골_아이디 = 1L;
-    protected CreateGoalRequest 이름이_없는_골_생성_요청 = new CreateGoalRequest(
-            null,
-            골_생성_요청.memo(),
-            골_생성_요청.startDate(),
-            골_생성_요청.endDate(),
-            골_생성_요청.manager(),
-            골_생성_요청.team()
-    );
-    protected CreateGoalRequest 시작_날짜가_없는_골_생성_요청 = new CreateGoalRequest(
-            골_생성_요청.name(),
-            골_생성_요청.memo(),
-            null,
-            골_생성_요청.endDate(),
-            골_생성_요청.manager(),
-            골_생성_요청.team()
-    );
-    protected CreateGoalRequest 종료_날짜가_없는_골_생성_요청 = new CreateGoalRequest(
-            골_생성_요청.name(),
-            골_생성_요청.memo(),
-            골_생성_요청.startDate(),
-            null,
-            골_생성_요청.manager(),
-            골_생성_요청.team()
-    );
-    protected CreateGoalRequest 골_생성자_아이디가_없는_골_생성_요청 = new CreateGoalRequest(
-            골_생성_요청.name(),
-            골_생성_요청.memo(),
-            골_생성_요청.startDate(),
-            골_생성_요청.endDate(),
-            null,
-            골_생성_요청.team()
-    );
-    protected CreateGoalRequest 팀원_아이디가_없는_골_생성_요청 = new CreateGoalRequest(
-            골_생성_요청.name(),
-            골_생성_요청.memo(),
-            골_생성_요청.startDate(),
-            골_생성_요청.endDate(),
-            골_생성_요청.manager(),
-            null
-    );
 }

From 907ba8ed221a959c48111799e959a1aa41ff20b2 Mon Sep 17 00:00:00 2001
From: JJ503 <63184334+JJ503@users.noreply.github.com>
Date: Thu, 8 Feb 2024 17:08:23 +0900
Subject: [PATCH 10/10] =?UTF-8?q?refactor:=20=EC=BB=A8=EB=B2=A4=EC=85=98?=
 =?UTF-8?q?=EC=97=90=20=EB=94=B0=EB=A5=B8=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../FriendRequestNotAllowedException.java     |  1 -
 .../friend/application/FriendServiceTest.java |  2 +-
 .../presentation/FriendControllerTest.java    | 36 +++++++------------
 .../user/presentation/UserControllerTest.java |  3 +-
 4 files changed, 14 insertions(+), 28 deletions(-)

diff --git a/src/main/java/com/backend/blooming/friend/application/exception/FriendRequestNotAllowedException.java b/src/main/java/com/backend/blooming/friend/application/exception/FriendRequestNotAllowedException.java
index 111f867d..c070cfdf 100644
--- a/src/main/java/com/backend/blooming/friend/application/exception/FriendRequestNotAllowedException.java
+++ b/src/main/java/com/backend/blooming/friend/application/exception/FriendRequestNotAllowedException.java
@@ -5,7 +5,6 @@
 
 public class FriendRequestNotAllowedException extends BloomingException {
 
-
     private FriendRequestNotAllowedException(final ExceptionMessage exceptionMessage) {
         super(exceptionMessage);
     }
diff --git a/src/test/java/com/backend/blooming/friend/application/FriendServiceTest.java b/src/test/java/com/backend/blooming/friend/application/FriendServiceTest.java
index aa0208ff..9be490ad 100644
--- a/src/test/java/com/backend/blooming/friend/application/FriendServiceTest.java
+++ b/src/test/java/com/backend/blooming/friend/application/FriendServiceTest.java
@@ -11,7 +11,7 @@
 import com.backend.blooming.notification.domain.Notification;
 import com.backend.blooming.notification.infrastructure.repository.NotificationRepository;
 import com.backend.blooming.user.application.exception.NotFoundUserException;
-import org.assertj.core.api.*;
+import org.assertj.core.api.SoftAssertions;
 import org.junit.jupiter.api.DisplayNameGeneration;
 import org.junit.jupiter.api.DisplayNameGenerator;
 import org.junit.jupiter.api.Test;
diff --git a/src/test/java/com/backend/blooming/friend/presentation/FriendControllerTest.java b/src/test/java/com/backend/blooming/friend/presentation/FriendControllerTest.java
index 8db8bbf4..68d975ca 100644
--- a/src/test/java/com/backend/blooming/friend/presentation/FriendControllerTest.java
+++ b/src/test/java/com/backend/blooming/friend/presentation/FriendControllerTest.java
@@ -180,14 +180,10 @@ class FriendControllerTest extends FriendControllerTestFixture {
                                 fieldWithPath("friends").type(JsonFieldType.ARRAY).description("친구 요청을 보낸 사용자 목록"),
                                 fieldWithPath("friends.[].id").type(JsonFieldType.NUMBER).description("친구 요청 아이디"),
                                 fieldWithPath("friends.[].friend.id").type(JsonFieldType.NUMBER).description("사용자 아이디"),
-                                fieldWithPath("friends.[].friend.email").type(JsonFieldType.STRING)
-                                                                        .description("사용자 이메일"),
-                                fieldWithPath("friends.[].friend.name").type(JsonFieldType.STRING)
-                                                                       .description("사용자 이름"),
-                                fieldWithPath("friends.[].friend.color").type(JsonFieldType.STRING)
-                                                                        .description("사용자 테마 색상"),
-                                fieldWithPath("friends.[].friend.statusMessage").type(JsonFieldType.STRING)
-                                                                                .description("사용자 상태 메시지"),
+                                fieldWithPath("friends.[].friend.email").type(JsonFieldType.STRING).description("사용자 이메일"),
+                                fieldWithPath("friends.[].friend.name").type(JsonFieldType.STRING).description("사용자 이름"),
+                                fieldWithPath("friends.[].friend.color").type(JsonFieldType.STRING).description("사용자 테마 색상"),
+                                fieldWithPath("friends.[].friend.statusMessage").type(JsonFieldType.STRING).description("사용자 상태 메시지"),
                                 fieldWithPath("friends.[].isFriends").type(JsonFieldType.BOOLEAN).description("친구 여부")
                         )
                 )
@@ -233,14 +229,10 @@ class FriendControllerTest extends FriendControllerTestFixture {
                                 fieldWithPath("friends").type(JsonFieldType.ARRAY).description("친구 요청을 받은 사용자 목록"),
                                 fieldWithPath("friends.[].id").type(JsonFieldType.NUMBER).description("친구 요청 아이디"),
                                 fieldWithPath("friends.[].friend.id").type(JsonFieldType.NUMBER).description("사용자 아이디"),
-                                fieldWithPath("friends.[].friend.email").type(JsonFieldType.STRING)
-                                                                        .description("사용자 이메일"),
-                                fieldWithPath("friends.[].friend.name").type(JsonFieldType.STRING)
-                                                                       .description("사용자 이름"),
-                                fieldWithPath("friends.[].friend.color").type(JsonFieldType.STRING)
-                                                                        .description("사용자 테마 색상"),
-                                fieldWithPath("friends.[].friend.statusMessage").type(JsonFieldType.STRING)
-                                                                                .description("사용자 상태 메시지"),
+                                fieldWithPath("friends.[].friend.email").type(JsonFieldType.STRING).description("사용자 이메일"),
+                                fieldWithPath("friends.[].friend.name").type(JsonFieldType.STRING).description("사용자 이름"),
+                                fieldWithPath("friends.[].friend.color").type(JsonFieldType.STRING).description("사용자 테마 색상"),
+                                fieldWithPath("friends.[].friend.statusMessage").type(JsonFieldType.STRING).description("사용자 상태 메시지"),
                                 fieldWithPath("friends.[].isFriends").type(JsonFieldType.BOOLEAN).description("친구 여부")
                         )
                 )
@@ -286,14 +278,10 @@ class FriendControllerTest extends FriendControllerTestFixture {
                                 fieldWithPath("friends").type(JsonFieldType.ARRAY).description("서로 친구인 사용자 목록"),
                                 fieldWithPath("friends.[].id").type(JsonFieldType.NUMBER).description("친구 요청 아이디"),
                                 fieldWithPath("friends.[].friend.id").type(JsonFieldType.NUMBER).description("사용자 아이디"),
-                                fieldWithPath("friends.[].friend.email").type(JsonFieldType.STRING)
-                                                                        .description("사용자 이메일"),
-                                fieldWithPath("friends.[].friend.name").type(JsonFieldType.STRING)
-                                                                       .description("사용자 이름"),
-                                fieldWithPath("friends.[].friend.color").type(JsonFieldType.STRING)
-                                                                        .description("사용자 테마 색상"),
-                                fieldWithPath("friends.[].friend.statusMessage").type(JsonFieldType.STRING)
-                                                                                .description("사용자 상태 메시지"),
+                                fieldWithPath("friends.[].friend.email").type(JsonFieldType.STRING).description("사용자 이메일"),
+                                fieldWithPath("friends.[].friend.name").type(JsonFieldType.STRING).description("사용자 이름"),
+                                fieldWithPath("friends.[].friend.color").type(JsonFieldType.STRING).description("사용자 테마 색상"),
+                                fieldWithPath("friends.[].friend.statusMessage").type(JsonFieldType.STRING).description("사용자 상태 메시지"),
                                 fieldWithPath("friends.[].isFriends").type(JsonFieldType.BOOLEAN).description("친구 여부")
                         )
                 )
diff --git a/src/test/java/com/backend/blooming/user/presentation/UserControllerTest.java b/src/test/java/com/backend/blooming/user/presentation/UserControllerTest.java
index c402b9dc..2de2d8dc 100644
--- a/src/test/java/com/backend/blooming/user/presentation/UserControllerTest.java
+++ b/src/test/java/com/backend/blooming/user/presentation/UserControllerTest.java
@@ -171,8 +171,7 @@ class UserControllerTest extends UserControllerTestFixture {
                         fieldWithPath("users.[].name").type(JsonFieldType.STRING).description("사용자 이름"),
                         fieldWithPath("users.[].color").type(JsonFieldType.STRING).description("사용자 테마 색상 코드"),
                         fieldWithPath("users.[].statusMessage").type(JsonFieldType.STRING).description("사용자 상태 메시지"),
-                        fieldWithPath("users.[].friendsStatus").type(JsonFieldType.STRING)
-                                                               .description("로그인한 사용자와의 친구 상태")
+                        fieldWithPath("users.[].friendsStatus").type(JsonFieldType.STRING).description("로그인한 사용자와의 친구 상태")
                 )
         ));
     }