Skip to content

Commit

Permalink
Changed all listeners to work with controller update command.
Browse files Browse the repository at this point in the history 
Co-authored-by: Ziad Othman <ziadsadek999@gmail.com>
  • Loading branch information
@Ahmad45123 @ziadsadek999
Ahmad45123 and ziadsadek999 committed May 18, 2024
1 parent 1f6230c commit 2f40b09
Show file tree
Hide file tree
Showing 5 changed files with 142 additions and 100 deletions.
31 changes: 20 additions & 11 deletions services/contracts/src/main/java/com/workup/contracts/RabbitMQListener.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,8 @@ public class RabbitMQListener {
public CompletableFuture<InitiateContractResponse> receive(InitiateContractRequest in)
throws Exception {
InitiateContractResponse response =
((InitiateContractCommand) commandMap.getCommand("InitiateContract")).Run(in);
(InitiateContractResponse)
((Command<CommandRequest, ?>) commandMap.getCommand("InitiateContract")).Run(in);
return CompletableFuture.completedFuture(response);
}

Expand All @@ -47,64 +48,72 @@ public CompletableFuture<InitiateContractResponse> receive(InitiateContractReque
public CompletableFuture<ContractTerminationResponse> receive(ContractTerminationRequest in)
throws Exception {
return CompletableFuture.completedFuture(
((RequestContractTerminationCommand) commandMap.getCommand("RequestContractTermination"))
.Run(in));
(RequestContractTerminationResponse)
((Command<CommandRequest, ?>) commandMap.getCommand("RequestContractTermination"))
.Run(in));
}

@RabbitHandler
@Async
public CompletableFuture<HandleTerminationResponse> receive(HandleTerminationRequest in)
throws Exception {
return CompletableFuture.completedFuture(
((HandleTerminationRequestCommand) commandMap.getCommand("HandleTerminationRequest"))
.Run(in));
(HandleTerminationRequestResponse)
((Command<CommandRequest, ?>) commandMap.getCommand("HandleTerminationRequest"))
.Run(in));
}

@RabbitHandler
@Async
public CompletableFuture<MarkPaymentCompletedResponse> receive(MarkPaymentCompletedRequest in)
throws Exception {
return CompletableFuture.completedFuture(
((MarkMilestoneAsPaidCommand) commandMap.getCommand("MarkMilestoneAsPaid")).Run(in));
(MarkMilestoneAsPaidResponse)
((Command<CommandRequest, ?>) commandMap.getCommand("MarkMilestoneAsPaid")).Run(in));
}

@RabbitHandler
@Async
public CompletableFuture<ViewContractMilestonesResponse> receive(ViewContractMilestonesRequest in)
throws Exception {
return CompletableFuture.completedFuture(
((ViewContractMilestonesCommand) commandMap.getCommand("ViewContractMilestones")).Run(in));
(ViewContractMilestonesResponse)
((Command<CommandRequest, ?>) commandMap.getCommand("ViewContractMilestones")).Run(in));
}

@RabbitHandler
@Async
public CompletableFuture<GetContractResponse> receive(GetContractRequest in) throws Exception {
return CompletableFuture.completedFuture(
((GetContractCommand) commandMap.getCommand("GetContract")).Run(in));
(GetContractResponse)
((Command<CommandRequest, ?>) commandMap.getCommand("GetContract")).Run(in));
}

@RabbitHandler
@Async
public CompletableFuture<EvaluateMilestoneResponse> receive(EvaluateMilestoneRequest in)
throws Exception {
return CompletableFuture.completedFuture(
((EvaluateMilestoneCommand) commandMap.getCommand("EvaluateMilestone")).Run(in));
(EvaluateMilestoneResponse)
((Command<CommandRequest, ?>) commandMap.getCommand("EvaluateMilestone")).Run(in));
}

@RabbitHandler
@Async
public CompletableFuture<ProgressMilestoneResponse> receive(ProgressMilestoneRequest in)
throws Exception {
return CompletableFuture.completedFuture(
((ProgressMilestoneCommand) commandMap.getCommand("ProgressMilestone")).Run(in));
(ProgressMilestoneResponse)
((Command<CommandRequest, ?>) commandMap.getCommand("ProgressMilestone")).Run(in));
}

