Skip to content

Commit

Permalink
Merge pull request #39 from CSID-DGU/develop
Browse files Browse the repository at this point in the history
[Fix] ์ถœ์„ ์—ฌ๋ถ€ true
  • Loading branch information
saokiritoni authored Dec 2, 2024
2 parents b80917b + 6d3f479 commit cfb43f4
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 6 deletions.
4 changes: 2 additions & 2 deletions src/main/java/dongguk/osori/domain/goal/entity/Goal.java
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ public class Goal {
@GeneratedValue(strategy = GenerationType.IDENTITY)
private Long goalId;

@Column(nullable = false)
private String content;
@Column(nullable = false, columnDefinition = "TEXT DEFAULT ''")
private String content = "";

@Column(nullable = false)
private LocalDateTime createdAt;
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/dongguk/osori/domain/quest/entity/Quest.java
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ public class Quest {
private LocalDate date; // ํ€˜์ŠคํŠธ๊ฐ€ ์†ํ•œ ๋‚ ์งœ

@Column(nullable = false)
private boolean attended; // ์ถœ์„ ์—ฌ๋ถ€
private boolean attended = true; // ์ถœ์„ ์—ฌ๋ถ€

@Column(nullable = false)
private boolean goalWritten; // ๋ชฉํ‘œ ์ž‘์„ฑ ์—ฌ๋ถ€
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -56,9 +56,6 @@ public Long authenticate(String email, String password) {
throw new IllegalArgumentException("์ž˜๋ชป๋œ ๋น„๋ฐ€๋ฒˆํ˜ธ์ž…๋‹ˆ๋‹ค.");
}

// ํ€˜์ŠคํŠธ ์—…๋ฐ์ดํŠธ
questService.updateMissionStatus(user.getUserId(), MissionType.ATTENDANCE_CHECKED);

// ์ธ์ฆ ์„ฑ๊ณต ์‹œ ์œ ์ € ID ๋ฐ˜ํ™˜
return user.getUserId();
}
Expand Down

0 comments on commit cfb43f4

Please sign in to comment.