feat: sortOrder 정렬 기준 추가 (DASOMBE-14)

Author: si-zero

src/main/java/dmu/dasom/api/domain/executive/dto/ExecutiveListResponseDto.java

@@ -25,4 +25,7 @@ public class ExecutiveListResponseDto {
     @Schema(description = "임원진 깃허브 주소", example = "https://github.com/dasom")
     private String githubUrl;
 
+    @Schema(description = "정렬 기준")
+    private Integer sortOrder;
+
 }

src/main/java/dmu/dasom/api/domain/executive/dto/ExecutiveRequestDto.java

@@ -27,6 +27,8 @@ public class ExecutiveRequestDto {
 
     private String githubUrl;
 
+    private Integer sortOrder;
+
     public ExecutiveEntity toEntity() {
         return ExecutiveEntity.builder()
                 .name(this.name)

src/main/java/dmu/dasom/api/domain/executive/dto/ExecutiveResponseDto.java

@@ -24,4 +24,7 @@ public class ExecutiveResponseDto {
 
     @Schema(description = "임원진 깃허브", example = "https://github.com/dasom")
     private String githubUrl;
+
+    @Schema(description = "정렬 기준")
+    private Integer sortOrder;
 }

src/main/java/dmu/dasom/api/domain/executive/dto/ExecutiveUpdateRequestDto.java

@@ -21,4 +21,7 @@ public class ExecutiveUpdateRequestDto {
 
     @Schema(description = "수정할 임원진 깃허브 주소", example = "https://github.com/dasom", nullable = true)
     private String githubUrl;
+
+    @Schema(description = "정렬 기준")
+    private Integer sortOrder;
 }

src/main/java/dmu/dasom/api/domain/executive/entity/ExecutiveEntity.java

@@ -32,11 +32,16 @@ public class ExecutiveEntity extends BaseEntity {
     @Column(nullable=false, length = 255)
     private String githubUrl;
 
+    // 프론트 정렬 기준 제공
+    @Column(name = "sort_order", nullable = false)
+    private Integer sortOrder;
+
     // 엔티티 업데이트 메소드
-    public void update(String name, String position, String githubUrl) {
+    public void update(String name, String position, String githubUrl, Integer sortOrder) {
         this.name = name;
         this.position = position;
         this.githubUrl = githubUrl;
+        this.sortOrder = sortOrder;
     }
 
     // 엔티티 -> DTO 변환 책임
@@ -46,6 +51,7 @@ public ExecutiveResponseDto toResponseDto() {
                 .name(this.name)
                 .position(this.position)
                 .githubUrl(this.githubUrl)
+                .sortOrder(this.sortOrder)
                 .build();
     }
 

src/main/java/dmu/dasom/api/domain/executive/service/ExecutiveServiceImpl.java

@@ -6,6 +6,7 @@
 import dmu.dasom.api.domain.executive.entity.ExecutiveEntity;
 import dmu.dasom.api.domain.executive.repository.ExecutiveRepository;
 import lombok.RequiredArgsConstructor;
+import org.springframework.data.domain.Sort;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -31,11 +32,11 @@ public ExecutiveResponseDto getExecutiveById(Long id) {
     // 임원진 전체 조회
     // 이름, 직책, 깃허브 주소 출력
     public List<ExecutiveListResponseDto> getAllExecutives() {
-        List<ExecutiveEntity> executives = executiveRepository.findAll();
+        Sort sort = Sort.by(Sort.Direction.ASC, "sortOrder")
+                .and(Sort.by(Sort.Direction.ASC, "position"))
+                .and(Sort.by(Sort.Direction.ASC, "name"));
 
-        List<Long> executiveIds = executives.stream()
-                .map(ExecutiveEntity::getId)
-                .toList();
+        List<ExecutiveEntity> executives = executiveRepository.findAll(sort);
 
         return executives.stream()
                 .map(executiveEntity -> executiveEntity.toListResponseDto())
@@ -44,7 +45,17 @@ public List<ExecutiveListResponseDto> getAllExecutives() {
 
     // 임원진 멤버 생성
     public ExecutiveCreationResponseDto createExecutive(ExecutiveRequestDto requestDto) {
-        return new ExecutiveCreationResponseDto(executiveRepository.save(requestDto.toEntity()).getId());
+        Integer sortOrder = requestDto.getSortOrder() != null ? requestDto.getSortOrder() : 9999;
+
+        ExecutiveEntity executiveEntity = ExecutiveEntity.builder()
+                .name(requestDto.getName())
+                .position(requestDto.getPosition())
+                .githubUrl(requestDto.getGithubUrl())
+                .sortOrder(sortOrder)
+                .build();
+
+        Long id = executiveRepository.save(executiveEntity).getId();
+        return new ExecutiveCreationResponseDto(id);
     }
 
     // 임원진 멤버 삭제
@@ -62,7 +73,7 @@ public ExecutiveResponseDto updateExecutive(Long id, ExecutiveUpdateRequestDto r
         ExecutiveEntity executive = executiveRepository.findById(id)
                 .orElseThrow(() -> new CustomException(ErrorCode.EXECUTIVE_NOT_FOUND));
 
-        executive.update(requestDto.getName(), requestDto.getPosition(), requestDto.getGithubUrl());
+        executive.update(requestDto.getName(), requestDto.getPosition(), requestDto.getGithubUrl(), requestDto.getSortOrder());
 
         return executive.toResponseDto();
     }