Merge pull request #38 from KCY-Fit-a-Pet/feat/37

✨ User profile 조회 및 ID/PW 기능 추가

README.md

@@ -62,6 +62,7 @@
 - Naver Cloud Platform Cloud DB for Redis
 - Naver Cloud Platform Object Storage
 - Naver Cloud Platform Simple & Easy Notification Service
+- Naver Cloud Platform API Gateway & Cloud Functions
 - Goorm IDE (for DB Server)
 
 ## Project Check List

build.gradle

@@ -21,7 +21,6 @@ repositories {
 dependencies {
 	implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
 	implementation 'org.springframework.boot:spring-boot-starter-oauth2-client'
-	implementation 'org.springframework.boot:spring-boot-starter-oauth2-resource-server'
 	implementation 'org.springframework.boot:spring-boot-starter-security'
 	implementation 'org.springframework.boot:spring-boot-starter-web'
 	implementation 'org.springframework.boot:spring-boot-starter-jdbc'

src/main/java/com/kcy/fitapet/FitapetApplication.java

@@ -1,12 +1,16 @@
 package com.kcy.fitapet;
 
+import com.kcy.fitapet.global.common.repository.ExtendedJpaRepositoryFactory;
 import jakarta.annotation.PostConstruct;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
 
 import java.util.TimeZone;
 
 @SpringBootApplication
+@EnableJpaRepositories(repositoryFactoryBeanClass = ExtendedJpaRepositoryFactory.class)
+
 public class FitapetApplication {
 	public static void main(String[] args) {
 		SpringApplication.run(FitapetApplication.class, args);

src/main/java/com/kcy/fitapet/domain/care/domain/Care.java

@@ -1,13 +1,14 @@
 package com.kcy.fitapet.domain.care.domain;
 
-import com.kcy.fitapet.domain.care.type.CareType;
-import com.kcy.fitapet.domain.care.type.CareTypeConverter;
+import com.kcy.fitapet.domain.care.type.WeekType;
+import com.kcy.fitapet.domain.care.type.WeekTypeConverter;
 import com.kcy.fitapet.domain.member.domain.Member;
 import com.kcy.fitapet.domain.model.Auditable;
 import com.kcy.fitapet.domain.pet.domain.PetCare;
 import jakarta.persistence.*;
 import lombok.*;
 
+import java.time.LocalTime;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -21,9 +22,12 @@ public class Care extends Auditable {
     private Long id;
     @Column(name = "care_name")
     private String careName;
-    @Column(name = "dtype")
-    @Convert(converter = CareTypeConverter.class)
-    private CareType dtype;
+    @Column(name = "week")
+    @Convert(converter = WeekTypeConverter.class)
+    private WeekType week;
+    @Column(name = "limit_time")
+    @Temporal(TemporalType.TIME)
+    private LocalTime limitTime;
 
     @OneToOne(fetch = FetchType.LAZY)
     @JoinColumn(name = "author_id", updatable = false)
@@ -37,15 +41,16 @@ public class Care extends Auditable {
     private List<CareDetail> careDetails = new ArrayList<>();
 
     @Builder
-    private Care(String careName, CareType dtype) {
+    private Care(String careName, WeekType week, LocalTime limitTime) {
         this.careName = careName;
-        this.dtype = dtype;
+        this.week = week;
+        this.limitTime = limitTime;
     }
 
-    public static Care of(String careName, CareType dtype) {
+    public static Care of(String careName, WeekType week) {
         return Care.builder()
                 .careName(careName)
-                .dtype(dtype)
+                .week(week)
                 .build();
     }
 }

src/main/java/com/kcy/fitapet/domain/care/domain/CareDetail.java

@@ -10,11 +10,11 @@
 
 import java.time.LocalDateTime;
 import java.time.LocalTime;
+import java.util.List;
 
 @Entity
 @Table(name = "CARE_DETAIL")
 @NoArgsConstructor(access = AccessLevel.PROTECTED)
-@ToString(of = {"careDetailName", "careTime", "limitTime", "isDone", "clearedAt"})
 public class CareDetail extends Auditable {
     @Id @GeneratedValue(strategy = GenerationType.AUTO)
     private Long id;
@@ -23,47 +23,32 @@ public class CareDetail extends Auditable {
     @Temporal(TemporalType.TIME)
     @Column(name = "care_time")
     private LocalTime careTime;
-    @Temporal(TemporalType.TIME)
-    @Column(name = "limit_time")
-    private LocalTime limitTime;
-    @Column(name = "is_done") @ColumnDefault("false")
-    private Boolean isDone;
-    @Temporal(TemporalType.TIMESTAMP)
-    @Column(name = "cleared_at")
-    private LocalDateTime clearedAt;
 
     @ManyToOne(fetch = FetchType.LAZY)
     @JoinColumn(name = "care_id")
     private Care care;
-    @OneToOne(mappedBy = "careDetail")
-    private DayOfWeek dayOfWeek;
+
+    @OneToMany(mappedBy = "careDetail")
+    private List<CareLog> careLogs;
 
     @Builder
-    private CareDetail(String careDetailName, LocalTime careTime, LocalTime limitTime, Boolean isDone, LocalDateTime clearedAt) {
+    private CareDetail(String careDetailName, LocalTime careTime) {
         this.careDetailName = careDetailName;
         this.careTime = careTime;
-        this.limitTime = limitTime;
-        this.isDone = isDone;
-        this.clearedAt = clearedAt;
     }
 
     public static CareDetail of(String careDetailName, LocalTime careTime, LocalTime limitTime, Boolean isDone, LocalDateTime clearedAt) {
         return CareDetail.builder()
                 .careDetailName(careDetailName)
                 .careTime(careTime)
-                .limitTime(limitTime)
-                .isDone(isDone)
-                .clearedAt(clearedAt)
                 .build();
     }
 
-    public void isDone() {
-        this.isDone = Boolean.TRUE;
-        this.clearedAt = LocalDateTime.now();
-    }
-
-    public void cancelDone() {
-        this.isDone = Boolean.FALSE;
-        this.clearedAt = null;
+    @Override public String toString() {
+        return "CareDetail{" +
+                "id=" + id +
+                ", careDetailName='" + careDetailName + '\'' +
+                ", careTime=" + careTime +
+                '}';
     }
 }

src/main/java/com/kcy/fitapet/domain/care/domain/CareLog.java

@@ -0,0 +1,35 @@
+package com.kcy.fitapet.domain.care.domain;
+
+import jakarta.persistence.*;
+import lombok.AccessLevel;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import org.springframework.data.annotation.CreatedDate;
+import org.springframework.data.jpa.domain.support.AuditingEntityListener;
+
+import java.time.LocalDateTime;
+
+@Entity
+@Table(name = "CARE_LOG")
+@Getter
+@EntityListeners(AuditingEntityListener.class)
+@NoArgsConstructor(access = AccessLevel.PROTECTED)
+public class CareLog {
+    @Id @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Long id;
+
+    @CreatedDate
+    private LocalDateTime createdAt;
+
+    @ManyToOne
+    @JoinColumn(name = "care_detail_id")
+    private CareDetail careDetail;
+
+    private CareLog(CareDetail careDetail) {
+        this.careDetail = careDetail;
+    }
+
+    public static CareLog of(CareDetail careDetail) {
+        return new CareLog(careDetail);
+    }
+}

src/main/java/com/kcy/fitapet/domain/care/type/CareType.java → src/main/java/com/kcy/fitapet/domain/care/type/WeekType.java

@@ -11,14 +11,19 @@
 import static java.util.stream.Collectors.toMap;
 
 @RequiredArgsConstructor
-public enum CareType implements LegacyCommonType {
-    DAILY("1", "D"),
-    WEEKLY("2", "W");
+public enum WeekType implements LegacyCommonType {
+    MON("1", "월"),
+    TUE("2", "화"),
+    WED("3", "수"),
+    THU("4", "목"),
+    FRI("5", "금"),
+    SAT("6", "토"),
+    SUN("7", "일");
 
     private final String code;
     private final String type;
 
-    private static final Map<String, CareType> stringToEnum =
+    private static final Map<String, WeekType> stringToEnum =
             Stream.of(values()).collect(toMap(Object::toString, e -> e));
 
     @Override public String getCode() {
@@ -29,7 +34,7 @@ public enum CareType implements LegacyCommonType {
     }
 
     @JsonCreator
-    public static CareType fromString(String type) {
+    public static WeekType fromString(String type) {
         return stringToEnum.get(type.toUpperCase());
     }
     @Override public String toString() {

src/main/java/com/kcy/fitapet/domain/care/type/CareTypeConverter.java → src/main/java/com/kcy/fitapet/domain/care/type/WeekTypeConverter.java

@@ -4,10 +4,10 @@
 import jakarta.persistence.Converter;
 
 @Converter
-public class CareTypeConverter extends AbstractLegacyEnumAttributeConverter<CareType> {
+public class WeekTypeConverter extends AbstractLegacyEnumAttributeConverter<WeekType> {
     private static final String ENUM_NAME = "돌봄타입";
 
-    public CareTypeConverter() {
-        super(CareType.class, false, ENUM_NAME);
+    public WeekTypeConverter() {
+        super(WeekType.class, false, ENUM_NAME);
     }
 }