@RabbitHandler
@Async
public CompletableFuture<GetPendingTerminationsResponse> receive(GetPendingTerminationsRequest in)
throws Exception {
return CompletableFuture.completedFuture(
((GetPendingTerminationsCommand) commandMap.getCommand("GetPendingTerminations")).Run(in));
(GetPendingTerminationsResponse)
((Command<CommandRequest, ?>) commandMap.getCommand("GetPendingTerminations")).Run(in));
}
// NEW_COMMAND_BOILERPLATE

Expand Down
29 changes: 15 additions & 14 deletions services/jobs/src/main/java/com/workup/jobs/RabbitMQListener.java
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,6 @@
package com.workup.jobs;

import com.workup.jobs.commands.AcceptProposalCommand;
import com.workup.jobs.commands.CreateProposalCommand;
import com.workup.jobs.commands.GetJobByIdCommand;
import com.workup.jobs.commands.GetMyJobsCommand;
import com.workup.jobs.commands.GetMyProposalsCommand;
import com.workup.jobs.commands.GetProposalsByJobIdCommand;
import com.workup.jobs.commands.JobCommandMap;
import com.workup.jobs.commands.SearchJobsCommand;
import com.workup.shared.commands.Command;
import com.workup.shared.commands.CommandRequest;
import com.workup.shared.commands.jobs.proposals.requests.AcceptProposalRequest;
Expand Down Expand Up @@ -54,31 +47,35 @@ public CompletableFuture<CreateJobResponse> receive(CreateJobRequest in) throws
public CompletableFuture<CreateProposalResponse> receive(CreateProposalRequest in)
throws Exception {
CreateProposalResponse response =
((CreateProposalCommand) commandMap.getCommand("CreateProposal")).Run(in);
(CreateProposalResponse)
((Command<CommandRequest, ?>) commandMap.getCommand("CreateProposal")).Run(in);
return CompletableFuture.completedFuture(response);
}

@RabbitHandler
@Async
public CompletableFuture<GetJobByIdResponse> receive(GetJobByIdRequest request) throws Exception {
GetJobByIdResponse response =
((GetJobByIdCommand) commandMap.getCommand("GetJobById")).Run(request);
(GetJobByIdResponse)
((Command<CommandRequest, ?>) commandMap.getCommand("GetJobById")).Run(request);
return CompletableFuture.completedFuture(response);
}

@RabbitHandler
@Async
public CompletableFuture<SearchJobsResponse> receive(SearchJobsRequest request) throws Exception {
SearchJobsResponse response =
((SearchJobsCommand) commandMap.getCommand("SearchJobs")).Run(request);
(SearchJobsResponse)
((Command<CommandRequest, ?>) commandMap.getCommand("SearchJobs")).Run(request);
return CompletableFuture.completedFuture(response);
}

@RabbitHandler
@Async
public CompletableFuture<GetMyJobsResponse> receive(GetMyJobsRequest request) throws Exception {
GetMyJobsResponse response =
((GetMyJobsCommand) commandMap.getCommand("GetMyJobs")).Run(request);
(GetMyJobsResponse)
((Command<CommandRequest, ?>) commandMap.getCommand("GetMyJobs")).Run(request);
return CompletableFuture.completedFuture(response);
}

Expand All @@ -87,7 +84,8 @@ public CompletableFuture<GetMyJobsResponse> receive(GetMyJobsRequest request) th
public CompletableFuture<AcceptProposalResponse> receive(AcceptProposalRequest request)
throws Exception {
AcceptProposalResponse response =
((AcceptProposalCommand) commandMap.getCommand("AcceptProposal")).Run(request);
(AcceptProposalResponse)
((Command<CommandRequest, ?>) commandMap.getCommand("AcceptProposal")).Run(request);
return CompletableFuture.completedFuture(response);
}

