refactor: map으로 url - controller 매칭

woowacourse · Sep 4, 2023 · ee9370d · ee9370d
1 parent 2339099
commit ee9370d
Show file tree

Hide file tree

Showing 2 changed files with 41 additions and 13 deletions.
diff --git a/tomcat/src/main/java/nextstep/jwp/presentation/FrontController.java b/tomcat/src/main/java/nextstep/jwp/presentation/FrontController.java
@@ -1,17 +1,27 @@
 package nextstep.jwp.presentation;
 
+import java.util.HashMap;
+import java.util.Map;
 import org.apache.coyote.http11.request.RequestReader;
 
 public class FrontController {
 
+    private static final Map<String, Controller> controllers = new HashMap<>();
+    private static final FrontController frontController = new FrontController();
+
+    static {
+        controllers.put("/", frontController.mainPageController);
+        controllers.put("/login", frontController.loginController);
+        controllers.put("/register", frontController.loginController);
+        controllers.put("/index", frontController.indexController);
+        controllers.put("/index.html", frontController.indexController);
+    }
+
     private final LoginController loginController = new LoginController();
     private final MainPageController mainPageController = new MainPageController();
     private final IndexController indexController = new IndexController();
     private final OtherController otherController = new OtherController();
 
-
-    private static final FrontController frontController = new FrontController();
-
     private FrontController() {
     }
 
@@ -20,15 +30,6 @@ public static FrontController getInstance() {
     }
 
     public Controller findController(RequestReader requestReader) {
-        if (requestReader.getRequestUrl().equals("/")) {
-            return mainPageController;
-        }
-        if (requestReader.getRequestUrl().equals("/login") || requestReader.getRequestUrl().equals("/register")) {
-            return loginController;
-        }
-        if (requestReader.getRequestUrl().equals("/index") || requestReader.getRequestUrl().equals("/index.html")) {
-            return indexController;
-        }
-        return otherController;
+        return controllers.getOrDefault(requestReader.getRequestUrl(), otherController);
     }
 }
diff --git a/tomcat/src/test/java/nextstep/jwp/db/InMemoryUserRepositoryTest.java b/tomcat/src/test/java/nextstep/jwp/db/InMemoryUserRepositoryTest.java
@@ -0,0 +1,27 @@
+package nextstep.jwp.db;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import nextstep.jwp.model.User;
+import org.junit.jupiter.api.Test;
+
+class InMemoryUserRepositoryTest {
+
+    @Test
+    void 저장할_때_마다_순차적으로_아이디가_증가한다() {
+        InMemoryUserRepository.save(new User("test1", "test", "email@eamil"));
+        InMemoryUserRepository.save(new User("test2", "test", "email@eamil"));
+        InMemoryUserRepository.save(new User("test3", "test", "email@eamil"));
+
+        Long id2 = InMemoryUserRepository.findByAccount("test2")
+                                         .map(User::getId)
+                                         .orElse(0L);
+
+        Long id3 = InMemoryUserRepository.findByAccount("test3")
+                                         .map(User::getId)
+                                         .orElse(0L);
+
+        assertThat(id3 - id2).isOne();
+    }
+
+}