Skip to content

Commit

Permalink
[#20] ParsingService: DateTime 파싱 메소드 수정
Browse files Browse the repository at this point in the history 
1.다음년도로 넘어갔을 때, 지난 년도로 정확하게 파싱합니다.
2.쿨엔조이 DateTime 파싱 메소드를 수정하여, (년도, 월, 일) 정보를 정확하게 파싱합니다.
3.퀘사이존 DateTime 파싱 메소드를 분리했습니다.
  • Loading branch information
@chaiminwoo0223
chaiminwoo0223 committed Jun 1, 2024
1 parent ae3f0bd commit 629647c
Show file tree
Hide file tree
Showing 3 changed files with 45 additions and 20 deletions.
1 change: 0 additions & 1 deletion docker-compose.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ services:
GOOGLE_REDIRECT_URI: ${GOOGLE_REDIRECT_URI}
GOOGLE_TOKEN_URI: ${GOOGLE_TOKEN_URI}
GOOGLE_USERINFO_URI: ${GOOGLE_USERINFO_URI}

JWT_SECRET: ${JWT_SECRET}
ACCESS_SECOND: ${ACCESS_SECOND}
REFRESH_SECOND: ${REFRESH_SECOND}
Expand Down
1 change: 1 addition & 0 deletions src/main/java/skhu/jijijig/domain/Crawling.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,7 @@ public static Crawling of(String label, String subLabel, String title, String na

public boolean isDifferent(Crawling other) {
return !Objects.equals(this.label, other.label) ||
!Objects.equals(this.subLabel, other.subLabel) ||
!Objects.equals(this.title, other.title) ||
!Objects.equals(this.name, other.name) ||
!Objects.equals(this.image, other.image) ||
Expand Down
63 changes: 44 additions & 19 deletions src/main/java/skhu/jijijig/service/ParsingService.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,12 +53,14 @@ public String parseDateTime(WebElement row, String label, String DATETIME) {
DateTimeFormatter timeFormatter = DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss");
if (label.startsWith("뽐뿌")) {
return parsePpomppuDateTime(dateTime, today, dateFormatter);
} else if (label.startsWith("루리웹") || label.startsWith("퀘사이존")) {
} else if (label.startsWith("루리웹")) {
return parseRuliwebDateTime(dateTime, today, dateFormatter);
} else if (label.startsWith("어미새")) {
return parseEomisaeDateTime(dateTime, today, now, dateFormatter, timeFormatter);
} else if (label.startsWith("쿨엔조이")) {
return parseCoolenjoyDateTime(dateTime, today, dateFormatter);
} else if (label.startsWith("퀘사이존")) {
return parseQuasarzoneDateTime(dateTime, today, dateFormatter);
}
return today.format(timeFormatter);
}
Expand Down Expand Up @@ -159,23 +161,19 @@ private int parseInteger(String text) {
}

private String parsePpomppuDateTime(String dateTime, LocalDate today, DateTimeFormatter dateFormatter) {
if (dateTime.contains(":")) { // 시간 포맷이 들어오면 (예: "20:18:16")
if (dateTime.contains(":")) {
return today.format(dateFormatter) + " " + dateTime;
} else if (dateTime.contains("/")) { // 날짜 포맷이 들어오면 (예: "24/05/11")
} else if (dateTime.contains("/")) {
String[] parts = dateTime.split("/");
LocalDate date = LocalDate.of(today.getYear(), Integer.parseInt(parts[1]), Integer.parseInt(parts[2]));
LocalDate date = LocalDate.of(2000 + Integer.parseInt(parts[0]), Integer.parseInt(parts[1]), Integer.parseInt(parts[2]));
return date.format(dateFormatter) + " 00:00:00";
}
return today.format(dateFormatter) + " 00:00:00";
}

private String parseRuliwebDateTime(String dateTime, LocalDate today, DateTimeFormatter dateFormatter) {
if (dateTime.contains(":")) { // 시간 포맷 (예: "11:53")
return today.format(dateFormatter) + " " + dateTime + ":00"; // "2024-05-12 11:53:00"
} else if (dateTime.contains("-")) { // 날짜 포맷 (예: "05-11")
String[] parts = dateTime.split("-");
LocalDate date = LocalDate.of(today.getYear(), Integer.parseInt(parts[0]), Integer.parseInt(parts[1]));
return date.format(dateFormatter) + " 00:00:00"; // "2024-05-11 00:00:00"
if (dateTime.contains(":")) {
return today.format(dateFormatter) + " " + dateTime + ":00";
} else if (dateTime.contains(".")) {
String[] parts = dateTime.split("\\.");
LocalDate date = LocalDate.of(Integer.parseInt(parts[0]), Integer.parseInt(parts[1]), Integer.parseInt(parts[2]));
Expand All @@ -187,24 +185,51 @@ private String parseRuliwebDateTime(String dateTime, LocalDate today, DateTimeFo
private String parseEomisaeDateTime(String dateTime, LocalDate today, LocalDateTime now, DateTimeFormatter dateFormatter, DateTimeFormatter timeFormatter) {
if (dateTime.contains(".")) {
String[] parts = dateTime.split("\\.");
LocalDate date = LocalDate.of(today.getYear(), Integer.parseInt(parts[1]), Integer.parseInt(parts[2]));
if (date.isEqual(today)) { // 날짜가 오늘 날짜인 경우
LocalDate date = LocalDate.of(2000 + Integer.parseInt(parts[0]), Integer.parseInt(parts[1]), Integer.parseInt(parts[2]));
if (date.isEqual(today)) {
return now.format(timeFormatter);
} else { // 어제 날짜 또는 그 이전 날짜인 경우
} else {
return date.format(dateFormatter) + " 00:00:00";
}
}
return today.format(dateFormatter) + " 00:00:00";
}

private String parseCoolenjoyDateTime(String dateTime, LocalDate today, DateTimeFormatter dateFormatter) {
dateTime = dateTime.replaceAll("등록일\\s+", ""); // "등록일"과 모든 공백(공백, 탭, 개행 포함) 제거
if (dateTime.contains(":")) { // 시간 포맷 (예: "11:00")
return today.format(dateFormatter) + " " + dateTime + ":00"; // "2024-05-12 11:00:00"
} else if (dateTime.contains(".")) { // 날짜 포맷 (예: "05.11")
dateTime = dateTime.replaceAll("등록일\\s+", "");
if (dateTime.contains(":")) {
return today.format(dateFormatter) + " " + dateTime + ":00";
}
if (dateTime.contains(".")) {
String[] parts = dateTime.split("\\.");
LocalDate date = LocalDate.of(today.getYear(), Integer.parseInt(parts[1]), Integer.parseInt(parts[2]));
return date.format(dateFormatter) + " 00:00:00"; // "2024-05-11 00:00:00"
int year = today.getYear();
int month = Integer.parseInt(parts[0]);
int day = Integer.parseInt(parts[1]);
if (month > 12) {
year = 2000 + month;
month = Integer.parseInt(parts[1]);
day = Integer.parseInt(parts[2]);
}
LocalDate date = LocalDate.of(year, month, day);
return date.format(dateFormatter) + " 00:00:00";
}
return today.format(dateFormatter) + " 00:00:00";
}

private String parseQuasarzoneDateTime(String dateTime, LocalDate today, DateTimeFormatter dateFormatter) {
if (dateTime.contains(":")) {
return today.format(dateFormatter) + " " + dateTime + ":00";
}
if (dateTime.contains("-")) {
String[] parts = dateTime.split("-");
int year = today.getYear();
int month = Integer.parseInt(parts[0]);
int day = Integer.parseInt(parts[1]);
if (month == 12 && today.getMonthValue() == 1) {
year -= 1; // 전년도
}
LocalDate date = LocalDate.of(year, month, day);
return date.format(dateFormatter) + " 00:00:00";
}
return today.format(dateFormatter) + " 00:00:00";
}
Expand Down

0 comments on commit 629647c

Please sign in to comment.