From b7b331676d7d4ed69f1cc680bec3e0eb6b7a9ca7 Mon Sep 17 00:00:00 2001 From: kdy2224 Date: Mon, 19 May 2025 13:34:19 +0900 Subject: [PATCH 1/3] =?UTF-8?q?=EC=9E=90=EA=B0=80=EC=A7=84=EB=8B=A8,=20?= =?UTF-8?q?=EC=9D=98=EB=A3=8C=EA=B8=B0=EB=A1=9D,=20=EA=B1=B4=EA=B0=95?= =?UTF-8?q?=EC=83=81=ED=83=9C=20=EC=88=98=EC=A0=95=20api=20=EC=88=98?= =?UTF-8?q?=EC=A0=95=20-=EC=88=98=EC=A0=95=20api=20=ED=98=B8=EC=B6=9C=20?= =?UTF-8?q?=EC=9D=B4=ED=9B=84=20=EC=88=98=EC=A0=95=EC=9D=B4=20=EB=B0=98?= =?UTF-8?q?=EC=98=81=EB=90=98=EB=8F=84=EB=A1=9D=20=EB=B3=80=EA=B2=BD=20-?= =?UTF-8?q?=EC=9D=98=EB=A3=8C=EA=B8=B0=EB=A1=9D=EC=9D=98=20summary=20?= =?UTF-8?q?=EC=88=98=EC=A0=95=20=EB=B6=80=EB=B6=84=EC=9D=80=20=EB=AF=B8?= =?UTF-8?q?=ED=95=B4=EA=B2=B0=20=EC=83=81=ED=83=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ouch/converter/HealthStatusConverter.java | 11 ++----- .../converter/MedicalRecordConverter.java | 16 ++++----- .../converter/SelfDiagnosisConverter.java | 22 +++++-------- .../onebridge/ouch/domain/HealthStatus.java | 9 +++++ .../onebridge/ouch/domain/SelfDiagnosis.java | 33 +++++++++++++++---- .../ouch/domain/mapping/MedicalRecord.java | 14 ++++++++ 6 files changed, 68 insertions(+), 37 deletions(-) diff --git a/src/main/java/com/onebridge/ouch/converter/HealthStatusConverter.java b/src/main/java/com/onebridge/ouch/converter/HealthStatusConverter.java index 06686e0..00d5c49 100644 --- a/src/main/java/com/onebridge/ouch/converter/HealthStatusConverter.java +++ b/src/main/java/com/onebridge/ouch/converter/HealthStatusConverter.java @@ -52,14 +52,9 @@ public HealthStatus createHealthStatus(User user) { .build(); } - public HealthStatus healthStatusUpdateRequestToHealthStatus(HealthStatus healthStatus, + public void healthStatusUpdateRequestToHealthStatus(HealthStatus healthStatus, HealthStatusUpdateRequest request) { - return healthStatus.toBuilder() - .disease(request.getDisease()) - .allergy(request.getAllergy()) - .bloodPressure(request.getBloodPressure()) - .bloodSugar(request.getBloodSugar()) - .medicineHistory(request.getMedicineHistory()) - .build(); + healthStatus.update(request.getDisease(), request.getAllergy(), + request.getBloodPressure(), request.getBloodSugar(), request.getMedicineHistory()); } } diff --git a/src/main/java/com/onebridge/ouch/converter/MedicalRecordConverter.java b/src/main/java/com/onebridge/ouch/converter/MedicalRecordConverter.java index f87b571..6820e1c 100644 --- a/src/main/java/com/onebridge/ouch/converter/MedicalRecordConverter.java +++ b/src/main/java/com/onebridge/ouch/converter/MedicalRecordConverter.java @@ -47,14 +47,14 @@ public MedicalRecord medicalRecordCreateRequestToMedicalRecord(MedicalRecordCrea .build(); } - public MedicalRecord medicalRecordUpdateRequestToMedicalRecord(MedicalRecord medicalRecord, + public void 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(); + medicalRecord.update( + request.getVisitDate(), + request.getVisitingHospital(), + request.getMedicalSubject(), + request.getSymptoms(), + summary + ); } } diff --git a/src/main/java/com/onebridge/ouch/converter/SelfDiagnosisConverter.java b/src/main/java/com/onebridge/ouch/converter/SelfDiagnosisConverter.java index 95eca96..e1981c7 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,15 +48,15 @@ public SelfDiagnosis diagnosisCreateRequestToSelfDiagnosis(SelfDiagnosisRequest // .build(); // } - public SelfDiagnosis diagnosisUpdateRequestToSelfDiagnosis(SelfDiagnosis diagnosis, User user, + public void 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(); + diagnosis.update( + request.getSymptom(), + request.getVisitType(), + request.getDuration(), + request.getPainSeverity(), + request.getAdditionalNote() + ); } // // public List symptomListForResponseDto(SelfDiagnosis selfDiagnosis) { diff --git a/src/main/java/com/onebridge/ouch/domain/HealthStatus.java b/src/main/java/com/onebridge/ouch/domain/HealthStatus.java index 83d8dea..50faa5d 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 update(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..200e482 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 update( + 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/mapping/MedicalRecord.java b/src/main/java/com/onebridge/ouch/domain/mapping/MedicalRecord.java index 3a71328..26844ea 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,18 @@ public class MedicalRecord extends BaseEntity { @OneToOne(cascade = CascadeType.ALL, orphanRemoval = true, fetch = FetchType.LAZY) @JoinColumn(name = "summary_id") private Summary summary; + + public void update( + LocalDate visitDate, + String hospital, + String department, + String symptoms, + Summary summary + ) { + this.visitDate = visitDate; + this.hospital = hospital; + this.department = department; + this.symptoms = symptoms; + this.summary = summary; + } } From ffd9d4cfa34306ba82b2f490a9cd05468420c2b9 Mon Sep 17 00:00:00 2001 From: kdy2224 Date: Mon, 19 May 2025 13:57:50 +0900 Subject: [PATCH 2/3] =?UTF-8?q?[REFACT]=20=EC=9D=98=EB=A3=8C=EA=B8=B0?= =?UTF-8?q?=EB=A1=9D=20=EC=88=98=EC=A0=95=20api=20=EC=98=A4=EB=A5=98=20?= =?UTF-8?q?=ED=95=B4=EA=B2=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/onebridge/ouch/domain/Summary.java | 5 +++++ .../ouch/service/medicalRecord/MedicalRecordService.java | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/onebridge/ouch/domain/Summary.java b/src/main/java/com/onebridge/ouch/domain/Summary.java index 710d32b..145c4c0 100644 --- a/src/main/java/com/onebridge/ouch/domain/Summary.java +++ b/src/main/java/com/onebridge/ouch/domain/Summary.java @@ -34,4 +34,9 @@ public class Summary extends BaseEntity { @Column(columnDefinition = "TEXT") private String contents_summary; + + public Summary update(String contents_summary) { + this.contents_summary = contents_summary; + return this; + } } 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..5c2c5a3 100644 --- a/src/main/java/com/onebridge/ouch/service/medicalRecord/MedicalRecordService.java +++ b/src/main/java/com/onebridge/ouch/service/medicalRecord/MedicalRecordService.java @@ -82,9 +82,9 @@ 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(); + Summary summary = medicalRecord.getSummary().update( + request.getTreatmentSummary() + ); medicalRecordConverter.medicalRecordUpdateRequestToMedicalRecord(medicalRecord, request, summary); } From 6074a2d5811baa512cd263600c82e1c9138d60a6 Mon Sep 17 00:00:00 2001 From: kdy2224 Date: Mon, 19 May 2025 15:48:17 +0900 Subject: [PATCH 3/3] =?UTF-8?q?[REFACT]=20=EB=A6=AC=EB=B7=B0=20=EB=B0=98?= =?UTF-8?q?=EC=98=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ouch/converter/HealthStatusConverter.java | 7 ------- .../ouch/converter/MedicalRecordConverter.java | 12 ------------ .../ouch/converter/SelfDiagnosisConverter.java | 11 ----------- .../com/onebridge/ouch/domain/HealthStatus.java | 2 +- .../com/onebridge/ouch/domain/SelfDiagnosis.java | 2 +- .../java/com/onebridge/ouch/domain/Summary.java | 3 +-- .../ouch/domain/mapping/MedicalRecord.java | 6 ++---- .../healthStatus/HealthStatusService.java | 3 ++- .../medicalRecord/MedicalRecordService.java | 11 +++++++---- .../selfDiagnosis/SelfDiagnosisService.java | 16 ++++++++++------ 10 files changed, 24 insertions(+), 49 deletions(-) diff --git a/src/main/java/com/onebridge/ouch/converter/HealthStatusConverter.java b/src/main/java/com/onebridge/ouch/converter/HealthStatusConverter.java index 00d5c49..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,10 +50,4 @@ public HealthStatus createHealthStatus(User user) { .medicineHistory(null) .build(); } - - public void healthStatusUpdateRequestToHealthStatus(HealthStatus healthStatus, - HealthStatusUpdateRequest request) { - healthStatus.update(request.getDisease(), request.getAllergy(), - request.getBloodPressure(), request.getBloodSugar(), request.getMedicineHistory()); - } } diff --git a/src/main/java/com/onebridge/ouch/converter/MedicalRecordConverter.java b/src/main/java/com/onebridge/ouch/converter/MedicalRecordConverter.java index 6820e1c..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 void medicalRecordUpdateRequestToMedicalRecord(MedicalRecord medicalRecord, - MedicalRecordUpdateRequest request, Summary summary) { - medicalRecord.update( - request.getVisitDate(), - request.getVisitingHospital(), - request.getMedicalSubject(), - request.getSymptoms(), - summary - ); - } } diff --git a/src/main/java/com/onebridge/ouch/converter/SelfDiagnosisConverter.java b/src/main/java/com/onebridge/ouch/converter/SelfDiagnosisConverter.java index e1981c7..a55e233 100644 --- a/src/main/java/com/onebridge/ouch/converter/SelfDiagnosisConverter.java +++ b/src/main/java/com/onebridge/ouch/converter/SelfDiagnosisConverter.java @@ -48,17 +48,6 @@ public SelfDiagnosis diagnosisCreateRequestToSelfDiagnosis(SelfDiagnosisRequest // .build(); // } - public void diagnosisUpdateRequestToSelfDiagnosis(SelfDiagnosis diagnosis, User user, - SelfDiagnosisRequest request) { - diagnosis.update( - request.getSymptom(), - request.getVisitType(), - request.getDuration(), - request.getPainSeverity(), - request.getAdditionalNote() - ); - } - // // 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 50faa5d..295f825 100644 --- a/src/main/java/com/onebridge/ouch/domain/HealthStatus.java +++ b/src/main/java/com/onebridge/ouch/domain/HealthStatus.java @@ -46,7 +46,7 @@ public class HealthStatus extends BaseEntity { @Column(nullable = true, columnDefinition = "TEXT") private String medicineHistory; - public void update(String disease, String allergy, Long bloodPressure, Long bloodSugar, + public void updateHealthStatus(String disease, String allergy, Long bloodPressure, Long bloodSugar, String medicineHistory) { this.disease = disease; this.allergy = allergy; diff --git a/src/main/java/com/onebridge/ouch/domain/SelfDiagnosis.java b/src/main/java/com/onebridge/ouch/domain/SelfDiagnosis.java index 200e482..ff2d145 100644 --- a/src/main/java/com/onebridge/ouch/domain/SelfDiagnosis.java +++ b/src/main/java/com/onebridge/ouch/domain/SelfDiagnosis.java @@ -50,7 +50,7 @@ public class SelfDiagnosis extends BaseEntity { @Column(columnDefinition = "TEXT") private String additionalNote; - public void update( + public void updateSelfDiagnosis( String symptom, VisitType visitType, SymptomDuration duration, diff --git a/src/main/java/com/onebridge/ouch/domain/Summary.java b/src/main/java/com/onebridge/ouch/domain/Summary.java index 145c4c0..a744f1c 100644 --- a/src/main/java/com/onebridge/ouch/domain/Summary.java +++ b/src/main/java/com/onebridge/ouch/domain/Summary.java @@ -35,8 +35,7 @@ public class Summary extends BaseEntity { @Column(columnDefinition = "TEXT") private String contents_summary; - public Summary update(String contents_summary) { + public void updateSummary(String contents_summary) { this.contents_summary = contents_summary; - return this; } } 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 26844ea..c9184a8 100644 --- a/src/main/java/com/onebridge/ouch/domain/mapping/MedicalRecord.java +++ b/src/main/java/com/onebridge/ouch/domain/mapping/MedicalRecord.java @@ -48,17 +48,15 @@ public class MedicalRecord extends BaseEntity { @JoinColumn(name = "summary_id") private Summary summary; - public void update( + public void updateMedicalRecord( LocalDate visitDate, String hospital, String department, - String symptoms, - Summary summary + String symptoms ) { this.visitDate = visitDate; this.hospital = hospital; this.department = department; this.symptoms = symptoms; - this.summary = summary; } } 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 5c2c5a3..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().update( - request.getTreatmentSummary() - ); + medicalRecord.getSummary().updateSummary(request.getTreatmentSummary()); - medicalRecordConverter.medicalRecordUpdateRequestToMedicalRecord(medicalRecord, request, summary); + 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();