Skip to content

Commit

Permalink
bug fix : delete 삭제 수정
Browse files Browse the repository at this point in the history
  • Loading branch information
MyunghyunNero committed Nov 21, 2023
1 parent ae37660 commit 8e9e3f4
Show file tree
Hide file tree
Showing 9 changed files with 49 additions and 0 deletions.
20 changes: 20 additions & 0 deletions src/main/java/kusitms/gallae/config/WebConfig.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
package kusitms.gallae.config;

import org.springframework.context.annotation.Configuration;
import org.springframework.web.servlet.config.annotation.CorsRegistry;
import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;

@Configuration
public class WebConfig implements WebMvcConfigurer {

@Override
public void addCorsMappings(CorsRegistry registry) {
registry.addMapping("/**")
.allowedOrigins("*")
.allowedMethods("GET", "POST", "PUT", "DELETE")
.allowedHeaders("Authorization", "Content-Type")
.exposedHeaders("Custom-Header")
.allowCredentials(true)
.maxAge(3600);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,6 @@ public interface FavoriteRepository extends JpaRepository<Favorite, Long> {
Optional<Favorite> findByUserAndProgram(User user, Program program);

List<Favorite> findAllByUser(User user);

void deleteAllByProgram(Program program);
}
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,6 @@ public interface FavoriteArchiveRepository extends JpaRepository<FavoriteArchive
Optional<FavoriteArchive> findByUserAndArchive(User user, Archive archive);

boolean existsByUserAndArchive(User user, Archive archive);

void deleteAllByArchive(Archive archive);
}
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,6 @@ public interface FavoriteReviewRepository extends JpaRepository<FavoriteReview,
Optional<FavoriteReview> findByUserAndReview(User user, Review review);

boolean existsByUserAndReview(User user, Review review);

void deleteAllByReview(Review review);
}
Original file line number Diff line number Diff line change
@@ -1,11 +1,14 @@
package kusitms.gallae.repository.userArchive;

import kusitms.gallae.domain.Archive;
import kusitms.gallae.domain.Review;
import kusitms.gallae.domain.User;
import kusitms.gallae.domain.UserArchive;
import org.springframework.data.jpa.repository.JpaRepository;

public interface UserArchiveRepository extends JpaRepository<UserArchive,Long> {

boolean existsByUserAndArchive(User user, Archive archive);

void deleteAllByArchive(Archive archive);
}
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,6 @@
public interface UserReviewRepository extends JpaRepository<UserReview,Long> {

boolean existsByUserAndReview(User user, Review review);

void deleteAllByReview(Review review);
}
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
import kusitms.gallae.global.DurationCalcurator;
import kusitms.gallae.global.S3Service;
import kusitms.gallae.global.jwt.AuthUtil;
import kusitms.gallae.repository.favorite.FavoriteRepository;
import kusitms.gallae.repository.program.ProgramRepositoryCustom;
import kusitms.gallae.repository.program.ProgramRepositoryImpl;
import kusitms.gallae.repository.program.ProgramRespository;
Expand Down Expand Up @@ -39,6 +40,8 @@ public class ManagerServiceImpl implements ManagerService {

private final UserRepository userRepository;

private final FavoriteRepository favoriteRepository;


@Override
public PostModelGet getProgramDetail(Long id){
Expand Down Expand Up @@ -133,7 +136,10 @@ public Long postTempProgram(ProgramPostReq programPostReq , String username) {
}

@Override
@Transactional
public void deleteTempProgram(Long programId) {
Program program = programRespository.findById(programId).orElse(null);
favoriteRepository.deleteAllByProgram(program);
programRespository.deleteByIdAndStatus(programId, Program.ProgramStatus.TEMP);
}

Expand All @@ -156,7 +162,10 @@ public void finishProgram(Long programId) {
}

@Override
@Transactional
public void deleteProgram(Long programId) {
Program program = programRespository.findById(programId).orElse(null);
favoriteRepository.deleteAllByProgram(program);
programRespository.deleteById(programId);
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,14 @@
import org.springframework.data.domain.Page;
import org.springframework.data.domain.Pageable;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

import java.time.LocalDate;
import java.time.LocalTime;
import java.util.List;
import java.util.stream.Collectors;
@Service
@Transactional
public class ArchiveService {


Expand Down Expand Up @@ -85,6 +87,8 @@ public void deleteArchive(Long archiveId, String username) {
if(archive.getFileUrl() != null ){
s3Service.deleteFile(archive.getFileUrl());
}
favoriteArchiveRepository.deleteAllByArchive(archive);
userArchiveRepository.deleteAllByArchive(archive);
archiveRepository.deleteById(archiveId);
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,13 +17,15 @@
import org.springframework.data.domain.Page;
import org.springframework.data.domain.Pageable;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

import java.time.LocalDate;
import java.time.LocalTime;
import java.util.List;
import java.util.stream.Collectors;

@Service
@Transactional
public class ReviewService {

@Autowired
Expand Down Expand Up @@ -112,6 +114,7 @@ public Long editReivew(ReviewEditReq reviewEditReq) {
return saveReview.getId();
}


public void deleteReivew(Long reviewId, String username) {
Review review = reviewRepository.findById(reviewId).orElse(null);
User user = userRepository.findById(Long.valueOf(username)).orElse(null);
Expand All @@ -121,6 +124,8 @@ public void deleteReivew(Long reviewId, String username) {
if(review.getFileUrl() != null ){
s3Service.deleteFile(review.getFileUrl());
}
favoriteReviewRepository.deleteAllByReview(review);
userReviewRepository.deleteAllByReview(review);
reviewRepository.deleteById(reviewId);
}

Expand Down

0 comments on commit 8e9e3f4

Please sign in to comment.