Merge pull request #1486 from navikt/dev/ORG-1799-skjule-sluttdato-i-…

…export ORG-1799 skjule sluttdato i export
navikt · Jun 21, 2024 · 93d44bc · 93d44bc
2 parents d585991 + bfd5aa7
commit 93d44bc
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 5 deletions.
diff --git a/apps/backend/src/main/java/no/nav/data/team/member/MemberExportService.java b/apps/backend/src/main/java/no/nav/data/team/member/MemberExportService.java
@@ -18,12 +18,14 @@
 import no.nav.data.team.team.domain.Team;
 import org.springframework.stereotype.Service;
 
+import java.time.LocalDate;
 import java.util.Comparator;
 import java.util.List;
 import java.util.UUID;
 import java.util.stream.Stream;
 
 import static java.util.Comparator.comparing;
+import static java.util.Objects.isNull;
 import static java.util.Optional.ofNullable;
 import static java.util.stream.Collectors.toList;
 import static no.nav.data.common.utils.StreamUtils.convert;
@@ -149,10 +151,15 @@ private void add(ExcelBuilder doc, Member member) {
                 .addCell(member.member.getDescription())
                 .addCell(member.member.getResource().getEmail())
                 .addCell(DateUtil.formatDate(member.member.getResource().getStartDate()))
-                .addCell(DateUtil.formatDate(member.member.getResource().getEndDate()))
+                .addCell(shouldHideEndDateIfBeforeNow(member.member.getResource().getEndDate()))
         ;
     }
 
+    private String shouldHideEndDateIfBeforeNow(LocalDate endDate) {
+        if (isNull(endDate) || endDate.isBefore(LocalDate.now())) return null;
+        else return DateUtil.formatDate(endDate);
+    }
+
     record Member(Relation relation, MemberResponse member, Team team, ProductArea pa, List<Cluster> clusters) {
 
         enum Relation {
@@ -196,8 +203,5 @@ public String memberType() {
         public String roles() {
             return String.join(", ", convert(member.getRoles(), Lang::roleName));
         }
-
-
     }
-
 }
diff --git a/apps/backend/src/main/java/no/nav/data/team/resource/domain/Resource.java b/apps/backend/src/main/java/no/nav/data/team/resource/domain/Resource.java
@@ -19,6 +19,8 @@
 import java.time.ZonedDateTime;
 import java.util.UUID;
 
+import static java.util.Objects.isNull;
+
 @Data
 @Builder
 @AllArgsConstructor
@@ -90,9 +92,14 @@ public ResourceResponse convertToResponse() {
                 .onLeave(onLeave)
                 .resourceType(resourceType)
                 .startDate(startDate)
-                .endDate(endDate)
+                .endDate(shouldHideEndDateIfBeforeNow())
                 .stale(stale)
                 .links(Links.getFor(this))
                 .build();
     }
+
+    private LocalDate shouldHideEndDateIfBeforeNow() {
+        if (isNull(this.endDate) || this.endDate.isBefore(LocalDate.now())) return null;
+        else return this.endDate;
+    }
 }