Skip to content

Commit 74a3f6b

Browse files
Refactor: [290] 이미지 변경 기능 리팩토링
Refactor: [290] 이미지 변경 기능 리팩토링
2 parents abf900e + ac5434d commit 74a3f6b

27 files changed

Lines changed: 490 additions & 102 deletions

‎.github/workflows/cd.yml‎

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
name: CD
2+
3+
on:
4+
push:
5+
branches:
6+
- main
7+
8+
jobs:
9+
deploy:
10+
runs-on: ubuntu-latest
11+
12+
steps:
13+
- name: Checkout code
14+
uses: actions/checkout@v4
15+
16+
- name: Login to DockerHub
17+
run: echo "${{ secrets.DOCKER_PASSWORD }}" | docker login -u "${{ secrets.DOCKER_USERNAME }}" --password-stdin
18+
19+
- name: Extract Docker image metadata
20+
id: meta
21+
uses: docker/metadata-action@v5
22+
with:
23+
images: dungbik/flipnote-image
24+
- name: Build and push Docker image
25+
uses: docker/build-push-action@v6
26+
with:
27+
context: .
28+
push: true
29+
tags: ${{ steps.meta.outputs.tags }}
30+
labels: ${{ steps.meta.outputs.labels }}

‎Dockerfile‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
FROM gradle:8-jdk21 AS build
2+
WORKDIR /app
3+
4+
COPY build.gradle.kts settings.gradle.kts ./
5+
COPY src ./src
6+
7+
RUN gradle bootJar --no-daemon
8+
9+
FROM eclipse-temurin:21-jre
10+
WORKDIR /app
11+
12+
ENV TZ=Asia/Seoul
13+
RUN apt-get update \
14+
&& apt-get install -y tzdata \
15+
&& ln -sf /usr/share/zoneinfo/$TZ /etc/localtime \
16+
&& echo $TZ > /etc/timezone \
17+
&& rm -rf /var/lib/apt/lists/*
18+
19+
COPY --from=build /app/build/libs/user-0.0.1-SNAPSHOT.jar .
20+
21+
EXPOSE 8082 9090
22+
23+
ENTRYPOINT ["java", "-jar", "user-0.0.1-SNAPSHOT.jar"]

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

Lines changed: 19 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,13 @@
33

44
import org.springframework.grpc.server.service.GrpcService;
55

6+
import flipnote.image.application.port.in.ActivateImageUseCase;
67
import flipnote.image.application.port.in.GetImageUrlByReferenceUseCase;
78
import flipnote.image.domain.model.reference.ReferenceType;
8-
import flipnote.image.grpc.v1.CleanOrphanImagesRequest;
9-
import flipnote.image.grpc.v1.CleanOrphanImagesResponse;
10-
import flipnote.image.grpc.v1.ConfirmUploadRequest;
11-
import flipnote.image.grpc.v1.ConfirmUploadResponse;
9+
import flipnote.image.grpc.v1.ActivateImageRequest;
10+
import flipnote.image.grpc.v1.ActivateImageResponse;
11+
import flipnote.image.grpc.v1.ChangeImageRequest;
12+
import flipnote.image.grpc.v1.ChangeImageResponse;
1213
import flipnote.image.grpc.v1.GetUrlByReferenceRequest;
1314
import flipnote.image.grpc.v1.GetUrlByReferenceResponse;
1415
import flipnote.image.grpc.v1.ImageCommandServiceGrpc;
@@ -21,6 +22,7 @@
2122
public class ImageCommandGrpcService extends ImageCommandServiceGrpc.ImageCommandServiceImplBase {
2223

2324
private final GetImageUrlByReferenceUseCase getImageUrlByReferenceUseCase;
25+
private final ActivateImageUseCase activateImageUseCase;
2426

2527
/**
2628
* 참조 타입 및 아이디를 통해 url 조회
@@ -46,14 +48,23 @@ public void getUrlByReference(GetUrlByReferenceRequest request,
4648
}
4749
}
4850

51+
/**
52+
* 이미지 활성화
53+
* @param request
54+
* @param responseObserver
55+
*/
4956
@Override
50-
public void confirmUpload(ConfirmUploadRequest request,
51-
StreamObserver<ConfirmUploadResponse> responseObserver) {
57+
public void activateImage(ActivateImageRequest request, StreamObserver<ActivateImageResponse> responseObserver) {
58+
try {
59+
ReferenceType type = mapType(request.getReferenceType());
60+
activateImageUseCase.activateImage(request.getImageRefId(), type, request.getReferenceId());
61+
} catch (Exception e) {
62+
responseObserver.onError(e);
63+
}
5264
}
5365

5466
@Override
55-
public void cleanOrphanImages(CleanOrphanImagesRequest request,
56-
StreamObserver<CleanOrphanImagesResponse> responseObserver) {
67+
public void changeImage(ChangeImageRequest request, StreamObserver<ChangeImageResponse> responseObserver) {
5768

5869
}
5970

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
package flipnote.image.adapter.out.other;
2+
3+
import org.springframework.beans.factory.annotation.Value;
4+
import org.springframework.stereotype.Component;
5+
6+
import flipnote.image.application.port.out.DefaultImagePort;
7+
import flipnote.image.domain.model.reference.ReferenceType;
8+
9+
@Component
10+
public class DefaultImageAdapter implements DefaultImagePort {
11+
12+
@Value("${image.default.group}")
13+
private String defaultGroupImage;
14+
15+
@Value("${image.default.user}")
16+
private String defaultUserImage;
17+
18+
@Value("${image.default.cardSet}")
19+
private String defaultCardSetImage;
20+
21+
@Override
22+
public String defaultUrl(ReferenceType type) {
23+
return switch (type) {
24+
case USER -> defaultUserImage;
25+
case GROUP -> defaultGroupImage;
26+
case CARD_SET -> defaultCardSetImage;
27+
};
28+
}
29+
}

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

Lines changed: 60 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88

99
import flipnote.image.domain.model.image.Image;
1010
import flipnote.image.domain.model.reference.ImageRef;
11-
import flipnote.image.domain.model.reference.Reference;
1211
import flipnote.image.domain.model.reference.ReferenceType;
1312
import flipnote.image.infrastructure.persistence.jpa.ImageRefRepository;
1413
import flipnote.image.infrastructure.persistence.jpa.ImageRepository;
@@ -27,14 +26,72 @@ public class ImageRefRepositoryAdapter implements ImageRefPort {
2726
* @return
2827
*/
2928
@Override
30-
public ImageRefRow save(Long imageId) {
29+
public ImageRefAndImage save(Long imageId) {
3130

3231
Image image = imageRepository.findById(imageId).orElseThrow(
3332
() -> new IllegalArgumentException("image is blank")
3433
);
3534

3635
ImageRef imageRef = imageRefRepository.save(ImageRef.createImageRef(image));
3736

38-
return new ImageRefRow(imageRef.getId(), image.getId());
37+
return new ImageRefAndImage(imageRef.getId(), image.getId());
38+
}
39+
40+
/**
41+
* 이미지 참조 활성화 참조되는 타입과 아이디를 업데이트
42+
* @param imageRefId
43+
* @param referenceType
44+
* @param referenceId
45+
*/
46+
@Override
47+
public void activate(Long imageRefId, ReferenceType referenceType, Long referenceId) {
48+
ImageRef imageRef = imageRefRepository.findById(imageRefId).orElseThrow(
49+
() -> new IllegalArgumentException("ImageRef is Blank")
50+
);
51+
52+
imageRef.getReference().activate(referenceType, referenceId);
53+
54+
imageRefRepository.save(imageRef);
55+
56+
}
57+
58+
/**
59+
* 이미지 아이디 조회
60+
* @param imageRefId
61+
* @return
62+
*/
63+
@Override
64+
public Long getImageIdByRefId(Long imageRefId) {
65+
return imageRefRepository.findImageIdByImageRefId(imageRefId);
66+
}
67+
68+
/**
69+
* 참조타입과 아이디로부터 이미지 조회
70+
* @param type
71+
* @param referenceId
72+
* @return
73+
*/
74+
@Override
75+
public Optional<Long> findByReference(ReferenceType type, Long referenceId) {
76+
return imageRefRepository
77+
.findByReference_TypeAndReference_Id(type, referenceId)
78+
.map(ImageRef::getId);
79+
}
80+
81+
@Override
82+
public void delete(Long id) {
83+
imageRefRepository.deleteById(id);
84+
}
85+
86+
@Override
87+
public ImageRefRow findById(Long imageRefId) {
88+
ImageRef imageRef = imageRefRepository.findById(imageRefId).orElseThrow(
89+
() -> new IllegalArgumentException("Image")
90+
);
91+
92+
ReferenceType type = imageRef.getReference().getType();
93+
Long referenceId = imageRef.getReference().getId();
94+
95+
return new ImageRefRow(imageRef.getId(), type, referenceId);
3996
}
4097
}

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

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,4 +57,32 @@ public ImageRow save(newImage newImage) {
5757

5858
return new ImageRow(image.getId(), image.getHash(), image.getS3Key());
5959
}
60+
61+
/**
62+
* 이미지 아이디를 통해 이미지의 메타 데이터 정보 출력
63+
* @param imageId
64+
* @return
65+
*/
66+
@Override
67+
public ImageHeadRow findImageHeadById(Long imageId) {
68+
69+
Image image = imageRepository.findById(imageId).orElseThrow(
70+
() -> new IllegalArgumentException("image not Exist")
71+
);
72+
73+
return new ImageHeadRow(image.getId(),image.getS3Key(), image.getMimeType(), image.getSizeBytes());
74+
}
75+
76+
/**
77+
* 이미지의 메타테이더 정보 업데이트
78+
* @param imageId
79+
* @param mimeType
80+
* @param contentLength
81+
*/
82+
@Override
83+
public void updateMetadata(Long imageId, String mimeType, long contentLength) {
84+
int updated = imageRepository.updateMetadata(imageId, mimeType, contentLength);
85+
86+
if(updated == 0) throw new IllegalArgumentException("Image not Exist");
87+
}
6088
}
Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
package flipnote.image.adapter.out.persistence;
2+
3+
import java.util.Optional;
4+
5+
import org.springframework.stereotype.Repository;
6+
7+
import flipnote.image.application.port.out.ImageS3KeyPort;
8+
import flipnote.image.domain.model.image.Image;
9+
import flipnote.image.domain.model.reference.ImageRef;
10+
import flipnote.image.domain.model.reference.ReferenceType;
11+
import flipnote.image.infrastructure.persistence.jpa.ImageRefRepository;
12+
import flipnote.image.infrastructure.persistence.jpa.ImageRepository;
13+
import lombok.RequiredArgsConstructor;
14+
import lombok.extern.slf4j.Slf4j;
15+
16+
@Slf4j
17+
@Repository
18+
@RequiredArgsConstructor
19+
public class ImageS3KeyAdapter implements ImageS3KeyPort {
20+
21+
private final ImageRefRepository imageRefRepository;
22+
private final ImageRepository imageRepository;
23+
24+
@Override
25+
public String getS3KeyByReference(ReferenceType type, Long referenceId) {
26+
Optional<ImageRef> imageRef = imageRefRepository.findByReference_TypeAndReference_Id(type, referenceId);
27+
28+
Image image = imageRef.get().getImage();
29+
30+
return image.getS3Key();
31+
}
32+
}
Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
package flipnote.image.adapter.out.storage.s3;
2+
3+
import org.springframework.beans.factory.annotation.Value;
4+
import org.springframework.stereotype.Component;
5+
6+
import flipnote.image.application.port.out.ObjectMetadataPort;
7+
import lombok.RequiredArgsConstructor;
8+
import software.amazon.awssdk.services.s3.S3Client;
9+
import software.amazon.awssdk.services.s3.model.HeadObjectRequest;
10+
11+
@Component
12+
@RequiredArgsConstructor
13+
public class S3ObjectMetadataAdapter implements ObjectMetadataPort {
14+
15+
private final S3Client s3Client;
16+
17+
@Value("${cloud.aws.bucket}")
18+
private String bucket;
19+
20+
@Override
21+
public ObjectMeta head(String s3Key) {
22+
var res = s3Client.headObject(
23+
HeadObjectRequest.builder()
24+
.bucket(bucket)
25+
.key(s3Key)
26+
.build()
27+
);
28+
29+
return new ObjectMeta(res.contentType(), res.contentLength());
30+
}
31+
}
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
package flipnote.image.application.port.in;
2+
3+
import flipnote.image.domain.model.reference.ReferenceType;
4+
5+
public interface ActivateImageUseCase {
6+
void activateImage(Long imageRefId, ReferenceType referenceType, Long referenceId);
7+
}
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
package flipnote.image.application.port.in;
2+
3+
import flipnote.image.application.port.in.result.ChangeImageResult;
4+
import flipnote.image.domain.model.reference.ReferenceType;
5+
6+
public interface ChangeImageUseCase {
7+
ChangeImageResult changeImage(Long imageRefId, ReferenceType type, Long referenceId);
8+
}

0 commit comments

Comments
 (0)