From 5450d0cacc24e68a3313e6a83db1899e40b8615b Mon Sep 17 00:00:00 2001
From: aoezyetimoglu <ali.oezyetimoglu@iqser.com>
Date: Wed, 6 Apr 2022 11:09:58 +0200
Subject: [PATCH] RED-3287: Improve RedactionLog Controller to allow
 incremental calls

---
 .../peristence/v1/server/service/RedactionLogService.java   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/service/RedactionLogService.java b/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/service/RedactionLogService.java
index 616ebd5fa..502260ff2 100644
--- a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/service/RedactionLogService.java
+++ b/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/service/RedactionLogService.java
@@ -109,19 +109,19 @@ public class RedactionLogService {
             var redactionLogEntry = it.next();
             boolean isAfterSpecifiedDate = false;
             for (var change : redactionLogEntry.getChanges()) {
-                if (change.getDateTime().isAfter(filteredRedactionLogRequest.getSpecifiedDate())) {
+                if (change.getDateTime() != null && change.getDateTime().isAfter(filteredRedactionLogRequest.getSpecifiedDate())) {
                     isAfterSpecifiedDate = true;
                 }
             }
             for (var manualChange : redactionLogEntry.getManualChanges()) {
-                if (manualChange.getProcessedDate().isAfter(filteredRedactionLogRequest.getSpecifiedDate())) {
+                if (manualChange.getProcessedDate() != null && manualChange.getProcessedDate().isAfter(filteredRedactionLogRequest.getSpecifiedDate()) || manualChange.getRequestedDate() != null && manualChange.getRequestedDate().isAfter(filteredRedactionLogRequest.getSpecifiedDate())) {
                     isAfterSpecifiedDate = true;
                 }
             }
             var comments = redactionLogEntry.getComments();
             if (comments != null) {
                 for (var comment : comments) {
-                    if (comment.getSoftDeletedTime() != null && comment.getSoftDeletedTime().isAfter(filteredRedactionLogRequest.getSpecifiedDate()) || comment.getDate().isAfter(filteredRedactionLogRequest.getSpecifiedDate())) {
+                    if (comment.getSoftDeletedTime() != null && comment.getSoftDeletedTime().isAfter(filteredRedactionLogRequest.getSpecifiedDate()) || comment.getDate() != null && comment.getDate().isAfter(filteredRedactionLogRequest.getSpecifiedDate())) {
                         isAfterSpecifiedDate = true;
                     }
                 }