Fix: 상담 저장시 consultId를 return하도록 코드 수정

src/main/java/com/medicare/neulpeum/Repository/ConsultRepository.java

@@ -1,6 +1,5 @@
 package com.medicare.neulpeum.Repository;
 
-import com.medicare.neulpeum.controller.ConsultController;
 import com.medicare.neulpeum.domain.entity.ConsultContentInfo;
 import com.medicare.neulpeum.domain.entity.PatientInfo;
 import org.springframework.data.jpa.repository.JpaRepository;

src/main/java/com/medicare/neulpeum/Repository/ProvidedDrugRepository.java

@@ -0,0 +1,8 @@
+package com.medicare.neulpeum.Repository;
+
+import com.medicare.neulpeum.domain.entity.ProvidedDrugInfo;
+import org.springframework.data.jpa.repository.JpaRepository;
+
+public interface ProvidedDrugRepository extends JpaRepository<ProvidedDrugInfo, Long> {
+
+}

src/main/java/com/medicare/neulpeum/dto/ProvidedDrugRequestDto.java

@@ -0,0 +1,17 @@
+package com.medicare.neulpeum.dto;
+
+
+import com.medicare.neulpeum.domain.entity.ConsultContentInfo;
+import com.medicare.neulpeum.domain.entity.DrugInfo;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+@Getter
+@Setter
+@NoArgsConstructor
+public class ProvidedDrugRequestDto {
+    private ConsultContentInfo consultId;
+    private DrugInfo drugId;
+    private Long providedAmount;
+}

src/main/java/com/medicare/neulpeum/service/ConsultService.java

@@ -6,7 +6,7 @@
 import java.util.List;
 
 public interface ConsultService {
-    void save(ConsultRequestDto consultRequestDto);
+    Long save(ConsultRequestDto consultRequestDto);
 
     List<ConsultResponseDto> findAllByPatientId(PatientInfo patientId);
 

src/main/java/com/medicare/neulpeum/service/ConsultServiceImpl.java

@@ -32,19 +32,41 @@ public class ConsultServiceImpl implements ConsultService{
 
 
     @Override
-    public void save(ConsultRequestDto consultReq) {
+    public Long save(ConsultRequestDto consultReq) {
         try {
-            PatientInfo patientId = patientRepository.findById(consultReq.getPatientId()).get();
+            PatientInfo patientId = patientRepository.findById(consultReq.getPatientId()).orElse(null);
+            if (patientId == null) {
+                throw new IllegalArgumentException("환자를 찾을 수 없습니다. ID: " + consultReq.getPatientId());
+            }
+
             ConsultContentInfo consultContentInfo = ConsultContentInfo.builder()
                     .patientId(patientId)
                     .providerName(consultReq.getProviderName())
                     .takingDrug(consultReq.getTakingDrug())
                     .consultContent(consultReq.getConsultContent())
                     .build();
-            consultRepository.save(consultContentInfo);
+
+            ConsultContentInfo savedConsult = consultRepository.save(consultContentInfo);
+//            log.info("*********************" + savedConsult.getConsultId());
+            return savedConsult.getConsultId();
+
         } catch (Exception e) {
             log.error("ConsultContentInfo 저장 중 오류 발생: {}", e.getMessage());
+            throw new RuntimeException("ConsultContentInfo 저장 중 오류 발생: " + e.getMessage());
         }
+
+//        try {
+//            PatientInfo patientId = patientRepository.findById(consultReq.getPatientId()).get();
+//            ConsultContentInfo consultContentInfo = ConsultContentInfo.builder()
+//                    .patientId(patientId)
+//                    .providerName(consultReq.getProviderName())
+//                    .takingDrug(consultReq.getTakingDrug())
+//                    .consultContent(consultReq.getConsultContent())
+//                    .build();
+//            consultRepository.save(consultContentInfo);
+//        } catch (Exception e) {
+//            log.error("ConsultContentInfo 저장 중 오류 발생: {}", e.getMessage());
+//        }
     }
 
 

src/main/java/com/medicare/neulpeum/service/DrugServiceImpl.java

@@ -2,10 +2,7 @@
 
 import com.medicare.neulpeum.Repository.DrugRepository;
 import com.medicare.neulpeum.domain.entity.DrugInfo;
-import com.medicare.neulpeum.dto.DrugNameAndAmountResponseDto;
-import com.medicare.neulpeum.dto.DrugRequestDto;
-import com.medicare.neulpeum.dto.DrugResponseDto;
-import com.medicare.neulpeum.dto.DrugUpdateRequestDto;
+import com.medicare.neulpeum.dto.*;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -102,6 +99,9 @@ public void updateUsedDrug(List<DrugUpdateRequestDto> drugUpdateRequestDtoList)
                     if (usableAmount >= remainingAmount) {
                         drug.setUsableAmount(usableAmount - remainingAmount);
                         drugRepository.save(drug);
+
+                        //ProvidedDrugInfo 테이블에 저장
+
                         break;
                     } else {
                         //사용 가능한 개수가 사용하려는 개수보다 적은 경우 약 재고를 0개로 변경 후

src/main/java/com/medicare/neulpeum/service/ProvidedDrugService.java

@@ -0,0 +1,7 @@
+package com.medicare.neulpeum.service;
+
+import com.medicare.neulpeum.dto.ProvidedDrugRequestDto;
+
+public interface ProvidedDrugService {
+    void saveProvidedDrug(ProvidedDrugRequestDto providedDrugRequestDto);
+}

src/main/java/com/medicare/neulpeum/service/ProvidedDrugServiceImpl.java

@@ -0,0 +1,9 @@
+package com.medicare.neulpeum.service;
+
+import com.medicare.neulpeum.dto.ProvidedDrugRequestDto;
+
+public class ProvidedDrugServiceImpl implements ProvidedDrugService{
+    @Override
+    public void saveProvidedDrug(ProvidedDrugRequestDto providedDrugRequestDto) {
+    }
+}