Skip to content

Commit ebe545e

Browse files
committed
edit
1 parent 0a0f735 commit ebe545e

File tree

1 file changed

+9
-8
lines changed

1 file changed

+9
-8
lines changed

src/main/java/com/catcher/batch/core/service/BatchService.java

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ public abstract class BatchService {
2323
private final CategoryRepository categoryRepository;
2424
private final LocationRepository locationRepository;
2525

26-
@Transactional
2726
public void batch(List<? extends ApiResponse> apiResponses) {
2827
Category category = categoryRepository.findByName(apiResponses.get(0).getCategory())
2928
.orElseGet(() -> categoryRepository.save(Category.create(apiResponses.get(0).getCategory())));
@@ -32,31 +31,33 @@ public void batch(List<? extends ApiResponse> apiResponses) {
3231
.collect(Collectors.toMap(CatcherItem::getItemHashValue, Function.identity()));
3332

3433
List<CatcherItem> deleteItems = new ArrayList<>();
34+
List<CatcherItem> saveItems = new ArrayList<>();
3535

3636
List<CatcherItem> catcherItems = apiResponses.stream()
3737
.filter(apiResponse -> {
3838
String hashKey = hashString(apiResponse);
3939
if (itemMap.containsKey(hashKey)) {
4040
if (isExpired(apiResponse.getEndAt())) {
4141
deleteItems.add(itemMap.get(hashKey));
42-
itemMap.remove(hashKey);
43-
return false;
4442
}
4543
if (isContentChanged(itemMap.get(hashKey), apiResponse)) {
46-
return true;
44+
CatcherItem e = itemMap.get(hashKey);
45+
// e.changeContent(dsfasfaf,dadasd); ... 요기에 바꾸는 로직 추가
46+
saveItems.add(e);
4747
}
48+
return false;
4849
} else {
49-
if(isExpired(apiResponse.getEndAt())) {
50+
if (isExpired(apiResponse.getEndAt())) {
5051
return false;
5152
}
53+
return true;
5254
}
53-
return true;
5455
})
5556
.map(apiResponse -> apiResponseToCatcherItem(apiResponse, category, getLocation(apiResponse)))
5657
.toList();
5758

58-
if (!catcherItems.isEmpty()) {
59-
catcherItemRepository.saveAll(catcherItems);
59+
if (!saveItems.isEmpty()) {
60+
catcherItemRepository.saveAll(saveItems);
6061
}
6162

6263
if (!deleteItems.isEmpty()) {

0 commit comments

Comments
 (0)