hot fix : 이미지 변경사항이 있는지 공고등록 model에 추가 (#38)

Kusitms-28th-Meet-Up-B · Nov 23, 2023 · 885a308 · 885a308
1 parent 069631d
commit 885a308
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 8 deletions.
diff --git a/src/main/java/kusitms/gallae/controller/ManagerController.java b/src/main/java/kusitms/gallae/controller/ManagerController.java
@@ -93,7 +93,7 @@ public ResponseEntity<BaseResponse<Long>> saveProgram(
             PostModel model
     ) throws IOException {
         String photoUrl = null;
-        if(model.getPhoto() != null  && !model.getPhoto().isEmpty()) {
+        if(model.getPhoto() != null  && model.getPhotoCheck().equals("1")) {
             photoUrl = s3Service.upload(model.getPhoto());
         }
 
@@ -112,6 +112,7 @@ public ResponseEntity<BaseResponse<Long>> saveProgram(
         programPostReq.setLink(model.getLink());
         programPostReq.setHashtag(model.getHashtag());
         programPostReq.setBody(model.getBody());
+        programPostReq.setPhotoCheck(model.getPhotoCheck());
 
         return ResponseEntity.ok(new BaseResponse<>(this.managerService.postProgram(programPostReq, principal.getName())));
     }
@@ -208,7 +209,7 @@ public ResponseEntity<BaseResponse<Long>> tempSaveProgram(
             EditModel model
     ) throws IOException {
         String photoUrl = null;
-        if(model.getPhoto() != null) {
+        if(model.getPhoto() != null  && model.getPhotoCheck().equals("1")) {
             photoUrl = s3Service.upload(model.getPhoto());
         }
         ProgramPostReq programPostReq = new ProgramPostReq();
@@ -227,6 +228,7 @@ public ResponseEntity<BaseResponse<Long>> tempSaveProgram(
         programPostReq.setLink(model.getLink());
         programPostReq.setHashtag(model.getHashtag());
         programPostReq.setBody(model.getBody());
+        programPostReq.setPhotoCheck(model.getPhotoCheck());
 
 
         return ResponseEntity.ok(new BaseResponse<>(this.managerService.editProgram(programPostReq, principal.getName())));
@@ -249,7 +251,7 @@ public ResponseEntity<BaseResponse<Long>> tempSaveProgram(
             PostModel model
     ) throws IOException {
         String photoUrl = null;
-        if(model.getPhoto() != null && !model.getPhoto().isEmpty()) {
+        if(model.getPhoto() != null  && model.getPhotoCheck().equals("1")) {
             photoUrl = s3Service.upload(model.getPhoto());
         }
         ProgramPostReq programPostReq = new ProgramPostReq();
@@ -267,7 +269,7 @@ public ResponseEntity<BaseResponse<Long>> tempSaveProgram(
         programPostReq.setLink(model.getLink());
         programPostReq.setHashtag(model.getHashtag());
         programPostReq.setBody(model.getBody());
-
+        programPostReq.setPhotoCheck(model.getPhotoCheck());
 
         return ResponseEntity.ok(new BaseResponse<>(this.managerService.postTempProgram(programPostReq, principal.getName())));
     }

diff --git a/src/main/java/kusitms/gallae/dto/model/EditModel.java b/src/main/java/kusitms/gallae/dto/model/EditModel.java
@@ -43,4 +43,6 @@ public class EditModel {
     private String body;
 
     private MultipartFile photo;
+
+    private String photoCheck;
 }
diff --git a/src/main/java/kusitms/gallae/dto/model/PostModel.java b/src/main/java/kusitms/gallae/dto/model/PostModel.java
@@ -45,4 +45,6 @@ public class PostModel {
     private String body;
 
     private MultipartFile photo;
+
+    private String photoCheck;
 }
diff --git a/src/main/java/kusitms/gallae/dto/program/ProgramPostReq.java b/src/main/java/kusitms/gallae/dto/program/ProgramPostReq.java
@@ -44,4 +44,6 @@ public class ProgramPostReq {
     private String hashtag;
 
     private String body;
+
+    private String photoCheck;
 }
diff --git a/src/main/java/kusitms/gallae/service/admin/ManagerServiceImpl.java b/src/main/java/kusitms/gallae/service/admin/ManagerServiceImpl.java
@@ -199,10 +199,10 @@ private List<ProgramManagerRes> getProgramManagerRes(List<Program> programs){
 
     private Program getProgramEntity(Program program ,ProgramPostReq programPostReq) {
         program.setProgramName(programPostReq.getProgramName());
-        if(program.getPhotoUrl()==null) {
-            program.setPhotoUrl(programPostReq.getPhotoUrl());
-        }else{
-            s3Service.deleteFile(program.getPhotoUrl());
+        if(programPostReq.getPhotoCheck().equals("1")) {
+            if (program.getPhotoUrl() != null) {
+                s3Service.deleteFile(program.getPhotoUrl());
+            }
             program.setPhotoUrl(programPostReq.getPhotoUrl());
         }
         program.setLocation(programPostReq.getLocation());