refactor(#67): entity

heachi-core/auth-api/src/main/java/com/heachi/auth/config/swagger/SwaggerConfig.java

@@ -22,9 +22,10 @@ public class SwaggerConfig {
     @Bean
     public OpenAPI openAPI(@Value("${heachiCoreAuthUrls}") String[] serverList) {
         Info info = new Info()
-                .title("Heachi-Auth Server")
+                .title("N빵 집안일 사용자 인증 API Document")
                 .version("0.1")
-                .description("N빵 집안일 인증서버 API 문서입니다.")
+                .description("N빵 집안일 인증서버 API 문서입니다.\n" +
+                        "해당 문서를 이용해 N빵 집안일 REST API를 테스트해볼 수 있습니다.")
                 .contact(new Contact()
                         .name("📍 N-bbang-housework Backend GitHub Link")
                         .url("https://github.com/ghdcksgml1/N-bbang-housework"))

heachi-core/auth-api/src/test/java/com/heachi/auth/api/service/auth/AuthServiceTest.java

@@ -103,12 +103,12 @@ void loginTokenValidClaims() {
         User user2 = User.builder()
                 .name("김민목")
                 .email("abc2")
-                .role(UserRole.CHEMIST)
+                .role(UserRole.USER)
                 .build();
         User user3 = User.builder()
                 .name("김민금")
                 .email("abc3")
-                .role(UserRole.CENTER)
+                .role(UserRole.USER)
                 .build();
         userRepository.saveAll(List.of(user1, user2, user3));
 
@@ -151,11 +151,11 @@ void loginTokenValidClaims() {
                 () -> assertThat(claims1.get("name")).isEqualTo("김민수"),
                 () -> assertThat(claims1.get("profileImageUrl")).isEqualTo("google.com"),
                 // 김민목
-                () -> assertThat(claims2.get("role")).isEqualTo("CHEMIST"),
+                () -> assertThat(claims2.get("role")).isEqualTo("USER"),
                 () -> assertThat(claims2.get("name")).isEqualTo("김민목"),
                 () -> assertThat(claims2.get("profileImageUrl")).isEqualTo("google.com"),
                 // 김민금
-                () -> assertThat(claims3.get("role")).isEqualTo("CENTER"),
+                () -> assertThat(claims3.get("role")).isEqualTo("USER"),
                 () -> assertThat(claims3.get("name")).isEqualTo("김민금"),
                 () -> assertThat(claims3.get("profileImageUrl")).isEqualTo("google.com")
         );
@@ -219,7 +219,7 @@ public void registerUnauthUserSuccessTest() {
 
         // 회원가입 요청 생성 (CENTER)
         AuthServiceRegisterRequest request = AuthServiceRegisterRequest.builder()
-                .role(UserRole.CENTER)
+                .role(UserRole.USER)
                 .phoneNumber(phoneNumber)
                 .email(email)
                 .build();
@@ -232,7 +232,7 @@ public void registerUnauthUserSuccessTest() {
 
 
         // then
-        assertEquals(UserRole.CENTER, response.getRole());
+        assertEquals(UserRole.USER, response.getRole());
         assertThat(tokenValid).isTrue();
     }
 
@@ -249,7 +249,7 @@ public void registerUnauthUserFailTest() {
         User user = User.builder()
                 .platformId(platformId)
                 .platformType(platformType)
-                .role(UserRole.CENTER)
+                .role(UserRole.USER)
                 .email(email)
                 .name(name)
                 .profileImageUrl(profileImageUrl)
@@ -259,7 +259,7 @@ public void registerUnauthUserFailTest() {
 
         // 회원가입 요청 생성 (CENTER)
         AuthServiceRegisterRequest request = AuthServiceRegisterRequest.builder()
-                .role(UserRole.CENTER)
+                .role(UserRole.USER)
                 .phoneNumber(phoneNumber)
                 .email(email)
                 .build();

heachi-domain-mongo/src/main/java/com/heachi/mongo/define/notify/Notify.java

@@ -23,20 +23,18 @@ public class Notify {
     private List<String> receiveUserIds = new ArrayList<>();            // 알림을 받는 아이디
     private NotifyType type;                                            // 알림 종류
     private String message;                                             // 알림 내용
-    private String generatedUrl;                                        // 알림의 근원지
     private String url;                                                 // 알림 클릭 시 이동할 주소
     private LocalDateTime createdTime = LocalDateTime.now();            // 알림 발생 시간
     private Map<String, LocalDateTime> checkedTime = new HashMap<>();   // 알림 확인 시간
     private Set<String> checked = new HashSet<>();                      // 알림을 확인했는지 안했는지
 
     @Builder
-    private Notify(String sendUserId, List<String> receiveUserIds, NotifyType type, String message, String generatedUrl
-            , String url, LocalDateTime createdTime, Map<String, LocalDateTime> checkedTime, Set<String> checked) {
+    private Notify(String sendUserId, List<String> receiveUserIds, NotifyType type, String message, String url,
+                   LocalDateTime createdTime, Map<String, LocalDateTime> checkedTime, Set<String> checked) {
         this.sendUserId = sendUserId;
         this.receiveUserIds = receiveUserIds;
         this.type = type;
         this.message = message;
-        this.generatedUrl = generatedUrl;
         this.url = url;
         this.createdTime = createdTime;
         this.checkedTime = checkedTime;

heachi-domain-mysql/src/main/generated/com/heachi/mysql/define/group/background/QGroupBg.java

@@ -0,0 +1,51 @@
+package com.heachi.mysql.define.group.background;
+
+import static com.querydsl.core.types.PathMetadataFactory.*;
+
+import com.querydsl.core.types.dsl.*;
+
+import com.querydsl.core.types.PathMetadata;
+import javax.annotation.processing.Generated;
+import com.querydsl.core.types.Path;
+
+
+/**
+ * QGroupBg is a Querydsl query type for GroupBg
+ */
+@Generated("com.querydsl.codegen.DefaultEntitySerializer")
+public class QGroupBg extends EntityPathBase<GroupBg> {
+
+    private static final long serialVersionUID = -387669863L;
+
+    public static final QGroupBg groupBg = new QGroupBg("groupBg");
+
+    public final com.heachi.mysql.define.QBaseEntity _super = new com.heachi.mysql.define.QBaseEntity(this);
+
+    public final StringPath bgColor = createString("bgColor");
+
+    public final StringPath colorCode = createString("colorCode");
+
+    //inherited
+    public final DateTimePath<java.time.LocalDateTime> createdDateTime = _super.createdDateTime;
+
+    public final StringPath gradient = createString("gradient");
+
+    public final NumberPath<Long> id = createNumber("id", Long.class);
+
+    //inherited
+    public final DateTimePath<java.time.LocalDateTime> modifiedDateTime = _super.modifiedDateTime;
+
+    public QGroupBg(String variable) {
+        super(GroupBg.class, forVariable(variable));
+    }
+
+    public QGroupBg(Path<? extends GroupBg> path) {
+        super(path.getType(), path.getMetadata());
+    }
+
+    public QGroupBg(PathMetadata metadata) {
+        super(GroupBg.class, metadata);
+    }
+
+}
+

heachi-domain-mysql/src/main/generated/com/heachi/mysql/define/group/info/QGroupInfo.java

@@ -31,6 +31,10 @@ public class QGroupInfo extends EntityPathBase<GroupInfo> {
     //inherited
     public final DateTimePath<java.time.LocalDateTime> createdDateTime = _super.createdDateTime;
 
+    public final StringPath gradient = createString("gradient");
+
+    public final ListPath<com.heachi.mysql.define.housework.todo.HouseworkTodo, com.heachi.mysql.define.housework.todo.QHouseworkTodo> houseworkTodoList = this.<com.heachi.mysql.define.housework.todo.HouseworkTodo, com.heachi.mysql.define.housework.todo.QHouseworkTodo>createList("houseworkTodoList", com.heachi.mysql.define.housework.todo.HouseworkTodo.class, com.heachi.mysql.define.housework.todo.QHouseworkTodo.class, PathInits.DIRECT2);
+
     public final NumberPath<Long> id = createNumber("id", Long.class);
 
     public final StringPath info = createString("info");

heachi-domain-mysql/src/main/generated/com/heachi/mysql/define/housework/info/QHouseworkInfo.java

@@ -27,8 +27,12 @@ public class QHouseworkInfo extends EntityPathBase<HouseworkInfo> {
     //inherited
     public final DateTimePath<java.time.LocalDateTime> createdDateTime = _super.createdDateTime;
 
+    public final DatePath<java.util.Date> dayDate = createDate("dayDate", java.util.Date.class);
+
     public final StringPath detail = createString("detail");
 
+    public final TimePath<java.util.Date> endTime = createTime("endTime", java.util.Date.class);
+
     public final com.heachi.mysql.define.housework.category.QHouseworkCategory houseworkCategory;
 
     public final ListPath<com.heachi.mysql.define.housework.member.HouseworkMember, com.heachi.mysql.define.housework.member.QHouseworkMember> houseworkMembers = this.<com.heachi.mysql.define.housework.member.HouseworkMember, com.heachi.mysql.define.housework.member.QHouseworkMember>createList("houseworkMembers", com.heachi.mysql.define.housework.member.HouseworkMember.class, com.heachi.mysql.define.housework.member.QHouseworkMember.class, PathInits.DIRECT2);
@@ -38,8 +42,14 @@ public class QHouseworkInfo extends EntityPathBase<HouseworkInfo> {
     //inherited
     public final DateTimePath<java.time.LocalDateTime> modifiedDateTime = _super.modifiedDateTime;
 
+    public final StringPath monthDate = createString("monthDate");
+
     public final StringPath title = createString("title");
 
+    public final EnumPath<com.heachi.mysql.define.housework.info.constant.HouseworkPeriodType> type = createEnum("type", com.heachi.mysql.define.housework.info.constant.HouseworkPeriodType.class);
+
+    public final StringPath weekDate = createString("weekDate");
+
     public QHouseworkInfo(String variable) {
         this(HouseworkInfo.class, forVariable(variable), INITS);
     }

heachi-domain-mysql/src/main/generated/com/heachi/mysql/define/housework/todo/QHouseworkTodo.java

@@ -7,6 +7,7 @@
 import com.querydsl.core.types.PathMetadata;
 import javax.annotation.processing.Generated;
 import com.querydsl.core.types.Path;
+import com.querydsl.core.types.dsl.PathInits;
 
 
 /**
@@ -17,6 +18,8 @@ public class QHouseworkTodo extends EntityPathBase<HouseworkTodo> {
 
     private static final long serialVersionUID = -1421769550L;
 
+    private static final PathInits INITS = PathInits.DIRECT2;
+
     public static final QHouseworkTodo houseworkTodo = new QHouseworkTodo("houseworkTodo");
 
     public final com.heachi.mysql.define.QBaseEntity _super = new com.heachi.mysql.define.QBaseEntity(this);
@@ -26,8 +29,14 @@ public class QHouseworkTodo extends EntityPathBase<HouseworkTodo> {
     //inherited
     public final DateTimePath<java.time.LocalDateTime> createdDateTime = _super.createdDateTime;
 
+    public final DatePath<java.util.Date> date = createDate("date", java.util.Date.class);
+
     public final StringPath detail = createString("detail");
 
+    public final com.heachi.mysql.define.group.info.QGroupInfo groupInfo;
+
+    public final com.heachi.mysql.define.housework.info.QHouseworkInfo houseworkInfo;
+
     public final StringPath houseworkMember = createString("houseworkMember");
 
     public final NumberPath<Long> id = createNumber("id", Long.class);
@@ -41,16 +50,32 @@ public class QHouseworkTodo extends EntityPathBase<HouseworkTodo> {
 
     public final StringPath title = createString("title");
 
+    public final StringPath verificationPhotoURL = createString("verificationPhotoURL");
+
+    public final DateTimePath<java.time.LocalDateTime> verificationTime = createDateTime("verificationTime", java.time.LocalDateTime.class);
+
+    public final StringPath verifierId = createString("verifierId");
+
     public QHouseworkTodo(String variable) {
-        super(HouseworkTodo.class, forVariable(variable));
+        this(HouseworkTodo.class, forVariable(variable), INITS);
     }
 
     public QHouseworkTodo(Path<? extends HouseworkTodo> path) {
-        super(path.getType(), path.getMetadata());
+        this(path.getType(), path.getMetadata(), PathInits.getFor(path.getMetadata(), INITS));
     }
 
     public QHouseworkTodo(PathMetadata metadata) {
-        super(HouseworkTodo.class, metadata);
+        this(metadata, PathInits.getFor(metadata, INITS));
+    }
+
+    public QHouseworkTodo(PathMetadata metadata, PathInits inits) {
+        this(HouseworkTodo.class, metadata, inits);
+    }
+
+    public QHouseworkTodo(Class<? extends HouseworkTodo> type, PathMetadata metadata, PathInits inits) {
+        super(type, metadata, inits);
+        this.groupInfo = inits.isInitialized("groupInfo") ? new com.heachi.mysql.define.group.info.QGroupInfo(forProperty("groupInfo"), inits.get("groupInfo")) : null;
+        this.houseworkInfo = inits.isInitialized("houseworkInfo") ? new com.heachi.mysql.define.housework.info.QHouseworkInfo(forProperty("houseworkInfo"), inits.get("houseworkInfo")) : null;
     }
 
 }

heachi-domain-mysql/src/main/generated/com/heachi/mysql/define/user/QUser.java

@@ -7,6 +7,7 @@
 import com.querydsl.core.types.PathMetadata;
 import javax.annotation.processing.Generated;
 import com.querydsl.core.types.Path;
+import com.querydsl.core.types.dsl.PathInits;
 
 
 /**
@@ -26,6 +27,8 @@ public class QUser extends EntityPathBase<User> {
 
     public final StringPath email = createString("email");
 
+    public final ListPath<com.heachi.mysql.define.group.info.GroupInfo, com.heachi.mysql.define.group.info.QGroupInfo> groupInfoList = this.<com.heachi.mysql.define.group.info.GroupInfo, com.heachi.mysql.define.group.info.QGroupInfo>createList("groupInfoList", com.heachi.mysql.define.group.info.GroupInfo.class, com.heachi.mysql.define.group.info.QGroupInfo.class, PathInits.DIRECT2);
+
     public final NumberPath<Long> id = createNumber("id", Long.class);
 
     //inherited

heachi-domain-mysql/src/main/java/com/heachi/mysql/define/group/background/GroupBg.java

@@ -0,0 +1,35 @@
+package com.heachi.mysql.define.group.background;
+
+import com.heachi.mysql.define.BaseEntity;
+import jakarta.persistence.*;
+import lombok.AccessLevel;
+import lombok.Builder;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+
+@Getter
+@NoArgsConstructor(access = AccessLevel.PROTECTED)
+@Entity(name = "GROUP_BG")
+public class GroupBg extends BaseEntity {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @Column(name = "GROUP_BG_ID")
+    private Long id;            // GROUP의 배경색 아이디
+
+    @Column(name = "BG_COLOR", nullable = false)
+    private String bgColor;     // 그룹의 배경색
+
+    @Column(name = "COLOR_CODE", nullable = false)
+    private String colorCode;   // 그룹의 색상 코드
+
+    @Column(name = "GRADIENT", nullable = false)
+    private String gradient;    // 그룹의 CSS 속성
+
+    @Builder
+    private GroupBg(String bgColor, String colorCode, String gradient) {
+        this.bgColor = bgColor;
+        this.colorCode = colorCode;
+        this.gradient = gradient;
+    }
+}

heachi-domain-mysql/src/main/java/com/heachi/mysql/define/group/background/repository/GroupBgRepository.java

@@ -0,0 +1,7 @@
+package com.heachi.mysql.define.group.background.repository;
+
+import com.heachi.mysql.define.group.background.GroupBg;
+import org.springframework.data.jpa.repository.JpaRepository;
+
+public interface GroupBgRepository extends JpaRepository<GroupBg, Long> {
+}