Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

LLM을 활용하여 돌봄대상자별 차트 요약하기 #59

Merged
merged 14 commits into from
Nov 6, 2024
Merged
Show file tree
Hide file tree
Changes from all 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 @@ -71,4 +71,4 @@ public ResponseEntity<Void> deleteCareworker(
careworkerService.deleteCareworker(careworkerId, institutionId);
return ResponseEntity.noContent().build();
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -33,4 +33,4 @@ public class CareworkerRequestDTO {
@NotBlank(message = "휴대폰 번호는 필수 항목입니다.")
@Pattern(regexp = "010\\d{8}", message = "010XXXXXXXX형식으로 입력해주세요.")
private String phone;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,4 @@ public interface CareworkerRepository extends JpaRepository<Careworker, Long> {
boolean existsByEmail(String email);

boolean existsByPhone(String phone);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -109,4 +109,4 @@ public Careworker findByLineUserId(String userId) {
public Careworker findByPhone(String phoneNumber) {
return careworkerRepository.findByPhone(phoneNumber).orElse(null);
}
}
}
Original file line number Diff line number Diff line change
@@ -1,10 +1,17 @@
package dbdr.domain.chart.repository;

import dbdr.domain.chart.entity.Chart;
import java.time.LocalDateTime;
import java.util.List;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.Pageable;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.query.Param;

public interface ChartRepository extends JpaRepository<Chart, Long> {
Page<Chart> findAllByRecipientId(Long recipientId, Pageable pageable);

@Query("SELECT c FROM Chart c WHERE c.recipient.id = :recipientId AND c.createdAt >= :startDate AND c.createdAt <= :endDate")
List<Chart> findByLocalDateTimeAndRecipient(@Param("recipientId") Long recipientId, @Param("startDate") LocalDateTime startDate, @Param("endDate") LocalDateTime endDate);
}
91 changes: 91 additions & 0 deletions src/main/java/dbdr/domain/chart/service/ChartService.java
Original file line number Diff line number Diff line change
@@ -1,10 +1,24 @@
package dbdr.domain.chart.service;

import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.ObjectMapper;
import dbdr.domain.chart.dto.ChartMapper;
import dbdr.domain.chart.dto.request.ChartDetailRequest;
import dbdr.domain.chart.dto.response.ChartDetailResponse;
import dbdr.domain.chart.entity.Chart;
import dbdr.domain.chart.repository.ChartRepository;
import dbdr.global.exception.ApplicationError;
import dbdr.global.exception.ApplicationException;
import dbdr.openai.dto.request.ChartDataRequest;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.time.format.DateTimeParseException;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.function.Function;
import java.util.stream.Collectors;
import lombok.RequiredArgsConstructor;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.Pageable;
Expand Down Expand Up @@ -43,4 +57,81 @@ public ChartDetailResponse updateChart(Long chartId, ChartDetailRequest request)
Chart savedChart = chartRepository.save(chart);
return chartMapper.toResponse(savedChart);
}

public ChartDataRequest getSelectedDatesSummarization(Long recipientId, LocalDateTime startDate, LocalDateTime endDate) {
List<ChartDetailResponse> chartList = getSelectedDayChart(recipientId, startDate, endDate);

StringBuilder conditionDisease = new StringBuilder();

String bodyManagement = formatSection(chartList,
ChartDetailResponse::bodyManagement);
conditionDisease.append(collectConditionDisease(chartList));
String nursingManagement = formatSection(chartList,
ChartDetailResponse::nursingManagement);
String recoveryTraining = formatSection(chartList,
ChartDetailResponse::recoveryTraining);
String cognitiveManagement = formatSection(chartList,
ChartDetailResponse::cognitiveManagement);

return new ChartDataRequest(cognitiveManagement, bodyManagement,
recoveryTraining, conditionDisease.toString(), nursingManagement);
}

private List<ChartDetailResponse> getSelectedDayChart(Long recipientId, LocalDateTime startDate, LocalDateTime endDate) {
List<Chart> chartList = chartRepository.findByLocalDateTimeAndRecipient(recipientId, startDate, endDate);
return chartList.stream().map(chartMapper::toResponse).toList();
}

private <T> String formatSection(List<ChartDetailResponse> chartList,
Function<ChartDetailResponse, T> mapper) {
return chartList.stream()
.map(mapper)
.filter(Objects::nonNull)
.map(this::convertToReadableString)
.collect(Collectors.joining("; ", "", ""));
}

private String convertToReadableString(Object obj) {
ObjectMapper objectMapper = new ObjectMapper();
try {
Map<String, Object> map = objectMapper.convertValue(obj, new TypeReference<>() {});

String createdAt = (String) map.getOrDefault("createdAt", "unknown");
String dateLabel = formatDateLabel(createdAt);

return map.entrySet().stream()
.map(entry -> formatEntry(entry.getKey(), entry.getValue(), dateLabel))
.collect(Collectors.joining(", "));
} catch (IllegalArgumentException e) {
throw new ApplicationException(ApplicationError.JSON_PARSING_ERROR);
}
}

private String formatEntry(String key, Object value, String dateLabel) {
if ("id".equals(key)) {
return dateLabel;
}
String formattedValue = (value != null) ? value.toString() : "없음";
return key + ": " + formattedValue;
}

private String formatDateLabel(String createdAt) {
try {
if (createdAt.length() >= 10) {
LocalDate date = LocalDate.parse(createdAt.substring(0, 10)); // Extract "YYYY-MM-DD"
DateTimeFormatter formatter = DateTimeFormatter.ofPattern("MM월 dd일");
return date.format(formatter);
}
else return null;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

날짜인식이 안되면 바로 예외를 던지는 방식으로 가는건 어떤지용...?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

저도 그럴려고 했는데, 인식이 안되는게 7일을 가져올 때, 해당 날짜의 차트가 없으면 인식이 안되는 것 같더라고요.
7일치를 가져오라고 했을때, 3일치만 있으면 인식을 못하더라고요. 그래서 이런식으로 처리했습니다. 아니면 그렇다해도 에러를 던지는게 나을까요?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

넹 그게 좋을 것 같아요! -> 사용자가 몇일 치를 가져오는 것을 입력하는 것이고, 입력값이 옳지 못해서 생기는 비즈니스 에러? ( 로그인에서 비밀번호가 틀리면 로그인 실패와 같은) 그런 종류로 생각해서 처리하는 것이 좋을 것 같아요!

} catch (DateTimeParseException e) {
throw new ApplicationException(ApplicationError.CANNOT_DETECT_DATE);
}
}

private String collectConditionDisease(List<ChartDetailResponse> chartList) {
return chartList.stream()
.map(ChartDetailResponse::conditionDisease)
.filter(Objects::nonNull)
.collect(Collectors.joining(" "));
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -65,4 +65,4 @@ public ResponseEntity<Void> deleteInstitution(@PathVariable("institutionId") Lon
institutionService.deleteInstitutionById(institutionId);
return ResponseEntity.noContent().build();
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -64,4 +64,4 @@ private void ensureUniqueInstitutionNumber(Long institutionNumber) {
throw new ApplicationException(ApplicationError.DUPLICATE_INSTITUTION_NUMBER);
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -74,4 +74,4 @@ public ResponseEntity<Void> deleteRecipient(
recipientService.deleteRecipient(recipientId, institutionId, careworkerId);
return ResponseEntity.noContent().build();
}
}
}
39 changes: 39 additions & 0 deletions src/main/java/dbdr/exception/ApplicationError.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
package dbdr.exception;

import lombok.AllArgsConstructor;
import lombok.Getter;
import org.springframework.http.HttpStatus;

@AllArgsConstructor
@Getter
public enum ApplicationError {

//Auth
ROLE_NOT_FOUND(HttpStatus.NOT_FOUND, "해당 유저가 ROLE을 가지고 있지 않습니다."),
ACCESS_NOT_ALLOWED(HttpStatus.FORBIDDEN, "접근 권한이 없습니다."),

// Guardian (보호자)
GUARDIAN_NOT_FOUND(HttpStatus.NOT_FOUND, "해당 보호자를 찾을 수가 없습니다."),

// Careworker (요양보호사)
CAREWORKER_NOT_FOUND(HttpStatus.NOT_FOUND, "해당 요양보호사를 찾을 수가 없습니다."),

// Recipient (돌봄대상자)
RECIPIENT_NOT_FOUND(HttpStatus.NOT_FOUND, "해당 돌봄대상자를 찾을 수가 없습니다."),

// Institution (요양원)
INSTITUTION_NOT_FOUND(HttpStatus.NOT_FOUND, "해당 요양원을 찾을 수가 없습니다."),

// 공통
DUPLICATE_EMAIL(HttpStatus.CONFLICT, "이미 존재하는 이메일입니다."),
DUPLICATE_PHONE(HttpStatus.CONFLICT, "이미 존재하는 전화번호입니다."),
DUPLICATE_CARE_NUMBER(HttpStatus.CONFLICT, "이미 존재하는 장기요양번호입니다."),
DUPLICATE_INSTITUTION_NUMBER(HttpStatus.CONFLICT, "이미 존재하는 요양기관번호입니다."),
INVALID_INPUT(HttpStatus.BAD_REQUEST, "잘못된 입력값입니다."),

// 시스템
DATABASE_ERROR(HttpStatus.INTERNAL_SERVER_ERROR, "데이터베이스 처리 중 오류가 발생했습니다.");

private final HttpStatus status;
private final String message;
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
package dbdr.global.configuration;

import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.http.HttpHeaders;
import org.springframework.http.MediaType;
import org.springframework.web.client.RestTemplate;

@Configuration
public class OpenAiSummarizationConfig {

@Value("${openai.api-key}")
private String secretKey;

@Bean
public RestTemplate restTemplate() {
return new RestTemplate();
}

@Bean
public HttpHeaders httpHeaders() {
HttpHeaders headers = new HttpHeaders();
headers.setBearerAuth(secretKey);
headers.setContentType(MediaType.APPLICATION_JSON);
return headers;
}
}
18 changes: 18 additions & 0 deletions src/main/java/dbdr/global/configuration/OpenApiConfiguration.java
Original file line number Diff line number Diff line change
Expand Up @@ -106,4 +106,22 @@ public GroupedOpenApi excelApi() {
.pathsToMatch("/v*/excel/**")
.build();
}

@Bean
public GroupedOpenApi authentication() {
return GroupedOpenApi.builder()
.group("authentication")
.displayName("Auth API")
.pathsToMatch("/v*/auth/**")
.build();
}

@Bean
public GroupedOpenApi summarization() {
return GroupedOpenApi.builder()
.group("summarization")
.displayName("Summary API")
.pathsToMatch("/v*/summary/**")
.build();
}
}
35 changes: 35 additions & 0 deletions src/main/java/dbdr/openai/controller/SummaryController.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
package dbdr.openai.controller;

import dbdr.openai.dto.response.SummaryResponse;
import dbdr.openai.service.SummarizationService;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import java.time.LocalDateTime;
import lombok.RequiredArgsConstructor;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;

@Tag(name = "요약 API", description = "차트 하루 요약")
@RestController
@RequiredArgsConstructor
@RequestMapping("/${spring.app.version}/summary")
public class SummaryController {

private final SummarizationService summarizationService;

@Operation(summary = "해당 날짜와 돌봄대상자 id로 요약을 해준다.", description = "시작 날짜만 필수이고, 끝 날짜는 필수가 아니다. 끝나는 날짜를 넣지 않으면 자동으로 하루치만 요약한다.")
@PostMapping
public ResponseEntity<SummaryResponse> getSummary(@RequestParam("recipientId") Long recipientId,
@RequestParam("startDate")
LocalDateTime startDate,
@RequestParam(name = "endDate", required = false) LocalDateTime endDate) {
if(endDate == null){
endDate = startDate;
}
return ResponseEntity.ok(
summarizationService.getTextAndGetSummary(recipientId, startDate, endDate));
}
}
12 changes: 12 additions & 0 deletions src/main/java/dbdr/openai/dto/etc/Choice.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
package dbdr.openai.dto.etc;

import com.fasterxml.jackson.databind.PropertyNamingStrategies.SnakeCaseStrategy;
import com.fasterxml.jackson.databind.annotation.JsonNaming;

@JsonNaming(SnakeCaseStrategy.class)
public record Choice(
int index,
Message message,
Object logprobs,
String finishReason
) {}
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
package dbdr.openai.dto.etc;

import com.fasterxml.jackson.databind.PropertyNamingStrategies.SnakeCaseStrategy;
import com.fasterxml.jackson.databind.annotation.JsonNaming;

@JsonNaming(SnakeCaseStrategy.class)
public record CompletionTokensDetails(
int reasoningTokens
) {}
6 changes: 6 additions & 0 deletions src/main/java/dbdr/openai/dto/etc/Message.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
package dbdr.openai.dto.etc;

public record Message(
String role,
String content
) {}
12 changes: 12 additions & 0 deletions src/main/java/dbdr/openai/dto/etc/Usage.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
package dbdr.openai.dto.etc;

import com.fasterxml.jackson.databind.PropertyNamingStrategies.SnakeCaseStrategy;
import com.fasterxml.jackson.databind.annotation.JsonNaming;

@JsonNaming(SnakeCaseStrategy.class)
public record Usage(
int promptTokens,
int completionTokens,
int totalTokens,
CompletionTokensDetails completionTokensDetails
) {}
14 changes: 14 additions & 0 deletions src/main/java/dbdr/openai/dto/request/ChartDataRequest.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
package dbdr.openai.dto.request;

import com.fasterxml.jackson.databind.PropertyNamingStrategies.SnakeCaseStrategy;
import com.fasterxml.jackson.databind.annotation.JsonNaming;

@JsonNaming(SnakeCaseStrategy.class)
public record ChartDataRequest(
String cognitiveManagement,
String bodyManagement,
String recoveryTraining,
String conditionDisease,
String nursingManagement) {

}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
package dbdr.openai.dto.request;

import dbdr.openai.dto.etc.Message;
import java.util.List;

public record OpenAiSummaryRequest(String model, List<Message> messages) {
}
18 changes: 18 additions & 0 deletions src/main/java/dbdr/openai/dto/response/OpenAiSummaryResponse.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
package dbdr.openai.dto.response;

import com.fasterxml.jackson.databind.PropertyNamingStrategies.SnakeCaseStrategy;
import com.fasterxml.jackson.databind.annotation.JsonNaming;
import dbdr.openai.dto.etc.Choice;
import dbdr.openai.dto.etc.Usage;
import java.util.List;

@JsonNaming(SnakeCaseStrategy.class)
public record OpenAiSummaryResponse(
String id,
String object,
long created,
String model,
String systemFingerprint,
List<Choice> choices,
Usage usage
) {}
Loading