Skip to content

Commit 67689d8

Browse files
authored
Dev > Main 브랜치 병합
1. 내 프로젝트 , 지원 최신순 조회로 수정하였습니다. 2. 알림 필터링 값을 수정하였습니다. 통합 테스트 거친 뒤 Main 브랜치로 병합합니다.
2 parents 91d7740 + ff4b425 commit 67689d8

File tree

3 files changed

+11
-11
lines changed

3 files changed

+11
-11
lines changed

src/main/java/hs/kr/backend/devpals/domain/user/entity/alarm/ApplicantAlarmEntity.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@
77
import org.hibernate.annotations.OnDelete;
88
import org.hibernate.annotations.OnDeleteAction;
99

10-
import static hs.kr.backend.devpals.global.constants.AlarmFilterConstants.APPLIED_PROJECTS;
11-
import static hs.kr.backend.devpals.global.constants.AlarmFilterConstants.APPLIED_PROJECT_INT_VALUE;
10+
import static hs.kr.backend.devpals.global.constants.AlarmFilterConstants.APPLICANT_CHECK;
11+
import static hs.kr.backend.devpals.global.constants.AlarmFilterConstants.APPLICANT_CHECK_INT_VALUE;
1212

1313
@Entity
14-
@DiscriminatorValue(APPLIED_PROJECTS)
14+
@DiscriminatorValue(APPLICANT_CHECK)
1515
@NoArgsConstructor
1616
@Table(name = "ApplicantAlarm") // 테이블 이름 지정
1717
public class ApplicantAlarmEntity extends AlarmEntity {
@@ -35,6 +35,6 @@ public ApplicantAlarmEntity(ApplicantEntity applicantEntity, String content, Pro
3535
}
3636

3737
public Integer getAlarmFilterIntValue() {
38-
return APPLIED_PROJECT_INT_VALUE;
38+
return APPLICANT_CHECK_INT_VALUE;
3939
}
4040
}

src/main/java/hs/kr/backend/devpals/domain/user/entity/alarm/ProjectAlarmEntity.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
import static hs.kr.backend.devpals.global.constants.AlarmFilterConstants.*;
1212

1313
@Entity
14-
@DiscriminatorValue(APPLICANT_CHECK)
14+
@DiscriminatorValue(APPLIED_PROJECTS)
1515
@NoArgsConstructor
1616
@Table(name = "ProjectAlarm") // 테이블 이름 지정
1717
public class ProjectAlarmEntity extends AlarmEntity{
@@ -35,6 +35,6 @@ public ProjectAlarmEntity(ProjectEntity project, UserEntity author, String conte
3535
}
3636

3737
public Integer getAlarmFilterIntValue() {
38-
return APPLICANT_CHECK_INT_VALUE;
38+
return APPLIED_PROJECT_INT_VALUE;
3939
}
4040
}

src/main/java/hs/kr/backend/devpals/domain/user/service/UserProjectService.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,7 @@
2323
import org.springframework.stereotype.Service;
2424
import org.springframework.transaction.annotation.Transactional;
2525

26-
import java.util.ArrayList;
27-
import java.util.HashMap;
28-
import java.util.List;
29-
import java.util.Map;
26+
import java.util.*;
3027
import java.util.stream.Collectors;
3128

3229
@Service
@@ -133,6 +130,7 @@ public ResponseEntity<ApiResponse<List<ProjectApplyResponse>>> getMyProjectApply
133130
}
134131

135132
List<ProjectApplyResponse> myProjects = applications.stream()
133+
.sorted(Comparator.comparing(app -> app.getProject().getCreatedAt(), Comparator.reverseOrder()))
136134
.map(application -> ProjectApplyResponse.fromEntity(
137135
application.getProject().getId(),
138136
application.getProject().getTitle(),
@@ -148,7 +146,9 @@ public ResponseEntity<ApiResponse<List<ProjectApplyResponse>>> getMyProjectApply
148146
public ResponseEntity<ApiResponse<List<ProjectAuthoredResponse>>> getMyProject(String token) {
149147
Long userId = jwtTokenValidator.getUserId(token);
150148

151-
List<ProjectEntity> projects = projectRepository.findProjectsByUserId(userId);
149+
List<ProjectEntity> projects = projectRepository.findProjectsByUserId(userId).stream()
150+
.sorted(Comparator.comparing(ProjectEntity::getCreatedAt).reversed())
151+
.toList();
152152

153153
List<ProjectAuthoredResponse> projectAuthoredResponses = projects.stream()
154154
.map(project -> {

0 commit comments

Comments
 (0)