Skip to content

Commit b29b09f

Browse files
committed
Revert "merge: dev → main 관리자 삭제 권한 v2"
This reverts commit 0e218de, reversing changes made to 4709441.
1 parent 0e218de commit b29b09f

1 file changed

Lines changed: 1 addition & 19 deletions

File tree

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

Lines changed: 1 addition & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -43,24 +43,17 @@
4343
import org.springframework.stereotype.Service;
4444
import org.springframework.transaction.annotation.Transactional;
4545

46-
import javax.persistence.EntityManager;
47-
import javax.persistence.PersistenceContext;
48-
4946
@Service
5047
@RequiredArgsConstructor
5148
public class PublicCourseService {
5249
private static final Integer PAGE_SIZE = 10;
5350
private static List<Long> MARATHON_PUBLIC_COURSE_IDS;
54-
private static final Long ADMIN_USER_ID = 280L;
5551

5652
private final PublicCourseRepository publicCourseRepository;
5753
private final UserRepository userRepository;
5854
private final ScrapRepository scrapRepository;
5955
private final CourseRepository courseRepository;
6056

61-
@PersistenceContext
62-
private EntityManager entityManager;
63-
6457

6558
@Value("${runnect.marathon-public-course-id}")
6659
private void setMARATHON_PUBLIC_COURSE_IDS(String MARATHON_PUBLIC_COURSE_ID) {
@@ -357,10 +350,8 @@ public DeletePublicCoursesResponseDto deletePublicCourses(
357350
throw new NotFoundException(ErrorStatus.NOT_FOUND_PUBLICCOURSE_EXCEPTION, ErrorStatus.NOT_FOUND_PUBLICCOURSE_EXCEPTION.getMessage());
358351
}
359352

360-
boolean isAdmin = userId.equals(ADMIN_USER_ID);
361-
362353
publicCourses.stream()
363-
.filter(pc -> !isAdmin && !pc.getCourse().getRunnectUser().equals(user))
354+
.filter(pc -> !pc.getCourse().getRunnectUser().equals(user))
364355
.findAny()
365356
.ifPresent(pc -> {
366357
throw new PermissionDeniedException(
@@ -371,15 +362,6 @@ public DeletePublicCoursesResponseDto deletePublicCourses(
371362
//삭제전 course의 isPrivate update
372363
publicCourses.forEach(publicCourse -> publicCourse.getCourse().retrieveCourse());
373364

374-
// Record의 publicCourse FK를 null로 설정 (Record 테이블 FK 제약조건 해제)
375-
entityManager.createQuery(
376-
"UPDATE Record r SET r.publicCourse = null WHERE r.publicCourse IN :publicCourses")
377-
.setParameter("publicCourses", publicCourses)
378-
.executeUpdate();
379-
380-
// Scrap 삭제 (Scrap 테이블 FK NOT NULL 제약조건)
381-
scrapRepository.deleteByPublicCourseIn(publicCourses);
382-
383365
publicCourseRepository.deleteAllInBatch(publicCourses);
384366

385367
return DeletePublicCoursesResponseDto.from(publicCourses.size());

0 commit comments

Comments
 (0)