Skip to content

Commit 467d92a

Browse files
Fix: grpc 내용 수정
Fix: grpc 내용 수정
2 parents c9a421d + e372685 commit 467d92a

10 files changed

Lines changed: 145 additions & 19 deletions

File tree

‎src/main/java/flipnote/image/adapter/in/grpc/ImageCommandGrpcService.java‎

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,26 @@
11
package flipnote.image.adapter.in.grpc;
22

33

4+
import java.util.Map;
5+
import java.util.stream.Collectors;
6+
47
import org.springframework.grpc.server.service.GrpcService;
58

69
import flipnote.image.application.port.in.ActivateImageUseCase;
710
import flipnote.image.application.port.in.ChangeImageUseCase;
11+
import flipnote.image.application.port.in.DeleteImageUseCase;
812
import flipnote.image.application.port.in.GetImageUrlByReferenceUseCase;
913
import flipnote.image.domain.model.reference.ReferenceType;
1014
import flipnote.image.grpc.v1.ActivateImageRequest;
1115
import flipnote.image.grpc.v1.ActivateImageResponse;
1216
import flipnote.image.grpc.v1.ChangeImageRequest;
1317
import flipnote.image.grpc.v1.ChangeImageResponse;
18+
import flipnote.image.grpc.v1.DeleteByIdRequest;
19+
import flipnote.image.grpc.v1.DeleteByIdResponse;
1420
import flipnote.image.grpc.v1.GetUrlByReferenceRequest;
1521
import flipnote.image.grpc.v1.GetUrlByReferenceResponse;
22+
import flipnote.image.grpc.v1.GetUrlsByIdsRequest;
23+
import flipnote.image.grpc.v1.GetUrlsByIdsResponse;
1624
import flipnote.image.grpc.v1.ImageCommandServiceGrpc;
1725
import flipnote.image.grpc.v1.Type;
1826
import io.grpc.stub.StreamObserver;
@@ -27,6 +35,7 @@ public class ImageCommandGrpcService extends ImageCommandServiceGrpc.ImageComman
2735
private final GetImageUrlByReferenceUseCase getImageUrlByReferenceUseCase;
2836
private final ActivateImageUseCase activateImageUseCase;
2937
private final ChangeImageUseCase changeImageUseCase;
38+
private final DeleteImageUseCase deleteImageUseCase;
3039

