Skip to content

Commit

Permalink
Merge pull request #1 from Timetris-Trendithon/mainpage
Browse files Browse the repository at this point in the history
♻️Refactor: LocalDateTime으로 통일됐던 필드들을 적절히 분리
  • Loading branch information
Zena0128 authored Feb 14, 2024
2 parents d71716f + c2a91ba commit ad9fbee
Show file tree
Hide file tree
Showing 7 changed files with 61 additions and 18 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
import lombok.Getter;
import lombok.NoArgsConstructor;

import java.time.LocalDateTime;
import java.time.LocalDate;

@Entity
@Getter
Expand All @@ -19,6 +19,6 @@ public class Date {

@Id @GeneratedValue(strategy = GenerationType.IDENTITY)
private long id;
private LocalDateTime date;
private LocalDate date;

}
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
package com.trendithon.timetris.domain.mainpage.domain;

import com.trendithon.timetris.domain.mainpage.dto.DoCreateDTO;
import jakarta.persistence.*;
import lombok.AccessLevel;
import lombok.AllArgsConstructor;
import lombok.Getter;
import lombok.NoArgsConstructor;

import java.time.LocalDateTime;
import java.time.LocalTime;

@Entity
@Getter
Expand All @@ -17,13 +18,27 @@ public class Do {
@Id @GeneratedValue(strategy = GenerationType.IDENTITY)
private long id;
private String title;
private LocalDateTime startTime;
private LocalDateTime endTime;
private LocalTime startTime;
private LocalTime endTime;
@ManyToOne(fetch = FetchType.LAZY)
@JoinColumn(name = "categoryId")
private Category category;
@ManyToOne(fetch = FetchType.LAZY)
@JoinColumn(name = "dateId")
private Date date;
@JoinColumn(name = "userDateId")
private UserDate userDate;

public Do(DoCreateDTO doCreateDTO, UserDate userDate){
this.title = doCreateDTO.getTitle();
this.startTime = doCreateDTO.getStartTime();
this.endTime = doCreateDTO.getEndTime();
this.category = doCreateDTO.getCategory();
this.userDate = userDate;
}

public void updateDo(String title, LocalTime startTime, LocalTime endTime){
this.title = title;
this.startTime = startTime;
this.endTime = endTime;
}

}
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
package com.trendithon.timetris.domain.mainpage.domain;

import com.trendithon.timetris.domain.mainpage.dto.PlanCreateDTO;
import com.trendithon.timetris.domain.mainpage.dto.PlanViewDTO;
import jakarta.persistence.*;
import lombok.AccessLevel;
import lombok.AllArgsConstructor;
import lombok.Getter;
import lombok.NoArgsConstructor;
import lombok.*;

import java.time.LocalDateTime;
import java.time.LocalTime;

@Entity
@Getter
Expand All @@ -17,14 +16,33 @@ public class Plan {
@Id @GeneratedValue(strategy = GenerationType.IDENTITY)
private long id;
private String title;
private LocalDateTime startTime;
private LocalDateTime endTime;
private LocalTime startTime;
private LocalTime endTime;
private boolean status = false;
@ManyToOne(fetch = FetchType.LAZY)
@JoinColumn(name = "categoryId")
private Category category;
@ManyToOne(fetch = FetchType.LAZY)
@JoinColumn(name = "dateId")
private Date date;
@JoinColumn(name = "userDateId")
private UserDate userDate;

public Plan(PlanCreateDTO planCreateDTO, UserDate userDate){
this.title = planCreateDTO.getTitle();
this.startTime = planCreateDTO.getStartTime();
this.endTime = planCreateDTO.getEndTime();
this.status = planCreateDTO.isStatus();
this.category = planCreateDTO.getCategory();
this.userDate = userDate;
}

public void updatePlan(String title, LocalTime startTime, LocalTime endTime){
this.title = title;
this.startTime = startTime;
this.endTime = endTime;
}

public void donePlan(){
this.status = true;
}

}
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package com.trendithon.timetris.domain.mainpage.domain;

import com.trendithon.timetris.domain.mainpage.dto.SeeCreateDTO;
import jakarta.persistence.*;
import lombok.AccessLevel;
import lombok.AllArgsConstructor;
Expand All @@ -17,7 +18,16 @@ public class See {
@Lob
private String content;
@ManyToOne(fetch = FetchType.LAZY)
@JoinColumn(name = "dateId")
private Date date;
@JoinColumn(name = "userDateId")
private UserDate userDate;

public void updateSee(String content){
this.content = content;
}

public See(SeeCreateDTO seeCreateDTO, UserDate userDate){
this.content = seeCreateDTO.getContent();
this.userDate = userDate;
}

}
Empty file.
Empty file.
Empty file.

0 comments on commit ad9fbee

Please sign in to comment.