Fix: 도메인을 엔티티와 합침

Author: stoneTiger0912

src/main/java/flipnote/group/adapter/out/entity/GroupEntity.java

@@ -83,4 +83,52 @@ public void change(
 		this.maxMember = cmd.maxMember();
 		this.imageRefId = cmd.imageRefId();
 	}
+
+	/**
+	 * 신규로 그룹 생성
+	 * @param cmd
+	 * @return
+	 */
+	public static GroupEntity create(CreateGroupCommand cmd) {
+		validate(cmd);
+
+		return GroupEntity.builder()
+			.name(cmd.name())
+			.category(cmd.category())
+			.description(cmd.description())
+			.joinPolicy(cmd.joinPolicy())
+			.visibility(cmd.visibility())
+			.maxMember(cmd.maxMember())
+			.imageRefId(cmd.imageRefId())
+			.memberCount(0)
+			.build();
+	}
+
+	/**
+	 * 파라미터 검증
+	 * @param cmd
+	 */
+	private static void validate(CreateGroupCommand cmd) {
+		if (cmd.name() == null || cmd.name().isBlank()) {
+			throw new IllegalArgumentException("name required");
+		}
+		if (cmd.maxMember() < 1 || cmd.maxMember() > 100) {
+			throw new IllegalArgumentException("maxMember invalid");
+		}
+		if (cmd.category() == null) {
+			throw new IllegalArgumentException("category required");
+		}
+		if (cmd.joinPolicy() == null) {
+			throw new IllegalArgumentException("join required");
+		}
+		if (cmd.visibility() == null) {
+			throw new IllegalArgumentException("visibility required");
+		}
+		if (cmd.description() == null || cmd.description().isBlank()) {
+			throw new IllegalArgumentException("description required");
+		}
+		if (cmd.name().length() > 50) {
+			throw new IllegalArgumentException("name too long");
+		}
+	}
 }

src/main/java/flipnote/group/adapter/out/persistence/GroupMemberRepositoryAdapter.java

@@ -21,12 +21,11 @@ public class GroupMemberRepositoryAdapter implements GroupMemberRepositoryPort {
 
 	/**
 	 * 그룹 멤버 저장
-	 * @param groupId
-	 * @param userId
+	 * @param groupMember
 	 */
 	@Override
-	public void save(Long groupId, Long userId, RoleEntity role) {
-		groupMemberRepository.save(GroupMemberMapper.create(groupId, userId, role));
+	public void save(GroupMemberEntity groupMember) {
+		groupMemberRepository.save(groupMember);
 	}
 
 	/**

src/main/java/flipnote/group/adapter/out/persistence/GroupRepositoryAdapter.java

@@ -1,13 +1,11 @@
 package flipnote.group.adapter.out.persistence;
 
-import java.util.Optional;
 
 import org.springframework.stereotype.Repository;
 
 import flipnote.group.adapter.out.entity.GroupEntity;
 import flipnote.group.adapter.out.persistence.mapper.GroupMapper;
 import flipnote.group.application.port.out.GroupRepositoryPort;
-import flipnote.group.domain.model.group.Group;
 import flipnote.group.infrastructure.persistence.jpa.GroupRepository;
 import lombok.RequiredArgsConstructor;
 
@@ -23,9 +21,8 @@ public class GroupRepositoryAdapter implements GroupRepositoryPort {
 	 * @return
 	 */
 	@Override
-	public Long saveNewGroup(Group group) {
-		GroupEntity entity = GroupMapper.createNewEntity(group);
-		return groupRepository.save(entity).getId();
+	public Long saveNewGroup(GroupEntity group) {
+		return groupRepository.save(group).getId();
 	}
 
 	@Override

src/main/java/flipnote/group/adapter/out/persistence/mapper/GroupMapper.java

@@ -1,8 +1,38 @@
 package flipnote.group.application.port.in.result;
 
-import flipnote.group.domain.model.group.Group;
+import java.time.LocalDateTime;
+
+import flipnote.group.adapter.out.entity.GroupEntity;
+import flipnote.group.domain.model.group.Category;
+import flipnote.group.domain.model.group.JoinPolicy;
+import flipnote.group.domain.model.group.Visibility;
 
 public record ChangeGroupResult(
-	Group group
+	String name,
+	Category category,
+	String description,
+	JoinPolicy joinPolicy,
+	Visibility visibility,
+	Integer maxMember,
+	String imageUrl,
+	Long imageRefId,
+	Integer memberCount,
+	LocalDateTime createdAt,
+	LocalDateTime modifiedAt
 ) {
+	public static ChangeGroupResult of(GroupEntity group, String imageUrl) {
+		return new ChangeGroupResult(
+			group.getName(),
+			group.getCategory(),
+			group.getDescription(),
+			group.getJoinPolicy(),
+			group.getVisibility(),
+			group.getMaxMember(),
+			imageUrl,
+			group.getImageRefId(),
+			group.getMemberCount(),
+			group.getCreatedAt(),
+			group.getModifiedAt()
+		);
+	}
 }

src/main/java/flipnote/group/adapter/out/persistence/mapper/GroupMemberMapper.java

@@ -2,4 +2,8 @@
 
 public record CreateGroupResult(
 	Long groupId
-) {}
+) {
+	public static CreateGroupResult of(Long groupId) {
+		return new CreateGroupResult(groupId);
+	}
+}

src/main/java/flipnote/group/application/port/in/result/ChangeGroupResult.java

@@ -2,11 +2,11 @@
 
 import java.util.List;
 
-import flipnote.group.adapter.out.entity.RoleEntity;
+import flipnote.group.adapter.out.entity.GroupMemberEntity;
 import flipnote.group.domain.model.member.MemberInfo;
 
 public interface GroupMemberRepositoryPort {
-    void save(Long groupId, Long userId, RoleEntity role);
+    void save(GroupMemberEntity groupMember);
 
     void existsUserInGroup(Long groupId, Long userId);
 

src/main/java/flipnote/group/application/port/in/result/CreateGroupResult.java

@@ -1,9 +1,9 @@
 package flipnote.group.application.port.out;
 
-import flipnote.group.domain.model.group.Group;
+import flipnote.group.adapter.out.entity.GroupEntity;
 
 public interface GroupRepositoryPort {
-    Long saveNewGroup(Group group);
+    Long saveNewGroup(GroupEntity group);
 
     Group findById(Long id);
 

src/main/java/flipnote/group/application/port/out/GroupMemberRepositoryPort.java

@@ -5,7 +5,6 @@
 
 import flipnote.group.adapter.out.entity.GroupEntity;
 import flipnote.group.adapter.out.persistence.GroupRoleRepositoryAdapter;
-import flipnote.group.adapter.out.persistence.mapper.GroupMapper;
 import flipnote.group.application.port.in.ChangeGroupUseCase;
 import flipnote.group.application.port.in.command.ChangeGroupCommand;
 import flipnote.group.application.port.in.result.ChangeGroupResult;
@@ -42,6 +41,8 @@ public ChangeGroupResult change(ChangeGroupCommand cmd) {
 
 		entity.change(cmd);
 
-		return new ChangeGroupResult(GroupMapper.toDomain(entity));
+		String imageUrl = "dummy";
+
+		return ChangeGroupResult.of(entity, imageUrl);
 	}
 }