Merge pull request #130 from My-Medi/develop

Merge to main from develop

Author: H4nnhoi

src/main/java/com/my_medi/api/common/service/SseService.java

@@ -5,9 +5,9 @@
 
 public interface SseService {
 
-    SseEmitter connectUser(Long userId);
+    SseEmitter connectUser(String userUsername);
 
-    SseEmitter connectExpert(Long expertId);
+    SseEmitter connectExpert(String expertUsername);
 
     void sendToUser(Long userId, Object notification);
 

src/main/java/com/my_medi/api/common/service/SseServiceImpl.java

@@ -19,14 +19,14 @@ public class SseServiceImpl implements SseService{
     @Qualifier("expertEmitters")
     private final Map<String, SseEmitter> expertEmitters;
     @Override
-    public SseEmitter connectUser(Long userId) {
-        String key = "user_" + userId;
+    public SseEmitter connectUser(String userUsername) {
+        String key = "user_" + userUsername;
         SseEmitter emitter = new SseEmitter(Long.MAX_VALUE);
 
         emitter.onCompletion(() -> userEmitters.remove(key));
         emitter.onTimeout(() -> userEmitters.remove(key));
         emitter.onError((e) -> {
-            log.error("SSE error for user {}: {}", userId, e.getMessage());
+            log.error("SSE error for user {}: {}", userUsername, e.getMessage());
             userEmitters.remove(key);
         });
 
@@ -38,7 +38,7 @@ public SseEmitter connectUser(Long userId) {
                     .name("connected")
                     .data("SSE 연결이 성공했습니다"));
         } catch (IOException e) {
-            log.error("Failed to send connection message to user {}", userId, e);
+            log.error("Failed to send connection message to user {}", userUsername, e);
             userEmitters.remove(key);
             emitter.completeWithError(e);
         }
@@ -47,14 +47,14 @@ public SseEmitter connectUser(Long userId) {
     }
 
     @Override
-    public SseEmitter connectExpert(Long expertId) {
-        String key = "expert_" + expertId;
+    public SseEmitter connectExpert(String expertUsername) {
+        String key = "expert_" + expertUsername;
         SseEmitter emitter = new SseEmitter(Long.MAX_VALUE);
 
         emitter.onCompletion(() -> expertEmitters.remove(key));
         emitter.onTimeout(() -> expertEmitters.remove(key));
         emitter.onError((e) -> {
-            log.error("SSE error for expert {}: {}", expertId, e.getMessage());
+            log.error("SSE error for expert {}: {}", expertUsername, e.getMessage());
             expertEmitters.remove(key);
         });
 
@@ -65,7 +65,7 @@ public SseEmitter connectExpert(Long expertId) {
                     .name("connected")
                     .data("SSE 연결이 성공했습니다"));
         } catch (IOException e) {
-            log.error("Failed to send connection message to expert {}", expertId, e);
+            log.error("Failed to send connection message to expert {}", expertUsername, e);
             expertEmitters.remove(key);
             emitter.completeWithError(e);
         }

src/main/java/com/my_medi/api/expert/controller/ExpertApiController.java

@@ -11,6 +11,7 @@
 import com.my_medi.domain.expert.service.ExpertCommandService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.validation.Valid;
 import lombok.RequiredArgsConstructor;
 import org.springframework.web.bind.annotation.*;
 
@@ -24,7 +25,7 @@ public class ExpertApiController {
 
     @Operation(summary = "전문가 계정을 생성합니다.[회원가입 플로우 전문가 ver.]")
     @PostMapping
-    public ApiResponseDto<Long> registerExpertAccount(@RequestBody RegisterExpertDto registerExpertDto) {
+    public ApiResponseDto<Long> registerExpertAccount(@RequestBody @Valid RegisterExpertDto registerExpertDto) {
         return ApiResponseDto.onSuccess(expertCommandService.registerExpert(registerExpertDto));
     }
 

src/main/java/com/my_medi/api/expert/dto/RegisterExpertDto.java

@@ -4,6 +4,7 @@
 import com.my_medi.api.licenseImage.dto.LicenseImageRequestDto;
 import com.my_medi.api.member.dto.RegisterMemberDto;
 import com.my_medi.domain.expert.entity.Specialty;
+import jakarta.validation.Valid;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
@@ -20,6 +21,7 @@
 public class RegisterExpertDto {
 
     // 회원 공통 정보
+    @Valid
     private RegisterMemberDto member;
 
     // Expert 정보

src/main/java/com/my_medi/api/expertNotification/controller/ExpertNotificationApiController.java

@@ -17,6 +17,8 @@
 import org.springframework.data.domain.Page;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
+import org.springframework.security.core.annotation.AuthenticationPrincipal;
+import org.springframework.security.core.userdetails.UserDetails;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.servlet.mvc.method.annotation.SseEmitter;
 
@@ -64,7 +66,7 @@ public ApiResponseDto<Void> deleteExpertNotifications(@RequestParam List<Long> n
 
     @Operation(summary = "사용자 알림 실시간 조회를 위해 sse 연결을 합니다.")
     @GetMapping(value = "/stream", produces = MediaType.TEXT_EVENT_STREAM_VALUE)
-    public SseEmitter linkExpertAtSse(@AuthExpert Expert expert) {
-        return sseService.connectExpert(expert.getId());
+    public SseEmitter linkExpertAtSse(@AuthenticationPrincipal UserDetails userDetails) {
+        return sseService.connectExpert(userDetails.getUsername());
     }
 }

src/main/java/com/my_medi/api/member/dto/RegisterMemberDto.java

@@ -2,6 +2,11 @@
 
 import com.my_medi.domain.member.entity.Gender;
 import com.my_medi.domain.member.entity.Role;
+import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.Email;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
+import jakarta.validation.constraints.Pattern;
 import lombok.Builder;
 import lombok.Data;
 
@@ -10,14 +15,39 @@
 @Data
 @Builder
 public class RegisterMemberDto {
+    @NotNull(message = "성명을 입력하세요.")
     private String name;
+
+    @NotBlank(message = "생년월일은 필수입니다.")
+    @Pattern(
+            regexp = "^(\\d{6})$", //숫자 6자리 고정
+            message = "생년월일은 yymmdd 형식의 6자리 숫자여야 합니다. (예: 970101)"
+    )
+    @Schema(example = "000102")
     private String birthDate;
+
+    @NotNull(message = "성별은 필수입니다.")
     private Gender gender;
+
+    @NotBlank(message = "닉네임은 필수입니다.")
     private String nickname;
+
+    @NotBlank(message = "이메일은 필수입니다.")
+    @Email(message = "이메일 형식이 아닙니다.")
     private String email;
+
+    @NotBlank(message = "전화번호는 필수입니다.")
+    @Schema(example = "01012345678")
+    @Pattern(
+            regexp = "^(01[016789])[-]?\\d{3,4}[-]?\\d{4}$",     // 010-1234-5678 또는 01012345678 허용
+            message = "전화번호 형식이 올바르지 않습니다."
+    )
     private String phoneNumber;
+
     private String profileImgUrl;
+
     private String loginId;
+
     private String password;
 
 

src/main/java/com/my_medi/api/user/controller/UserApiController.java

@@ -18,6 +18,7 @@
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 
+import jakarta.validation.Valid;
 import lombok.RequiredArgsConstructor;
 import org.springframework.web.bind.annotation.*;
 
@@ -30,11 +31,10 @@ public class UserApiController {
 
     private final UserCommandService userCommandService;
     private final ReportQueryService reportQueryService;
-    private final ExpertQueryService expertQueryService;
 
     @Operation(summary = "사용자 계정을 생성합니다.")
     @PostMapping
-    public ApiResponseDto<Long> registerUserAccount(@RequestBody RegisterMemberDto registerMemberDto) {
+    public ApiResponseDto<Long> registerUserAccount(@RequestBody @Valid RegisterMemberDto registerMemberDto) {
         return ApiResponseDto.onSuccess(userCommandService.registerUser(registerMemberDto));
     }
 

src/main/java/com/my_medi/api/userNotification/controller/UserNotificationApiController.java

@@ -17,6 +17,8 @@
 import org.springframework.data.domain.Page;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
+import org.springframework.security.core.annotation.AuthenticationPrincipal;
+import org.springframework.security.core.userdetails.UserDetails;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.servlet.mvc.method.annotation.SseEmitter;
 
@@ -67,7 +69,7 @@ public ApiResponseDto<Void> deleteUserNotifications(@RequestParam(required = fal
 
     @Operation(summary = "사용자 알림 실시간 조회를 위해 sse 연결을 합니다.")
     @GetMapping(value = "/stream", produces = MediaType.TEXT_EVENT_STREAM_VALUE)
-    public SseEmitter linkUserAtSse(@AuthUser User user) {
-        return sseService.connectUser(user.getId());
+    public SseEmitter linkUserAtSse(@AuthenticationPrincipal UserDetails userDetails) {
+        return sseService.connectUser(userDetails.getUsername());
     }
 }

src/main/java/com/my_medi/domain/member/entity/Member.java

@@ -58,13 +58,14 @@ public abstract class Member extends BaseTimeEntity implements UserDetails {
     private String nickname;
 
     //이메일
-    // TODO: email, password : 검증 어노테이션, presentation(web 혹은 api) 레이어에 좀 더 적합하므로 추후 수정
     @Column(name = "email", nullable = false, unique = true)
     private String email;
 
+    //아이디 : 소문자, 대문자, 특수문자 포함 8글자 이상
     @Column(name = "login_id", unique = true)
     private String loginId;
 
+    //비밀번호 : 소문자, 대문자, 특수문자 포함 8글자 이상
     private String password;
 
     //연락처

src/main/java/com/my_medi/security/config/SecurityConfig.java

@@ -88,7 +88,8 @@ private String[] permitAllGetPaths() {
                 "/api/v1/test/health-check",
                 "/api/v1/examples/user",
                 "/api/v1/examples/global",
-                "/api/v1/tokens/**"
+                "/api/v1/tokens/**",
+                "/actuator/**"
         };
     }