From 29409191bff873ea26a5a05a5f61d5b7a38a5eeb Mon Sep 17 00:00:00 2001
From: Ahmed Elwasefi <a.m.elwasefi@gmail.com>
Date: Sat, 18 May 2024 18:56:49 +0300
Subject: [PATCH] Added delete command and add command.

Co-authored-by: Elshimaa Betah <79271594+ShimaaBetah@users.noreply.github.com>
Co-authored-by: Ziad Othman <ziadsadek999@gmail.com>
---
 .../com/workup/controller/CLIHandler.java     |   6 +
 .../contracts/ControllerMQListener.java       |   4 +-
 .../workup/contracts/RabbitMQListener.java    | 135 +++--
 .../com/workup/jobs/ControllerMQListener.java |   4 +-
 .../com/workup/jobs/RabbitMQListener.java     | 131 +++--
 .../workup/jobs/ContractsMockingListener.java |  18 +-
 .../workup/payments/ControllerMQListener.java |   4 +-
 .../com/workup/payments/RabbitMQListener.java | 195 +++++--
 .../workup/users/ControllerMQListener.java    |   4 +-
 .../com/workup/users/RabbitMQListener.java    | 479 ++++++++++++++----
 .../workup/users/PaymentMockingListener.java  |  12 +-
 .../controller/UpdateCommandRequest.java      |   1 +
 12 files changed, 762 insertions(+), 231 deletions(-)

diff --git a/controller/src/main/java/com/workup/controller/CLIHandler.java b/controller/src/main/java/com/workup/controller/CLIHandler.java
index 10834a3f..e0ee7dd7 100644
--- a/controller/src/main/java/com/workup/controller/CLIHandler.java
+++ b/controller/src/main/java/com/workup/controller/CLIHandler.java
@@ -55,6 +55,11 @@ public String maxdb(String app, int maxDBConn) {
     return "Command Sent!";
   }
 