3140
/**
3241
* 참조 타입 및 아이디를 통해 url 조회
@@ -84,6 +93,40 @@ public void changeImage(ChangeImageRequest request, StreamObserver<ChangeImageRe
8493
}
8594
}
8695

96+
@Override
97+
public void getUrlsByIds(GetUrlsByIdsRequest request,
98+
StreamObserver<GetUrlsByIdsResponse> responseObserver) {
99+
try {
100+
Map<Long, String> urlMap = getImageUrlByReferenceUseCase.getUrls(
101+
request.getIdsList()
102+
);
103+
104+
GetUrlsByIdsResponse res = GetUrlsByIdsResponse.newBuilder()
105+
.putAllImageUrls(urlMap)
106+
.build();
107+
108+
responseObserver.onNext(res);
109+
responseObserver.onCompleted();
110+
} catch (Exception e) {
111+
log.error("gRPC 에러 메시지: {}", e.getMessage());
112+
responseObserver.onError(e);
113+
}
114+
}
115+
116+
@Override
117+
public void deleteById(DeleteByIdRequest request,
118+
StreamObserver<DeleteByIdResponse> responseObserver) {
119+
try {
120+
deleteImageUseCase.deleteImage(request.getImageRefId());
121+
122+
responseObserver.onNext(DeleteByIdResponse.newBuilder().build());
123+
responseObserver.onCompleted();
124+
} catch (Exception e) {
125+
log.error("gRPC 에러 메시지: {}", e.getMessage());
126+
responseObserver.onError(e);
127+
}
128+
}
129+
87130
/**
88131
* 타입 변환
89132
* @param type

‎src/main/java/flipnote/image/adapter/out/persistence/ImageRefRepositoryAdapter.java‎

Lines changed: 15 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66

77
import flipnote.image.application.port.out.ImageRefPort;
88

9+
import flipnote.image.application.port.out.PublicUrlPort;
910
import flipnote.image.domain.model.image.Image;
1011
import flipnote.image.domain.model.reference.ImageRef;
1112
import flipnote.image.domain.model.reference.ReferenceType;
@@ -21,6 +22,7 @@ public class ImageRefRepositoryAdapter implements ImageRefPort {
2122

2223
private final ImageRefRepository imageRefRepository;
2324
private final ImageRepository imageRepository;
25+
private final PublicUrlPort publicUrlPort;
2426

2527
/**
2628
* 참조한 타입과 아이디를 통해 ref 저장
@@ -50,17 +52,13 @@ public ImageRefAndImage save(Long imageId) {
5052
@Override
5153
public void activate(Long imageRefId, ReferenceType referenceType, Long referenceId) {
5254

53-
log.debug("fsdf "+imageRefId.toString());
55+
ImageRef imageRef = imageRefRepository.findById(imageRefId).orElseThrow(
56+
() -> new IllegalArgumentException("ImageRef is Blank")
57+
);
5458

55-
ImageRef imageRef = imageRefRepository.findById(imageRefId).orElseThrow(
56-
() -> new IllegalArgumentException("ImageRef is Blank")
57-
);
58-
59-
imageRef.activate(referenceType, referenceId);
59+
imageRef.getReference().activate(referenceType, referenceId);
6060

61-
imageRefRepository.save(imageRef);
62-
63-
log.debug("save");
61+
imageRefRepository.save(imageRef);
6462

6563
}
6664

@@ -103,4 +101,12 @@ public ImageRefRow findById(Long imageRefId) {
103101

104102
return new ImageRefRow(imageRef.getId(), type, referenceId);
105103
}
104+
105+
@Override
106+
public String getUrlByRefId(Long imageRefId) {
107+
108+
Image image = imageRefRepository.findById(imageRefId).get().getImage();
109+
110+
return publicUrlPort.urlOf(image.getS3Key());
111+
}
106112
}
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
package flipnote.image.application.port.in;
2+
3+
public interface DeleteImageUseCase {
4+
void deleteImage(Long imageRefId);
5+
}
Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,11 @@
11
package flipnote.image.application.port.in;
22

3+
import java.util.List;
4+
import java.util.Map;
5+
36
import flipnote.image.domain.model.reference.ReferenceType;
47

58
public interface GetImageUrlByReferenceUseCase {
6-
String getUrl(ReferenceType type, long referenceId);
9+
String getUrl(ReferenceType type, Long referenceId);
10+
Map<Long, String> getUrls(List<Long> referenceIds);
711
}

‎src/main/java/flipnote/image/application/port/out/ImageRefPort.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ public interface ImageRefPort {
1919

2020
ImageRefRow findById(Long newImageRefId);
2121

22-
22+
String getUrlByRefId(Long imageRefId);
2323

2424
record ImageRefAndImage(Long imageRefId, Long imageId) {}
2525
record ImageRefRow(Long id, ReferenceType type, Long referenceId) {}

‎src/main/java/flipnote/image/application/service/ChangeImageService.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package flipnote.image.application.service;
22

33
import org.springframework.stereotype.Service;
4+
import org.springframework.transaction.annotation.Transactional;
45

56
import flipnote.image.application.port.in.ChangeImageUseCase;
67
import flipnote.image.application.port.in.result.ChangeImageResult;
@@ -22,6 +23,7 @@ public class ChangeImageService implements ChangeImageUseCase {
2223
private final PublicUrlPort publicUrlPort;
2324

2425
@Override
26+
@Transactional
2527
public ChangeImageResult changeImage(Long newImageRefId, ReferenceType type, Long referenceId) {
2628

2729
//참조 대상에 연결된 ref 조회
Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
package flipnote.image.application.service;
2+
3+
import org.springframework.stereotype.Service;
4+
import org.springframework.transaction.annotation.Transactional;
5+
6+
import flipnote.image.application.port.in.DeleteImageUseCase;
7+
import flipnote.image.application.port.out.ImageRefPort;
8+
import flipnote.image.domain.model.reference.ReferenceType;
9+
import lombok.RequiredArgsConstructor;
10+
11+
@Service
12+
@RequiredArgsConstructor
13+
public class DeleteImageService implements DeleteImageUseCase {
14+
15+
private final ImageRefPort imageRefPort;
16+
17+
@Override
18+
@Transactional
19+
public void deleteImage(Long imageRefId) {
20+
imageRefPort.delete(imageRefId);
21+
}
22+
}
Lines changed: 27 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,57 @@
11
package flipnote.image.application.service;
22

3+
import java.util.List;
4+
import java.util.Map;
5+
import java.util.stream.Collectors;
6+
37
import org.springframework.stereotype.Service;
8+
import org.springframework.transaction.annotation.Transactional;
49

510
import flipnote.image.application.port.in.GetImageUrlByReferenceUseCase;
611
import flipnote.image.application.port.out.DefaultImagePort;
712
import flipnote.image.application.port.out.ImagePort;
13+
import flipnote.image.application.port.out.ImageRefPort;
814
import flipnote.image.application.port.out.PublicUrlPort;
915
import flipnote.image.domain.model.reference.ReferenceType;
1016
import lombok.RequiredArgsConstructor;
17+
import lombok.extern.slf4j.Slf4j;
1118

19+
@Slf4j
1220
@Service
1321
@RequiredArgsConstructor
1422
public class GetImageUrlByReferenceService implements GetImageUrlByReferenceUseCase {
1523

1624
private final ImagePort imagePort;
1725
private final PublicUrlPort publicUrlPort;
1826
private final DefaultImagePort defaultImagePort;
27+
private final ImageRefPort imageRefPort;
1928

2029
@Override
21-
public String getUrl(ReferenceType type, long referenceId) {
30+
@Transactional(readOnly = true)
31+
public String getUrl(ReferenceType type, Long referenceId) {
32+
33+
log.debug("{}{}", referenceId, type);
34+
2235
var image = imagePort.findByReference(type, referenceId);
2336

2437
// 이미지 없을 시 기본 이미지 출력
2538
if(image.isEmpty()) {
2639
return publicUrlPort.urlOf(defaultImagePort.defaultUrl(type));
2740
}
2841

42+
log.debug("{} {}", image.get().id(), image.get().s3Key());
43+
2944
return publicUrlPort.urlOf(image.get().s3Key());
3045
}
46+
47+
@Override
48+
@Transactional(readOnly = true)
49+
public Map<Long, String> getUrls(List<Long> referenceIds) {
50+
return referenceIds.stream()
51+
.distinct()
52+
.collect(Collectors.toMap(
53+
id -> id,
54+
id -> imageRefPort.getUrlByRefId(id)
55+
));
56+
}
3157
}

‎src/main/java/flipnote/image/infrastructure/persistence/querydsl/ImageRepositoryImpl.java‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,9 @@
1919
import flipnote.image.domain.model.reference.Reference;
2020
import flipnote.image.domain.model.reference.ReferenceType;
2121
import lombok.RequiredArgsConstructor;
22+
import lombok.extern.slf4j.Slf4j;
2223

24+
@Slf4j
2325
@Repository
2426
@RequiredArgsConstructor
2527
public class ImageRepositoryImpl implements ImageRepositoryCustom {
@@ -39,6 +41,7 @@ public Optional<Image> findAttachedImage(Long referenceId, ReferenceType type) {
3941
.where(where)
4042
.fetchOne();
4143

44+
4245
return Optional.ofNullable(image);
4346
}
4447

‎src/main/proto/image.proto‎

Lines changed: 22 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,24 @@
11
syntax = "proto3";
22

3-
// 논리적 패키지 API 관점
43
package image.v1;
54

6-
// Java 옵션 설정
75
option java_multiple_files = true;
8-
option java_package = "flipnote.image.grpc.v1"; // Java 패키지 경로 설정
9-
option java_outer_classname = "ImageServiceProto"; // 외부 클래스 이름 설정
6+
option java_package = "flipnote.image.grpc.v1";
7+
option java_outer_classname = "ImageServiceProto";
108

11-
// gRPC 서비스 정의
129
service ImageCommandService {
1310
// 이미지 url 조회
1411
rpc GetUrlByReference(GetUrlByReferenceRequest) returns (GetUrlByReferenceResponse);
12+
// 이미지 url 리스트 조회
13+
rpc GetUrlsByIds(GetUrlsByIdsRequest) returns (GetUrlsByIdsResponse);
1514
// 이미지 활성화
1615
rpc ActivateImage(ActivateImageRequest) returns (ActivateImageResponse);
1716
// 이미지 변경
1817
rpc ChangeImage(ChangeImageRequest) returns (ChangeImageResponse);
18+
// 이미지 삭제
19+
rpc DeleteById(DeleteByIdRequest) returns (DeleteByIdResponse);
1920
}
2021

21-
// 요청/응답 메시지
2222
enum Type {
2323
REFERENCE_TYPE_UNSPECIFIED = 0;
2424
USER = 1;
@@ -35,14 +35,21 @@ message GetUrlByReferenceResponse {
3535
string image_url = 1;
3636
}
3737

38+
message GetUrlsByIdsRequest {
39+
repeated int64 ids = 1;
40+
}
41+
42+
message GetUrlsByIdsResponse {
43+
map<int64, string> image_urls = 1;
44+
}
45+
3846
message ActivateImageRequest {
3947
int64 image_ref_id = 1;
4048
Type reference_type = 2;
4149
int64 reference_id = 3;
4250
}
4351

4452
message ActivateImageResponse {
45-
// int64 image_ref_id = 1;
4653
}
4754

4855
message ChangeImageRequest {
@@ -55,3 +62,11 @@ message ChangeImageResponse {
5562
int64 image_ref_id = 1;
5663
string url = 2;
5764
}
65+
66+
message DeleteByIdRequest {
67+
68+
int64 image_ref_id = 3;
69+
}
70+
71+
message DeleteByIdResponse {
72+
}

0 commit comments

Comments
 (0)