diff --git a/legal-core/src/main/java/org/opengroup/osdu/legal/jobs/LegalTagStatusJob.java b/legal-core/src/main/java/org/opengroup/osdu/legal/jobs/LegalTagStatusJob.java index b210ffe9ee002282299d40353818147e53062782..79a6d4945bdc6ba8d7ce7627b15c4a79d8f8bbd5 100644 --- a/legal-core/src/main/java/org/opengroup/osdu/legal/jobs/LegalTagStatusJob.java +++ b/legal-core/src/main/java/org/opengroup/osdu/legal/jobs/LegalTagStatusJob.java @@ -86,9 +86,9 @@ public class LegalTagStatusJob { Date expirationDate = properties.getExpirationDate(); Date today = new Date(); Date aboutToExpireDate = getAboutToExpireDate(expirationDate); - Boolean isAboutToExpire = aboutToExpireDate.before(today); + Boolean isNotAboutToExpire = aboutToExpireDate.after(today); - if (isAboutToExpire) { + if (!isNotAboutToExpire) { log.info(String.format("Found legal tag about to expire: %s", tag.getName())); aboutToExpireLegalTags.getAboutToExpireLegalTags().add(tag.getName()); } diff --git a/legal-core/src/test/java/org/opengroup/osdu/legal/jobs/LegalTagStatusJobTests.java b/legal-core/src/test/java/org/opengroup/osdu/legal/jobs/LegalTagStatusJobTests.java index d7d71316ecca90faf854ad483ce15821c3ab4fe5..1d1c9f1957f58aff9571347264d309f016412b8e 100644 --- a/legal-core/src/test/java/org/opengroup/osdu/legal/jobs/LegalTagStatusJobTests.java +++ b/legal-core/src/test/java/org/opengroup/osdu/legal/jobs/LegalTagStatusJobTests.java @@ -147,9 +147,9 @@ public class LegalTagStatusJobTests { ReflectionTestUtils.setField(sut, "legalTagExpiration", "3d"); Collection<LegalTag> validLegalTags = new ArrayList<>(); - LegalTag aboutToExpireLegalTag1 = createValidLegalTagWithIsValidStatus("aboutToExpireLegalTag1", true, 1); + LegalTag aboutToExpireLegalTag1 = createValidLegalTagWithIsValidStatus("aboutToExpireLegalTag1", true, 2); validLegalTags.add(aboutToExpireLegalTag1); - LegalTag aboutToExpireLegalTag2 = createValidLegalTagWithIsValidStatus("aboutToExpireLegalTag2", true, 2); + LegalTag aboutToExpireLegalTag2 = createValidLegalTagWithIsValidStatus("aboutToExpireLegalTag2", true, 3); validLegalTags.add(aboutToExpireLegalTag2); LegalTag longTermLegalTag = createValidLegalTagWithIsValidStatus("longTermLegalTag", true, 10); validLegalTags.add(longTermLegalTag); @@ -167,9 +167,9 @@ public class LegalTagStatusJobTests { ReflectionTestUtils.setField(sut, "legalTagExpiration", "2w"); Collection<LegalTag> validLegalTags = new ArrayList<>(); - LegalTag aboutToExpireLegalTag1 = createValidLegalTagWithIsValidStatus("aboutToExpireLegalTag1", true, 12); + LegalTag aboutToExpireLegalTag1 = createValidLegalTagWithIsValidStatus("aboutToExpireLegalTag1", true, 13); validLegalTags.add(aboutToExpireLegalTag1); - LegalTag aboutToExpireLegalTag2 = createValidLegalTagWithIsValidStatus("aboutToExpireLegalTag2", true, 13); + LegalTag aboutToExpireLegalTag2 = createValidLegalTagWithIsValidStatus("aboutToExpireLegalTag2", true, 14); validLegalTags.add(aboutToExpireLegalTag2); LegalTag longTermLegalTag = createValidLegalTagWithIsValidStatus("longTermLegalTag", true, 20); validLegalTags.add(longTermLegalTag);