Fixed bug with tests

Author: ShimaaBetah

services/users/src/main/java/com/workup/users/commands/ClientRegisterCommand.java

@@ -38,7 +38,7 @@ public SignUpAndInResponse Run(ClientRegisterRequest request) {
           .withSuccess(true)
           .withUserName(savedClient.getEmail())
           .withUserId(savedClient.getId().toString())
-          .withUserType(UserType.FREELANCER)
+          .withUserType(UserType.CLIENT)
           .withStatusCode(HttpStatusCode.OK)
           .build();
     } catch (Exception e) {

services/users/src/test/java/com/workup/users/PaymentMockingListener.java

@@ -0,0 +1,21 @@
+package com.workup.users;
+
+import com.workup.shared.commands.payments.wallet.requests.CreateWalletRequest;
+import com.workup.shared.commands.payments.wallet.responses.CreateWalletResponse;
+import com.workup.shared.enums.HttpStatusCode;
+import com.workup.shared.enums.ServiceQueueNames;
+import org.springframework.amqp.rabbit.annotation.RabbitHandler;
+import org.springframework.amqp.rabbit.annotation.RabbitListener;
+import org.springframework.stereotype.Service;
+
+@Service
+@RabbitListener(queues = ServiceQueueNames.PAYMENTS)
+public class PaymentMockingListener {
+
+  public static HttpStatusCode statusCodeToBeReturned;
+
+  @RabbitHandler
+  public CreateWalletResponse receive(CreateWalletRequest in) throws Exception {
+    return CreateWalletResponse.builder().withStatusCode(statusCodeToBeReturned).build();
+  }
+}

services/users/src/test/java/com/workup/users/TestConfigBase.java

@@ -9,7 +9,7 @@
 public class TestConfigBase {
 
   @Bean
-  public Queue usersQueueMock() {
-    return new Queue(ServiceQueueNames.USERS);
+  public Queue payementQueueMock() {
+    return new Queue(ServiceQueueNames.PAYMENTS);
   }
 }

services/users/src/test/java/com/workup/users/UsersApplicationTests.java

@@ -10,6 +10,7 @@
 import com.workup.shared.views.users.AchievementView;
 import com.workup.shared.views.users.EducationView;
 import com.workup.shared.views.users.ExperienceView;
+import com.workup.users.commands.utils.PasswordHasher;
 import com.workup.users.db.*;
 import com.workup.users.repositories.*;
 import java.sql.Date;
@@ -97,12 +98,13 @@ public void testFreelancerRegister() {
 
   @Test
   public void testFreelancerLogin() {
-    Freelancer freelancer = freelancerRepository.save(UsersTestUtils.generateRandomFreelancer());
+    String password = "password";
+    String hashedPassword = PasswordHasher.hashPassword(password);
+    Freelancer randomFreelancer = UsersTestUtils.generateRandomFreelancer();
+    randomFreelancer.setPassword_hash(hashedPassword);
+    Freelancer freelancer = freelancerRepository.save(randomFreelancer);
     LoginRequest request =
-        LoginRequest.builder()
-            .withEmail(freelancer.getEmail())
-            .withPassword(freelancer.getPassword_hash())
-            .build();
+        LoginRequest.builder().withEmail(freelancer.getEmail()).withPassword(password).build();
     SignUpAndInResponse response =
         (SignUpAndInResponse) template.convertSendAndReceive(ServiceQueueNames.USERS, request);
     UsersTestUtils.verifySignUpAndInResponse(response, freelancer.getEmail(), UserType.FREELANCER);
@@ -128,12 +130,13 @@ public void testClientRegister() {
 
   @Test
   public void testClientLogin() {
-    Client client = clientRepository.save(UsersTestUtils.generateRandomClient());
+    String password = "password";
+    String hashedPassword = PasswordHasher.hashPassword(password);
+    Client randomClient = UsersTestUtils.generateRandomClient();
+    randomClient.setPassword_hash(hashedPassword);
+    Client client = clientRepository.save(randomClient);
     LoginRequest request =
-        LoginRequest.builder()
-            .withEmail(client.getEmail())
-            .withPassword(client.getPassword_hash())
-            .build();
+        LoginRequest.builder().withEmail(client.getEmail()).withPassword(password).build();
     SignUpAndInResponse response =
         (SignUpAndInResponse) template.convertSendAndReceive(ServiceQueueNames.USERS, request);
     UsersTestUtils.verifySignUpAndInResponse(response, client.getEmail(), UserType.CLIENT);

services/users/src/test/java/com/workup/users/UsersTestUtils.java

@@ -180,7 +180,7 @@ public static void verifySignUpAndInResponse(
       SignUpAndInResponse response, String email, UserType userType) {
     assertNotNull(response);
     assertNotNull(response.getUserName());
-    assertEquals(response.getUserName(), email);
-    assertEquals(response.getUserType(), userType);
+    assertEquals(email, response.getUserName());
+    assertEquals(userType, response.getUserType());
   }
 }