Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
qlido committed Apr 24, 2024
2 parents f519c01 + 6b2650f commit a28159a
Show file tree
Hide file tree
Showing 6 changed files with 271 additions and 345 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,15 @@ public class DocsCreator {

public void create(Docs docs, User user, String contents) {
docsRepository.save(docs);
versionDocsRepository.save(
VersionDocs versionDocs = versionDocsRepository.save(
new VersionDocs(
0,
docs,
contents,
user
)
);
docsUpdater.updateModifiedAt(docs, versionDocs.getCreatedAt());
}

public void createVersionDocs(Docs docs, User user, String contents) {
Expand Down
21 changes: 11 additions & 10 deletions src/main/java/com/project/bumawiki/domain/user/domain/User.java
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
import jakarta.persistence.GenerationType;
import jakarta.persistence.Id;
import jakarta.persistence.OneToMany;
import jakarta.validation.constraints.Email;
import jakarta.validation.constraints.NotNull;
import jakarta.validation.constraints.Size;
import lombok.AccessLevel;
Expand All @@ -31,27 +32,23 @@
@AllArgsConstructor(access = AccessLevel.PRIVATE)
@NoArgsConstructor(access = AccessLevel.PROTECTED)
public class User {

@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
private Long id;

@OneToMany(
mappedBy = "user",
fetch = FetchType.LAZY,
cascade = CascadeType.ALL,
orphanRemoval = true)
@Builder.Default
private final List<ThumbsUp> thumbsUps = new ArrayList<>();

@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
private Long id;

@Email
@Size(max = 32)
@Column(unique = true, length = 32)
private String email;

@Size(max = 16)
@NotNull
@Column(length = 16)
private String name;

@Column(length = 8)
private Integer enroll;

Expand All @@ -62,6 +59,10 @@ public class User {
@Column(length = 16)
@Enumerated(EnumType.STRING)
private Authority authority;
@NotNull
@Size(max = 16)
@Column(length = 16)
private String name;

public List<ThumbsUpResponseDto> getList() {
return this.thumbsUps
Expand Down
Loading

0 comments on commit a28159a

Please sign in to comment.