edit

Author: dev-khg

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

@@ -36,12 +36,19 @@ public void batch(List<? extends ApiResponse> apiResponses) {
         List<CatcherItem> catcherItems = apiResponses.stream()
                 .filter(apiResponse -> {
                     String hashKey = hashString(apiResponse);
-                    if (itemMap.containsKey(hashKey) && isContentChanged(itemMap.get(hashKey), apiResponse)) {
-                        if (isExpired(apiResponse)) {
+                    if (itemMap.containsKey(hashKey)) {
+                        if (isExpired(apiResponse.getEndAt())) {
                             deleteItems.add(itemMap.get(hashKey));
                             itemMap.remove(hashKey);
                             return false;
                         }
+                        if (isContentChanged(itemMap.get(hashKey), apiResponse)) {
+                            return true;
+                        }
+                    } else {
+                        if(isExpired(apiResponse.getEndAt())) {
+                            return false;
+                        }
                     }
                     return true;
                 })
@@ -93,7 +100,7 @@ protected CatcherItem apiResponseToCatcherItem(ApiResponse apiResponse, Category
                 .build();
     }
 
-    private boolean isExpired(ApiResponse apiResponse) {
-        return apiResponse.getStartAt() != null && ZonedDateTime.now().isAfter(apiResponse.getStartAt());
+    private boolean isExpired(ZonedDateTime endDateTime) {
+        return endDateTime != null && ZonedDateTime.now().isAfter(endDateTime);
     }
 }