+  @Command(description = "Adds a new command")
+  public String addCommand(String app, String commandName, String className) throws Exception {
+    return updateCommand(app, commandName, className);
+  }
+
   @Command(description = "starts a specific app")
   public String start(String app) {
     app = app.toLowerCase();
@@ -102,6 +107,7 @@ public String updateCommand(String app, String commandName, String className) th
           "",
           UpdateCommandRequest.builder()
               .withCommandName(commandName)
+              .withClassName(className)
               .withByteCode(byteArray)
               .build());
     } catch (Exception ex) {
diff --git a/services/contracts/src/main/java/com/workup/contracts/ControllerMQListener.java b/services/contracts/src/main/java/com/workup/contracts/ControllerMQListener.java
index 776161de..d59baecf 100644
--- a/services/contracts/src/main/java/com/workup/contracts/ControllerMQListener.java
+++ b/services/contracts/src/main/java/com/workup/contracts/ControllerMQListener.java
@@ -86,11 +86,11 @@ public void receive(ContinueRequest in) throws Exception {
   @RabbitHandler
   public void receive(UpdateCommandRequest in) throws Exception {
     try {
-      String className = commandMap.getCommand(in.getCommandName()).getClass().getName();
       byte[] byteArray = in.getByteCode();
       Class<?> clazz =
           (Class<?>)
-              (new MyClassLoader(this.getClass().getClassLoader()).loadClass(byteArray, className));
+              (new MyClassLoader(this.getClass().getClassLoader())
+                  .loadClass(byteArray, in.getClassName()));
 
       commandMap.replaceCommand(
           in.getCommandName(),
diff --git a/services/contracts/src/main/java/com/workup/contracts/RabbitMQListener.java b/services/contracts/src/main/java/com/workup/contracts/RabbitMQListener.java
index 10732eed..d8a305cf 100644
--- a/services/contracts/src/main/java/com/workup/contracts/RabbitMQListener.java
+++ b/services/contracts/src/main/java/com/workup/contracts/RabbitMQListener.java
@@ -21,6 +21,7 @@
 import com.workup.shared.commands.contracts.responses.MarkPaymentCompletedResponse;
 import com.workup.shared.commands.contracts.responses.ProgressMilestoneResponse;
 import com.workup.shared.commands.contracts.responses.ViewContractMilestonesResponse;
+import com.workup.shared.enums.HttpStatusCode;
 import com.workup.shared.enums.ServiceQueueNames;
 import java.util.concurrent.CompletableFuture;
 import org.springframework.amqp.rabbit.annotation.RabbitHandler;
@@ -39,83 +40,157 @@ public class RabbitMQListener {
   @Async
   public CompletableFuture<InitiateContractResponse> receive(InitiateContractRequest in)
       throws Exception {
-    InitiateContractResponse response =
-        (InitiateContractResponse)
-            ((Command<CommandRequest, ?>) commandMap.getCommand("InitiateContract")).Run(in);
-    return CompletableFuture.completedFuture(response);
+    try {
+      InitiateContractResponse response =
+          (InitiateContractResponse)
+              ((Command<CommandRequest, ?>) commandMap.getCommand("InitiateContract")).Run(in);
+      return CompletableFuture.completedFuture(response);
+    } catch (Exception ex) {
+      return CompletableFuture.completedFuture(
+          InitiateContractResponse.builder()
+              .withErrorMessage("Not Implemented.")
+              .withStatusCode(HttpStatusCode.NOT_IMPLEMENTED)
+              .build());
+    }
   }
 
   @RabbitHandler
   @Async
   public CompletableFuture<ContractTerminationResponse> receive(ContractTerminationRequest in)
       throws Exception {
-    return CompletableFuture.completedFuture(
-        (ContractTerminationResponse)
-            ((Command<CommandRequest, ?>) commandMap.getCommand("RequestContractTermination"))
-                .Run(in));
+    try {
+      return CompletableFuture.completedFuture(
+          (ContractTerminationResponse)
+              ((Command<CommandRequest, ?>) commandMap.getCommand("RequestContractTermination"))
+                  .Run(in));
+    } catch (Exception ex) {
+      return CompletableFuture.completedFuture(
+          ContractTerminationResponse.builder()
+              .withErrorMessage("Not Implemented.")
+              .withStatusCode(HttpStatusCode.NOT_IMPLEMENTED)
+              .build());
+    }
   }
 
   @RabbitHandler
   @Async
   public CompletableFuture<HandleTerminationResponse> receive(HandleTerminationRequest in)
       throws Exception {
-    return CompletableFuture.completedFuture(
-        (HandleTerminationResponse)
-            ((Command<CommandRequest, ?>) commandMap.getCommand("HandleTerminationRequest"))
-                .Run(in));
+    try {
+      return CompletableFuture.completedFuture(
+          (HandleTerminationResponse)
+              ((Command<CommandRequest, ?>) commandMap.getCommand("HandleTerminationRequest"))
+                  .Run(in));
+    } catch (Exception ex) {
+      return CompletableFuture.completedFuture(
+          HandleTerminationResponse.builder()
+              .withErrorMessage("Not Implemented.")
+              .withStatusCode(HttpStatusCode.NOT_IMPLEMENTED)
+              .build());
+    }
   }
 
   @RabbitHandler
   @Async
   public CompletableFuture<MarkPaymentCompletedResponse> receive(MarkPaymentCompletedRequest in)
       throws Exception {
-    return CompletableFuture.completedFuture(
-        (MarkPaymentCompletedResponse)
-            ((Command<CommandRequest, ?>) commandMap.getCommand("MarkMilestoneAsPaid")).Run(in));
+    try {
+      return CompletableFuture.completedFuture(
+          (MarkPaymentCompletedResponse)
+              ((Command<CommandRequest, ?>) commandMap.getCommand("MarkMilestoneAsPaid")).Run(in));
+    } catch (Exception ex) {
+      return CompletableFuture.completedFuture(
+          MarkPaymentCompletedResponse.builder()
+              .withErrorMessage("Not Implemented.")
+              .withStatusCode(HttpStatusCode.NOT_IMPLEMENTED)
+              .build());
+    }
   }
 
   @RabbitHandler
   @Async
   public CompletableFuture<ViewContractMilestonesResponse> receive(ViewContractMilestonesRequest in)
       throws Exception {
-    return CompletableFuture.completedFuture(
-        (ViewContractMilestonesResponse)
-            ((Command<CommandRequest, ?>) commandMap.getCommand("ViewContractMilestones")).Run(in));
+    try {
+      return CompletableFuture.completedFuture(
+          (ViewContractMilestonesResponse)
+              ((Command<CommandRequest, ?>) commandMap.getCommand("ViewContractMilestones"))
+                  .Run(in));
+    } catch (Exception ex) {
+      return CompletableFuture.completedFuture(
+          ViewContractMilestonesResponse.builder()
+              .withErrorMessage("Not Implemented.")
+              .withStatusCode(HttpStatusCode.NOT_IMPLEMENTED)
+              .build());
+    }
   }
 
   @RabbitHandler
   @Async
   public CompletableFuture<GetContractResponse> receive(GetContractRequest in) throws Exception {
-    return CompletableFuture.completedFuture(
-        (GetContractResponse)
-            ((Command<CommandRequest, ?>) commandMap.getCommand("GetContract")).Run(in));
+    try {
+      return CompletableFuture.completedFuture(
+          (GetContractResponse)
+              ((Command<CommandRequest, ?>) commandMap.getCommand("GetContract")).Run(in));
+    } catch (Exception ex) {
+      return CompletableFuture.completedFuture(
+          GetContractResponse.builder()
+              .withErrorMessage("Not Implemented.")
+              .withStatusCode(HttpStatusCode.NOT_IMPLEMENTED)
+              .build());
+    }
   }
 
   @RabbitHandler
   @Async
   public CompletableFuture<EvaluateMilestoneResponse> receive(EvaluateMilestoneRequest in)
       throws Exception {
-    return CompletableFuture.completedFuture(
-        (EvaluateMilestoneResponse)
-            ((Command<CommandRequest, ?>) commandMap.getCommand("EvaluateMilestone")).Run(in));
+    try {
+      return CompletableFuture.completedFuture(
+          (EvaluateMilestoneResponse)
+              ((Command<CommandRequest, ?>) commandMap.getCommand("EvaluateMilestone")).Run(in));
+    } catch (Exception ex) {
+      return CompletableFuture.completedFuture(
+          EvaluateMilestoneResponse.builder()
+              .withErrorMessage("Not Implemented.")
+              .withStatusCode(HttpStatusCode.NOT_IMPLEMENTED)
+              .build());
+    }
   }
 
   @RabbitHandler
   @Async
   public CompletableFuture<ProgressMilestoneResponse> receive(ProgressMilestoneRequest in)
       throws Exception {
-    return CompletableFuture.completedFuture(
-        (ProgressMilestoneResponse)
-            ((Command<CommandRequest, ?>) commandMap.getCommand("ProgressMilestone")).Run(in));
+    try {
+      return CompletableFuture.completedFuture(
+          (ProgressMilestoneResponse)
+              ((Command<CommandRequest, ?>) commandMap.getCommand("ProgressMilestone")).Run(in));
+    } catch (Exception ex) {
+      return CompletableFuture.completedFuture(
+          ProgressMilestoneResponse.builder()
+              .withErrorMessage("Not Implemented.")
+              .withStatusCode(HttpStatusCode.NOT_IMPLEMENTED)
+              .build());
+    }
   }
 
   @RabbitHandler
   @Async
   public CompletableFuture<GetPendingTerminationsResponse> receive(GetPendingTerminationsRequest in)
       throws Exception {
-    return CompletableFuture.completedFuture(
-        (GetPendingTerminationsResponse)
-            ((Command<CommandRequest, ?>) commandMap.getCommand("GetPendingTerminations")).Run(in));
+    try {
+      return CompletableFuture.completedFuture(
+          (GetPendingTerminationsResponse)
+              ((Command<CommandRequest, ?>) commandMap.getCommand("GetPendingTerminations"))
+                  .Run(in));
+    } catch (Exception ex) {
+      return CompletableFuture.completedFuture(
+          GetPendingTerminationsResponse.builder()
+              .withErrorMessage("Not Implemented.")
+              .withStatusCode(HttpStatusCode.NOT_IMPLEMENTED)
+              .build());
+    }
   }
   // NEW_COMMAND_BOILERPLATE
 
diff --git a/services/jobs/src/main/java/com/workup/jobs/ControllerMQListener.java b/services/jobs/src/main/java/com/workup/jobs/ControllerMQListener.java
index b546ec7a..b4ae802b 100644
--- a/services/jobs/src/main/java/com/workup/jobs/ControllerMQListener.java
+++ b/services/jobs/src/main/java/com/workup/jobs/ControllerMQListener.java
@@ -83,11 +83,11 @@ public void receive(ContinueRequest in) throws Exception {
   @RabbitHandler
   public void receive(UpdateCommandRequest in) throws Exception {
     try {
-      String className = commandMap.getCommand(in.getCommandName()).getClass().getName();
       byte[] byteArray = in.getByteCode();
       Class<?> clazz =
           (Class<?>)
-              (new MyClassLoader(this.getClass().getClassLoader()).loadClass(byteArray, className));
+              (new MyClassLoader(this.getClass().getClassLoader())
+                  .loadClass(byteArray, in.getClassName()));
 
       commandMap.replaceCommand(
           in.getCommandName(),
diff --git a/services/jobs/src/main/java/com/workup/jobs/RabbitMQListener.java b/services/jobs/src/main/java/com/workup/jobs/RabbitMQListener.java
index 21d38611..fd5c8beb 100644
--- a/services/jobs/src/main/java/com/workup/jobs/RabbitMQListener.java
+++ b/services/jobs/src/main/java/com/workup/jobs/RabbitMQListener.java
@@ -19,6 +19,7 @@
 import com.workup.shared.commands.jobs.responses.GetJobByIdResponse;
 import com.workup.shared.commands.jobs.responses.GetMyJobsResponse;
 import com.workup.shared.commands.jobs.responses.SearchJobsResponse;
+import com.workup.shared.enums.HttpStatusCode;
 import com.workup.shared.enums.ServiceQueueNames;
 import java.util.concurrent.CompletableFuture;
 import org.springframework.amqp.rabbit.annotation.RabbitHandler;
@@ -36,77 +37,141 @@ public class RabbitMQListener {
   @RabbitHandler
   @Async
   public CompletableFuture<CreateJobResponse> receive(CreateJobRequest in) throws Exception {
-    CreateJobResponse resp =
-        (CreateJobResponse)
-            ((Command<CommandRequest, ?>) commandMap.getCommand("CreateJob")).Run(in);
-    return CompletableFuture.completedFuture(resp);
+    try {
+      CreateJobResponse resp =
+          (CreateJobResponse)
+              ((Command<CommandRequest, ?>) commandMap.getCommand("CreateJob")).Run(in);
+      return CompletableFuture.completedFuture(resp);
+    } catch (Exception ex) {
+      return CompletableFuture.completedFuture(
+          CreateJobResponse.builder()
+              .withErrorMessage("Not Implemented.")
+              .withStatusCode(HttpStatusCode.NOT_IMPLEMENTED)
+              .build());
+    }
   }
 
   @RabbitHandler
   @Async
   public CompletableFuture<CreateProposalResponse> receive(CreateProposalRequest in)
       throws Exception {
-    CreateProposalResponse response =
-        (CreateProposalResponse)
-            ((Command<CommandRequest, ?>) commandMap.getCommand("CreateProposal")).Run(in);
-    return CompletableFuture.completedFuture(response);
+    try {
+      CreateProposalResponse response =
+          (CreateProposalResponse)
+              ((Command<CommandRequest, ?>) commandMap.getCommand("CreateProposal")).Run(in);
+      return CompletableFuture.completedFuture(response);
+    } catch (Exception ex) {
+      return CompletableFuture.completedFuture(
+          CreateProposalResponse.builder()
+              .withErrorMessage("Not Implemented.")
+              .withStatusCode(HttpStatusCode.NOT_IMPLEMENTED)
+              .build());
+    }
   }
 
   @RabbitHandler
   @Async
   public CompletableFuture<GetJobByIdResponse> receive(GetJobByIdRequest request) throws Exception {
-    GetJobByIdResponse response =
-        (GetJobByIdResponse)
-            ((Command<CommandRequest, ?>) commandMap.getCommand("GetJobById")).Run(request);
-    return CompletableFuture.completedFuture(response);
+    try {
+      GetJobByIdResponse response =
+          (GetJobByIdResponse)
+              ((Command<CommandRequest, ?>) commandMap.getCommand("GetJobById")).Run(request);
+      return CompletableFuture.completedFuture(response);
+    } catch (Exception ex) {
+      return CompletableFuture.completedFuture(
+          GetJobByIdResponse.builder()
+              .withErrorMessage("Not Implemented.")
+              .withStatusCode(HttpStatusCode.NOT_IMPLEMENTED)
+              .build());
+    }
   }
 
   @RabbitHandler
   @Async
   public CompletableFuture<SearchJobsResponse> receive(SearchJobsRequest request) throws Exception {
-    SearchJobsResponse response =
-        (SearchJobsResponse)
-            ((Command<CommandRequest, ?>) commandMap.getCommand("SearchJobs")).Run(request);
-    return CompletableFuture.completedFuture(response);
+    try {
+      SearchJobsResponse response =
+          (SearchJobsResponse)
+              ((Command<CommandRequest, ?>) commandMap.getCommand("SearchJobs")).Run(request);
+      return CompletableFuture.completedFuture(response);
+    } catch (Exception ex) {
+      return CompletableFuture.completedFuture(
+          SearchJobsResponse.builder()
+              .withErrorMessage("Not Implemented.")
+              .withStatusCode(HttpStatusCode.NOT_IMPLEMENTED)
+              .build());
+    }
   }
 
   @RabbitHandler
   @Async
   public CompletableFuture<GetMyJobsResponse> receive(GetMyJobsRequest request) throws Exception {
-    GetMyJobsResponse response =
-        (GetMyJobsResponse)
-            ((Command<CommandRequest, ?>) commandMap.getCommand("GetMyJobs")).Run(request);
-    return CompletableFuture.completedFuture(response);
+    try {
+      GetMyJobsResponse response =
+          (GetMyJobsResponse)
+              ((Command<CommandRequest, ?>) commandMap.getCommand("GetMyJobs")).Run(request);
+      return CompletableFuture.completedFuture(response);
+    } catch (Exception ex) {
+      return CompletableFuture.completedFuture(
+          GetMyJobsResponse.builder()
+              .withErrorMessage("Not Implemented.")
+              .withStatusCode(HttpStatusCode.NOT_IMPLEMENTED)
+              .build());
+    }
   }
 
   @RabbitHandler
   @Async
   public CompletableFuture<AcceptProposalResponse> receive(AcceptProposalRequest request)
       throws Exception {
-    AcceptProposalResponse response =
-        (AcceptProposalResponse)
-            ((Command<CommandRequest, ?>) commandMap.getCommand("AcceptProposal")).Run(request);
-    return CompletableFuture.completedFuture(response);
+    try {
+      AcceptProposalResponse response =
+          (AcceptProposalResponse)
+              ((Command<CommandRequest, ?>) commandMap.getCommand("AcceptProposal")).Run(request);
+      return CompletableFuture.completedFuture(response);
+    } catch (Exception ex) {
+      return CompletableFuture.completedFuture(
+          AcceptProposalResponse.builder()
+              .withErrorMessage("Not Implemented.")
+              .withStatusCode(HttpStatusCode.NOT_IMPLEMENTED)
+              .build());
+    }
   }
 
   @RabbitHandler
   @Async
   public CompletableFuture<GetProposalsByJobIdResponse> receive(GetProposalsByJobIdRequest request)
       throws Exception {
-    GetProposalsByJobIdResponse response =
-        (GetProposalsByJobIdResponse)
-            ((Command<CommandRequest, ?>) commandMap.getCommand("GetProposalsByJobId"))
-                .Run(request);
-    return CompletableFuture.completedFuture(response);
+    try {
+      GetProposalsByJobIdResponse response =
+          (GetProposalsByJobIdResponse)
+              ((Command<CommandRequest, ?>) commandMap.getCommand("GetProposalsByJobId"))
+                  .Run(request);
+      return CompletableFuture.completedFuture(response);
+    } catch (Exception ex) {
+      return CompletableFuture.completedFuture(
+          GetProposalsByJobIdResponse.builder()
+              .withErrorMessage("Not Implemented.")
+              .withStatusCode(HttpStatusCode.NOT_IMPLEMENTED)
+              .build());
+    }
   }
 
   @RabbitHandler
   @Async
   public CompletableFuture<GetMyProposalsResponse> receive(GetMyProposalsRequest request)
       throws Exception {
-    GetMyProposalsResponse response =
-        (GetMyProposalsResponse)
-            ((Command<CommandRequest, ?>) commandMap.getCommand("GetMyProposals")).Run(request);
-    return CompletableFuture.completedFuture(response);
+    try {
+      GetMyProposalsResponse response =
+          (GetMyProposalsResponse)
+              ((Command<CommandRequest, ?>) commandMap.getCommand("GetMyProposals")).Run(request);
+      return CompletableFuture.completedFuture(response);
+    } catch (Exception ex) {
+      return CompletableFuture.completedFuture(
+          GetMyProposalsResponse.builder()
+              .withErrorMessage("Not Implemented.")
+              .withStatusCode(HttpStatusCode.NOT_IMPLEMENTED)
+              .build());
+    }
   }
 }
diff --git a/services/jobs/src/test/java/com/workup/jobs/ContractsMockingListener.java b/services/jobs/src/test/java/com/workup/jobs/ContractsMockingListener.java
index a466ec3c..28ce74bb 100644
--- a/services/jobs/src/test/java/com/workup/jobs/ContractsMockingListener.java
+++ b/services/jobs/src/test/java/com/workup/jobs/ContractsMockingListener.java
@@ -21,10 +21,18 @@ public class ContractsMockingListener {
   @Async
   public CompletableFuture<InitiateContractResponse> receive(InitiateContractRequest in)
       throws Exception {
-    return CompletableFuture.completedFuture(
-        InitiateContractResponse.builder()
-            .withContractId(contractIdToBeReturned)
-            .withStatusCode(statusCodeToBeReturned)
-            .build());
+    try {
+      return CompletableFuture.completedFuture(
+          InitiateContractResponse.builder()
+              .withContractId(contractIdToBeReturned)
+              .withStatusCode(statusCodeToBeReturned)
+              .build());
+    } catch (Exception ex) {
+      return CompletableFuture.completedFuture(
+          InitiateContractResponse.builder()
+              .withErrorMessage("Not Implemented.")
+              .withStatusCode(HttpStatusCode.NOT_IMPLEMENTED)
+              .build());
+    }
   }
 }
diff --git a/services/payments/src/main/java/com/workup/payments/ControllerMQListener.java b/services/payments/src/main/java/com/workup/payments/ControllerMQListener.java
index eebb1f77..8877f6e4 100644
--- a/services/payments/src/main/java/com/workup/payments/ControllerMQListener.java
+++ b/services/payments/src/main/java/com/workup/payments/ControllerMQListener.java
@@ -85,11 +85,11 @@ public void receive(ContinueRequest in) throws Exception {
   @RabbitHandler
   public void receive(UpdateCommandRequest in) throws Exception {
     try {
-      String className = commandMap.getCommand(in.getCommandName()).getClass().getName();
       byte[] byteArray = in.getByteCode();
       Class<?> clazz =
           (Class<?>)
-              (new MyClassLoader(this.getClass().getClassLoader()).loadClass(byteArray, className));
+              (new MyClassLoader(this.getClass().getClassLoader())
+                  .loadClass(byteArray, in.getClassName()));
 
       commandMap.replaceCommand(
           in.getCommandName(),
diff --git a/services/payments/src/main/java/com/workup/payments/RabbitMQListener.java b/services/payments/src/main/java/com/workup/payments/RabbitMQListener.java
index 742f8bbf..a130bea1 100644
--- a/services/payments/src/main/java/com/workup/payments/RabbitMQListener.java
+++ b/services/payments/src/main/java/com/workup/payments/RabbitMQListener.java
@@ -22,6 +22,7 @@
 import com.workup.shared.commands.payments.wallettransaction.responses.GetWalletTransactionResponse;
 import com.workup.shared.commands.payments.wallettransaction.responses.GetWalletTransactionsResponse;
 import com.workup.shared.commands.payments.wallettransaction.responses.WithdrawFromWalletResponse;
+import com.workup.shared.enums.HttpStatusCode;
 import com.workup.shared.enums.ServiceQueueNames;
 import java.util.concurrent.CompletableFuture;
 import org.springframework.amqp.rabbit.annotation.RabbitHandler;
@@ -40,119 +41,225 @@ public class RabbitMQListener {
   @Async
   public CompletableFuture<CreatePaymentRequestResponse> receive(CreatePaymentRequestRequest in)
       throws Exception {
-    return CompletableFuture.completedFuture(
-        (CreatePaymentRequestResponse)
-            ((Command<CommandRequest, ?>) commandMap.getCommand("CreatePaymentRequest")).Run(in));
+    try {
+      return CompletableFuture.completedFuture(
+          (CreatePaymentRequestResponse)
+              ((Command<CommandRequest, ?>) commandMap.getCommand("CreatePaymentRequest")).Run(in));
+    } catch (Exception ex) {
+      return CompletableFuture.completedFuture(
+          CreatePaymentRequestResponse.builder()
+              .withErrorMessage("Not Implemented.")
+              .withStatusCode(HttpStatusCode.NOT_IMPLEMENTED)
+              .build());
+    }
   }
 
   @RabbitHandler
   @Async
   public CompletableFuture<CreateWalletTransactionResponse> receive(
       CreateWalletTransactionRequest in) throws Exception {
-    return CompletableFuture.completedFuture(
-        (CreateWalletTransactionResponse)
-            ((Command<CommandRequest, ?>) commandMap.getCommand("CreateWalletTransaction"))
-                .Run(in));
+    try {
+      return CompletableFuture.completedFuture(
+          (CreateWalletTransactionResponse)
+              ((Command<CommandRequest, ?>) commandMap.getCommand("CreateWalletTransaction"))
+                  .Run(in));
+    } catch (Exception ex) {
+      return CompletableFuture.completedFuture(
+          CreateWalletTransactionResponse.builder()
+              .withErrorMessage("Not Implemented.")
+              .withStatusCode(HttpStatusCode.NOT_IMPLEMENTED)
+              .build());
+    }
   }
 
   @RabbitHandler
   @Async
   public CompletableFuture<GetClientPaymentRequestsResponse> receive(
       GetClientPaymentRequestsRequest in) throws Exception {
-    return CompletableFuture.completedFuture(
-        (GetClientPaymentRequestsResponse)
-            ((Command<CommandRequest, ?>) commandMap.getCommand("GetClientPaymentRequests"))
-                .Run(in));
+    try {
+      return CompletableFuture.completedFuture(
+          (GetClientPaymentRequestsResponse)
+              ((Command<CommandRequest, ?>) commandMap.getCommand("GetClientPaymentRequests"))
+                  .Run(in));
+    } catch (Exception ex) {
+      return CompletableFuture.completedFuture(
+          GetClientPaymentRequestsResponse.builder()
+              .withErrorMessage("Not Implemented.")
+              .withStatusCode(HttpStatusCode.NOT_IMPLEMENTED)
+              .build());
+    }
   }
 
   @RabbitHandler
   @Async
   public CompletableFuture<GetWalletTransactionResponse> receive(GetWalletTransactionRequest in)
       throws Exception {
-    return CompletableFuture.completedFuture(
-        (GetWalletTransactionResponse)
-            ((Command<CommandRequest, ?>) commandMap.getCommand("GetWalletTransaction")).Run(in));
+    try {
+      return CompletableFuture.completedFuture(
+          (GetWalletTransactionResponse)
+              ((Command<CommandRequest, ?>) commandMap.getCommand("GetWalletTransaction")).Run(in));
+    } catch (Exception ex) {
+      return CompletableFuture.completedFuture(
+          GetWalletTransactionResponse.builder()
+              .withErrorMessage("Not Implemented.")
+              .withStatusCode(HttpStatusCode.NOT_IMPLEMENTED)
+              .build());
+    }
   }
 
   @RabbitHandler
   @Async
   public CompletableFuture<GetWalletTransactionsResponse> receive(GetWalletTransactionsRequest in)
       throws Exception {
-    return CompletableFuture.completedFuture(
-        (GetWalletTransactionsResponse)
-            ((Command<CommandRequest, ?>) commandMap.getCommand("GetWalletTransactions")).Run(in));
+    try {
+      return CompletableFuture.completedFuture(
+          (GetWalletTransactionsResponse)
+              ((Command<CommandRequest, ?>) commandMap.getCommand("GetWalletTransactions"))
+                  .Run(in));
+    } catch (Exception ex) {
+      return CompletableFuture.completedFuture(
+          GetWalletTransactionsResponse.builder()
+              .withErrorMessage("Not Implemented.")
+              .withStatusCode(HttpStatusCode.NOT_IMPLEMENTED)
+              .build());
+    }
   }
 
   @RabbitHandler
   @Async
   public CompletableFuture<WithdrawFromWalletResponse> receive(WithdrawFromWalletRequest in)
       throws Exception {
-    return CompletableFuture.completedFuture(
-        (WithdrawFromWalletResponse)
-            ((Command<CommandRequest, ?>) commandMap.getCommand("WithdrawFromWallet")).Run(in));
+    try {
+      return CompletableFuture.completedFuture(
+          (WithdrawFromWalletResponse)
+              ((Command<CommandRequest, ?>) commandMap.getCommand("WithdrawFromWallet")).Run(in));
+    } catch (Exception ex) {
+      return CompletableFuture.completedFuture(
+          WithdrawFromWalletResponse.builder()
+              .withErrorMessage("Not Implemented.")
+              .withStatusCode(HttpStatusCode.NOT_IMPLEMENTED)
+              .build());
+    }
   }
 
   @RabbitHandler
   @Async
   public CompletableFuture<GetFreelancerPaymentRequestsResponse> receive(
       GetFreelancerPaymentRequestsRequest in) throws Exception {
-    return CompletableFuture.completedFuture(
-        (GetFreelancerPaymentRequestsResponse)
-            ((Command<CommandRequest, ?>) commandMap.getCommand("GetFreelancerPaymentRequests"))
-                .Run(in));
+    try {
+      return CompletableFuture.completedFuture(
+          (GetFreelancerPaymentRequestsResponse)
+              ((Command<CommandRequest, ?>) commandMap.getCommand("GetFreelancerPaymentRequests"))
+                  .Run(in));
+    } catch (Exception ex) {
+      return CompletableFuture.completedFuture(
+          GetFreelancerPaymentRequestsResponse.builder()
+              .withErrorMessage("Not Implemented.")
+              .withStatusCode(HttpStatusCode.NOT_IMPLEMENTED)
+              .build());
+    }
   }
 
   @RabbitHandler
   @Async
   public CompletableFuture<GetPaymentRequestResponse> receive(GetPaymentRequestRequest in)
       throws Exception {
-    return CompletableFuture.completedFuture(
-        (GetPaymentRequestResponse)
-            ((Command<CommandRequest, ?>) commandMap.getCommand("GetPaymentRequest")).Run(in));
+    try {
+      return CompletableFuture.completedFuture(
+          (GetPaymentRequestResponse)
+              ((Command<CommandRequest, ?>) commandMap.getCommand("GetPaymentRequest")).Run(in));
+    } catch (Exception ex) {
+      return CompletableFuture.completedFuture(
+          GetPaymentRequestResponse.builder()
+              .withErrorMessage("Not Implemented.")
+              .withStatusCode(HttpStatusCode.NOT_IMPLEMENTED)
+              .build());
+    }
   }
 
   @RabbitHandler
   @Async
   public CompletableFuture<PayPaymentRequestResponse> receive(PayPaymentRequestRequest in)
       throws Exception {
-    return CompletableFuture.completedFuture(
-        (PayPaymentRequestResponse)
-            ((Command<CommandRequest, ?>) commandMap.getCommand("PayPaymentRequest")).Run(in));
+    try {
+      return CompletableFuture.completedFuture(
+          (PayPaymentRequestResponse)
+              ((Command<CommandRequest, ?>) commandMap.getCommand("PayPaymentRequest")).Run(in));
+    } catch (Exception ex) {
+      return CompletableFuture.completedFuture(
+          PayPaymentRequestResponse.builder()
+              .withErrorMessage("Not Implemented.")
+              .withStatusCode(HttpStatusCode.NOT_IMPLEMENTED)
+              .build());
+    }
   }
 
   @RabbitHandler
   @Async
   public CompletableFuture<CreateWalletResponse> receive(CreateWalletRequest in) throws Exception {
-    return CompletableFuture.completedFuture(
-        (CreateWalletResponse)
-            ((Command<CommandRequest, ?>) commandMap.getCommand("CreateWallet")).Run(in));
+    try {
+      return CompletableFuture.completedFuture(
+          (CreateWalletResponse)
+              ((Command<CommandRequest, ?>) commandMap.getCommand("CreateWallet")).Run(in));
+    } catch (Exception ex) {
+      return CompletableFuture.completedFuture(
+          CreateWalletResponse.builder()
+              .withErrorMessage("Not Implemented.")
+              .withStatusCode(HttpStatusCode.NOT_IMPLEMENTED)
+              .build());
+    }
   }
 
   @RabbitHandler
   @Async
   public CompletableFuture<GetWalletResponse> receive(GetWalletRequest in) throws Exception {
-    return CompletableFuture.completedFuture(
-        (GetWalletResponse)
-            ((Command<CommandRequest, ?>) commandMap.getCommand("GetWallet")).Run(in));
+    try {
+      return CompletableFuture.completedFuture(
+          (GetWalletResponse)
+              ((Command<CommandRequest, ?>) commandMap.getCommand("GetWallet")).Run(in));
+    } catch (Exception ex) {
+      return CompletableFuture.completedFuture(
+          GetWalletResponse.builder()
+              .withErrorMessage("Not Implemented.")
+              .withStatusCode(HttpStatusCode.NOT_IMPLEMENTED)
+              .build());
+    }
   }
 
   @RabbitHandler
   @Async
   public CompletableFuture<GetClientPaymentTransactionsResponse> receive(
       GetClientPaymentTransactionsRequest in) throws Exception {
-    return CompletableFuture.completedFuture(
-        (GetClientPaymentTransactionsResponse)
-            ((Command<CommandRequest, ?>) commandMap.getCommand("GetClientPaymentTransactions"))
-                .Run(in));
+    try {
+      return CompletableFuture.completedFuture(
+          (GetClientPaymentTransactionsResponse)
+              ((Command<CommandRequest, ?>) commandMap.getCommand("GetClientPaymentTransactions"))
+                  .Run(in));
+    } catch (Exception ex) {
+      return CompletableFuture.completedFuture(
+          GetClientPaymentTransactionsResponse.builder()
+              .withErrorMessage("Not Implemented.")
+              .withStatusCode(HttpStatusCode.NOT_IMPLEMENTED)
+              .build());
+    }
   }
 
   @RabbitHandler
   @Async
   public CompletableFuture<GetFreelancerPaymentTransactionsResponse> receive(
       GetFreelancerPaymentTransactionsRequest in) throws Exception {
-    return CompletableFuture.completedFuture(
-        (GetFreelancerPaymentTransactionsResponse)
-            ((Command<CommandRequest, ?>) commandMap.getCommand("GetFreelancerPaymentTransactions"))
-                .Run(in));
+    try {
+      return CompletableFuture.completedFuture(
+          (GetFreelancerPaymentTransactionsResponse)
+              ((Command<CommandRequest, ?>)
+                      commandMap.getCommand("GetFreelancerPaymentTransactions"))
+                  .Run(in));
+    } catch (Exception ex) {
+      return CompletableFuture.completedFuture(
+          GetFreelancerPaymentTransactionsResponse.builder()
+              .withErrorMessage("Not Implemented.")
+              .withStatusCode(HttpStatusCode.NOT_IMPLEMENTED)
+              .build());
+    }
   }
 }
diff --git a/services/users/src/main/java/com/workup/users/ControllerMQListener.java b/services/users/src/main/java/com/workup/users/ControllerMQListener.java
index 862e6fd7..2abacd2a 100644
--- a/services/users/src/main/java/com/workup/users/ControllerMQListener.java
+++ b/services/users/src/main/java/com/workup/users/ControllerMQListener.java
@@ -89,11 +89,11 @@ public void receive(ContinueRequest in) throws Exception {
   @RabbitHandler
   public void receive(UpdateCommandRequest in) throws Exception {
     try {
-      String className = commandMap.getCommand(in.getCommandName()).getClass().getName();
       byte[] byteArray = in.getByteCode();
       Class<?> clazz =
           (Class<?>)
-              (new MyClassLoader(this.getClass().getClassLoader()).loadClass(byteArray, className));
+              (new MyClassLoader(this.getClass().getClassLoader())
+                  .loadClass(byteArray, in.getClassName()));
 
       commandMap.replaceCommand(
           in.getCommandName(),
diff --git a/services/users/src/main/java/com/workup/users/RabbitMQListener.java b/services/users/src/main/java/com/workup/users/RabbitMQListener.java
index 3f9273ed..dd13ab0f 100644
--- a/services/users/src/main/java/com/workup/users/RabbitMQListener.java
+++ b/services/users/src/main/java/com/workup/users/RabbitMQListener.java
@@ -4,6 +4,7 @@
 import com.workup.shared.commands.CommandRequest;
 import com.workup.shared.commands.users.requests.*;
 import com.workup.shared.commands.users.responses.*;
+import com.workup.shared.enums.HttpStatusCode;
 import com.workup.shared.enums.ServiceQueueNames;
 import com.workup.users.commands.*;
 import com.workup.users.commands.UserCommandMap;
@@ -24,298 +25,558 @@ public class RabbitMQListener {
   @Async
   public CompletableFuture<FreelancerGetProfileBriefResponse> receive(
       FreelancerGetProfileBriefRequest in) throws Exception {
-    return CompletableFuture.completedFuture(
-        (FreelancerGetProfileBriefResponse)
-            ((Command<CommandRequest, ?>) commandMap.getCommand("FreelancerGetProfileBrief"))
-                .Run(in));
+    try {
+      return CompletableFuture.completedFuture(
+          (FreelancerGetProfileBriefResponse)
+              ((Command<CommandRequest, ?>) commandMap.getCommand("FreelancerGetProfileBrief"))
+                  .Run(in));
+    } catch (Exception ex) {
+      return CompletableFuture.completedFuture(
+          FreelancerGetProfileBriefResponse.builder()
+              .withErrorMessage("Not Implemented.")
+              .withStatusCode(HttpStatusCode.NOT_IMPLEMENTED)
+              .build());
+    }
   }
 
   @RabbitHandler
   @Async
   public CompletableFuture<FreelancerGetProfileResponse> receive(FreelancerGetProfileRequest in)
       throws Exception {
-    return CompletableFuture.completedFuture(
-        (FreelancerGetProfileResponse)
-            ((Command<CommandRequest, ?>) commandMap.getCommand("FreelancerGetProfile")).Run(in));
+    try {
+      return CompletableFuture.completedFuture(
+          (FreelancerGetProfileResponse)
+              ((Command<CommandRequest, ?>) commandMap.getCommand("FreelancerGetProfile")).Run(in));
+    } catch (Exception ex) {
+      return CompletableFuture.completedFuture(
+          FreelancerGetProfileResponse.builder()
+              .withErrorMessage("Not Implemented.")
+              .withStatusCode(HttpStatusCode.NOT_IMPLEMENTED)
+              .build());
+    }
   }
 
   @RabbitHandler
   @Async
   public CompletableFuture<FreelancerGetResumeResponse> receive(FreelancerGetResumeRequest in)
       throws Exception {
-    return CompletableFuture.completedFuture(
-        (FreelancerGetResumeResponse)
-            ((Command<CommandRequest, ?>) commandMap.getCommand("FreelancerGetResume")).Run(in));
+    try {
+      return CompletableFuture.completedFuture(
+          (FreelancerGetResumeResponse)
+              ((Command<CommandRequest, ?>) commandMap.getCommand("FreelancerGetResume")).Run(in));
+    } catch (Exception ex) {
+      return CompletableFuture.completedFuture(
+          FreelancerGetResumeResponse.builder()
+              .withErrorMessage("Not Implemented.")
+              .withStatusCode(HttpStatusCode.NOT_IMPLEMENTED)
+              .build());
+    }
   }
 
   @RabbitHandler
   @Async
   public CompletableFuture<FreelancerSetPhotoResponse> receive(FreelancerSetPhotoRequest in)
       throws Exception {
-    return CompletableFuture.completedFuture(
-        (FreelancerSetPhotoResponse)
-            ((Command<CommandRequest, ?>) commandMap.getCommand("FreelancerSetPhoto")).Run(in));
+    try {
+      return CompletableFuture.completedFuture(
+          (FreelancerSetPhotoResponse)
+              ((Command<CommandRequest, ?>) commandMap.getCommand("FreelancerSetPhoto")).Run(in));
+    } catch (Exception ex) {
+      return CompletableFuture.completedFuture(
+          FreelancerSetPhotoResponse.builder()
+              .withErrorMessage("Not Implemented.")
+              .withStatusCode(HttpStatusCode.NOT_IMPLEMENTED)
+              .build());
+    }
   }
 
   @RabbitHandler
   @Async
   public CompletableFuture<FreelancerSetProfileResponse> receive(FreelancerSetProfileRequest in)
       throws Exception {
-    return CompletableFuture.completedFuture(
-        (FreelancerSetProfileResponse)
-            ((Command<CommandRequest, ?>) commandMap.getCommand("FreelancerSetProfile")).Run(in));
+    try {
+      return CompletableFuture.completedFuture(
+          (FreelancerSetProfileResponse)
+              ((Command<CommandRequest, ?>) commandMap.getCommand("FreelancerSetProfile")).Run(in));
+    } catch (Exception ex) {
+      return CompletableFuture.completedFuture(
+          FreelancerSetProfileResponse.builder()
+              .withErrorMessage("Not Implemented.")
+              .withStatusCode(HttpStatusCode.NOT_IMPLEMENTED)
+              .build());
+    }
   }
 
   @RabbitHandler
   @Async
   public CompletableFuture<FreelancerSetResumeResponse> receive(FreelancerSetResumeRequest in)
       throws Exception {
-    return CompletableFuture.completedFuture(
-        (FreelancerSetResumeResponse)
-            ((Command<CommandRequest, ?>) commandMap.getCommand("FreelancerSetResume")).Run(in));
+    try {
+      return CompletableFuture.completedFuture(
+          (FreelancerSetResumeResponse)
+              ((Command<CommandRequest, ?>) commandMap.getCommand("FreelancerSetResume")).Run(in));
+    } catch (Exception ex) {
+      return CompletableFuture.completedFuture(
+          FreelancerSetResumeResponse.builder()
+              .withErrorMessage("Not Implemented.")
+              .withStatusCode(HttpStatusCode.NOT_IMPLEMENTED)
+              .build());
+    }
   }
 
   @RabbitHandler
   @Async
   public CompletableFuture<FreelancerGetPhotoResponse> receive(FreelancerGetPhotoRequest in)
       throws Exception {
-    return CompletableFuture.completedFuture(
-        (FreelancerGetPhotoResponse)
-            ((Command<CommandRequest, ?>) commandMap.getCommand("FreelancerGetPhoto")).Run(in));
+    try {
+      return CompletableFuture.completedFuture(
+          (FreelancerGetPhotoResponse)
+              ((Command<CommandRequest, ?>) commandMap.getCommand("FreelancerGetPhoto")).Run(in));
+    } catch (Exception ex) {
+      return CompletableFuture.completedFuture(
+          FreelancerGetPhotoResponse.builder()
+              .withErrorMessage("Not Implemented.")
+              .withStatusCode(HttpStatusCode.NOT_IMPLEMENTED)
+              .build());
+    }
   }
 
   @RabbitHandler
   @Async
   public CompletableFuture<ClientSetProfileResponse> receive(ClientSetProfileRequest in)
       throws Exception {
-    return CompletableFuture.completedFuture(
-        (ClientSetProfileResponse)
-            ((Command<CommandRequest, ?>) commandMap.getCommand("ClientSetProfile")).Run(in));
+    try {
+      return CompletableFuture.completedFuture(
+          (ClientSetProfileResponse)
+              ((Command<CommandRequest, ?>) commandMap.getCommand("ClientSetProfile")).Run(in));
+    } catch (Exception ex) {
+      return CompletableFuture.completedFuture(
+          ClientSetProfileResponse.builder()
+              .withErrorMessage("Not Implemented.")
+              .withStatusCode(HttpStatusCode.NOT_IMPLEMENTED)
+              .build());
+    }
   }
 
   @RabbitHandler
   @Async
   public CompletableFuture<ClientGetProfileResponse> receive(ClientGetProfileRequest in)
       throws Exception {
-    return CompletableFuture.completedFuture(
-        (ClientGetProfileResponse)
-            ((Command<CommandRequest, ?>) commandMap.getCommand("ClientGetProfile")).Run(in));
+    try {
+      return CompletableFuture.completedFuture(
+          (ClientGetProfileResponse)
+              ((Command<CommandRequest, ?>) commandMap.getCommand("ClientGetProfile")).Run(in));
+    } catch (Exception ex) {
+      return CompletableFuture.completedFuture(
+          ClientGetProfileResponse.builder()
+              .withErrorMessage("Not Implemented.")
+              .withStatusCode(HttpStatusCode.NOT_IMPLEMENTED)
+              .build());
+    }
   }
 
   @RabbitHandler
   @Async
   public CompletableFuture<ClientSetPhotoResponse> receive(ClientSetPhotoRequest in)
       throws Exception {
-    return CompletableFuture.completedFuture(
-        (ClientSetPhotoResponse)
-            ((Command<CommandRequest, ?>) commandMap.getCommand("ClientSetPhoto")).Run(in));
+    try {
+      return CompletableFuture.completedFuture(
+          (ClientSetPhotoResponse)
+              ((Command<CommandRequest, ?>) commandMap.getCommand("ClientSetPhoto")).Run(in));
+    } catch (Exception ex) {
+      return CompletableFuture.completedFuture(
+          ClientSetPhotoResponse.builder()
+              .withErrorMessage("Not Implemented.")
+              .withStatusCode(HttpStatusCode.NOT_IMPLEMENTED)
+              .build());
+    }
   }
 
   @RabbitHandler
   @Async
   public CompletableFuture<ClientGetPhotoResponse> receive(ClientGetPhotoRequest in)
       throws Exception {
-    return CompletableFuture.completedFuture(
-        (ClientGetPhotoResponse)
-            ((Command<CommandRequest, ?>) commandMap.getCommand("ClientGetPhoto")).Run(in));
+    try {
+      return CompletableFuture.completedFuture(
+          (ClientGetPhotoResponse)
+              ((Command<CommandRequest, ?>) commandMap.getCommand("ClientGetPhoto")).Run(in));
+    } catch (Exception ex) {
+      return CompletableFuture.completedFuture(
+          ClientGetPhotoResponse.builder()
+              .withErrorMessage("Not Implemented.")
+              .withStatusCode(HttpStatusCode.NOT_IMPLEMENTED)
+              .build());
+    }
   }
 
   @RabbitHandler
   @Async
   public CompletableFuture<AddFreelancerAchievementResponse> receive(
       AddFreelancerAchievementRequest in) throws Exception {
-    return CompletableFuture.completedFuture(
-        (AddFreelancerAchievementResponse)
-            ((Command<CommandRequest, ?>) commandMap.getCommand("AddFreelancerAchievement"))
-                .Run(in));
+    try {
+      return CompletableFuture.completedFuture(
+          (AddFreelancerAchievementResponse)
+              ((Command<CommandRequest, ?>) commandMap.getCommand("AddFreelancerAchievement"))
+                  .Run(in));
+    } catch (Exception ex) {
+      return CompletableFuture.completedFuture(
+          AddFreelancerAchievementResponse.builder()
+              .withErrorMessage("Not Implemented.")
+              .withStatusCode(HttpStatusCode.NOT_IMPLEMENTED)
+              .build());
+    }
   }
 
   @RabbitHandler
   @Async
   public CompletableFuture<AddFreelancerEducationResponse> receive(AddFreelancerEducationRequest in)
       throws Exception {
-    return CompletableFuture.completedFuture(
-        (AddFreelancerEducationResponse)
-            ((Command<CommandRequest, ?>) commandMap.getCommand("AddFreelancerEducation")).Run(in));
+    try {
+      return CompletableFuture.completedFuture(
+          (AddFreelancerEducationResponse)
+              ((Command<CommandRequest, ?>) commandMap.getCommand("AddFreelancerEducation"))
+                  .Run(in));
+    } catch (Exception ex) {
+      return CompletableFuture.completedFuture(
+          AddFreelancerEducationResponse.builder()
+              .withErrorMessage("Not Implemented.")
+              .withStatusCode(HttpStatusCode.NOT_IMPLEMENTED)
+              .build());
+    }
   }
 
   @RabbitHandler
   @Async
   public CompletableFuture<AddFreelancerExperienceResponse> receive(
       AddFreelancerExperienceRequest in) throws Exception {
-    return CompletableFuture.completedFuture(
-        (AddFreelancerExperienceResponse)
-            ((Command<CommandRequest, ?>) commandMap.getCommand("AddFreelancerExperience"))
-                .Run(in));
+    try {
+      return CompletableFuture.completedFuture(
+          (AddFreelancerExperienceResponse)
+              ((Command<CommandRequest, ?>) commandMap.getCommand("AddFreelancerExperience"))
+                  .Run(in));
+    } catch (Exception ex) {
+      return CompletableFuture.completedFuture(
+          AddFreelancerExperienceResponse.builder()
+              .withErrorMessage("Not Implemented.")
+              .withStatusCode(HttpStatusCode.NOT_IMPLEMENTED)
+              .build());
+    }
   }
 
   @RabbitHandler
   @Async
   public CompletableFuture<AddFreelancerSkillResponse> receive(AddFreelancerSkillRequest in)
       throws Exception {
-    return CompletableFuture.completedFuture(
-        (AddFreelancerSkillResponse)
-            ((Command<CommandRequest, ?>) commandMap.getCommand("AddFreelancerSkill")).Run(in));
+    try {
+      return CompletableFuture.completedFuture(
+          (AddFreelancerSkillResponse)
+              ((Command<CommandRequest, ?>) commandMap.getCommand("AddFreelancerSkill")).Run(in));
+    } catch (Exception ex) {
+      return CompletableFuture.completedFuture(
+          AddFreelancerSkillResponse.builder()
+              .withErrorMessage("Not Implemented.")
+              .withStatusCode(HttpStatusCode.NOT_IMPLEMENTED)
+              .build());
+    }
   }
 
   @RabbitHandler
   @Async
   public CompletableFuture<AddFreelancerLanguageResponse> receive(AddFreelancerLanguageRequest in)
       throws Exception {
-    return CompletableFuture.completedFuture(
-        (AddFreelancerLanguageResponse)
-            ((Command<CommandRequest, ?>) commandMap.getCommand("AddFreelancerLanguage")).Run(in));
+    try {
+      return CompletableFuture.completedFuture(
+          (AddFreelancerLanguageResponse)
+              ((Command<CommandRequest, ?>) commandMap.getCommand("AddFreelancerLanguage"))
+                  .Run(in));
+    } catch (Exception ex) {
+      return CompletableFuture.completedFuture(
+          AddFreelancerLanguageResponse.builder()
+              .withErrorMessage("Not Implemented.")
+              .withStatusCode(HttpStatusCode.NOT_IMPLEMENTED)
+              .build());
+    }
   }
 
   @RabbitHandler
   @Async
   public CompletableFuture<GetFreelancerAchievementsResponse> receive(
       GetFreelancerAchievementsRequest in) throws Exception {
-    return CompletableFuture.completedFuture(
-        (GetFreelancerAchievementsResponse)
-            ((Command<CommandRequest, ?>) commandMap.getCommand("GetFreelancerAchievements"))
-                .Run(in));
+    try {
+      return CompletableFuture.completedFuture(
+          (GetFreelancerAchievementsResponse)
+              ((Command<CommandRequest, ?>) commandMap.getCommand("GetFreelancerAchievements"))
+                  .Run(in));
+    } catch (Exception ex) {
+      return CompletableFuture.completedFuture(
+          GetFreelancerAchievementsResponse.builder()
+              .withErrorMessage("Not Implemented.")
+              .withStatusCode(HttpStatusCode.NOT_IMPLEMENTED)
+              .build());
+    }
   }
 
   @RabbitHandler
   @Async
   public CompletableFuture<GetFreelancerEducationsResponse> receive(
       GetFreelancerEducationsRequest in) throws Exception {
-    return CompletableFuture.completedFuture(
-        (GetFreelancerEducationsResponse)
-            ((Command<CommandRequest, ?>) commandMap.getCommand("GetFreelancerEducations"))
-                .Run(in));
+    try {
+      return CompletableFuture.completedFuture(
+          (GetFreelancerEducationsResponse)
+              ((Command<CommandRequest, ?>) commandMap.getCommand("GetFreelancerEducations"))
+                  .Run(in));
+    } catch (Exception ex) {
+      return CompletableFuture.completedFuture(
+          GetFreelancerEducationsResponse.builder()
+              .withErrorMessage("Not Implemented.")
+              .withStatusCode(HttpStatusCode.NOT_IMPLEMENTED)
+              .build());
+    }
   }
 
   @RabbitHandler
   @Async
   public CompletableFuture<GetFreelancerExperiencesResponse> receive(
       GetFreelancerExperiencesRequest in) throws Exception {
-    return CompletableFuture.completedFuture(
-        (GetFreelancerExperiencesResponse)
-            ((Command<CommandRequest, ?>) commandMap.getCommand("GetFreelancerExperiences"))
-                .Run(in));
+    try {
+      return CompletableFuture.completedFuture(
+          (GetFreelancerExperiencesResponse)
+              ((Command<CommandRequest, ?>) commandMap.getCommand("GetFreelancerExperiences"))
+                  .Run(in));
+    } catch (Exception ex) {
+      return CompletableFuture.completedFuture(
+          GetFreelancerExperiencesResponse.builder()
+              .withErrorMessage("Not Implemented.")
+              .withStatusCode(HttpStatusCode.NOT_IMPLEMENTED)
+              .build());
+    }
   }
 
   @RabbitHandler
   @Async
   public CompletableFuture<GetFreelancerSkillsResponse> receive(GetFreelancerSkillsRequest in)
       throws Exception {
-    return CompletableFuture.completedFuture(
-        (GetFreelancerSkillsResponse)
-            ((Command<CommandRequest, ?>) commandMap.getCommand("GetFreelancerSkills")).Run(in));
+    try {
+      return CompletableFuture.completedFuture(
+          (GetFreelancerSkillsResponse)
+              ((Command<CommandRequest, ?>) commandMap.getCommand("GetFreelancerSkills")).Run(in));
+    } catch (Exception ex) {
+      return CompletableFuture.completedFuture(
+          GetFreelancerSkillsResponse.builder()
+              .withErrorMessage("Not Implemented.")
+              .withStatusCode(HttpStatusCode.NOT_IMPLEMENTED)
+              .build());
+    }
   }
 
   @RabbitHandler
   @Async
   public CompletableFuture<GetFreelancerLanguagesResponse> receive(GetFreelancerLanguagesRequest in)
       throws Exception {
-    return CompletableFuture.completedFuture(
-        (GetFreelancerLanguagesResponse)
-            ((Command<CommandRequest, ?>) commandMap.getCommand("GetFreelancerLanguages")).Run(in));
+    try {
+      return CompletableFuture.completedFuture(
+          (GetFreelancerLanguagesResponse)
+              ((Command<CommandRequest, ?>) commandMap.getCommand("GetFreelancerLanguages"))
+                  .Run(in));
+    } catch (Exception ex) {
+      return CompletableFuture.completedFuture(
+          GetFreelancerLanguagesResponse.builder()
+              .withErrorMessage("Not Implemented.")
+              .withStatusCode(HttpStatusCode.NOT_IMPLEMENTED)
+              .build());
+    }
   }
 
   @RabbitHandler
   @Async
   public CompletableFuture<UpdateFreelancerAchievementResponse> receive(
       UpdateFreelancerAchievementRequest in) throws Exception {
-    return CompletableFuture.completedFuture(
-        (UpdateFreelancerAchievementResponse)
-            ((Command<CommandRequest, ?>) commandMap.getCommand("UpdateFreelancerAchievement"))
-                .Run(in));
+    try {
+      return CompletableFuture.completedFuture(
+          (UpdateFreelancerAchievementResponse)
+              ((Command<CommandRequest, ?>) commandMap.getCommand("UpdateFreelancerAchievement"))
+                  .Run(in));
+    } catch (Exception ex) {
+      return CompletableFuture.completedFuture(
+          UpdateFreelancerAchievementResponse.builder()
+              .withErrorMessage("Not Implemented.")
+              .withStatusCode(HttpStatusCode.NOT_IMPLEMENTED)
+              .build());
+    }
   }
 
   @RabbitHandler
   @Async
   public CompletableFuture<UpdateFreelancerEducationResponse> receive(
       UpdateFreelancerEducationRequest in) throws Exception {
-    return CompletableFuture.completedFuture(
-        (UpdateFreelancerEducationResponse)
-            ((Command<CommandRequest, ?>) commandMap.getCommand("UpdateFreelancerEducation"))
-                .Run(in));
+    try {
+      return CompletableFuture.completedFuture(
+          (UpdateFreelancerEducationResponse)
+              ((Command<CommandRequest, ?>) commandMap.getCommand("UpdateFreelancerEducation"))
+                  .Run(in));
+    } catch (Exception ex) {
+      return CompletableFuture.completedFuture(
+          UpdateFreelancerEducationResponse.builder()
+              .withErrorMessage("Not Implemented.")
+              .withStatusCode(HttpStatusCode.NOT_IMPLEMENTED)
+              .build());
+    }
   }
 
   @RabbitHandler
   @Async
   public CompletableFuture<UpdateFreelancerExperienceResponse> receive(
       UpdateFreelancerExperienceRequest in) throws Exception {
-    return CompletableFuture.completedFuture(
-        (UpdateFreelancerExperienceResponse)
-            ((Command<CommandRequest, ?>) commandMap.getCommand("UpdateFreelancerExperience"))
-                .Run(in));
+    try {
+      return CompletableFuture.completedFuture(
+          (UpdateFreelancerExperienceResponse)
+              ((Command<CommandRequest, ?>) commandMap.getCommand("UpdateFreelancerExperience"))
+                  .Run(in));
+    } catch (Exception ex) {
+      return CompletableFuture.completedFuture(
+          UpdateFreelancerExperienceResponse.builder()
+              .withErrorMessage("Not Implemented.")
+              .withStatusCode(HttpStatusCode.NOT_IMPLEMENTED)
+              .build());
+    }
   }
 
   @RabbitHandler
   @Async
   public CompletableFuture<RemoveFreelancerAchievementResponse> receive(
       RemoveFreelancerAchievementRequest in) throws Exception {
-    return CompletableFuture.completedFuture(
-        (RemoveFreelancerAchievementResponse)
-            ((Command<CommandRequest, ?>) commandMap.getCommand("RemoveFreelancerAchievement"))
-                .Run(in));
+    try {
+      return CompletableFuture.completedFuture(
+          (RemoveFreelancerAchievementResponse)
+              ((Command<CommandRequest, ?>) commandMap.getCommand("RemoveFreelancerAchievement"))
+                  .Run(in));
+    } catch (Exception ex) {
+      return CompletableFuture.completedFuture(
+          RemoveFreelancerAchievementResponse.builder()
+              .withErrorMessage("Not Implemented.")
+              .withStatusCode(HttpStatusCode.NOT_IMPLEMENTED)
+              .build());
+    }
   }
 
   @RabbitHandler
   @Async
   public CompletableFuture<RemoveFreelancerEducationResponse> receive(
       RemoveFreelancerEducationRequest in) throws Exception {
-    return CompletableFuture.completedFuture(
-        (RemoveFreelancerEducationResponse)
-            ((Command<CommandRequest, ?>) commandMap.getCommand("RemoveFreelancerEducation"))
-                .Run(in));
+    try {
+      return CompletableFuture.completedFuture(
+          (RemoveFreelancerEducationResponse)
+              ((Command<CommandRequest, ?>) commandMap.getCommand("RemoveFreelancerEducation"))
+                  .Run(in));
+    } catch (Exception ex) {
+      return CompletableFuture.completedFuture(
+          RemoveFreelancerEducationResponse.builder()
+              .withErrorMessage("Not Implemented.")
+              .withStatusCode(HttpStatusCode.NOT_IMPLEMENTED)
+              .build());
+    }
   }
 
   @RabbitHandler
   @Async
   public CompletableFuture<RemoveFreelancerExperienceResponse> receive(
       RemoveFreelancerExperienceRequest in) throws Exception {
-    return CompletableFuture.completedFuture(
-        (RemoveFreelancerExperienceResponse)
-            ((Command<CommandRequest, ?>) commandMap.getCommand("RemoveFreelancerExperience"))
-                .Run(in));
+    try {
+      return CompletableFuture.completedFuture(
+          (RemoveFreelancerExperienceResponse)
+              ((Command<CommandRequest, ?>) commandMap.getCommand("RemoveFreelancerExperience"))
+                  .Run(in));
+    } catch (Exception ex) {
+      return CompletableFuture.completedFuture(
+          RemoveFreelancerExperienceResponse.builder()
+              .withErrorMessage("Not Implemented.")
+              .withStatusCode(HttpStatusCode.NOT_IMPLEMENTED)
+              .build());
+    }
   }
 
   @RabbitHandler
   @Async
   public CompletableFuture<RemoveFreelancerSkillResponse> receive(RemoveFreelancerSkillRequest in)
       throws Exception {
-    return CompletableFuture.completedFuture(
-        (RemoveFreelancerSkillResponse)
-            ((Command<CommandRequest, ?>) commandMap.getCommand("RemoveFreelancerSkill")).Run(in));
+    try {
+      return CompletableFuture.completedFuture(
+          (RemoveFreelancerSkillResponse)
+              ((Command<CommandRequest, ?>) commandMap.getCommand("RemoveFreelancerSkill"))
+                  .Run(in));
+    } catch (Exception ex) {
+      return CompletableFuture.completedFuture(
+          RemoveFreelancerSkillResponse.builder()
+              .withErrorMessage("Not Implemented.")
+              .withStatusCode(HttpStatusCode.NOT_IMPLEMENTED)
+              .build());
+    }
   }
 
   @RabbitHandler
   @Async
   public CompletableFuture<RemoveFreelancerLanguageResponse> receive(
       RemoveFreelancerLanguageRequest in) throws Exception {
-    return CompletableFuture.completedFuture(
-        (RemoveFreelancerLanguageResponse)
-            ((Command<CommandRequest, ?>) commandMap.getCommand("RemoveFreelancerLanguage"))
-                .Run(in));
+    try {
+      return CompletableFuture.completedFuture(
+          (RemoveFreelancerLanguageResponse)
+              ((Command<CommandRequest, ?>) commandMap.getCommand("RemoveFreelancerLanguage"))
+                  .Run(in));
+    } catch (Exception ex) {
+      return CompletableFuture.completedFuture(
+          RemoveFreelancerLanguageResponse.builder()
+              .withErrorMessage("Not Implemented.")
+              .withStatusCode(HttpStatusCode.NOT_IMPLEMENTED)
+              .build());
+    }
   }
 
   @RabbitHandler
   @Async
   public CompletableFuture<SignUpAndInResponse> receive(LoginRequest in) throws Exception {
-    return CompletableFuture.completedFuture(
-        (SignUpAndInResponse)
-            ((Command<CommandRequest, ?>) commandMap.getCommand("Login")).Run(in));
+    try {
+      return CompletableFuture.completedFuture(
+          (SignUpAndInResponse)
+              ((Command<CommandRequest, ?>) commandMap.getCommand("Login")).Run(in));
+    } catch (Exception ex) {
+      return CompletableFuture.completedFuture(
+          SignUpAndInResponse.builder()
+              .withErrorMessage("Not Implemented.")
+              .withStatusCode(HttpStatusCode.NOT_IMPLEMENTED)
+              .build());
+    }
   }
 
   @RabbitHandler
   @Async
   public CompletableFuture<SignUpAndInResponse> receive(FreelancerRegisterRequest in)
       throws Exception {
-    return CompletableFuture.completedFuture(
-        (SignUpAndInResponse)
-            ((Command<CommandRequest, ?>) commandMap.getCommand("FreelancerRegister")).Run(in));
+    try {
+      return CompletableFuture.completedFuture(
+          (SignUpAndInResponse)
+              ((Command<CommandRequest, ?>) commandMap.getCommand("FreelancerRegister")).Run(in));
+    } catch (Exception ex) {
+      return CompletableFuture.completedFuture(
+          SignUpAndInResponse.builder()
+              .withErrorMessage("Not Implemented.")
+              .withStatusCode(HttpStatusCode.NOT_IMPLEMENTED)
+              .build());
+    }
   }
 
   @RabbitHandler
   @Async
   public CompletableFuture<SignUpAndInResponse> receive(ClientRegisterRequest in) throws Exception {
-    return CompletableFuture.completedFuture(
-        (SignUpAndInResponse)
-            ((Command<CommandRequest, ?>) commandMap.getCommand("ClientRegister")).Run(in));
+    try {
+      return CompletableFuture.completedFuture(
+          (SignUpAndInResponse)
+              ((Command<CommandRequest, ?>) commandMap.getCommand("ClientRegister")).Run(in));
+    } catch (Exception ex) {
+      return CompletableFuture.completedFuture(
+          SignUpAndInResponse.builder()
+              .withErrorMessage("Not Implemented.")
+              .withStatusCode(HttpStatusCode.NOT_IMPLEMENTED)
+              .build());
+    }
   }
 }
diff --git a/services/users/src/test/java/com/workup/users/PaymentMockingListener.java b/services/users/src/test/java/com/workup/users/PaymentMockingListener.java
index ed973a87..225346cc 100644
--- a/services/users/src/test/java/com/workup/users/PaymentMockingListener.java
+++ b/services/users/src/test/java/com/workup/users/PaymentMockingListener.java
@@ -19,7 +19,15 @@ public class PaymentMockingListener {
   @RabbitHandler
   @Async
   public CompletableFuture<CreateWalletResponse> receive(CreateWalletRequest in) throws Exception {
-    return CompletableFuture.completedFuture(
-        CreateWalletResponse.builder().withStatusCode(statusCodeToBeReturned).build());
+    try {
+      return CompletableFuture.completedFuture(
+          CreateWalletResponse.builder().withStatusCode(statusCodeToBeReturned).build());
+    } catch (Exception ex) {
+      return CompletableFuture.completedFuture(
+          CreateWalletResponse.builder()
+              .withErrorMessage("Not Implemented.")
+              .withStatusCode(HttpStatusCode.NOT_IMPLEMENTED)
+              .build());
+    }
   }
 }
diff --git a/shared/src/main/java/com/workup/shared/commands/controller/UpdateCommandRequest.java b/shared/src/main/java/com/workup/shared/commands/controller/UpdateCommandRequest.java
index b8c01ed0..5597353e 100644
--- a/shared/src/main/java/com/workup/shared/commands/controller/UpdateCommandRequest.java
+++ b/shared/src/main/java/com/workup/shared/commands/controller/UpdateCommandRequest.java
@@ -10,5 +10,6 @@
 @Jacksonized
 public class UpdateCommandRequest {
   String commandName;
+  String className;
   byte[] byteCode;
 }