Merge pull request #16 from kduoh99/Feat/#11

Fix: 파싱 오류 수정
moyeothon · Nov 1, 2024 · 2c0a733 · 2c0a733
2 parents 2a746e9 + 4f37632
commit 2c0a733
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 8 deletions.
diff --git a/src/main/java/com/hackathon/momento/team/application/TeamService.java b/src/main/java/com/hackathon/momento/team/application/TeamService.java
@@ -107,14 +107,22 @@ private List<TeamInfo> parseResToTeamInfo(String resContent, List<TeamBuilding>
         TeamInfo currentTeam = null;
 
         for (String line : lines) {
-            if (line.startsWith("팀 이름: ")) {
+            line = line.trim();
+
+            if (line.equals("- 팀 시작 -")) {
                 if (currentTeam != null) {
                     teamInfos.add(currentTeam);
                 }
+                currentTeam = TeamInfo.builder().build();
+
+            } else if (line.startsWith("팀 이름: ")) {
                 String teamName = line.replace("팀 이름: ", "").trim();
-                currentTeam = TeamInfo.builder()
-                        .teamName(teamName)
-                        .build();
+                if (currentTeam != null) {
+                    currentTeam = TeamInfo.builder()
+                            .teamName(teamName)
+                            .build();
+                }
+
             } else if (line.startsWith("팀 설명: ")) {
                 String description = line.replace("팀 설명: ", "").trim();
                 if (currentTeam != null) {
@@ -123,17 +131,23 @@ private List<TeamInfo> parseResToTeamInfo(String resContent, List<TeamBuilding>
                             .description(description)
                             .build();
                 }
+
             } else if (line.startsWith("- 이메일: ")) {
                 String email = line.replace("- 이메일: ", "").trim();
                 if (currentTeam != null) {
                     for (TeamBuilding request : requests) {
                         if (request.getMember().getEmail().equals(email)) {
-                            request.assignTeamInfo(currentTeam);
-                            request.updateStatus(Status.COMPLETED);
                             currentTeam.addTeamBuilding(request);
+                            request.updateStatus(Status.COMPLETED);
                         }
                     }
                 }
+
+            } else if (line.equals("- 팀 끝 -")) {
+                if (currentTeam != null) {
+                    teamInfos.add(currentTeam);
+                    currentTeam = null;
+                }
             }
         }
 

diff --git a/src/main/java/com/hackathon/momento/team/domain/TeamBuilding.java b/src/main/java/com/hackathon/momento/team/domain/TeamBuilding.java
@@ -67,7 +67,7 @@ private TeamBuilding(LocalDate startDate, LocalDate endDate, int teamSize, Strin
         this.member = member;
     }
 
-    public void assignTeamInfo(TeamInfo teamInfo) {
+    protected void setTeamInfo(TeamInfo teamInfo) {
         this.teamInfo = teamInfo;
     }
 

diff --git a/src/main/java/com/hackathon/momento/team/domain/TeamInfo.java b/src/main/java/com/hackathon/momento/team/domain/TeamInfo.java
@@ -42,6 +42,6 @@ private TeamInfo(String teamName, String description) {
 
     public void addTeamBuilding(TeamBuilding teamBuilding) {
         this.teamBuildings.add(teamBuilding);
-        teamBuilding.assignTeamInfo(this);
+        teamBuilding.setTeamInfo(this);
     }
 }