release: 서버 배포

src/main/java/org/ioteatime/meonghanyangserver/batch/job/image/ImageDeleteJobExecutionListener.java

@@ -15,7 +15,7 @@ public class ImageDeleteJobExecutionListener implements JobExecutionListener {
     public void beforeJob(JobExecution jobExecution) {
         LocalDateTime now = LocalDateTime.now();
         log.info(
-                "[{}] - 14일이 지난 이미지 삭제 배치 작업을 시작합니다.",
+                "[{}] - 14일이 지났거나 연결된 그룹이 없는 이미지 삭제 배치 작업을 시작합니다.",
                 now.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")));
     }
 

src/main/java/org/ioteatime/meonghanyangserver/batch/job/image/ImageItemReader.java

@@ -34,7 +34,7 @@ private void fetchNext() {
         LocalDateTime twoWeeksAgo = LocalDateTime.now().minusDays(14);
         TypedQuery<ImageEntity> query =
                 em.createQuery(
-                                "SELECT v FROM ImageEntity v WHERE v.createdAt <= (:twoWeeksAgo)",
+                                "SELECT v FROM ImageEntity v WHERE v.createdAt <= (:twoWeeksAgo) OR v.group IS NULL",
                                 ImageEntity.class)
                         .setParameter("twoWeeksAgo", twoWeeksAgo)
                         .setFirstResult(curIdx)

src/main/java/org/ioteatime/meonghanyangserver/batch/job/image/OldImageDeleteJobConfig.java

@@ -23,8 +23,8 @@ public class OldImageDeleteJobConfig {
 
     @Bean
     @JobScope
-    public Step oldImageDeleteStep(JobRepository jobRepository) {
-        return new StepBuilder("oldImageDeleteStep", jobRepository)
+    public Step oldOrRemovedImageDeleteStep(JobRepository jobRepository) {
+        return new StepBuilder("oldOrRemovedImageDeleteStep", jobRepository)
                 .<ImageEntity, ImageEntity>chunk(10, transactionManager)
                 .reader(itemReader)
                 .processor(itemProcessor)
@@ -34,10 +34,10 @@ public Step oldImageDeleteStep(JobRepository jobRepository) {
     }
 
     @Bean
-    public Job oldImageDeleteJob(JobRepository jobRepository) {
-        return new JobBuilder("oldImageDeleteJob", jobRepository)
+    public Job oldOrRemovedImageDeleteJob(JobRepository jobRepository) {
+        return new JobBuilder("oldOrRemovedImageDeleteJob", jobRepository)
                 .listener(imageDeleteJobExecutionListener)
-                .start(oldImageDeleteStep(jobRepository))
+                .start(oldOrRemovedImageDeleteStep(jobRepository))
                 .build();
     }
 }

src/main/java/org/ioteatime/meonghanyangserver/batch/scheduler/BatchScheduler.java

@@ -38,7 +38,8 @@ public void runJob() {
                     oldMediaDeleteJobConfig.oldMediaDeleteJob(jobRepository), jobParameters);
 
             jobLauncher.run(
-                    oldImageDeleteJobConfig.oldImageDeleteJob(jobRepository), jobParameters);
+                    oldImageDeleteJobConfig.oldOrRemovedImageDeleteJob(jobRepository),
+                    jobParameters);
 
         } catch (JobExecutionAlreadyRunningException
                 | JobInstanceAlreadyCompleteException

src/main/java/org/ioteatime/meonghanyangserver/groupmember/service/GroupMemberService.java

@@ -130,7 +130,7 @@ public void deleteGroupMember(Long memberId, Long groupId) {
             // 방장 퇴장
             groupMemberRepository.deleteByGroupId(groupId);
             cctvRepository.deleteByGroupId(groupId);
-            imageRepository.deleteByGroupId(groupId);
+            imageRepository.updateGroupNull(groupId);
             groupRepository.deleteById(groupId);
         } else {
             // 참여자 퇴장

src/main/java/org/ioteatime/meonghanyangserver/image/domain/ImageEntity.java

@@ -23,7 +23,7 @@ public class ImageEntity {
     @Column(nullable = false, length = 50)
     private String imageName;
 
-    @JoinColumn(nullable = false)
+    @JoinColumn
     @ManyToOne(fetch = FetchType.LAZY)
     private GroupEntity group;
 
@@ -35,10 +35,11 @@ public class ImageEntity {
     private LocalDateTime createdAt;
 
     @Builder
-    public ImageEntity(String imageName, GroupEntity group, String imagePath) {
-
+    public ImageEntity(
+            String imageName, GroupEntity group, String imagePath, LocalDateTime createdAt) {
         this.imageName = imageName;
         this.group = group;
         this.imagePath = imagePath;
+        this.createdAt = createdAt;
     }
 }

src/main/java/org/ioteatime/meonghanyangserver/image/repository/ImageRepository.java

@@ -11,4 +11,6 @@ public interface ImageRepository {
     ImageEntity save(ImageEntity imageEntity);
 
     void deleteByGroupId(Long groupId);
+
+    void updateGroupNull(Long groupId);
 }

src/main/java/org/ioteatime/meonghanyangserver/image/repository/ImageRepositoryImpl.java

@@ -58,4 +58,13 @@ public ImageEntity save(ImageEntity imageEntity) {
     public void deleteByGroupId(Long groupId) {
         imageJpaRepository.deleteByGroupId(groupId);
     }
+
+    @Override
+    public void updateGroupNull(Long groupId) {
+        queryFactory
+                .update(imageEntity)
+                .setNull(imageEntity.group)
+                .where(imageEntity.group.id.eq(groupId))
+                .execute();
+    }
 }

src/main/java/org/ioteatime/meonghanyangserver/member/service/MemberService.java

@@ -116,9 +116,9 @@ public void deleteMember(String authHeader, Long memberId) {
             cctvRepository.deleteByGroupId(groupId);
             log.info("[방장 회원 탈퇴] {}", "GroupId 기준으로 CCTV 목록을 삭제하였습니다.");
 
-            // Image 목록 삭제
-            imageRepository.deleteByGroupId(groupId);
-            log.info("[방장 회원 탈퇴] {}", "GroupId 기준으로 Image 목록을 삭제하였습니다.");
+            // Image 목록 group 필드 null
+            imageRepository.updateGroupNull(groupId);
+            log.info("[방장 회원 탈퇴] {}", "GroupId 기준으로 Image 목록의 Group 필드를 Null로 변경하였습니다.");
 
             // GroupId 기준으로 groupMember 모두 찾아 삭제
             groupMemberRepository.deleteAllByGroupId(groupId);