향수 등록, 수정, 삭제 api 구현 및 영속성 문제 해결

src/main/java/com/perfumepedia/perfumepedia/domain/perfume/controller/PerfumeController.java

@@ -2,7 +2,10 @@
 
 import com.perfumepedia.perfumepedia.domain.perfume.dto.PerfumeUpdateReq;
 import com.perfumepedia.perfumepedia.domain.perfume.service.PerfumeService;
+import com.perfumepedia.perfumepedia.domain.perfume.service.RequestPerfumeService;
 import com.perfumepedia.perfumepedia.domain.perfumeNote.dto.PerfumeDetailResponse;
+import com.perfumepedia.perfumepedia.domain.perfumeNote.dto.RequestPerfumeDetailReq;
+import com.perfumepedia.perfumepedia.global.enums.NoneResponse;
 import com.perfumepedia.perfumepedia.global.response.Response;
 import com.perfumepedia.perfumepedia.global.response.SuccessResponse;
 import io.swagger.v3.oas.annotations.tags.Tag;
@@ -17,10 +20,12 @@
 public class PerfumeController {
 
     private final PerfumeService perfumeService;
+    private final RequestPerfumeService requestPerfumeService;
 
     @Autowired
-    public PerfumeController(PerfumeService perfumeService) {
+    public PerfumeController(PerfumeService perfumeService, RequestPerfumeService requestPerfumeService) {
         this.perfumeService = perfumeService;
+        this.requestPerfumeService = requestPerfumeService;
     }
 
     /**
@@ -48,5 +53,33 @@ public ResponseEntity<Response<PerfumeDetailResponse>> getPerfumeDetail(@PathVar
         return Response.success(response);
     }
 
+    /**
+     * 향수 등록 api
+     */
+    @PostMapping("/perfumes/admins")
+    public ResponseEntity<Response<NoneResponse>> registerPerfume(@RequestBody RequestPerfumeDetailReq requestPerfumeDetailReq) {
+        SuccessResponse<NoneResponse> response = requestPerfumeService.registerPerfume(requestPerfumeDetailReq);
+        return Response.success(response);
+    }
+
+    /**
+     * 향수 수정 api
+     */
+    @PutMapping("/perfumes/admins/{perfumeId}")
+    public ResponseEntity<Response<NoneResponse>> updatePerfume(@RequestBody RequestPerfumeDetailReq requestPerfumeDetailReq, @PathVariable Long perfumeId) {
+        SuccessResponse<NoneResponse> response = requestPerfumeService.updatePerfume(requestPerfumeDetailReq, perfumeId);
+        return Response.success(response);
+    }
+
+    /**
+     * 향수 삭제 api
+     */
+    @DeleteMapping("/perfumes/admins/{perfumeId}")
+    public ResponseEntity<Response<NoneResponse>> deletePerfume(@PathVariable Long perfumeId) {
+        SuccessResponse<NoneResponse> response = requestPerfumeService.deletePerfume(perfumeId);
+        return Response.success(response);
+    }
+
+
 
 }

src/main/java/com/perfumepedia/perfumepedia/domain/perfume/entity/Perfume.java

@@ -32,4 +32,11 @@ public Perfume(Long id, String name, int price, Brand brand) {
         this.price = price;
         this.brand = brand;
     }
+
+    // 수정 메서드
+    public void update(String name, int price, Brand brand) {
+        this.name = name;
+        this.price = price;
+        this.brand = brand;
+    }
 }

src/main/java/com/perfumepedia/perfumepedia/domain/perfume/service/PerfumeService.java

@@ -225,13 +225,16 @@ public SuccessResponse<NoneResponse> acceptUpdateRequest(Request request) {
                                 .build()
                 ));
 
-        // 기존 향수의 정보를 요청된 정보로 업데이트
-        perfume = Perfume.builder()
-                .id(perfume.getId())
-                .name(reqPerfume.getName())
-                .price(reqPerfume.getPrice())
-                .brand(brand)
-                .build();
+        // 기존 향수의 정보를 요청된 정보로 업데이트 - 영속성 문제?
+//        perfume = Perfume.builder()
+//                .id(perfume.getId())
+//                .name(reqPerfume.getName())
+//                .price(reqPerfume.getPrice())
+//                .brand(brand)
+//                .build();
+
+        perfume.update(reqPerfume.getName(), reqPerfume.getPrice(), brand);
+
 
         perfumeRepository.save(perfume);
 
@@ -267,6 +270,7 @@ public SuccessResponse<NoneResponse> acceptUpdateRequest(Request request) {
     }
 
 
+
     /**
      * 삭제 요청 처리
      */
@@ -279,12 +283,15 @@ public SuccessResponse<NoneResponse> acceptDeleteRequest(Request request) {
         List<PerfumeNote> perfumeNotes = perfumeNoteRepository.findByPerfume(perfume);
         perfumeNoteRepository.deleteAll(perfumeNotes);
 
+        //  새로운 Request 객체 생성 Perfume, requestPerfume을 null로 설정
+        Request updatedRequest = new Request(request.getId(), request.getRequestType(), RequestStatus.APPROVED,
+                request.getUserId(), null, null);
+
+        requestRepository.save(updatedRequest);
+
         // 향수 삭제
         perfumeRepository.delete(perfume);
 
-        request.updateRequestStatus(RequestStatus.APPROVED);
-        requestRepository.save(request);
-
         return new SuccessResponse<>(DELETE_COMPLETED, NoneResponse.NONE);
     }