!hotfix: inquiry, proposal status

FITPET-A · Sep 8, 2024 · 72c8ba6 · 72c8ba6
1 parent 769c86f
commit 72c8ba6
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/src/main/java/FITPET/dev/converter/InquiryConverter.java b/src/main/java/FITPET/dev/converter/InquiryConverter.java
@@ -2,10 +2,8 @@
 
 import FITPET.dev.common.enums.InquiryStatus;
 import FITPET.dev.dto.response.InquiryResponse;
-import FITPET.dev.dto.response.ProposalResponse;
 import FITPET.dev.entity.Inquiry;
 
-import FITPET.dev.entity.Proposal;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 import java.util.List;
@@ -37,7 +35,7 @@ public static InquiryResponse.InquiryDto toInquiryDto(Inquiry inquiry){
                 .email(inquiry.getEmail())
                 .phoneNum(inquiry.getPhoneNum())
                 .comment(inquiry.getComment())
-                .status(inquiry.getStatus().getLabel())
+                .status(inquiry.getStatus().toString())
                 .build();
     }
 
@@ -61,7 +59,8 @@ public static InquiryResponse.InquiryPageDto toInquiryPageDto(Page<Inquiry> page
                 .currentPage(page.getNumber() + 1)
                 .pageSize(page.getSize())
                 .numberOfElement(page.getNumberOfElements())
-                .totalElements((int) page.getTotalElements())                .totalPage(page.getTotalPages())
+                .totalElements((int) page.getTotalElements())
+                .totalPage(page.getTotalPages())
                 .build();
     }
 

diff --git a/src/main/java/FITPET/dev/converter/ProposalConverter.java b/src/main/java/FITPET/dev/converter/ProposalConverter.java
@@ -34,7 +34,7 @@ public static ProposalResponse.ProposalDto toProposalDto(Proposal proposal){
                 .email(proposal.getEmail())
                 .phoneNum(proposal.getPhoneNum())
                 .comment(proposal.getComment())
-                .status(proposal.getStatus().getLabel())
+                .status(proposal.getStatus().toString())
                 .build();
     }
 
@@ -58,7 +58,8 @@ public static ProposalResponse.ProposalPageDto toProposalPageDto(Page<Proposal>
                 .currentPage(page.getNumber() + 1)
                 .pageSize(page.getSize())
                 .numberOfElement(page.getNumberOfElements())
-                .totalElements((int) page.getTotalElements())                .totalPage(page.getTotalPages())
+                .totalElements((int) page.getTotalElements())
+                .totalPage(page.getTotalPages())
                 .build();
     }
 }
diff --git a/src/main/java/FITPET/dev/service/ProposalService.java b/src/main/java/FITPET/dev/service/ProposalService.java
@@ -104,7 +104,7 @@ public ProposalResponse.ProposalDto patchProposalStatus(Long proposalId, Proposa
     @Transactional
     public void deleteProposal(Long proposalId) {
         Proposal proposal = findProposalById(proposalId);
-        proposalRepository.save(proposal);
+        proposalRepository.delete(proposal);
     }
 
     private Page<Proposal> getProposalListByStatusBetweenDate(LocalDateTime start, LocalDateTime end, ProposalStatus proposalStatus, Pageable pageable) {