Expand All @@ -96,7 +94,9 @@ public CompletableFuture<AcceptProposalResponse> receive(AcceptProposalRequest r
public CompletableFuture<GetProposalsByJobIdResponse> receive(GetProposalsByJobIdRequest request)
throws Exception {
GetProposalsByJobIdResponse response =
((GetProposalsByJobIdCommand) commandMap.getCommand("GetProposalsByJobId")).Run(request);
(GetProposalsByJobIdResponse)
((Command<CommandRequest, ?>) commandMap.getCommand("GetProposalsByJobId"))
.Run(request);
return CompletableFuture.completedFuture(response);
}

Expand All @@ -105,7 +105,8 @@ public CompletableFuture<GetProposalsByJobIdResponse> receive(GetProposalsByJobI
public CompletableFuture<GetMyProposalsResponse> receive(GetMyProposalsRequest request)
throws Exception {
GetMyProposalsResponse response =
((GetMyProposalsCommand) commandMap.getCommand("GetMyProposals")).Run(request);
(GetMyProposalsResponse)
((Command<CommandRequest, ?>) commandMap.getCommand("GetMyProposals")).Run(request);
return CompletableFuture.completedFuture(response);
}
}
1 change: 0 additions & 1 deletion services/payments/src/main/java/com/workup/payments/PaymentsApplication.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
import com.workup.shared.enums.ControllerQueueNames;
import com.workup.shared.enums.ServiceQueueNames;
import com.workup.shared.enums.ThreadPoolSize;

import org.springframework.amqp.core.AnonymousQueue;
import org.springframework.amqp.core.Binding;
import org.springframework.amqp.core.BindingBuilder;
Expand Down
60 changes: 31 additions & 29 deletions services/payments/src/main/java/com/workup/payments/RabbitMQListener.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,6 @@

import com.workup.payments.commands.PaymentCommandMap;
import com.workup.payments.commands.paymentrequest.*;
import com.workup.payments.commands.paymenttransaction.GetClientPaymentTransactionsCommand;
import com.workup.payments.commands.paymenttransaction.GetFreelancerPaymentTransactionsCommand;
import com.workup.payments.commands.wallet.CreateWalletCommand;
import com.workup.payments.commands.wallet.GetWalletCommand;
import com.workup.payments.commands.wallettransaction.CreateWalletTransactionCommand;
import com.workup.payments.commands.wallettransaction.GetWalletTransactionCommand;
import com.workup.payments.commands.wallettransaction.GetWalletTransactionsCommand;
import com.workup.payments.commands.wallettransaction.WithdrawFromWalletCommand;
import com.workup.shared.commands.payments.paymentrequest.requests.*;
import com.workup.shared.commands.payments.paymentrequest.responses.*;
import com.workup.shared.commands.payments.paymenttransaction.requests.GetClientPaymentTransactionsRequest;
Expand Down Expand Up @@ -47,108 +39,118 @@ public class RabbitMQListener {
public CompletableFuture<CreatePaymentRequestResponse> receive(CreatePaymentRequestRequest in)
throws Exception {
return CompletableFuture.completedFuture(
((CreatePaymentRequestCommand) commandMap.getCommand("CreatePaymentRequest")).Run(in));
(CreatePaymentRequestResponse)
((Command<CommandRequest, ?>) commandMap.getCommand("CreatePaymentRequest")).Run(in));
}

@RabbitHandler
@Async
public CompletableFuture<CreateWalletTransactionResponse> receive(
CreateWalletTransactionRequest in) throws Exception {
return CompletableFuture.completedFuture(
((CreateWalletTransactionCommand) commandMap.getCommand("CreateWalletTransaction"))
.Run(in));
(CreateWalletTransactionResponse)
((Command<CommandRequest, ?>) commandMap.getCommand("CreateWalletTransaction"))
.Run(in));
}

@RabbitHandler
@Async
public CompletableFuture<GetClientPaymentRequestsResponse> receive(
GetClientPaymentRequestsRequest in) throws Exception {
return CompletableFuture.completedFuture(
((GetClientPaymentRequestsCommand) commandMap.getCommand("GetClientPaymentRequests"))
.Run(in));
(GetClientPaymentRequestsResponse)
((Command<CommandRequest, ?>) commandMap.getCommand("GetClientPaymentRequests"))
.Run(in));
}

@RabbitHandler
@Async
public CompletableFuture<GetWalletTransactionResponse> receive(GetWalletTransactionRequest in)
throws Exception {
return CompletableFuture.completedFuture(
((GetWalletTransactionCommand) commandMap.getCommand("GetWalletTransaction")).Run(in));
(GetWalletTransactionResponse)
((Command<CommandRequest, ?>) commandMap.getCommand("GetWalletTransaction")).Run(in));
}

