Feat : 학교 홈페이지 리뉴얼로인한 교직원 스크랩 및 스크랩간 직위 추가 #223
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,57 @@ | ||
| package com.kustacks.kuring.common.utils.converter; | ||
|
|
||
| import java.util.regex.Pattern; | ||
|
|
||
| public class EmailConverter { | ||
| private static final Pattern AT_PATTERN = Pattern.compile("\\s+at\\s+"); | ||
| private static final Pattern DOT_PATTERN = Pattern.compile("\\s+dot\\s+"); | ||
| private static final Pattern EMAIL_PATTERN = Pattern.compile("^[a-zA-Z0-9_!#$%&'\\*+/=?{|}~^.-]+@[a-zA-Z0-9.-]+$"); | ||
|
|
||
| private static final String KONKUK_DOMAIN = "@konkuk.ac.kr"; | ||
|
|
||
| public static String convertValidEmail(String email) { | ||
| if (email == null || email.isBlank()) { | ||
| return ""; // 빈 입력 처리 | ||
| } | ||
|
|
||
| //여러 이메일인 경우 있으니 분리. | ||
| String[] emailGroups = email.split("[/,]"); | ||
| //정상 구조가 아닌 경우 구조 정상화 | ||
| for (int i = 0; i < emailGroups.length; i++) { | ||
|
There was a problem hiding this comment. 코드를 조금 다시 재구성 해봤는데 확인 부탁해요~ public class EmailConverter {
private static final Pattern AT_PATTERN = Pattern.compile("\\s+at\\s+");
private static final Pattern DOT_PATTERN = Pattern.compile("\\s+dot\\s+");
private static final Pattern EMAIL_PATTERN = Pattern.compile("^[a-zA-Z0-9_!#$%&'\\*+/=?{|}~^.-]+@[a-zA-Z0-9.-]+$");
private static final String KONKUK_DOMAIN = "@konkuk.ac.kr";
private static final String EMPTY_EMAIL = "";
public static String convertValidEmail(String email) {
if (isNullOrEmpty(email)) {
return EMPTY_EMAIL;
}
String[] emailGroups = splitEmails(email);
String[] normalizedEmails = normalizeEmails(emailGroups);
return selectPreferredEmail(normalizedEmails);
}
private static boolean isNullOrEmpty(String str) {
return str == null || str.isBlank();
}
private static String[] splitEmails(String email) {
return email.split("[/,]");
}
private static String[] normalizeEmails(String[] emailGroups) {
return Arrays.stream(emailGroups)
.map(EmailConverter::normalizeEmail)
.toArray(String[]::new);
}
private static String normalizeEmail(String email) {
if (isNullOrEmpty(email)) {
return EMPTY_EMAIL;
}
if (EMAIL_PATTERN.matcher(email).matches()) {
return email;
}
if (containsSubstitutePatterns(email)) {
return replaceSubstitutePatterns(email);
}
return EMPTY_EMAIL;
}
private static boolean containsSubstitutePatterns(String email) {
return DOT_PATTERN.matcher(email).find() && AT_PATTERN.matcher(email).find();
}
private static String replaceSubstitutePatterns(String email) {
return email.replaceAll(DOT_PATTERN.pattern(), ".")
.replaceAll(AT_PATTERN.pattern(), "@");
}
private static String selectPreferredEmail(String[] emails) {
return Arrays.stream(emails)
.filter(email -> !email.isBlank())
.filter(email -> email.endsWith(KONKUK_DOMAIN))
.findFirst()
.orElseGet(() -> emails.length > 0 ? emails[0] : EMPTY_EMAIL);
}
} |
||
| emailGroups[i] = normalizeEmail(emailGroups[i]); | ||
| } | ||
|
|
||
| //여러 이메일 중 konkuk을 우선 선택, 없으면 첫번째 내용 | ||
| return selectEmail(emailGroups); | ||
| } | ||
|
|
||
| private static String normalizeEmail(String email) { | ||
| if (email == null || email.isBlank()) { | ||
| return ""; | ||
| } | ||
|
|
||
| // 정상 이메일인지 확인 | ||
| if (EMAIL_PATTERN.matcher(email).matches()) { | ||
| return email; | ||
| } | ||
|
|
||
| // "@", "." 대신 "at", "dot"으로 되어있는 경우 변환 | ||
| if (DOT_PATTERN.matcher(email).find() && AT_PATTERN.matcher(email).find()) { | ||
| return email.replaceAll(DOT_PATTERN.pattern(), ".") | ||
| .replaceAll(AT_PATTERN.pattern(), "@"); | ||
| } | ||
|
|
||
| // 기타 이상한 형식은 빈공백으로 저장 | ||
| return ""; | ||
| } | ||
|
|
||
| // Konkuk 도메인 우선 선택 | ||
| private static String selectEmail(String[] emails) { | ||
|
There was a problem hiding this comment. 현재는 빈 공백이라도 입력되도록 구현되어있어서 괜찮다고 넘긴 부분인데, 이 메서드의 입장에서 봤을 때 불확실한 믿을을 가져야 하는거 같아서 검증할 수 있도록 추가하겠습니다! |
||
| for (String email : emails) { | ||
| if (email.endsWith(KONKUK_DOMAIN)) { | ||
| return email; | ||
| } | ||
| } | ||
| return emails[0]; | ||
| } | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,28 @@ | ||
| package com.kustacks.kuring.common.utils.converter; | ||
|
|
||
| import java.util.regex.Pattern; | ||
|
|
||
| public class PhoneNumberConverter { | ||
|
|
||
| private static final Pattern LAST_FOUR_NUMBER_PATTERN = Pattern.compile("\\d{4}"); | ||
| private static final Pattern FULL_NUMBER_PATTERN = Pattern.compile("02-\\d{3,4}-\\d{4}"); | ||
| private static final Pattern FULL_NUMBER_WITH_PARENTHESES_PATTERN = Pattern.compile("02[)]\\d{3,4}-\\d{4}"); | ||
|
|
||
| public static String convertFullExtensionNumber(String number) { | ||
| if (number == null || number.isBlank()) { | ||
| return ""; | ||
| } | ||
| if (LAST_FOUR_NUMBER_PATTERN.matcher(number).matches()) { | ||
| return "02-450-" + number; | ||
| } | ||
| if (FULL_NUMBER_PATTERN.matcher(number).matches()) { | ||
| return number; | ||
| } | ||
| if (FULL_NUMBER_WITH_PARENTHESES_PATTERN.matcher(number).matches()) { | ||
| return number.replace(")", "-"); | ||
| } | ||
|
|
||
| //기타 이상한 형식은 빈공백으로 저장 ex. 218) 이게뭔데; | ||
| return ""; | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,8 +1,6 @@ | ||
| package com.kustacks.kuring.worker.parser.staff; | ||
|
|
||
| import com.kustacks.kuring.worker.scrap.deptinfo.DeptInfo; | ||
| import com.kustacks.kuring.worker.scrap.deptinfo.real_estate.RealEstateDept; | ||
| import lombok.NoArgsConstructor; | ||
| import lombok.extern.slf4j.Slf4j; | ||
|
|
@@ -18,33 +16,22 @@ public class EachDeptStaffHtmlParser extends StaffHtmlParserTemplate { | |
|
|
||
| @Override | ||
| public boolean support(DeptInfo deptInfo) { | ||
| return !(deptInfo instanceof RealEstateDept); | ||
| } | ||
|
|
||
| protected Elements selectStaffInfoRows(Document document) { | ||
| return document.select(".row"); | ||
| } | ||
|
|
||
| protected String[] extractStaffInfoFromRow(Element row) { | ||
| String name = row.select(".info .title .name").text(); | ||
|
|
||
| Elements detailElement = row.select(".detail"); | ||
| String jobPosition = detailElement.select(".ico1 dd").text().trim(); | ||
|
There was a problem hiding this comment. 여기의 모든 html요소들이 항상 존재할까요? There was a problem hiding this comment. 말씀해주신 부분 알아보니 null값은 나오지 않도록 Jsoup에서 지원하는 것 같아요! 예를들어
두 경우 모두 직접 테스트 해본 결과 null값이 아닌 ""과 같은 빈 공백이 배열에 저장됩니다. 실제, 데이터가 없는 학과(ex. 수의예과의 경우 1번의 경우에 해당되는걸 확인했습니다. 혹시나 싶어 Jsoup 라이브러리의 select메서드를 훑어봤을 때 찾는 요소가 없다면 빈 Elements 객체를 반환하는 걸로 보입니다. public static Elements select(String query, Iterable<Element> roots) {
Validate.notEmpty(query);
Validate.notNull(roots);
Evaluator evaluator = QueryParser.parse(query);
Elements elements = new Elements();
IdentityHashMap<Element, Boolean> seenElements = new IdentityHashMap();
Iterator var5 = roots.iterator();
while(var5.hasNext()) {
Element root = (Element)var5.next();
Elements found = select(evaluator, root);
Iterator var8 = found.iterator();
while(var8.hasNext()) {
Element el = (Element)var8.next();
if (seenElements.put(el, Boolean.TRUE) == null) {
elements.add(el);
}
}
}
return elements;
}마찬가지 text() 메서드 또한 빈 StringBuilder 객체를 생성하고 사용하기에 값이 없다면 그대로 빈 공백이 출력되도록 하는거 같습니다. public String text() {
StringBuilder sb = StringUtil.borrowBuilder();
Element element;
for(Iterator var2 = this.iterator(); var2.hasNext(); sb.append(element.text())) {
element = (Element)var2.next();
if (sb.length() != 0) {
sb.append(" ");
}
}
return StringUtil.releaseBuilder(sb);
}솔직하게 말하자면 잠깐 고민했던 부분인데 일단 돌아가길래 뒀던거 같습니다 하하...😂 |
||
| String major = detailElement.select(".ico2 dd").text().trim(); | ||
| String lab = detailElement.select(".ico3 dd").text().trim(); | ||
| String extensionNumber = detailElement.select(".ico4 dd").text().trim(); | ||
| String email = detailElement.select(".ico5 dd").text().trim(); | ||
| return new String[]{name, jobPosition, major, lab, extensionNumber, email}; | ||
| } | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
함수 이름이 convertValidEmail 인 상황인데 "" 이 나오면 이건 ValidEmail로 간주하는 것 일까요?
방어 로직이 있는거 자체는 좋아요!, 다만 호출하는쪽에서 null과 blank가 아닌 경우에 converting을 시도하는것도 좋을수도??
의견입니다!
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
동의합니다~! 조금 확장해서 EmailSupporter로 만드는게 더 좋을 수 있겠다는 생각이 드네용!
외부에서 null과 blank를 체크하는 메서드를 호출(isNullOrBlank)한 후 결과에 따라 convertEmail 메서드를 통해 변환하도록 구현하는게 조금 더 명확할거 같다고 생각합니다!
이런 방향성이면 PhoneNumberConverter도 수정이 필요할거 같네욤