Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refact : Defecation 필드 수정 #62

Merged
merged 1 commit into from
Feb 22, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ public StateRes exec(Long defecationId, DefecationUpdateReq defecationUpdateReq)

DefecationDAO.update(DefecationDAO.getBaby(),
defecationUpdateReq.getStartTime(),
defecationUpdateReq.getDefecationStatus(),
defecationUpdateReq.getMemo());

return new StateRes(true);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,14 +23,11 @@ public class DefecationDAO {
// 기록 시작 시간
private LocalDateTime startTime;

private String defecationStatus;

private String memo;

public void update(BabyDAO baby, LocalDateTime startTime, String defecationStatus, String memo) {
public void update(BabyDAO baby, LocalDateTime startTime, String memo) {
this.baby = baby;
this.startTime = startTime;
this.defecationStatus = defecationStatus;
this.memo = memo;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ public static ActivityListGetRes fromDefecationDAO(DefecationDAO defecationDAO)
"Defecation",
defecationDAO.getStartTime(),
null, // endTime은 DefecationDAO에 없음
defecationDAO.getDefecationStatus(),
null,
defecationDAO.getMemo()
);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,17 +20,13 @@ public class DefecationRegistReq {
@PastOrPresent
private LocalDateTime startTime;

@NotNull
private String defecationStatus;

private String memo;

private Long babyId;

public DefecationDAO toDAO(BabyDAO babyDAO) {
return DefecationDAO.builder()
.startTime(startTime)
.defecationStatus(defecationStatus)
.memo(memo)
.baby(babyDAO)
.build();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,5 @@ public class DefecationUpdateReq {
@PastOrPresent
private LocalDateTime startTime;

@NotNull
private String defecationStatus;

private String memo;
}
Original file line number Diff line number Diff line change
Expand Up @@ -17,15 +17,12 @@ public class DefecationGetRes {

private LocalDateTime startTime;

private String defecationStatus;

private String memo;

public static DefecationGetRes of(DefecationDAO defecationDAO) {
return DefecationGetRes.builder()
.defecationId(defecationDAO.getDefecationId())
.startTime(defecationDAO.getStartTime())
.defecationStatus(defecationDAO.getDefecationStatus())
.memo(defecationDAO.getMemo())
.build();
}
Expand Down
Loading