@RabbitHandler
@Async
public CompletableFuture<GetWalletTransactionsResponse> receive(GetWalletTransactionsRequest in)
throws Exception {
return CompletableFuture.completedFuture(
((GetWalletTransactionsCommand) commandMap.getCommand("GetWalletTransactions")).Run(in));
(GetWalletTransactionsResponse)
((Command<CommandRequest, ?>) commandMap.getCommand("GetWalletTransactions")).Run(in));
}

@RabbitHandler
@Async
public CompletableFuture<WithdrawFromWalletResponse> receive(WithdrawFromWalletRequest in)
throws Exception {
return CompletableFuture.completedFuture(
((WithdrawFromWalletCommand) commandMap.getCommand("WithdrawFromWallet")).Run(in));
(WithdrawFromWalletResponse)
((Command<CommandRequest, ?>) commandMap.getCommand("WithdrawFromWallet")).Run(in));
}

@RabbitHandler
@Async
public CompletableFuture<GetFreelancerPaymentRequestsResponse> receive(
GetFreelancerPaymentRequestsRequest in) throws Exception {
return CompletableFuture.completedFuture(
((GetFreelancerPaymentRequestsCommand)
commandMap.getCommand("GetFreelancerPaymentRequests"))
.Run(in));
(GetFreelancerPaymentRequestsResponse)
((Command<CommandRequest, ?>) commandMap.getCommand("GetFreelancerPaymentRequests"))
.Run(in));
}

@RabbitHandler
@Async
public CompletableFuture<GetPaymentRequestResponse> receive(GetPaymentRequestRequest in)
throws Exception {
return CompletableFuture.completedFuture(
((GetPaymentRequestCommand) commandMap.getCommand("GetPaymentRequest")).Run(in));
(GetPaymentRequestResponse)
((Command<CommandRequest, ?>) commandMap.getCommand("GetPaymentRequest")).Run(in));
}

@RabbitHandler
@Async
public CompletableFuture<PayPaymentRequestResponse> receive(PayPaymentRequestRequest in)
throws Exception {
return CompletableFuture.completedFuture(
((PayPaymentRequestCommand) commandMap.getCommand("PayPaymentRequest")).Run(in));
(PayPaymentRequestResponse)
((Command<CommandRequest, ?>) commandMap.getCommand("PayPaymentRequest")).Run(in));
}

@RabbitHandler
@Async
public CompletableFuture<CreateWalletResponse> receive(CreateWalletRequest in) throws Exception {
return CompletableFuture.completedFuture(
((CreateWalletCommand) commandMap.getCommand("CreateWallet")).Run(in));
(CreateWalletResponse)
((Command<CommandRequest, ?>) commandMap.getCommand("CreateWallet")).Run(in));
}

@RabbitHandler
@Async
public CompletableFuture<GetWalletResponse> receive(GetWalletRequest in) throws Exception {
return CompletableFuture.completedFuture(
((GetWalletCommand) commandMap.getCommand("GetWallet")).Run(in));
(GetWalletResponse)
((Command<CommandRequest, ?>) commandMap.getCommand("GetWallet")).Run(in));
}

@RabbitHandler
@Async
public CompletableFuture<GetClientPaymentTransactionsResponse> receive(
GetClientPaymentTransactionsRequest in) throws Exception {
return CompletableFuture.completedFuture(
((GetClientPaymentTransactionsCommand)
commandMap.getCommand("GetClientPaymentTransactions"))
.Run(in));
(GetClientPaymentTransactionsResponse)
((Command<CommandRequest, ?>) commandMap.getCommand("GetClientPaymentTransactions"))
.Run(in));
}

@RabbitHandler
@Async
public CompletableFuture<GetFreelancerPaymentTransactionsResponse> receive(
GetFreelancerPaymentTransactionsRequest in) throws Exception {
return CompletableFuture.completedFuture(
((GetFreelancerPaymentTransactionsCommand)
commandMap.getCommand("GetFreelancerPaymentTransactions"))
.Run(in));
(GetFreelancerPaymentTransactionsResponse)
((Command<CommandRequest, ?>) commandMap.getCommand("GetFreelancerPaymentTransactions"))
.Run(in));
}
}
Loading

0 comments on commit 2f40b09

Please sign in to comment.