diff --git a/src/main/java/org/cmh/backend/authentication/controller/AuthenticationController.java b/src/main/java/org/cmh/backend/authentication/controller/AuthenticationController.java index 5ec7e11..1895856 100644 --- a/src/main/java/org/cmh/backend/authentication/controller/AuthenticationController.java +++ b/src/main/java/org/cmh/backend/authentication/controller/AuthenticationController.java @@ -5,7 +5,7 @@ import lombok.AllArgsConstructor; import lombok.Getter; import lombok.Setter; import org.cmh.backend.Utils.JwtUtil; -import org.cmh.backend.authentication.dto.ManageUserProfileRequest; +import org.cmh.backend.authentication.dto.*; import org.cmh.backend.authentication.model.UserHS; import org.cmh.backend.authentication.service.UserService; import org.springframework.beans.factory.annotation.Autowired; @@ -88,49 +88,3 @@ class AuthenticationController { } - -// DTO classes -@Getter -@Setter -class RegisterRequest { - private String username; - private String password; - private String contactInfo; -} - -@Getter -@Setter -@AllArgsConstructor -class RegisterResponse { - private String message; -} - -@Getter -@Setter -class LoginRequest { - private String username; - private String password; - private String verificationCode; -} - -@Getter -@Setter -@AllArgsConstructor -class LoginResponse { - private String message; - private String jwt; -} - -@Getter -@Setter -@AllArgsConstructor -class UserProfileResponse { - private String username; - private String nickname; - private String gender; - private String phoneNumber; - private String email; - private String department; - private String role; - private LocalDateTime createdAt; -} \ No newline at end of file diff --git a/src/main/java/org/cmh/backend/authentication/dto/JwtRequest.java b/src/main/java/org/cmh/backend/authentication/dto/JwtRequest.java new file mode 100644 index 0000000..05cbacf --- /dev/null +++ b/src/main/java/org/cmh/backend/authentication/dto/JwtRequest.java @@ -0,0 +1,11 @@ +package org.cmh.backend.authentication.dto; + +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +public class JwtRequest { + private String token; +} + diff --git a/src/main/java/org/cmh/backend/authentication/dto/LoginRequest.java b/src/main/java/org/cmh/backend/authentication/dto/LoginRequest.java new file mode 100644 index 0000000..b55a4c8 --- /dev/null +++ b/src/main/java/org/cmh/backend/authentication/dto/LoginRequest.java @@ -0,0 +1,12 @@ +package org.cmh.backend.authentication.dto; + +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +public class LoginRequest { + private String username; + private String password; + private String verificationCode; +} diff --git a/src/main/java/org/cmh/backend/authentication/dto/LoginResponse.java b/src/main/java/org/cmh/backend/authentication/dto/LoginResponse.java new file mode 100644 index 0000000..d3d2a3c --- /dev/null +++ b/src/main/java/org/cmh/backend/authentication/dto/LoginResponse.java @@ -0,0 +1,13 @@ +package org.cmh.backend.authentication.dto; + +import lombok.AllArgsConstructor; +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +@AllArgsConstructor +public class LoginResponse { + private String message; + private String jwt; +} diff --git a/src/main/java/org/cmh/backend/authentication/dto/ManageUserProfileRequest.java b/src/main/java/org/cmh/backend/authentication/dto/ManageUserProfileRequest.java index 6c37924..0c1f6ee 100644 --- a/src/main/java/org/cmh/backend/authentication/dto/ManageUserProfileRequest.java +++ b/src/main/java/org/cmh/backend/authentication/dto/ManageUserProfileRequest.java @@ -5,8 +5,7 @@ import lombok.Setter; @Getter @Setter -public class ManageUserProfileRequest { - private String token; +public class ManageUserProfileRequest extends JwtRequest { private String nickname; private String gender; private String phoneNumber; diff --git a/src/main/java/org/cmh/backend/authentication/dto/RegisterRequest.java b/src/main/java/org/cmh/backend/authentication/dto/RegisterRequest.java new file mode 100644 index 0000000..f0eb627 --- /dev/null +++ b/src/main/java/org/cmh/backend/authentication/dto/RegisterRequest.java @@ -0,0 +1,12 @@ +package org.cmh.backend.authentication.dto; + +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +public class RegisterRequest { + private String username; + private String password; + private String contactInfo; +} diff --git a/src/main/java/org/cmh/backend/authentication/dto/RegisterResponse.java b/src/main/java/org/cmh/backend/authentication/dto/RegisterResponse.java new file mode 100644 index 0000000..ebf5945 --- /dev/null +++ b/src/main/java/org/cmh/backend/authentication/dto/RegisterResponse.java @@ -0,0 +1,12 @@ +package org.cmh.backend.authentication.dto; + +import lombok.AllArgsConstructor; +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +@AllArgsConstructor +public class RegisterResponse { + private String message; +} \ No newline at end of file diff --git a/src/main/java/org/cmh/backend/authentication/dto/UserProfileResponse.java b/src/main/java/org/cmh/backend/authentication/dto/UserProfileResponse.java new file mode 100644 index 0000000..8fbe409 --- /dev/null +++ b/src/main/java/org/cmh/backend/authentication/dto/UserProfileResponse.java @@ -0,0 +1,21 @@ +package org.cmh.backend.authentication.dto; + +import lombok.AllArgsConstructor; +import lombok.Getter; +import lombok.Setter; + +import java.time.LocalDateTime; + +@Getter +@Setter +@AllArgsConstructor +public class UserProfileResponse { + private String username; + private String nickname; + private String gender; + private String phoneNumber; + private String email; + private String department; + private String role; + private LocalDateTime createdAt; +}