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
@@ -0,0 +1,56 @@
package com.slatto.domain.project.controller;

import com.slatto.domain.project.dto.ProjectMemberDetailResponse;
import com.slatto.domain.project.dto.ProjectMemberListResponse;
import com.slatto.domain.project.service.ProjectMemberService;
import com.slatto.global.response.ApiResponse;
import com.slatto.global.response.code.CommonSuccessCode;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.RequiredArgsConstructor;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestHeader;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;

@Tag(name = "Project Member", description = "프로젝트 멤버 API")
@RestController
@RequiredArgsConstructor
@RequestMapping("/api/v1/projects/{projectId}/members")
public class ProjectMemberController {

private static final String CURRENT_USER_ID_HEADER = "X-USER-ID";

private final ProjectMemberService projectMemberService;

@Operation(summary = "프로젝트 멤버 목록 조회")
@GetMapping
public ApiResponse<ProjectMemberListResponse> getProjectMembers(
@RequestHeader(CURRENT_USER_ID_HEADER) Long currentUserId,
@PathVariable Long projectId
) {
ProjectMemberListResponse response = projectMemberService.getProjectMembers(
projectId,
currentUserId
);

return ApiResponse.success(CommonSuccessCode.OK, response);
}

@Operation(summary = "프로젝트 멤버 상세 조회")
@GetMapping("/{memberId}")
public ApiResponse<ProjectMemberDetailResponse> getProjectMember(
@RequestHeader(CURRENT_USER_ID_HEADER) Long currentUserId,
@PathVariable Long projectId,
@PathVariable Long memberId
) {
ProjectMemberDetailResponse response = projectMemberService.getProjectMember(
projectId,
memberId,
currentUserId
);

return ApiResponse.success(CommonSuccessCode.OK, response);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ public Project toProject(Users ownerUser, ProjectCreateRequest request) {
ownerUser,
request.getTitle(),
request.getType(),
request.getCustomTypeName(),
request.getLengthType(),
request.getDescription(),
request.getEndDate(),
Expand Down Expand Up @@ -67,7 +66,6 @@ public ProjectListResponse.ProjectSummary toSummary(
.id(project.getId())
.title(project.getTitle())
.type(project.getType())
.customTypeName(project.getCustomTypeName())
.lengthType(project.getLengthType())
.status(project.getStatus())
.kind(project.getKind())
Expand All @@ -94,7 +92,6 @@ public ProjectDetailResponse toDetailResponse(
.id(project.getId())
.title(project.getTitle())
.type(project.getType())
.customTypeName(project.getCustomTypeName())
.lengthType(project.getLengthType())
.description(project.getDescription())
.startDate(project.getStartDate())
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,6 @@ public class ProjectCreateRequest {
@NotNull(message = "프로젝트 유형은 필수입니다.")
private CategoryName type;

@Size(max = 100, message = "직접 입력한 프로젝트 유형은 최대 100자까지 입력할 수 있습니다.")
private String customTypeName;

@NotNull(message = "영상 길이는 필수입니다.")
private LengthType lengthType;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,6 @@ public class ProjectDetailResponse {

private CategoryName type;

private String customTypeName;

private LengthType lengthType;

private String description;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,6 @@ public static class ProjectSummary {

private CategoryName type;

private String customTypeName;

private LengthType lengthType;

private ProjectStatus status;
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
package com.slatto.domain.project.dto;

import com.slatto.domain.project.enums.Permission;
import com.slatto.domain.user.enums.RoleName;
import lombok.Builder;
import lombok.Getter;

import java.time.LocalDateTime;
import java.util.List;

@Getter
@Builder
public class ProjectMemberDetailResponse {

private Long memberId;

private Long userId;

private String nickname;

private String email;

private String profileImageUrl;

private String bio;

private Permission permission;

private List<RoleName> roleNames;

private LocalDateTime joinedAt;
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
package com.slatto.domain.project.dto;

import com.slatto.domain.project.enums.Permission;
import com.slatto.domain.user.enums.RoleName;
import lombok.Builder;
import lombok.Getter;

import java.time.LocalDateTime;
import java.util.List;

@Getter
@Builder
public class ProjectMemberListResponse {

private List<MemberSummary> items;

private Long memberCount;

@Getter
@Builder
public static class MemberSummary {

private Long memberId;

private Long userId;

private String nickname;

private String profileImageUrl;

private Permission permission;

private List<RoleName> roleNames;

private LocalDateTime joinedAt;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,6 @@ public class ProjectUpdateRequest {
@NotNull(message = "프로젝트 유형은 필수입니다.")
private CategoryName type;

@Size(max = 100, message = "직접 입력한 프로젝트 유형은 최대 100자까지 입력할 수 있습니다.")
private String customTypeName;

@NotNull(message = "영상 길이는 필수입니다.")
private LengthType lengthType;

Expand Down
9 changes: 0 additions & 9 deletions src/main/java/com/slatto/domain/project/entity/Project.java
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,6 @@ public class Project extends BaseEntity {
@Column(name = "type", nullable = true)
private CategoryName type;

@Column(name = "custom_type_name", nullable = true, length = 100)
private String customTypeName;

@Enumerated(EnumType.STRING)
@Column(name = "length_type", nullable = true)
private LengthType lengthType;
Expand Down Expand Up @@ -74,7 +71,6 @@ private Project(
Users ownerUser,
String title,
CategoryName type,
String customTypeName,
LengthType lengthType,
String description,
LocalDate endDate,
Expand All @@ -87,7 +83,6 @@ private Project(
this.ownerUser = ownerUser;
this.title = title;
this.type = type;
this.customTypeName = customTypeName;
this.lengthType = lengthType;
this.description = description;
this.startDate = startDate;
Expand All @@ -101,7 +96,6 @@ public static Project create(
Users ownerUser,
String title,
CategoryName type,
String customTypeName,
LengthType lengthType,
String description,
LocalDate endDate,
Expand All @@ -112,7 +106,6 @@ public static Project create(
ownerUser,
title,
type,
customTypeName,
lengthType,
description,
endDate,
Expand All @@ -124,7 +117,6 @@ public static Project create(
public void updateInfo(
String title,
CategoryName type,
String customTypeName,
LengthType lengthType,
String description,
LocalDate endDate,
Expand All @@ -135,7 +127,6 @@ public void updateInfo(

this.title = title;
this.type = type;
this.customTypeName = customTypeName;
this.lengthType = lengthType;
this.description = description;
this.endDate = endDate;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,29 @@ public interface ProjectMemberRepository extends JpaRepository<ProjectMember, Lo

long countByProjectIdAndLeftAtIsNull(Long projectId);

@Query("""
select pm
from ProjectMember pm
join fetch pm.user u
where pm.project.id = :projectId
and pm.leftAt is null
order by pm.id asc
""")
List<ProjectMember> findAllActiveMembersByProjectId(@Param("projectId") Long projectId);

@Query("""
select pm
from ProjectMember pm
join fetch pm.user u
where pm.project.id = :projectId
and pm.id = :memberId
and pm.leftAt is null
""")
Optional<ProjectMember> findActiveMemberByProjectIdAndMemberId(
@Param("projectId") Long projectId,
@Param("memberId") Long memberId
);

@Query("""
select pm
from ProjectMember pm
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

import com.slatto.domain.project.entity.ProjectUserRole;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.query.Param;

import java.util.Collection;
import java.util.List;
Expand All @@ -11,4 +13,26 @@ public interface ProjectUserRoleRepository extends JpaRepository<ProjectUserRole
List<ProjectUserRole> findAllByProjectMemberId(Long projectMemberId);

List<ProjectUserRole> findAllByProjectMemberIdIn(Collection<Long> projectMemberIds);

@Query("""
select pur
from ProjectUserRole pur
join fetch pur.projectMember pm
where pm.id = :projectMemberId
order by pur.id asc
""")
List<ProjectUserRole> findAllByProjectMemberIdOrderByIdAsc(
@Param("projectMemberId") Long projectMemberId
);

@Query("""
select pur
from ProjectUserRole pur
join fetch pur.projectMember pm
where pm.id in :projectMemberIds
order by pm.id asc, pur.id asc
""")
List<ProjectUserRole> findAllByProjectMemberIdsOrderByProjectMemberIdAscAndIdAsc(
@Param("projectMemberIds") Collection<Long> projectMemberIds
);
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
package com.slatto.domain.project.service;

import com.slatto.domain.project.entity.Project;
import com.slatto.domain.project.entity.ProjectMember;
import com.slatto.domain.project.exception.ProjectErrorCode;
import com.slatto.domain.project.repository.ProjectMemberRepository;
import com.slatto.domain.project.repository.ProjectRepository;
import com.slatto.global.exception.BaseException;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Component;
import org.springframework.transaction.annotation.Transactional;

@Component
@RequiredArgsConstructor
@Transactional(readOnly = true)
public class ProjectAccessValidator {

private final ProjectRepository projectRepository;
private final ProjectMemberRepository projectMemberRepository;

public Project getProjectOrThrow(Long projectId) {
return projectRepository.findByIdAndDeletedAtIsNull(projectId)
.orElseThrow(() -> new BaseException(ProjectErrorCode.PROJECT_NOT_FOUND));
}

public ProjectMember getCurrentMemberOrThrow(Long projectId, Long currentUserId) {
return projectMemberRepository.findByProjectIdAndUserIdAndLeftAtIsNull(projectId, currentUserId)
.orElseThrow(() -> new BaseException(ProjectErrorCode.PROJECT_ACCESS_DENIED));
}

public ProjectMember getCurrentAdminOrThrow(Long projectId, Long currentUserId) {
ProjectMember currentMember = getCurrentMemberOrThrow(projectId, currentUserId);
validateAdmin(currentMember);

return currentMember;
}

public void validateProjectAccess(Long projectId, Long currentUserId) {
getCurrentMemberOrThrow(projectId, currentUserId);
}

public void validateAdmin(ProjectMember projectMember) {
if (!projectMember.isAdmin()) {
throw new BaseException(ProjectErrorCode.PROJECT_ADMIN_REQUIRED);
}
}
}
Loading
Loading