Merge pull request #61 from kssumin/feat/#268/teambuilding-complete

[BE/FEAT] 팀빌딩 진행 결과를 볼 수 있다.

BE/eeos/src/main/java/com/blackcompany/eeos/common/persistence/IntegerArrayConverter.java

@@ -0,0 +1,26 @@
+package com.blackcompany.eeos.common.persistence;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.stream.Collectors;
+import javax.persistence.AttributeConverter;
+import javax.persistence.Converter;
+
+@Converter
+public class IntegerArrayConverter implements AttributeConverter<List<Long>, String> {
+
+	private static final String SPLIT_CHAR = ",";
+
+	@Override
+	public String convertToDatabaseColumn(List<Long> attribute) {
+		return attribute.stream().map(String::valueOf).collect(Collectors.joining(SPLIT_CHAR));
+	}
+
+	@Override
+	public List<Long> convertToEntityAttribute(String dbData) {
+		return Arrays.stream(dbData.split(SPLIT_CHAR))
+				.map(String::trim)
+				.map(Long::parseLong)
+				.collect(Collectors.toList());
+	}
+}

BE/eeos/src/main/java/com/blackcompany/eeos/target/application/service/CommandAttendTeamBuildingService.java

@@ -52,9 +52,7 @@ public void update(Long memberId, AttendTeamBuildingRequest request) {
 	private TeamBuildingTargetModel getTargetByActiveBuilding(Long memberId) {
 		Long teamBuildingId = find(TeamBuildingStatus.PROGRESS).getId();
 
-		TeamBuildingTargetEntity entity =
-				queryTeamBuildingTargetService.getTarget(memberId, teamBuildingId);
-		return entityConverter.from(entity);
+		return queryTeamBuildingTargetService.getTarget(memberId, teamBuildingId);
 	}
 
 	private void validateAttendTeamBuilding() {

BE/eeos/src/main/java/com/blackcompany/eeos/target/application/service/QueryTeamBuildingTargetService.java

@@ -1,8 +1,11 @@
 package com.blackcompany.eeos.target.application.service;
 
 import com.blackcompany.eeos.target.application.exception.NotFoundTargetTeamBuildingException;
-import com.blackcompany.eeos.target.persistence.TeamBuildingTargetEntity;
+import com.blackcompany.eeos.target.application.model.TeamBuildingTargetModel;
+import com.blackcompany.eeos.target.application.model.converter.TeamBuildingTargetEntityConverter;
 import com.blackcompany.eeos.target.persistence.TeamBuildingTargetRepository;
+import java.util.List;
+import java.util.stream.Collectors;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -12,10 +15,18 @@
 @RequiredArgsConstructor
 public class QueryTeamBuildingTargetService {
 	private final TeamBuildingTargetRepository teamBuildingTargetRepository;
+	private final TeamBuildingTargetEntityConverter entityConverter;
 
-	public TeamBuildingTargetEntity getTarget(Long memberId, Long teamBuildingId) {
+	public TeamBuildingTargetModel getTarget(Long memberId, Long teamBuildingId) {
 		return teamBuildingTargetRepository
 				.findByTeamBuildingIdAndMemberId(teamBuildingId, memberId)
+				.map(entityConverter::from)
 				.orElseThrow(NotFoundTargetTeamBuildingException::new);
 	}
+
+	public List<TeamBuildingTargetModel> getTarget(Long teamBuildingId) {
+		return teamBuildingTargetRepository.findByTeamBuildingId(teamBuildingId).stream()
+				.map(entityConverter::from)
+				.collect(Collectors.toList());
+	}
 }

BE/eeos/src/main/java/com/blackcompany/eeos/target/persistence/TeamBuildingTargetRepository.java

@@ -1,10 +1,13 @@
 package com.blackcompany.eeos.target.persistence;
 
+import java.util.List;
 import java.util.Optional;
 import org.springframework.data.jpa.repository.JpaRepository;
 
 public interface TeamBuildingTargetRepository
 		extends JpaRepository<TeamBuildingTargetEntity, Long> {
 	Optional<TeamBuildingTargetEntity> findByTeamBuildingIdAndMemberId(
 			Long teamBuildingId, Long memberId);
+
+	List<TeamBuildingTargetEntity> findByTeamBuildingId(Long teamBuildingId);
 }

BE/eeos/src/main/java/com/blackcompany/eeos/teamBuilding/application/dto/EachMemberResponse.java

@@ -0,0 +1,15 @@
+package com.blackcompany.eeos.teamBuilding.application.dto;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+
+@Getter
+@AllArgsConstructor
+@NoArgsConstructor
+@Builder(toBuilder = true)
+public class EachMemberResponse {
+	private Long memberId;
+	private String name;
+}

BE/eeos/src/main/java/com/blackcompany/eeos/teamBuilding/application/dto/ResultTeamBuildingResponse.java

@@ -0,0 +1,17 @@
+package com.blackcompany.eeos.teamBuilding.application.dto;
+
+import com.blackcompany.eeos.common.support.dto.AbstractResponseDto;
+import java.util.List;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+
+@Getter
+@AllArgsConstructor
+@NoArgsConstructor
+@Builder(toBuilder = true)
+public class ResultTeamBuildingResponse implements AbstractResponseDto {
+	private String accessRights;
+	private List<List<EachMemberResponse>> results;
+}

BE/eeos/src/main/java/com/blackcompany/eeos/teamBuilding/application/dto/converter/ResultTeamBuildingResponseConverter.java

@@ -0,0 +1,14 @@
+package com.blackcompany.eeos.teamBuilding.application.dto.converter;
+
+import com.blackcompany.eeos.teamBuilding.application.dto.EachMemberResponse;
+import com.blackcompany.eeos.teamBuilding.application.dto.ResultTeamBuildingResponse;
+import java.util.List;
+import org.springframework.stereotype.Component;
+
+@Component
+public class ResultTeamBuildingResponseConverter {
+	public ResultTeamBuildingResponse from(
+			String accessRight, List<List<EachMemberResponse>> results) {
+		return ResultTeamBuildingResponse.builder().accessRights(accessRight).results(results).build();
+	}
+}

BE/eeos/src/main/java/com/blackcompany/eeos/teamBuilding/application/exception/NotFoundResultException.java

@@ -0,0 +1,18 @@
+package com.blackcompany.eeos.teamBuilding.application.exception;
+
+import com.blackcompany.eeos.common.exception.BusinessException;
+import org.springframework.http.HttpStatus;
+
+/** 조회할 팀빌딩이 존재하지 않을 때 발생하는 예외 */
+public class NotFoundResultException extends BusinessException {
+	private static final String FAIL_CODE = "6009";
+
+	public NotFoundResultException() {
+		super(FAIL_CODE, HttpStatus.NOT_FOUND);
+	}
+
+	@Override
+	public String getMessage() {
+		return "결과를 조회할 팀빌딩이 존재하지 않습니다.";
+	}
+}

BE/eeos/src/main/java/com/blackcompany/eeos/teamBuilding/application/model/RestrictTeamBuildingModel.java

@@ -24,8 +24,8 @@ public class RestrictTeamBuildingModel implements AbstractModel {
 	private Long version;
 
 	public RestrictTeamBuildingModel addActiveCount() {
-		totalActiveCount++;
 		validateCreation();
+		totalActiveCount++;
 
 		return this;
 	}

BE/eeos/src/main/java/com/blackcompany/eeos/teamBuilding/application/model/TeamBuildingAccessRights.java

@@ -0,0 +1,17 @@
+package com.blackcompany.eeos.teamBuilding.application.model;
+
+import lombok.Getter;
+
+@Getter
+public enum TeamBuildingAccessRights {
+	/** 읽기, 수정 권한 있음 */
+	EDIT("edit"),
+	/** 읽기 권한 있음 */
+	READ_ONLY("read_only");
+
+	private final String accessRight;
+
+	TeamBuildingAccessRights(String accessRight) {
+		this.accessRight = accessRight;
+	}
+}

BE/eeos/src/main/java/com/blackcompany/eeos/teamBuilding/application/model/TeamBuildingModel.java

@@ -32,10 +32,24 @@ public void validateEdit(Long memberId) {
 		}
 	}
 
+	public TeamBuildingModel updateStatus(String status, Long memberId) {
+		validateEdit(memberId);
+
+		this.status = status;
+		return this;
+	}
+
 	public void validateAttend() {
 		validateStatus();
 	}
 
+	public TeamBuildingAccessRights getAccessRight(Long memberId) {
+		if (this.memberId.equals(memberId)) {
+			return TeamBuildingAccessRights.EDIT;
+		}
+		return TeamBuildingAccessRights.READ_ONLY;
+	}
+
 	private void validateStatus() {
 		if (!TeamBuildingStatus.validateSame(status, TeamBuildingStatus.PROGRESS)) {
 			throw new DeniedSaveAttendTeamBuildingException();

BE/eeos/src/main/java/com/blackcompany/eeos/teamBuilding/application/model/converter/TeamBuildingEntityConverter.java

@@ -32,4 +32,15 @@ public TeamBuildingEntity toEntity(TeamBuildingModel source) {
 				.memberId(source.getMemberId())
 				.build();
 	}
+
+	public TeamBuildingEntity toEntity(TeamBuildingModel source, TeamBuildingStatus status) {
+		return TeamBuildingEntity.builder()
+				.id(source.getId())
+				.title(source.getTitle())
+				.content(source.getContent())
+				.maxTeamSize(source.getMaxTeamSize())
+				.status(status)
+				.memberId(source.getMemberId())
+				.build();
+	}
 }

BE/eeos/src/main/java/com/blackcompany/eeos/teamBuilding/application/model/converter/TeamBuildingResultConverter.java

@@ -0,0 +1,16 @@
+package com.blackcompany.eeos.teamBuilding.application.model.converter;
+
+import com.blackcompany.eeos.teamBuilding.persistence.TeamBuildingResultEntity;
+import java.util.List;
+import java.util.stream.Collectors;
+import org.springframework.stereotype.Component;
+
+@Component
+public class TeamBuildingResultConverter {
+	public TeamBuildingResultEntity from(List<String> memberIds, Long teamBuildinId) {
+		return TeamBuildingResultEntity.builder()
+				.teamBuildingId(teamBuildinId)
+				.memberIds(memberIds.stream().map(Long::parseLong).collect(Collectors.toList()))
+				.build();
+	}
+}