Skip to content
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -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());
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -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
);
}
}
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down Expand Up @@ -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<String> symptomListForResponseDto(SelfDiagnosis selfDiagnosis) {
Expand Down
9 changes: 9 additions & 0 deletions src/main/java/com/onebridge/ouch/domain/HealthStatus.java
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
}
33 changes: 26 additions & 7 deletions src/main/java/com/onebridge/ouch/domain/SelfDiagnosis.java
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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;
}
}
5 changes: 5 additions & 0 deletions src/main/java/com/onebridge/ouch/domain/Summary.java
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
}
14 changes: 14 additions & 0 deletions src/main/java/com/onebridge/ouch/domain/mapping/MedicalRecord.java
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down