Modified the logic of view pending terminations

Ahmad45123 · May 16, 2024 · 0a604dc · 0a604dc
1 parent 55f3dd2
commit 0a604dc
Show file tree

Hide file tree

Showing 5 changed files with 46 additions and 19 deletions.
diff --git a/.../contracts/src/main/java/com/workup/contracts/commands/GetPendingTerminationsCommand.java b/.../contracts/src/main/java/com/workup/contracts/commands/GetPendingTerminationsCommand.java
@@ -2,10 +2,11 @@
 
 import com.workup.contracts.logger.ContractsLogger;
 import com.workup.contracts.logger.LoggingLevel;
-import com.workup.contracts.models.TerminationRequest;
+import com.workup.shared.commands.contracts.TerminationRequest;
 import com.workup.shared.commands.contracts.requests.GetPendingTerminationsRequest;
 import com.workup.shared.commands.contracts.responses.GetPendingTerminationsResponse;
 import com.workup.shared.enums.HttpStatusCode;
+import com.workup.shared.enums.contracts.TerminationRequestStatus;
 import java.util.List;
 
 public class GetPendingTerminationsCommand
@@ -15,8 +16,21 @@ public class GetPendingTerminationsCommand
   public GetPendingTerminationsResponse Run(GetPendingTerminationsRequest request) {
 
     try {
+      @SuppressWarnings("unchecked")
       List<TerminationRequest> terminationsList =
-          terminationRequestRepository.findByContractId(request.getContractId());
+          (List<TerminationRequest>)
+              terminationRequestRepository
+                  .findByContractIdAndStatus(
+                      request.getContractId(), TerminationRequestStatus.PENDING)
+                  .stream()
+                  .map(
+                      req ->
+                          TerminationRequest.builder()
+                              .withRequesterId(req.getRequesterId())
+                              .withRequestId(String.valueOf(req.getRequestId()))
+                              .withContractId(req.getContractId())
+                              .withReason(req.getReason())
+                              .build());
 
       if (terminationsList.isEmpty()) {
         return GetPendingTerminationsResponse.builder()
@@ -25,14 +39,8 @@ public GetPendingTerminationsResponse Run(GetPendingTerminationsRequest request)
             .build();
       }
 
-      TerminationRequest terminationRequest = terminationsList.getFirst();
-
       return GetPendingTerminationsResponse.builder()
-          .withRequestId(terminationRequest.getRequestId().toString())
-          .withRequesterId(terminationRequest.getRequesterId())
-          .withContractId(terminationRequest.getContractId())
-          .withReason(terminationRequest.getReason())
-          .withStatus(terminationRequest.getStatus())
+          .withTerminationRequests(terminationsList)
           .withStatusCode(HttpStatusCode.OK)
           .withErrorMessage("")
           .build();

diff --git a/...ntracts/src/main/java/com/workup/contracts/repositories/TerminationRequestRepository.java b/...ntracts/src/main/java/com/workup/contracts/repositories/TerminationRequestRepository.java
@@ -13,8 +13,8 @@
 public interface TerminationRequestRepository
     extends CassandraRepository<TerminationRequest, UUID> {
   @AllowFiltering
-  List<TerminationRequest> findByRequesterIdAndContractIdAndStatus(
-      String requesterId, String contractId, TerminationRequestStatus status);
+  List<TerminationRequest> findByContractIdAndStatus(
+      String contractId, TerminationRequestStatus status);
 
   @Query("SELECT * FROM contracts_data.termination_requests WHERE contractid = ?0")
   List<TerminationRequest> findByContractId(String contractId);

diff --git a/shared/src/main/java/com/workup/shared/commands/contracts/TerminationRequest.java b/shared/src/main/java/com/workup/shared/commands/contracts/TerminationRequest.java
@@ -0,0 +1,22 @@
+package com.workup.shared.commands.contracts;
+
+import com.workup.shared.enums.contracts.TerminationRequestStatus;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.experimental.SuperBuilder;
+import lombok.extern.jackson.Jacksonized;
+
+@Getter
+@Setter
+@SuperBuilder(setterPrefix = "with")
+@Jacksonized
+public class TerminationRequest {
+
+  private final String requestId;
+
+  private final String contractId;
+  private final String requesterId;
+  private final String reason;
+
+  private final TerminationRequestStatus status;
+}
diff --git a/...ain/java/com/workup/shared/commands/contracts/requests/GetPendingTerminationsRequest.java b/...ain/java/com/workup/shared/commands/contracts/requests/GetPendingTerminationsRequest.java
@@ -2,13 +2,15 @@
 
 import com.workup.shared.commands.CommandRequest;
 import lombok.Getter;
+import lombok.Setter;
 import lombok.experimental.SuperBuilder;
 import lombok.extern.jackson.Jacksonized;
 
 // PURPOSE : To fulfill the need for the read of CRUD for our terminations repository
 @Getter
 @SuperBuilder(setterPrefix = "with")
 @Jacksonized
+@Setter
 public class GetPendingTerminationsRequest extends CommandRequest {
   private final String contractId;
 }
diff --git a/...n/java/com/workup/shared/commands/contracts/responses/GetPendingTerminationsResponse.java b/...n/java/com/workup/shared/commands/contracts/responses/GetPendingTerminationsResponse.java
@@ -1,7 +1,8 @@
 package com.workup.shared.commands.contracts.responses;
 
 import com.workup.shared.commands.CommandResponse;
-import com.workup.shared.enums.contracts.TerminationRequestStatus;
+import com.workup.shared.commands.contracts.TerminationRequest;
+import java.util.List;
 import lombok.Getter;
 import lombok.experimental.SuperBuilder;
 import lombok.extern.jackson.Jacksonized;
@@ -10,11 +11,5 @@
 @SuperBuilder(setterPrefix = "with")
 @Jacksonized
 public class GetPendingTerminationsResponse extends CommandResponse {
-  private final String requestId;
-
-  private final String contractId;
-  private final String requesterId;
-  private final String reason;
-
-  private final TerminationRequestStatus status;
+  private List<TerminationRequest> terminationRequests;
 }