Skip to content
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 @@ -16,10 +16,6 @@ public class GroupCreateRequestDTO {
@Size(max = 10)
private String name;

@NotBlank
@Size(max = 200)
private String penalty;

/**
* 그룹 가용 최대 인원 (방장 포함, 2~5).
* 2인은 무료(GENERAL), 3~5인은 유료(SUBSCRIBED, (maxMemberCount - 2) × 500원).
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,12 @@ public class GroupMemberResponseDTO {

private Long userId;
private String nickname;
private String email;
private boolean isOwner;

public static GroupMemberResponseDTO of(GroupUser groupUser, Long ownerId) {
return GroupMemberResponseDTO.builder()
.userId(groupUser.getUser().getId())
.nickname(groupUser.getUser().getNickname())
.email(groupUser.getUser().getEmail())
.isOwner(groupUser.getUser().getId().equals(ownerId))
.build();
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ public class GroupResponseDTO {
private Long id;
private String name;
private GroupMembership membership;
private String penalty;
private int maxMemberCount;
private long currentMemberCount;
private int price;
Expand All @@ -24,7 +23,6 @@ public static GroupResponseDTO of(Group group, long currentMemberCount, Long vie
.id(group.getId())
.name(group.getName())
.membership(group.getMembership())
.penalty(group.getPenalty())
.maxMemberCount(group.getMaxMemberCount())
.currentMemberCount(currentMemberCount)
.price(group.getPrice())
Expand Down
11 changes: 0 additions & 11 deletions src/main/java/com/atmd/backend/domain/group/entity/Group.java
Original file line number Diff line number Diff line change
Expand Up @@ -47,9 +47,6 @@ public class Group extends BaseEntity {
@Column(name = "invite_code", nullable = false, unique = true, length = 20)
private String inviteCode;

@Column(nullable = false)
private String penalty;

@Column(name = "max_member_count", nullable = false)
private int maxMemberCount;

Expand All @@ -62,15 +59,13 @@ private Group(
String name,
GroupMembership membership,
String inviteCode,
String penalty,
int maxMemberCount,
int price
) {
this.owner = owner;
this.name = name;
this.membership = membership;
this.inviteCode = inviteCode;
this.penalty = penalty;
this.maxMemberCount = maxMemberCount;
this.price = price;
}
Expand All @@ -79,7 +74,6 @@ public static Group create(
User owner,
String name,
String inviteCode,
String penalty,
int maxMemberCount
) {
GroupMembership membership = maxMemberCount <= FREE_MEMBER_THRESHOLD
Expand All @@ -91,7 +85,6 @@ public static Group create(
.name(name)
.membership(membership)
.inviteCode(inviteCode)
.penalty(penalty)
.maxMemberCount(maxMemberCount)
.price(price)
.build();
Expand All @@ -116,8 +109,4 @@ public boolean canAddMember(long currentMemberCount) {
public void updateName(String name) {
this.name = name;
}

public void updatePenalty(String penalty) {
this.penalty = penalty;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ public GroupResponseDTO create(Long userId, GroupCreateRequestDTO request) {
}

String inviteCode = generateUniqueInviteCode();
Group group = Group.create(owner, request.getName(), inviteCode, request.getPenalty(), maxMemberCount);
Group group = Group.create(owner, request.getName(), inviteCode, maxMemberCount);

groupRepository.save(group);
groupUserRepository.save(GroupUser.of(group, owner));
Expand Down

This file was deleted.

This file was deleted.

Loading