refactor: stepName 제거

woowacourse-teams · Jul 30, 2024 · d5a2180 · d5a2180
1 parent 5ae22e2
commit d5a2180
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 13 deletions.
diff --git a/server/src/main/java/server/haengdong/presentation/response/StepResponse.java b/server/src/main/java/server/haengdong/presentation/response/StepResponse.java
@@ -6,14 +6,12 @@
 
 public record StepResponse(
         String type,
-        String stepName,
         List<String> members,
         List<ActionResponse> actions
 ) {
-    public static StepResponse of(List<ActionAppResponse> actions, List<String> members, String stepName) {
+    public static StepResponse of(List<String> members, List<ActionAppResponse> actions) {
         return new StepResponse(
                 actions.get(0).actionTypeName(),
-                stepName,
                 new ArrayList<>(members),
                 toActionsResponse(actions)
         );

diff --git a/server/src/main/java/server/haengdong/presentation/response/StepsResponse.java b/server/src/main/java/server/haengdong/presentation/response/StepsResponse.java
@@ -12,13 +12,9 @@ public static StepsResponse of(List<ActionAppResponse> actions) {
         List<String> currentMembers = new ArrayList<>();
         List<List<ActionAppResponse>> groups = createGroups(actions);
 
-        int billGroupCount = 0;
         for (List<ActionAppResponse> group : groups) {
             changeCurrentMembers(group, currentMembers);
-            if (group.get(0).actionType() == ActionType.BILL) {
-                billGroupCount++;
-            }
-            StepResponse stepResponse = StepResponse.of(group, currentMembers, billGroupCount + "차");
+            StepResponse stepResponse = StepResponse.of(currentMembers, group);
             steps.add(stepResponse);
         }
         return new StepsResponse(steps);

diff --git a/server/src/test/java/server/haengdong/presentation/response/StepsResponseTest.java b/server/src/test/java/server/haengdong/presentation/response/StepsResponseTest.java
@@ -30,23 +30,23 @@ void of() {
 
         StepsResponse expected = new StepsResponse(
                 List.of(
-                        new StepResponse("IN", "0차", List.of("망쵸", "백호"), List.of(
+                        new StepResponse("IN", List.of("망쵸", "백호"), List.of(
                                 new ActionResponse(1L, "망쵸", null, 1L),
                                 new ActionResponse(2L, "백호", null, 2L)
                         )),
-                        new StepResponse("BILL", "1차", List.of("망쵸", "백호"), List.of(
+                        new StepResponse("BILL", List.of("망쵸", "백호"), List.of(
                                 new ActionResponse(3L, "감자탕", 10_000L, 3L),
                                 new ActionResponse(4L, "인생네컷", 10_000L, 4L)
                         )),
-                        new StepResponse("IN", "1차", List.of("망쵸", "백호", "소하", "웨디"), List.of(
+                        new StepResponse("IN", List.of("망쵸", "백호", "소하", "웨디"), List.of(
                                 new ActionResponse(5L, "소하", null, 5L),
                                 new ActionResponse(6L, "웨디", null, 6L)
                         )),
-                        new StepResponse("OUT", "1차", List.of("소하", "웨디"), List.of(
+                        new StepResponse("OUT", List.of("소하", "웨디"), List.of(
                                 new ActionResponse(7L, "망쵸", null, 7L),
                                 new ActionResponse(8L, "백호", null, 8L)
                         )),
-                        new StepResponse("BILL", "2차", List.of("소하", "웨디"), List.of(
+                        new StepResponse("BILL", List.of("소하", "웨디"), List.of(
                                 new ActionResponse(9L, "노래방", 20_000L, 9L)
                         ))
                 )