Users Authentication Requests/Responses

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

@@ -1,30 +1,39 @@
 package com.workup.users;
 
-import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
-
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import com.workup.shared.commands.users.requests.AuthenticationRequest;
+import com.workup.shared.commands.users.requests.ClientRegisterRequest;
 import com.workup.shared.commands.users.requests.FreelancerRegisterRequest;
-import com.workup.shared.commands.users.responses.FreelancerRegisterResponse;
+import com.workup.shared.commands.users.requests.LoginRequest;
+import com.workup.shared.commands.users.responses.SignUpAndInResponse;
 import org.junit.jupiter.api.Test;
 
+import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
+
 public class RequestsAndResponsesTest {
-  private static Object[] testObjects = { // all requests/responses to be tested
-    FreelancerRegisterRequest.builder().build(), FreelancerRegisterResponse.builder().build(),
-  };
+    private static Object[] testObjects = { // all requests/responses to be tested
+            FreelancerRegisterRequest.builder().build(),
+            SignUpAndInResponse.builder().build(),
+            AuthenticationRequest.builder().build(),
+            ClientRegisterRequest.builder().build(),
+            LoginRequest.builder().build()
+    };
 
-  @Test
-  public void testSerializationNoExceptionsThrown() throws JsonProcessingException {
-    ObjectMapper objectMapper = new ObjectMapper();
-    for (Object testObject : testObjects) {
-      String className = testObject.getClass().getName();
-      assertDoesNotThrow(
-          () -> objectMapper.writeValueAsString(testObject),
-          String.format("Serialization of %s should not throw exceptions", className));
-      String json = objectMapper.writeValueAsString(testObject);
-      assertDoesNotThrow(
-          () -> objectMapper.readValue(json, testObject.getClass()),
-          String.format("Deserialization of %s should not throw exceptions", className));
+    @Test
+    public void testSerializationNoExceptionsThrown() throws JsonProcessingException {
+        ObjectMapper objectMapper = new ObjectMapper();
+        for (Object testObject : testObjects) {
+            String className = testObject.getClass().getName();
+            assertDoesNotThrow(
+                    () -> objectMapper.writeValueAsString(testObject),
+                    String.format("Serialization of %s should not throw exceptions", className)
+            );
+            String json = objectMapper.writeValueAsString(testObject);
+            assertDoesNotThrow(
+                    () -> objectMapper.readValue(json, testObject.getClass()),
+                    String.format("Deserialization of %s should not throw exceptions", className)
+            );
+        }
     }
-  }
 }

shared/src/main/java/com/workup/shared/commands/users/requests/AuthenticationRequest.java

@@ -0,0 +1,12 @@
+package com.workup.shared.commands.users.requests;
+
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import lombok.Builder;
+import lombok.Getter;
+
+@Getter
+@Builder(setterPrefix = "with")
+@JsonDeserialize(builder = AuthenticationRequest.AuthenticationRequestBuilder.class)
+public class AuthenticationRequest {
+    private String authToken;
+}

shared/src/main/java/com/workup/shared/commands/users/requests/ClientRegisterRequest.java

@@ -0,0 +1,19 @@
+package com.workup.shared.commands.users.requests;
+
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import lombok.Builder;
+import lombok.Getter;
+
+@Getter
+@Builder(setterPrefix = "with")
+@JsonDeserialize(builder = ClientRegisterRequest.ClientRegisterRequestBuilder.class)
+public class ClientRegisterRequest {
+    private String email;
+    private String passwordHash;
+    private String clientName;
+    private String industry;
+    private String city;
+    private String photoId;
+    private String description;
+    private Integer employeeCount;
+}

shared/src/main/java/com/workup/shared/commands/users/requests/FreelancerRegisterRequest.java

@@ -1,20 +1,20 @@
 package com.workup.shared.commands.users.requests;
 
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.workup.shared.commands.CommandRequest;
-import java.util.Date;
+import lombok.Builder;
 import lombok.Getter;
-import lombok.experimental.SuperBuilder;
-import lombok.extern.jackson.Jacksonized;
+
+import java.util.Date;
 
 @Getter
-@SuperBuilder(setterPrefix = "with")
-@Jacksonized
+@Builder(setterPrefix = "with")
+@JsonDeserialize(builder = FreelancerRegisterRequest.FreelancerRegisterRequestBuilder.class)
 public class FreelancerRegisterRequest extends CommandRequest {
-
-  String email;
-  String passwordHash;
-  String fullName;
-  String jobTitle;
-  String city;
-  Date birthDate;
+    private String email;
+    private String passwordHash;
+    private String fullName;
+    private String jobTitle;
+    private String city;
+    private Date birthDate;
 }

shared/src/main/java/com/workup/shared/commands/users/requests/LoginRequest.java

@@ -0,0 +1,13 @@
+package com.workup.shared.commands.users.requests;
+
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import lombok.Builder;
+import lombok.Getter;
+
+@Getter
+@Builder(setterPrefix = "with")
+@JsonDeserialize(builder = LoginRequest.LoginRequestBuilder.class)
+public class LoginRequest {
+    private String email;
+    private String passwordHash;
+}

shared/src/main/java/com/workup/shared/commands/users/responses/AuthenticationResponse.java

@@ -0,0 +1,13 @@
+package com.workup.shared.commands.users.responses;
+
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import lombok.Builder;
+import lombok.Getter;
+
+@Getter
+@Builder(setterPrefix = "with")
+@JsonDeserialize(builder = AuthenticationResponse.AuthenticationResponseBuilder.class)
+public class AuthenticationResponse {
+    private String email;
+    private UserType userType;
+}

shared/src/main/java/com/workup/shared/commands/users/responses/SignUpAndInResponse.java

@@ -0,0 +1,14 @@
+package com.workup.shared.commands.users.responses;
+
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import com.workup.shared.commands.CommandResponse;
+import lombok.Builder;
+import lombok.Getter;
+
+@Getter
+@Builder(setterPrefix = "with")
+@JsonDeserialize(builder = SignUpAndInResponse.SignUpAndInResponseBuilder.class)
+public class SignUpAndInResponse extends CommandResponse {
+    boolean success;
+    String authToken;
+}

shared/src/main/java/com/workup/shared/commands/users/responses/UserType.java

@@ -0,0 +1,6 @@
+package com.workup.shared.commands.users.responses;
+
+public enum UserType {
+    FREELANCER,
+    CLIENT
+}