diff --git a/src/main/java/com/navi/infra/portal/v2/jit/dto/JitReviewDto.java b/src/main/java/com/navi/infra/portal/v2/jit/dto/JitReviewDto.java index b6b8e21d..8f4ece40 100644 --- a/src/main/java/com/navi/infra/portal/v2/jit/dto/JitReviewDto.java +++ b/src/main/java/com/navi/infra/portal/v2/jit/dto/JitReviewDto.java @@ -17,7 +17,7 @@ public class JitReviewDto extends JitRequestDto { private Long jitApprovalId; public JitReviewDto( - Long id, + Long approvalId, Long jitId, String requestedFor, String requestedBy, @@ -38,6 +38,6 @@ public class JitReviewDto extends JitRequestDto { super(jitId, requestedFor, requestedBy, vertical, team, environment, resourceType, resourceId, resourceAction, awsResourceType, awsResourceNames, awsPolicy, grantWindow, epochSecond, justification, status); - this.jitApprovalId = id; + this.jitApprovalId = approvalId; } } \ No newline at end of file diff --git a/src/main/java/com/navi/infra/portal/v2/jit/service/JitServiceImpl.java b/src/main/java/com/navi/infra/portal/v2/jit/service/JitServiceImpl.java index 3bf06766..3b7343f8 100644 --- a/src/main/java/com/navi/infra/portal/v2/jit/service/JitServiceImpl.java +++ b/src/main/java/com/navi/infra/portal/v2/jit/service/JitServiceImpl.java @@ -704,7 +704,7 @@ class JitServiceImpl implements JitService { JitRequestStatus.PENDING.type, LIST_LIMIT).stream() .map(obj -> { JitRequest jitRequest = obj.getJitRequest(); - JitReviewDto t = new JitReviewDto(obj.getId(), obj.getId(), + JitReviewDto t = new JitReviewDto(obj.getId(), jitRequest.getId(), jitRequest.getRequestedFor().getEmail(), jitRequest.getRequestedBy().getEmail(), jitRequest.getVertical(), jitRequest.getTeam().getName(), jitRequest.getEnvironment(), @@ -716,7 +716,7 @@ class JitServiceImpl implements JitService { jitRequest.getGrantAt().atZone(ZoneId.systemDefault()).toEpochSecond(), jitRequest.getJustification(), jitRequest.getStatus().toString()); return t; - }) + }).filter(jitReviewDto -> jitReviewDto.getStatus() == JitRequestStatus.PENDING.type) .collect(Collectors.toList()); }