Merge pull request #17 from Bamdoliro/revert-15-fix/#14

Revert "[버그] 잘못된 엔드포인트에 대한 500 에러 반환"
Bamdoliro · Nov 23, 2024 · cf44f22 · cf44f22
2 parents cb4e82d + 2d7b9d7
commit cf44f22
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 28 deletions.
diff --git a/src/docs/asciidoc/auth.adoc b/src/docs/asciidoc/auth.adoc
@@ -43,20 +43,4 @@ include::{snippets}/auth-controller-test/리프레시_토큰으로_액세스_토
 include::{snippets}/auth-controller-test/리프레시_토큰으로_액세스_토큰을_재발급한다/http-response.adoc[]
 
 ==== 액세스 토큰으로 요청한 경우
-include::{snippets}/auth-controller-test/액세스_토큰으로_액세스_토큰을_재발급하면_예외가_발생한다/http-response.adoc[]
-
-=== 로그아웃
-로그인 한 사용자는 로그아웃 할 수 있습니다.
-
-==== 요청 형식
-
-===== Request Header
-include::{snippets}/auth-controller-test/유저가_로그아웃한다/request-headers.adoc[]
-
-==== 요청
-include::{snippets}/auth-controller-test/유저가_로그아웃한다/http-request.adoc[]
-
-==== 응답
-
-===== 정상 응답
-include::{snippets}/auth-controller-test/유저가_로그아웃한다/http-response.adoc[]
+include::{snippets}/auth-controller-test/액세스_토큰으로_액세스_토큰을_재발급하면_예외가_발생한다/http-response.adoc[]
diff --git a/src/main/java/com/bamdoliro/sinabro/domain/diary/domain/type/Emotion.java b/src/main/java/com/bamdoliro/sinabro/domain/diary/domain/type/Emotion.java
@@ -19,9 +19,9 @@ public enum Emotion implements EnumProperty {
     AMAZED("놀라운", Category.SURPRISED),
     ASTOUNDED("경악한", Category.SURPRISED),
 
-    EXCITED("설레는", Category.ROMANTIC),
-    POUNDING("두근거리는", Category.ROMANTIC),
-    DEDICATED("헌신적인", Category.ROMANTIC),
+    EXCITED("설레는", Category.LOVE),
+    POUNDING("두근거리는", Category.LOVE),
+    DEDICATED("헌신적인", Category.LOVE),
 
     GLOOMY("시무룩한", Category.DEPRESSED),
     HOPELESS("절망스러운", Category.DEPRESSED),
@@ -48,7 +48,7 @@ public enum Category implements EnumProperty {
         JOYFUL("기쁜"),
         SAD("슬픈"),
         SURPRISED("놀란"),
-        ROMANTIC("사랑"),
+        LOVE("사랑"),
         DEPRESSED("우울한"),
         STABLE("평범한"),
         EMBARRASSED("당황스러운"),

diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
@@ -25,13 +25,6 @@ spring:
       port: ${REDIS_PORT}
       password: ${REDIS_PASSWORD}
 
-  web:
-    resources:
-      add-mappings: false
-
-  mvc:
-    throw-exception-if-no-handler-found: false
-
 auth:
   google:
     base-url: ${GOOGLE_BASE_URL}