Merge branch 'develop' of https://github.com/woowacourse-teams/2024-h…

…aeng-dong into feature/#61

.github/workflows/backend-push.yml

@@ -21,6 +21,9 @@ jobs:
     steps:
       - name: CheckOut
         uses: actions/checkout@v4
+        with:
+          token: ${{secrets.CONFIG_SUBMODULE_TOKEN}}
+          submodules: true
 
       - name: Set up JDK 17
         uses: actions/setup-java@v4

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "server/src/main/resources/config"]
+	path = server/src/main/resources/config
+	url = https://github.com/woowacourse-teams/2024-haeng-dong-config.git

client/package.json

@@ -15,6 +15,7 @@
   "devDependencies": {
     "@eslint/compat": "^1.1.0",
     "@eslint/js": "^9.6.0",
+    "@svgr/webpack": "^8.1.0",
     "@types/react": "^18.3.3",
     "@types/react-dom": "^18.3.0",
     "@typescript-eslint/eslint-plugin": "^7.16.0",

client/webpack.config.js

@@ -39,6 +39,14 @@ export default {
         test: /\.css$/i,
         use: ['style-loader', 'css-loader'],
       },
+      {
+        test: /\.svg$/,
+        use: [
+          {
+            loader: '@svgr/webpack',
+          },
+        ],
+      },
     ],
   },
   plugins: [

server/Dockerfile

@@ -14,4 +14,4 @@ COPY --from=build /app/build/libs/*.jar /app/haengdong-0.0.1-SNAPSHOT.jar
 
 EXPOSE 8080
 ENTRYPOINT ["java"]
-CMD ["-jar", "haengdong-0.0.1-SNAPSHOT.jar"]
+CMD ["-Dspring.profiles.active=dev", "-jar", "haengdong-0.0.1-SNAPSHOT.jar"]

server/src/main/java/server/haengdong/application/EventService.java

@@ -4,9 +4,10 @@
 import org.springframework.stereotype.Service;
 import server.haengdong.application.request.EventAppRequest;
 import server.haengdong.application.response.EventAppResponse;
+import server.haengdong.application.response.EventDetailAppResponse;
 import server.haengdong.domain.event.Event;
-import server.haengdong.domain.event.EventTokenProvider;
 import server.haengdong.domain.event.EventRepository;
+import server.haengdong.domain.event.EventTokenProvider;
 
 @RequiredArgsConstructor
 @Service
@@ -22,4 +23,10 @@ public EventAppResponse saveEvent(EventAppRequest request) {
 
         return EventAppResponse.of(event);
     }
+
+    public EventDetailAppResponse findEvent(String token) {
+        Event event = eventRepository.findByToken(token).orElseThrow(() -> new IllegalArgumentException(""));
+
+        return EventDetailAppResponse.of(event);
+    }
 }

server/src/main/java/server/haengdong/application/response/EventDetailAppResponse.java

@@ -0,0 +1,10 @@
+package server.haengdong.application.response;
+
+import server.haengdong.domain.event.Event;
+
+public record EventDetailAppResponse(String eventName) {
+
+    public static EventDetailAppResponse of(Event event) {
+        return new EventDetailAppResponse(event.getName());
+    }
+}

server/src/main/java/server/haengdong/presentation/EventController.java

@@ -3,11 +3,15 @@
 import java.net.URI;
 import lombok.RequiredArgsConstructor;
 import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RestController;
 import server.haengdong.application.EventService;
 import server.haengdong.application.response.EventAppResponse;
 import server.haengdong.presentation.request.EventSaveRequest;
+import server.haengdong.presentation.response.EventDetailResponse;
 
 @RequiredArgsConstructor
 @RestController
@@ -16,11 +20,18 @@ public class EventController {
     private final EventService eventService;
 
     @PostMapping("/api/events")
-    public ResponseEntity<Void> saveEvent(EventSaveRequest request) {
+    public ResponseEntity<Void> saveEvent(@RequestBody EventSaveRequest request) {
         EventAppResponse eventAppResponse = eventService.saveEvent(request.toAppRequest());
 
         return ResponseEntity.ok()
                 .location(URI.create("events/" + eventAppResponse.token()))
                 .build();
     }
+
+    @GetMapping("/api/events/{token}")
+    public ResponseEntity<EventDetailResponse> findEvent(@PathVariable("token") String token) {
+        EventDetailResponse eventDetailResponse = EventDetailResponse.of(eventService.findEvent(token));
+
+        return ResponseEntity.ok(eventDetailResponse);
+    }
 }

server/src/main/java/server/haengdong/presentation/response/EventDetailResponse.java

@@ -0,0 +1,10 @@
+package server.haengdong.presentation.response;
+
+import server.haengdong.application.response.EventDetailAppResponse;
+
+public record EventDetailResponse(String eventName) {
+
+    public static EventDetailResponse of(EventDetailAppResponse response) {
+        return new EventDetailResponse(response.eventName());
+    }
+}

server/src/main/resources/application.yml

@@ -1,15 +1,23 @@
 spring:
-  h2:
-    console:
-      enabled: true
-      path: /h2-console
   datasource:
-    url: jdbc:h2:mem:database
+    url: jdbc:mysql://localhost:3306/haengdong
+    username: root
+    password: 1234
+    driver-class-name: com.mysql.cj.jdbc.Driver
+
   jpa:
-    defer-datasource-initialization: true
-    show-sql: true
+    hibernate:
+      ddl-auto: none
     properties:
       hibernate:
-        format_sql: true
-    hibernate:
-      ddl-auto: create-drop
+        dialect: org.hibernate.dialect.MySQL8Dialect
+      format_sql: true
+    show-sql: true
+
+---
+
+spring:
+  config:
+    import: classpath:config/application-dev.yml
+    activate:
+      on-profile: dev

server/src/test/java/server/haengdong/application/EventServiceTest.java

@@ -4,13 +4,17 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.BDDMockito.given;
 
+import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.test.mock.mockito.MockBean;
 import server.haengdong.application.request.EventAppRequest;
 import server.haengdong.application.response.EventAppResponse;
+import server.haengdong.application.response.EventDetailAppResponse;
+import server.haengdong.domain.event.Event;
+import server.haengdong.domain.event.EventRepository;
 import server.haengdong.domain.event.EventTokenProvider;
 
 @SpringBootTest
@@ -22,6 +26,14 @@ class EventServiceTest {
     @MockBean
     private EventTokenProvider eventTokenProvider;
 
+    @Autowired
+    private EventRepository eventRepository;
+
+    @AfterEach
+    void tearDown() {
+        eventRepository.deleteAllInBatch();
+    }
+
     @DisplayName("행사를 생성한다")
     @Test
     void saveEventTest() {
@@ -32,4 +44,16 @@ void saveEventTest() {
 
         assertThat(response.token()).isEqualTo("TOKEN");
     }
+
+    @DisplayName("토큰으로 행사를 조회한다.")
+    @Test
+    void findEventTest() {
+        String token = "TOKEN";
+        Event event = new Event("행동대장 회식", token);
+        eventRepository.save(event);
+
+        EventDetailAppResponse eventDetailAppResponse = eventService.findEvent(token);
+
+        assertThat(eventDetailAppResponse.eventName()).isEqualTo("행동대장 회식");
+    }
 }

server/src/test/java/server/haengdong/presentation/EventControllerTest.java

@@ -2,8 +2,10 @@
 
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.BDDMockito.given;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post;
 import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.print;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
@@ -18,6 +20,7 @@
 import server.haengdong.application.EventService;
 import server.haengdong.application.request.EventAppRequest;
 import server.haengdong.application.response.EventAppResponse;
+import server.haengdong.application.response.EventDetailAppResponse;
 import server.haengdong.presentation.request.EventSaveRequest;
 
 @WebMvcTest(EventController.class)
@@ -48,4 +51,17 @@ void saveEvent() throws Exception {
                 .andExpect(status().isOk())
                 .andExpect(MockMvcResultMatchers.redirectedUrl("events/" + token));
     }
+
+    @DisplayName("토큰으로 행사를 조회한다.")
+    @Test
+    void findEventTest() throws Exception {
+        String token = "TOKEN";
+        EventDetailAppResponse eventDetailAppResponse = new EventDetailAppResponse("행동대장 회식");
+        given(eventService.findEvent(token)).willReturn(eventDetailAppResponse);
+
+        mockMvc.perform(get("/api/events/" + token))
+                .andDo(print())
+                .andExpect(status().isOk())
+                .andExpect(jsonPath("$.eventName").value("행동대장 회식"));
+    }
 }

server/src/test/resources/application.yml

@@ -0,0 +1,15 @@
+spring:
+  h2:
+    console:
+      enabled: true
+      path: /h2-console
+  datasource:
+    url: jdbc:h2:mem:database
+  jpa:
+    defer-datasource-initialization: true
+    show-sql: true
+    properties:
+      hibernate:
+        format_sql: true
+    hibernate:
+      ddl-auto: create-drop