diff --git a/src/main/java/com/onebridge/ouch/converter/HealthStatusConverter.java b/src/main/java/com/onebridge/ouch/converter/HealthStatusConverter.java index 06686e0..79f4562 100644 --- a/src/main/java/com/onebridge/ouch/converter/HealthStatusConverter.java +++ b/src/main/java/com/onebridge/ouch/converter/HealthStatusConverter.java @@ -4,7 +4,6 @@ import com.onebridge.ouch.domain.HealthStatus; import com.onebridge.ouch.domain.User; -import com.onebridge.ouch.dto.healthStatus.request.HealthStatusUpdateRequest; import com.onebridge.ouch.dto.healthStatus.response.GetHealthStatusResponse; @Component @@ -51,15 +50,4 @@ public HealthStatus createHealthStatus(User user) { .medicineHistory(null) .build(); } - - public HealthStatus healthStatusUpdateRequestToHealthStatus(HealthStatus healthStatus, - HealthStatusUpdateRequest request) { - return healthStatus.toBuilder() - .disease(request.getDisease()) - .allergy(request.getAllergy()) - .bloodPressure(request.getBloodPressure()) - .bloodSugar(request.getBloodSugar()) - .medicineHistory(request.getMedicineHistory()) - .build(); - } } diff --git a/src/main/java/com/onebridge/ouch/converter/MedicalRecordConverter.java b/src/main/java/com/onebridge/ouch/converter/MedicalRecordConverter.java index f87b571..cb0d242 100644 --- a/src/main/java/com/onebridge/ouch/converter/MedicalRecordConverter.java +++ b/src/main/java/com/onebridge/ouch/converter/MedicalRecordConverter.java @@ -9,7 +9,6 @@ import com.onebridge.ouch.domain.User; import com.onebridge.ouch.domain.mapping.MedicalRecord; import com.onebridge.ouch.dto.medicalRecord.request.MedicalRecordCreateRequest; -import com.onebridge.ouch.dto.medicalRecord.request.MedicalRecordUpdateRequest; import com.onebridge.ouch.dto.medicalRecord.response.DateAndHospital; import com.onebridge.ouch.dto.medicalRecord.response.GetMedicalRecordResponse; @@ -46,15 +45,4 @@ public MedicalRecord medicalRecordCreateRequestToMedicalRecord(MedicalRecordCrea .summary(summary) .build(); } - - public MedicalRecord medicalRecordUpdateRequestToMedicalRecord(MedicalRecord medicalRecord, - MedicalRecordUpdateRequest request, Summary summary) { - return medicalRecord.toBuilder() - .visitDate(request.getVisitDate()) - .hospital(request.getVisitingHospital()) - .department(request.getMedicalSubject()) - .symptoms(request.getSymptoms()) - .summary(summary) - .build(); - } } diff --git a/src/main/java/com/onebridge/ouch/converter/SelfDiagnosisConverter.java b/src/main/java/com/onebridge/ouch/converter/SelfDiagnosisConverter.java index 95eca96..a55e233 100644 --- a/src/main/java/com/onebridge/ouch/converter/SelfDiagnosisConverter.java +++ b/src/main/java/com/onebridge/ouch/converter/SelfDiagnosisConverter.java @@ -1,18 +1,12 @@ package com.onebridge.ouch.converter; -import java.util.ArrayList; -import java.util.List; - import org.springframework.stereotype.Component; import com.onebridge.ouch.domain.SelfDiagnosis; -import com.onebridge.ouch.domain.Symptom; import com.onebridge.ouch.domain.User; -import com.onebridge.ouch.domain.mapping.DiagnosisSymptom; import com.onebridge.ouch.dto.selfDiagnosis.request.SelfDiagnosisRequest; import com.onebridge.ouch.dto.selfDiagnosis.response.GetDiagnosisByUserIdResponse; import com.onebridge.ouch.dto.selfDiagnosis.response.GetDiagnosisResponse; -import com.onebridge.ouch.dto.selfDiagnosis.response.GetSymptomsOfDiagnosisResponse; @Component public class SelfDiagnosisConverter { @@ -54,17 +48,6 @@ public SelfDiagnosis diagnosisCreateRequestToSelfDiagnosis(SelfDiagnosisRequest // .build(); // } - public SelfDiagnosis diagnosisUpdateRequestToSelfDiagnosis(SelfDiagnosis diagnosis, User user, - SelfDiagnosisRequest request) { - return diagnosis.toBuilder() - .visitType(request.getVisitType()) - .symptom(request.getSymptom()) - .duration(request.getDuration()) - .painSeverity(request.getPainSeverity()) - .additionalNote(request.getAdditionalNote()) - .build(); - } - // // public List symptomListForResponseDto(SelfDiagnosis selfDiagnosis) { // List symptoms = new ArrayList<>(); // for (DiagnosisSymptom symptom : selfDiagnosis.getDiagnosisSymptomList()) { diff --git a/src/main/java/com/onebridge/ouch/domain/HealthStatus.java b/src/main/java/com/onebridge/ouch/domain/HealthStatus.java index 83d8dea..295f825 100644 --- a/src/main/java/com/onebridge/ouch/domain/HealthStatus.java +++ b/src/main/java/com/onebridge/ouch/domain/HealthStatus.java @@ -45,4 +45,13 @@ public class HealthStatus extends BaseEntity { @Column(nullable = true, columnDefinition = "TEXT") private String medicineHistory; + + public void updateHealthStatus(String disease, String allergy, Long bloodPressure, Long bloodSugar, + String medicineHistory) { + this.disease = disease; + this.allergy = allergy; + this.bloodPressure = bloodPressure; + this.bloodSugar = bloodSugar; + this.medicineHistory = medicineHistory; + } } diff --git a/src/main/java/com/onebridge/ouch/domain/SelfDiagnosis.java b/src/main/java/com/onebridge/ouch/domain/SelfDiagnosis.java index 3ead815..ff2d145 100644 --- a/src/main/java/com/onebridge/ouch/domain/SelfDiagnosis.java +++ b/src/main/java/com/onebridge/ouch/domain/SelfDiagnosis.java @@ -1,16 +1,22 @@ package com.onebridge.ouch.domain; -import java.util.ArrayList; -import java.util.List; - import com.onebridge.ouch.domain.common.BaseEntity; import com.onebridge.ouch.domain.enums.SymptomDuration; import com.onebridge.ouch.domain.enums.VisitType; -import com.onebridge.ouch.domain.mapping.DiagnosisSymptom; -import jakarta.persistence.*; -import lombok.*; -import lombok.experimental.SuperBuilder; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import lombok.AccessLevel; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Getter; +import lombok.NoArgsConstructor; @Entity @Getter @@ -44,4 +50,17 @@ public class SelfDiagnosis extends BaseEntity { @Column(columnDefinition = "TEXT") private String additionalNote; + public void updateSelfDiagnosis( + String symptom, + VisitType visitType, + SymptomDuration duration, + Integer painSeverity, + String additionalNote + ) { + this.symptom = symptom; + this.visitType = visitType; + this.duration = duration; + this.painSeverity = painSeverity; + this.additionalNote = additionalNote; + } } diff --git a/src/main/java/com/onebridge/ouch/domain/Summary.java b/src/main/java/com/onebridge/ouch/domain/Summary.java index 710d32b..a744f1c 100644 --- a/src/main/java/com/onebridge/ouch/domain/Summary.java +++ b/src/main/java/com/onebridge/ouch/domain/Summary.java @@ -34,4 +34,8 @@ public class Summary extends BaseEntity { @Column(columnDefinition = "TEXT") private String contents_summary; + + public void updateSummary(String contents_summary) { + this.contents_summary = contents_summary; + } } diff --git a/src/main/java/com/onebridge/ouch/domain/mapping/MedicalRecord.java b/src/main/java/com/onebridge/ouch/domain/mapping/MedicalRecord.java index 3a71328..c9184a8 100644 --- a/src/main/java/com/onebridge/ouch/domain/mapping/MedicalRecord.java +++ b/src/main/java/com/onebridge/ouch/domain/mapping/MedicalRecord.java @@ -47,4 +47,16 @@ public class MedicalRecord extends BaseEntity { @OneToOne(cascade = CascadeType.ALL, orphanRemoval = true, fetch = FetchType.LAZY) @JoinColumn(name = "summary_id") private Summary summary; + + public void updateMedicalRecord( + LocalDate visitDate, + String hospital, + String department, + String symptoms + ) { + this.visitDate = visitDate; + this.hospital = hospital; + this.department = department; + this.symptoms = symptoms; + } } diff --git a/src/main/java/com/onebridge/ouch/service/healthStatus/HealthStatusService.java b/src/main/java/com/onebridge/ouch/service/healthStatus/HealthStatusService.java index f00272a..04461ad 100644 --- a/src/main/java/com/onebridge/ouch/service/healthStatus/HealthStatusService.java +++ b/src/main/java/com/onebridge/ouch/service/healthStatus/HealthStatusService.java @@ -57,7 +57,8 @@ public void updateHealthStatus(HealthStatusUpdateRequest request, Long userId) { HealthStatus healthStatus = healthStatusRepository.findByUserId(userId) .orElseThrow(() -> new OuchException(HealthStatusErrorCode.HEALTH_STATUS_NOT_FOUND)); - healthStatusConverter.healthStatusUpdateRequestToHealthStatus(healthStatus, request); + healthStatus.updateHealthStatus(request.getDisease(), request.getAllergy(), request.getBloodPressure(), + request.getBloodSugar(), request.getMedicineHistory()); } // //특정 건강상태 삭제 diff --git a/src/main/java/com/onebridge/ouch/service/medicalRecord/MedicalRecordService.java b/src/main/java/com/onebridge/ouch/service/medicalRecord/MedicalRecordService.java index f5b8974..564122b 100644 --- a/src/main/java/com/onebridge/ouch/service/medicalRecord/MedicalRecordService.java +++ b/src/main/java/com/onebridge/ouch/service/medicalRecord/MedicalRecordService.java @@ -82,10 +82,13 @@ public void updateMedicalRecord(@Valid MedicalRecordUpdateRequest request, MedicalRecord medicalRecord = medicalRecordRepository.findByIdAndUserId(medicalRecordId, userId) .orElseThrow(() -> new OuchException(MedicalRecordErrorCode.MEDICAL_RECORD_NOT_FOUND)); - Summary summary = medicalRecord.getSummary().toBuilder() - .contents_summary(request.getTreatmentSummary()) - .build(); - - medicalRecordConverter.medicalRecordUpdateRequestToMedicalRecord(medicalRecord, request, summary); + medicalRecord.getSummary().updateSummary(request.getTreatmentSummary()); + + medicalRecord.updateMedicalRecord( + request.getVisitDate(), + request.getVisitingHospital(), + request.getMedicalSubject(), + request.getSymptoms() + ); } } diff --git a/src/main/java/com/onebridge/ouch/service/selfDiagnosis/SelfDiagnosisService.java b/src/main/java/com/onebridge/ouch/service/selfDiagnosis/SelfDiagnosisService.java index 7df9d97..56db7be 100644 --- a/src/main/java/com/onebridge/ouch/service/selfDiagnosis/SelfDiagnosisService.java +++ b/src/main/java/com/onebridge/ouch/service/selfDiagnosis/SelfDiagnosisService.java @@ -2,8 +2,6 @@ import java.util.ArrayList; import java.util.List; -import java.util.Map; -import java.util.stream.Collectors; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -13,9 +11,7 @@ import com.onebridge.ouch.apiPayload.exception.OuchException; import com.onebridge.ouch.converter.SelfDiagnosisConverter; import com.onebridge.ouch.domain.SelfDiagnosis; -import com.onebridge.ouch.domain.Symptom; import com.onebridge.ouch.domain.User; -import com.onebridge.ouch.domain.mapping.DiagnosisSymptom; import com.onebridge.ouch.dto.selfDiagnosis.request.SelfDiagnosisRequest; import com.onebridge.ouch.dto.selfDiagnosis.response.GetDiagnosisByUserIdResponse; import com.onebridge.ouch.dto.selfDiagnosis.response.GetDiagnosisResponse; @@ -104,8 +100,16 @@ public void updateDiagnosis(Long diagnosisId, Long userId, SelfDiagnosisRequest User user = userRepository.findById(userId) .orElseThrow(() -> new OuchException(CommonErrorCode.MEMBER_NOT_FOUND)); - selfDiagnosisConverter.diagnosisUpdateRequestToSelfDiagnosis(diagnosis, user, request); - // SelfDiagnosis updatedDiagnosis = selfDiagnosisConverter.diagnosisUpdateRequestToSelfDiagnosis(diagnosis, user, + diagnosis.updateSelfDiagnosis( + request.getSymptom(), + request.getVisitType(), + request.getDuration(), + request.getPainSeverity(), + request.getAdditionalNote() + ); + + // SelfDiagnosis updatedDiagnosis = selfDiagnosisConverter.diagnosisUpdateRequestToSelfDia + // gnosis(diagnosis, user, // request); // List symptomNames = request.getSymptoms();