Skip to content

Commit fb4b1c8

Browse files
Fix: 이미지 활성화 수정
Fix: 이미지 활성화 수정
2 parents 1b117cc + bdcac55 commit fb4b1c8

12 files changed

Lines changed: 59 additions & 10 deletions

File tree

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ dependencies {
7171

7272
def querydslDir = layout.buildDirectory.dir("generated/querydsl").get().asFile
7373

74-
tasks.withType(JavaCompile).configureEach {
74+
tasks.named('compileJava', JavaCompile) {
7575
options.generatedSourceOutputDirectory.set(querydslDir)
7676
}
7777

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

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,9 @@
1717
import flipnote.image.grpc.v1.Type;
1818
import io.grpc.stub.StreamObserver;
1919
import lombok.RequiredArgsConstructor;
20+
import lombok.extern.slf4j.Slf4j;
2021

22+
@Slf4j
2123
@GrpcService
2224
@RequiredArgsConstructor
2325
public class ImageCommandGrpcService extends ImageCommandServiceGrpc.ImageCommandServiceImplBase {
@@ -59,8 +61,15 @@ public void getUrlByReference(GetUrlByReferenceRequest request,
5961
public void activateImage(ActivateImageRequest request, StreamObserver<ActivateImageResponse> responseObserver) {
6062
try {
6163
ReferenceType type = mapType(request.getReferenceType());
64+
65+
log.debug("{} {} {}", type.name(), request.getImageRefId(), request.getReferenceId());
66+
6267
activateImageUseCase.activateImage(request.getImageRefId(), type, request.getReferenceId());
68+
69+
responseObserver.onNext(ActivateImageResponse.newBuilder().build());
70+
responseObserver.onCompleted();
6371
} catch (Exception e) {
72+
log.error("gRPC 에러 메시지: {}", e.getMessage());
6473
responseObserver.onError(e);
6574
}
6675
}

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

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,9 @@
1212
import flipnote.image.infrastructure.persistence.jpa.ImageRefRepository;
1313
import flipnote.image.infrastructure.persistence.jpa.ImageRepository;
1414
import lombok.RequiredArgsConstructor;
15+
import lombok.extern.slf4j.Slf4j;
1516

17+
@Slf4j
1618
@Repository
1719
@RequiredArgsConstructor
1820
public class ImageRefRepositoryAdapter implements ImageRefPort {
@@ -34,6 +36,8 @@ public ImageRefAndImage save(Long imageId) {
3436

3537
ImageRef imageRef = imageRefRepository.save(ImageRef.createImageRef(image));
3638

39+
log.debug(imageRef.getId().toString());
40+
3741
return new ImageRefAndImage(imageRef.getId(), image.getId());
3842
}
3943

@@ -45,14 +49,19 @@ public ImageRefAndImage save(Long imageId) {
4549
*/
4650
@Override
4751
public void activate(Long imageRefId, ReferenceType referenceType, Long referenceId) {
52+
53+
log.debug("fsdf "+imageRefId.toString());
54+
4855
ImageRef imageRef = imageRefRepository.findById(imageRefId).orElseThrow(
4956
() -> new IllegalArgumentException("ImageRef is Blank")
5057
);
5158

52-
imageRef.getReference().activate(referenceType, referenceId);
59+
imageRef.activate(referenceType, referenceId);
5360

5461
imageRefRepository.save(imageRef);
5562

63+
log.debug("save");
64+
5665
}
5766

5867
/**

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,6 @@ public interface ImageRefPort {
2121

2222

2323

24-
record ImageRefAndImage(Long id, Long imageId) {}
24+
record ImageRefAndImage(Long imageRefId, Long imageId) {}
2525
record ImageRefRow(Long id, ReferenceType type, Long referenceId) {}
2626
}

src/main/java/flipnote/image/application/service/ActivateImageService.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,17 @@
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.ActivateImageUseCase;
67
import flipnote.image.application.port.out.ImagePort;
78
import flipnote.image.application.port.out.ImageRefPort;
89
import flipnote.image.application.port.out.ObjectMetadataPort;
910
import flipnote.image.domain.model.reference.ReferenceType;
1011
import lombok.RequiredArgsConstructor;
12+
import lombok.extern.slf4j.Slf4j;
1113

14+
@Slf4j
1215
@Service
1316
@RequiredArgsConstructor
1417
public class ActivateImageService implements ActivateImageUseCase {
@@ -24,6 +27,7 @@ public class ActivateImageService implements ActivateImageUseCase {
2427
* @param referenceId 참조 아이디
2528
*/
2629
@Override
30+
@Transactional
2731
public void activateImage(Long imageRefId, ReferenceType referenceType, Long referenceId) {
2832
//이미지 참조 활성화
2933
imageRefPort.activate(imageRefId, referenceType, referenceId);

src/main/java/flipnote/image/application/service/IssuePresignedUrlService.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ public IssuePresignedUrlResult issuePresignedUrl(IssuePresignedUrlCommand cmd) {
6060
var imageRef = imageRefPort.save(existingImage.get().id());
6161
String url = publicUrlPort.urlOf(existingImage.get().s3Key());
6262

63-
return new IssuePresignedUrlResult(imageRef.id(), url);
63+
return new IssuePresignedUrlResult(imageRef.imageRefId(), url);
6464
}
6565

6666
// 없으면 url을 발급
@@ -75,6 +75,6 @@ public IssuePresignedUrlResult issuePresignedUrl(IssuePresignedUrlCommand cmd) {
7575
var saveImageRef = imageRefPort.save(saveImage.id());
7676

7777
//발급 후 반환
78-
return new IssuePresignedUrlResult(saveImageRef.imageId(), presignedUrl);
78+
return new IssuePresignedUrlResult(saveImageRef.imageRefId(), presignedUrl);
7979
}
8080
}

src/main/java/flipnote/image/domain/model/reference/ImageRef.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,10 @@ public static ImageRef createImageRef(Image image) {
5757
.build();
5858
}
5959

60+
public void activate(ReferenceType referenceType, Long referenceId) {
61+
this.reference = Reference.of(referenceType, referenceId);
62+
}
63+
6064
/**
6165
* 이미지 연결 여부
6266
* @return

src/main/java/flipnote/image/domain/model/reference/Reference.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,4 +41,8 @@ public void activate(ReferenceType referenceType, Long referenceId) {
4141
this.type = referenceType;
4242
this.id = referenceId;
4343
}
44+
45+
public static Reference of(ReferenceType type, Long id) {
46+
return new Reference(type, id);
47+
}
4448
}

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,6 @@ public class ImageRepositoryImpl implements ImageRepositoryCustom {
2626

2727
private final JPAQueryFactory queryFactory;
2828

29-
// QImage image = QImage.image;
30-
// QImageRef imageRef = QImageRef.imageRef;
31-
3229
@Override
3330
public Optional<Image> findAttachedImage(Long referenceId, ReferenceType type) {
3431

src/main/proto/group.proto

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
syntax = "proto3";
2+
3+
package group.v1;
4+
5+
6+
option java_multiple_files = true;
7+
option java_package = "flipnote.group.grpc.v1";
8+
option java_outer_classname = "GroupServiceProto";
9+
10+
service GroupCommandService {
11+
12+
// 그룹 이름 조회
13+
rpc GetGroupName(GetGroupNameRequest) returns (GetGroupNameResponse);
14+
}
15+
16+
message GetGroupNameRequest {
17+
int64 group_id = 1;
18+
}
19+
20+
message GetGroupNameResponse {
21+
string group_name = 1;
22+
}

0 commit comments

Comments
 (0)