Merge pull request #389 from VitaCheck/develop

[MAIN] 2025-10-10 배포

Author: TAEW00KIM

module-user/src/main/java/com/vitacheck/user/domain/Role.java

@@ -1,4 +1,4 @@
-package com.vitacheck.user.notification.domain;
+package com.vitacheck.user.domain.notification;
 
 public enum NotificationChannel {
     EMAIL,

…fication/domain/NotificationChannel.java …in/notification/NotificationChannel.javamodule-user/src/main/java/com/vitacheck/user/notification/domain/NotificationChannel.java renamed to module-user/src/main/java/com/vitacheck/user/domain/notification/NotificationChannel.java module-user/src/main/java/com/vitacheck/user/notification/domain/NotificationChannel.java renamed to module-user/src/main/java/com/vitacheck/user/domain/notification/NotificationChannel.java

@@ -1,7 +1,8 @@
-package com.vitacheck.user.notification.domain;
+package com.vitacheck.user.domain.notification;
 
 
 import com.vitacheck.common.entity.BaseTimeEntity;
+import com.vitacheck.user.domain.user.User;
 import jakarta.persistence.*;
 import lombok.*;
 
@@ -19,7 +20,7 @@ public class NotificationSettings extends BaseTimeEntity {
 
     @ManyToOne(fetch = FetchType.LAZY)
     @JoinColumn(name = "user_id", nullable = false)
-    private com.vitacheck.user.domain.User user;
+    private User user;
 
     @Enumerated(EnumType.STRING)
     @Column(nullable = false)

…ication/domain/NotificationSettings.java …n/notification/NotificationSettings.javamodule-user/src/main/java/com/vitacheck/user/notification/domain/NotificationSettings.java renamed to module-user/src/main/java/com/vitacheck/user/domain/notification/NotificationSettings.java module-user/src/main/java/com/vitacheck/user/notification/domain/NotificationSettings.java renamed to module-user/src/main/java/com/vitacheck/user/domain/notification/NotificationSettings.java

@@ -1,4 +1,4 @@
-package com.vitacheck.user.notification.domain;
+package com.vitacheck.user.domain.notification;
 
 public enum NotificationType {
     EVENT, // 이벤트 및 혜택

…otification/domain/NotificationType.java …omain/notification/NotificationType.javamodule-user/src/main/java/com/vitacheck/user/notification/domain/NotificationType.java renamed to module-user/src/main/java/com/vitacheck/user/domain/notification/NotificationType.java module-user/src/main/java/com/vitacheck/user/notification/domain/NotificationType.java renamed to module-user/src/main/java/com/vitacheck/user/domain/notification/NotificationType.java

@@ -0,0 +1,5 @@
+package com.vitacheck.user.domain.user;
+
+public enum Role {
+    USER, ADMIN
+}

module-user/src/main/java/com/vitacheck/user/domain/user/Role.java

@@ -1,4 +1,4 @@
-package com.vitacheck.user.domain;
+package com.vitacheck.user.domain.user;
 
 import com.vitacheck.common.entity.BaseTimeEntity;
 import com.vitacheck.common.enums.Gender;

…java/com/vitacheck/user/domain/User.java …com/vitacheck/user/domain/user/User.javamodule-user/src/main/java/com/vitacheck/user/domain/User.java renamed to module-user/src/main/java/com/vitacheck/user/domain/user/User.java module-user/src/main/java/com/vitacheck/user/domain/User.java renamed to module-user/src/main/java/com/vitacheck/user/domain/user/User.java

@@ -1,4 +1,4 @@
-package com.vitacheck.user.domain;
+package com.vitacheck.user.domain.user;
 
 public enum UserStatus {
     ACTIVE, INACTIVE, DELETED

…om/vitacheck/user/domain/UserStatus.java …tacheck/user/domain/user/UserStatus.javamodule-user/src/main/java/com/vitacheck/user/domain/UserStatus.java renamed to module-user/src/main/java/com/vitacheck/user/domain/user/UserStatus.java module-user/src/main/java/com/vitacheck/user/domain/UserStatus.java renamed to module-user/src/main/java/com/vitacheck/user/domain/user/UserStatus.java

@@ -1,8 +1,8 @@
-package com.vitacheck.user.notification.dto;
+package com.vitacheck.user.dto;
 
-import com.vitacheck.user.notification.domain.NotificationChannel;
-import com.vitacheck.user.notification.domain.NotificationSettings;
-import com.vitacheck.user.notification.domain.NotificationType;
+import com.vitacheck.user.domain.notification.NotificationChannel;
+import com.vitacheck.user.domain.notification.NotificationSettings;
+import com.vitacheck.user.domain.notification.NotificationType;
 import lombok.Builder;
 import lombok.Getter;
 import lombok.NoArgsConstructor;

…ication/dto/NotificationSettingsDto.java …ck/user/dto/NotificationSettingsDto.javamodule-user/src/main/java/com/vitacheck/user/notification/dto/NotificationSettingsDto.java renamed to module-user/src/main/java/com/vitacheck/user/dto/NotificationSettingsDto.java module-user/src/main/java/com/vitacheck/user/notification/dto/NotificationSettingsDto.java renamed to module-user/src/main/java/com/vitacheck/user/dto/NotificationSettingsDto.java

@@ -1,6 +1,6 @@
 package com.vitacheck.user.dto;
 
-import com.vitacheck.user.domain.User;
+import com.vitacheck.user.domain.user.User;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 

module-user/src/main/java/com/vitacheck/user/dto/UserSignedUpEvent.java

@@ -1,9 +1,9 @@
-package com.vitacheck.user.notification.repository;
+package com.vitacheck.user.repository;
 
-import com.vitacheck.user.domain.User;
-import com.vitacheck.user.notification.domain.NotificationChannel;
-import com.vitacheck.user.notification.domain.NotificationSettings;
-import com.vitacheck.user.notification.domain.NotificationType;
+import com.vitacheck.user.domain.user.User;
+import com.vitacheck.user.domain.notification.NotificationChannel;
+import com.vitacheck.user.domain.notification.NotificationSettings;
+import com.vitacheck.user.domain.notification.NotificationType;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;