jhynsoo/edufocus
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'Be/Lecture' into 'backend'

Browse Source 
[Back-End] feat : lecture 역정렬

See merge request s11-webmobile1-sub2/S11P12A701!157
This commit is contained in:
김기창 2024-08-09 17:59:49 +09:00
commit e4d8ae4046
2 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
backend/src/main/java/com/edufocus/edufocus/lecture/repository/LectureRepository.java
View File

@ -14,7 +14,7 @@ public interface LectureRepository extends JpaRepository<Lecture, Long> {
List<Lecture> findAllByUserId(Long userId);
List<Lecture> findLecturesByUserId(Long userId);
List<Lecture> findLecturesByUserIdOrderById(Long userId);
Lecture findByIdAndUserId(long id, long userId);
}

17
backend/src/main/java/com/edufocus/edufocus/lecture/service/LectureServiceImpl.java
View File

@ -11,6 +11,7 @@ import com.edufocus.edufocus.user.model.entity.vo.UserRole;
import com.edufocus.edufocus.user.model.repository.UserRepository;
import jakarta.transaction.Transactional;
import lombok.RequiredArgsConstructor;
import org.springframework.data.domain.Sort;
import org.springframework.stereotype.Service;
import org.springframework.web.multipart.MultipartFile;
@ -118,7 +119,7 @@ public class LectureServiceImpl implements LectureService {
@Override
public List<LectureSearchResponse> findAllLecture() {
List<Lecture> lectureList = lectureRepository.findAll();
List<Lecture> lectureList = lectureRepository.findAll(Sort.by(Sort.Direction.DESC, "id"));
List<LectureSearchResponse> lectureSearchResponseList = new ArrayList<>();
for (Lecture lecture : lectureList) {
@ -190,7 +191,7 @@ public class LectureServiceImpl implements LectureService {
List<LectureSearchResponse> myLectureList = new ArrayList<>();
if (user.getRole() == UserRole.ADMIN) {
List<Lecture> lectureList = lectureRepository.findLecturesByUserId(userId);
List<Lecture> lectureList = lectureRepository.findLecturesByUserIdOrderById(userId);
for (Lecture lecture : lectureList) {
LectureSearchResponse lectureSearchResponse = LectureSearchResponse.builder()
.id(lecture.getId())
@ -214,6 +215,18 @@ public class LectureServiceImpl implements LectureService {
myLectureList.add(lectureSearchResponse);
}
}
Collections.sort(myLectureList, new Comparator<LectureSearchResponse>() {
@Override
public int compare(LectureSearchResponse lsr1, LectureSearchResponse lsr2) {
long lsr1Id = lsr1.getId();
long lsr2Id = lsr2.getId();
if(lsr2Id > lsr1Id)
return 1;
else if(lsr2Id == lsr1Id)
return 0;
return -1;
}
});
}
return myLectureList;