jhynsoo/worlabel
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Refactor: S3에 새로운 데이터 업로드

Browse Source
This commit is contained in:
김용수 2024-09-23 16:30:23 +09:00
parent 336f02834e
commit 6b99895b99
2 changed files with 21 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
backend/src/main/java/com/worlabel/domain/project/service/ProjectService.java
View File

@ -32,6 +32,7 @@ import com.worlabel.global.annotation.CheckPrivilege;
import com.worlabel.global.exception.CustomException; import com.worlabel.global.exception.CustomException;
import com.worlabel.global.exception.ErrorCode; import com.worlabel.global.exception.ErrorCode;
import com.worlabel.global.service.AiRequestService; import com.worlabel.global.service.AiRequestService;
import com.worlabel.global.service.S3UploadService;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
@ -57,6 +58,7 @@ public class ProjectService {
private final AiModelRepository aiModelRepository; private final AiModelRepository aiModelRepository;
private final AiRequestService aiService; private final AiRequestService aiService;
private final Gson gson; private final Gson gson;
private final S3UploadService s3UploadService;
public ProjectResponse createProject(final Integer memberId, final Integer workspaceId, final ProjectRequest projectRequest) { public ProjectResponse createProject(final Integer memberId, final Integer workspaceId, final ProjectRequest projectRequest) {
Workspace workspace = getWorkspace(memberId, workspaceId); Workspace workspace = getWorkspace(memberId, workspaceId);
@ -170,10 +172,21 @@ public class ProjectService {
// 응답없음 // 응답없음
log.debug("요청"); log.debug("요청");
List<AutoLabelingResult> list = aiService.postRequest(endPoint, autoLabelingRequest, List.class, this::converter); List<AutoLabelingResult> list = aiService.postRequest(endPoint, autoLabelingRequest, List.class, this::converter);
log.debug("list: {}", list); saveAutoLabelList(list);
} }
public List<AutoLabelingResult> converter(String data) { public void saveAutoLabelList(final List<AutoLabelingResult> resultList) {
for(AutoLabelingResult result: resultList) {
Image image = getImage(result.getImageId());
String dataPath = image.getDataPath();
s3UploadService.uploadJson(result.getData(), dataPath);
}
}
/**
* 데이터 변환
*/
private List<AutoLabelingResult> converter(String data) {
try { try {
log.debug("data :{}", data); log.debug("data :{}", data);
// Gson에서 리스트 형태로 변환할 타입을 지정 // Gson에서 리스트 형태로 변환할 타입을 지정
@ -205,6 +218,11 @@ public class ProjectService {
return labelMap; return labelMap;
} }
private Image getImage(final Long imageId){
return imageRepository.findById(imageId)
.orElseThrow(()-> new CustomException(ErrorCode.DATA_NOT_FOUND));
}
private Project getProject(final Integer projectId) { private Project getProject(final Integer projectId) {
return projectRepository.findById(projectId) return projectRepository.findById(projectId)
.orElseThrow(() -> new CustomException(ErrorCode.PROJECT_NOT_FOUND)); .orElseThrow(() -> new CustomException(ErrorCode.PROJECT_NOT_FOUND));

1
backend/src/main/java/com/worlabel/global/service/S3UploadService.java
View File

@ -46,6 +46,7 @@ public class S3UploadService {
public void uploadJson(final String json, final String dataUrl) { public void uploadJson(final String json, final String dataUrl) {
String key = getKeyFromImageAddress(dataUrl); String key = getKeyFromImageAddress(dataUrl);
log.debug(key);
try { try {
byte[] jsonBytes = json.getBytes(StandardCharsets.UTF_8); byte[] jsonBytes = json.getBytes(StandardCharsets.UTF_8);