Skip to content

Commit 4709441

Browse files
committed
revert: 관리자 삭제 권한 관련 변경사항 전체 롤백
- PublicCourseService: isAdmin 체크, 스크랩 삭제, Record FK null 처리 제거 - RecordRepository: nullifyPublicCourseIn 메서드 제거 - f8b4c26 상태로 원복
1 parent 0443f98 commit 4709441

2 files changed

Lines changed: 1 addition & 17 deletions

File tree

src/main/java/org/runnect/server/publicCourse/service/PublicCourseService.java

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
import org.runnect.server.common.module.convert.CoordinatePathConverter;
1515
import org.runnect.server.course.entity.Course;
1616
import org.runnect.server.course.repository.CourseRepository;
17-
import org.runnect.server.record.repository.RecordRepository;
1817
import org.runnect.server.publicCourse.dto.request.CreatePublicCourseRequestDto;
1918
import org.runnect.server.publicCourse.dto.request.DeletePublicCoursesRequestDto;
2019
import org.runnect.server.publicCourse.dto.response.CreatePublicCourseResponseDto;
@@ -54,7 +53,6 @@ public class PublicCourseService {
5453
private final UserRepository userRepository;
5554
private final ScrapRepository scrapRepository;
5655
private final CourseRepository courseRepository;
57-
private final RecordRepository recordRepository;
5856

5957

6058
@Value("${runnect.marathon-public-course-id}")
@@ -352,23 +350,15 @@ public DeletePublicCoursesResponseDto deletePublicCourses(
352350
throw new NotFoundException(ErrorStatus.NOT_FOUND_PUBLICCOURSE_EXCEPTION, ErrorStatus.NOT_FOUND_PUBLICCOURSE_EXCEPTION.getMessage());
353351
}
354352

355-
boolean isAdmin = userId.equals(280L);
356-
357353
publicCourses.stream()
358-
.filter(pc -> !isAdmin && !pc.getCourse().getRunnectUser().equals(user))
354+
.filter(pc -> !pc.getCourse().getRunnectUser().equals(user))
359355
.findAny()
360356
.ifPresent(pc -> {
361357
throw new PermissionDeniedException(
362358
ErrorStatus.PERMISSION_DENIED_PUBLIC_COURSE_DELETE_EXCEPTION,
363359
ErrorStatus.PERMISSION_DENIED_PUBLIC_COURSE_DELETE_EXCEPTION.getMessage());
364360
});
365361

366-
//삭제전 연관된 스크랩 먼저 삭제
367-
scrapRepository.deleteByPublicCourseIn(publicCourses);
368-
369-
//삭제전 연관된 Record의 publicCourse FK null 처리
370-
recordRepository.nullifyPublicCourseIn(publicCourses);
371-
372362
//삭제전 course의 isPrivate update
373363
publicCourses.forEach(publicCourse -> publicCourse.getCourse().retrieveCourse());
374364

src/main/java/org/runnect/server/record/repository/RecordRepository.java

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
11
package org.runnect.server.record.repository;
22

33
import java.util.Collection;
4-
import org.runnect.server.publicCourse.entity.PublicCourse;
54
import org.runnect.server.record.entity.Record;
65
import org.runnect.server.user.entity.RunnectUser;
7-
import org.springframework.data.jpa.repository.Modifying;
86
import org.springframework.data.jpa.repository.Query;
97
import org.springframework.data.repository.Repository;
108
import org.springframework.data.repository.query.Param;
@@ -31,8 +29,4 @@ public interface RecordRepository extends Repository<Record, Long> {
3129

3230
// DELETE
3331
long deleteByIdIn(Collection<Long> ids);
34-
35-
@Modifying
36-
@Query("UPDATE Record r SET r.publicCourse = null WHERE r.publicCourse IN :publicCourses")
37-
int nullifyPublicCourseIn(@Param("publicCourses") Collection<PublicCourse> publicCourses);
3832
}

0 commit comments

Comments
 (0)