From 1342de41bdfac10f2119f26870cc05fbd4925baf Mon Sep 17 00:00:00 2001 From: Yusun Choi Date: Wed, 27 Sep 2023 01:23:05 +0900 Subject: [PATCH] fix: Remove array fields not required for service feature (#3) --- .../service/DataUpdateService.java | 18 ++---------------- .../util/data/NewsDataWriter.java | 8 ++------ 2 files changed, 4 insertions(+), 22 deletions(-) diff --git a/dev/nusuy/ext-search-batch/src/main/java/com/cubix/extsearchbatch/service/DataUpdateService.java b/dev/nusuy/ext-search-batch/src/main/java/com/cubix/extsearchbatch/service/DataUpdateService.java index 5aa0adb..a29c5e6 100644 --- a/dev/nusuy/ext-search-batch/src/main/java/com/cubix/extsearchbatch/service/DataUpdateService.java +++ b/dev/nusuy/ext-search-batch/src/main/java/com/cubix/extsearchbatch/service/DataUpdateService.java @@ -1,7 +1,6 @@ package com.cubix.extsearchbatch.service; import com.cubix.extsearchbatch.dto.NaverRawNewsItemDto; -import com.cubix.extsearchbatch.entity.NewsEntity; import com.cubix.extsearchbatch.entity.NewsRepository; import com.cubix.extsearchbatch.exception.OpenApiRequestException; import com.cubix.extsearchbatch.exception.OpenApiResponseException; @@ -23,8 +22,6 @@ public class DataUpdateService { private final NewsRepository newsRepository; private final NewsDataReader newsDataReader; private final NewsDataWriter newsDataWriter; - private ArrayList rawData; - private ArrayList resultData; @PostConstruct public void onStartup() { @@ -33,8 +30,6 @@ public void onStartup() { @Scheduled(cron = "0 0 3 * * *", zone = "Asia/Seoul") public void updateNewsData() { - rawData = new ArrayList<>(); - resultData = new ArrayList<>(); log.info("Naver news data request started. --" + LocalDateTime.now()); final int DISPLAY_DEF = 100; @@ -58,15 +53,14 @@ public void updateNewsData() { // Get data ArrayList items = newsDataReader.get(display, start).getItems(); - rawData.addAll(items); // Write data if (isEmptyDB) { // DB is empty (no need to validate) - resultData.addAll(newsDataWriter.writeWithoutValidation(items)); + newsDataWriter.writeWithoutValidation(items); } else { // DB is not empty (validation required) - resultData.addAll(newsDataWriter.writeWithValidation(items)); + newsDataWriter.writeWithValidation(items); } } @@ -79,12 +73,4 @@ public void updateNewsData() { log.error("Naver API response status <" + e.getStatusCode().value() + ">: " + e.getMessage()); } } - - public ArrayList getRawData() { - return rawData; - } - - public ArrayList getResultData() { - return resultData; - } } diff --git a/dev/nusuy/ext-search-batch/src/main/java/com/cubix/extsearchbatch/util/data/NewsDataWriter.java b/dev/nusuy/ext-search-batch/src/main/java/com/cubix/extsearchbatch/util/data/NewsDataWriter.java index 0b135c4..33bbc50 100644 --- a/dev/nusuy/ext-search-batch/src/main/java/com/cubix/extsearchbatch/util/data/NewsDataWriter.java +++ b/dev/nusuy/ext-search-batch/src/main/java/com/cubix/extsearchbatch/util/data/NewsDataWriter.java @@ -25,7 +25,7 @@ public NewsEntity getDuplicateData(NaverRawNewsItemDto naverRawNewsItemDto) { } @Transactional - public ArrayList writeWithValidation(ArrayList items) { + public void writeWithValidation(ArrayList items) { ArrayList validatedItems = new ArrayList<>(); for (NaverRawNewsItemDto rawNewsItemDto : items) { @@ -42,11 +42,9 @@ public ArrayList writeWithValidation(ArrayList // Save data newsRepository.saveAll(validatedItems); - - return validatedItems; } - public ArrayList writeWithoutValidation(ArrayList items) { + public void writeWithoutValidation(ArrayList items) { ArrayList resultList = new ArrayList<>(); for (NaverRawNewsItemDto rawNewsItemDto : items) { @@ -55,7 +53,5 @@ public ArrayList writeWithoutValidation(ArrayList