Skip to content
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 @@ -30,7 +30,8 @@ public enum ErrorCode {
RECEIPT_NOT_DELETE("2003", "요청한 영수증을 삭제할 수 없습니다.", HttpStatus.FORBIDDEN),

// S3 관련 에러 코드
S3_UPLOAD_FAIL("3001", "S3에 이미지 업로드 에러입니다.", HttpStatus.INTERNAL_SERVER_ERROR);
S3_UPLOAD_FAIL("3001", "S3에 이미지 업로드 에러입니다.", HttpStatus.INTERNAL_SERVER_ERROR),
S3_DELETE_FAIL("3002", "S3에 이미지 삭제 에러입니다.", HttpStatus.INTERNAL_SERVER_ERROR);

private final String code;
private final String message;
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
package com.ClubAccount_BE.core.s3;

import org.springframework.stereotype.Component;

import java.net.URL;
import java.net.URLDecoder;
import java.nio.charset.StandardCharsets;

@Component
public class DefaultS3KeyExtractor implements S3KeyExtractor {
@Override
public String extractKey(String url) {
if (url == null || url.isBlank()) return null;
try {
String path = new URL(url).getPath();
return URLDecoder.decode(path.substring(1), StandardCharsets.UTF_8);
} catch (Exception e) {
return null;
}
}
}
19 changes: 19 additions & 0 deletions src/main/java/com/ClubAccount_BE/core/s3/DefaultS3UrlBuilder.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
package com.ClubAccount_BE.core.s3;

import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Component;

@Component
public class DefaultS3UrlBuilder implements S3UrlBuilder {

@Value("${cloud.aws.s3.bucket}")
private String bucket;

@Value("${cloud.aws.region.static}")
private String region;

@Override
public String toUrl(String key) {
return "https://" + bucket + ".s3." + region + ".amazonaws.com/" + key;
}
}
5 changes: 5 additions & 0 deletions src/main/java/com/ClubAccount_BE/core/s3/S3KeyExtractor.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
package com.ClubAccount_BE.core.s3;

public interface S3KeyExtractor {
String extractKey(String url);
}
5 changes: 5 additions & 0 deletions src/main/java/com/ClubAccount_BE/core/s3/S3UrlBuilder.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
package com.ClubAccount_BE.core.s3;

public interface S3UrlBuilder {
String toUrl(String key);
}
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,14 @@
.toList();
}

@Override
public List<Receipt> getAllReceipts(User user) {
return receiptRepository.findAllByUserId(user.getId())
.stream()
.map(ReceiptMapper::toDomain)
.toList();

Check warning on line 77 in src/main/java/com/ClubAccount_BE/receipt/adapter/out/ReceiptRepositoryAdapter.java

View check run for this annotation

Codecov / codecov/patch

src/main/java/com/ClubAccount_BE/receipt/adapter/out/ReceiptRepositoryAdapter.java#L74-L77

Added lines #L74 - L77 were not covered by tests
}

@Override
public List<Receipt> getReceiptCategoryList(User user) {
return receiptRepository
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,6 @@ Page<Receipt> getReceiptList(
Receipt getReceipt(User user, Long receiptId);

List<Receipt> getReceiptMonthlyExpenseList(User user, int year);

List<Receipt> getAllReceipts(User user);
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
package com.ClubAccount_BE.user.adapter.in.delete;

import com.ClubAccount_BE.user.domain.User;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;

@Tag(name = "User Deletion", description = "회원 탈퇴 API")
public interface DeleteUserApi {
@Operation(summary = "회원 탈퇴", description = "로그인된 사용자가 자신의 계정을 탈퇴합니다.")
void deleteMyAccount(User user);
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
package com.ClubAccount_BE.user.adapter.in.delete;

import com.ClubAccount_BE.core.meta.LoginUser;
import com.ClubAccount_BE.user.application.port.in.delete.DeleteUserUseCase;
import com.ClubAccount_BE.user.domain.User;
import lombok.RequiredArgsConstructor;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;

@RestController
@RequestMapping("/api/v1/users")
@RequiredArgsConstructor
public class DeleteUserController implements DeleteUserApi {

private final DeleteUserUseCase deleteUserUseCase;

@DeleteMapping
@Override
public void deleteMyAccount(@LoginUser User user) {
deleteUserUseCase.deleteUser(user);
}

Check warning on line 22 in src/main/java/com/ClubAccount_BE/user/adapter/in/delete/DeleteUserController.java

View check run for this annotation

Codecov / codecov/patch

src/main/java/com/ClubAccount_BE/user/adapter/in/delete/DeleteUserController.java#L21-L22

Added lines #L21 - L22 were not covered by tests
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
package com.ClubAccount_BE.user.adapter.out;
package com.ClubAccount_BE.user.adapter.out.persistence;

import com.ClubAccount_BE.core.exception.ApiException;
import com.ClubAccount_BE.core.exception.ErrorCode;
import com.ClubAccount_BE.core.s3.S3KeyExtractor;
import com.ClubAccount_BE.core.s3.S3UrlBuilder;
import com.ClubAccount_BE.user.application.port.out.UploadProfileImagePort;
import com.ClubAccount_BE.user.application.port.out.delete.DeleteProfileImagePort;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Component;
Expand All @@ -16,39 +21,47 @@

@Component
@RequiredArgsConstructor
public class ProfileImageRepositoryAdapter implements UploadProfileImagePort {
public class ProfileImageRepositoryAdapter implements UploadProfileImagePort, DeleteProfileImagePort {

private final S3Client amazonS3;
private final S3KeyExtractor keyExtractor;
private final S3UrlBuilder urlBuilder;

@Value("${cloud.aws.s3.bucket}")
private String bucket;

@Override
public String uploadProfileImage(Long userId, MultipartFile image) {

String imageName = createImageName(image.getOriginalFilename());

try {
PutObjectRequest request = PutObjectRequest.builder()
.bucket(bucket)
.key(imageName)
.contentType(image.getContentType())
.build();

amazonS3.putObject(request,
RequestBody.fromInputStream(image.getInputStream(), image.getSize())
);

} catch (IOException e) {
throw new RuntimeException("S3 업로드 실패", e);
throw new ApiException(ErrorCode.S3_UPLOAD_FAIL, e.getMessage());

Check warning on line 46 in src/main/java/com/ClubAccount_BE/user/adapter/out/persistence/ProfileImageRepositoryAdapter.java

View check run for this annotation

Codecov / codecov/patch

src/main/java/com/ClubAccount_BE/user/adapter/out/persistence/ProfileImageRepositoryAdapter.java#L46

Added line #L46 was not covered by tests
}

return amazonS3.utilities()
.getUrl(b -> b.bucket(bucket).key(imageName))
.toExternalForm();
return urlBuilder.toUrl(imageName);

Check warning on line 48 in src/main/java/com/ClubAccount_BE/user/adapter/out/persistence/ProfileImageRepositoryAdapter.java

View check run for this annotation

Codecov / codecov/patch

src/main/java/com/ClubAccount_BE/user/adapter/out/persistence/ProfileImageRepositoryAdapter.java#L48

Added line #L48 was not covered by tests
}

private String createImageName(String originalFilename) {
return UUID.randomUUID() + IMAGE_KEY_DELIMITER + originalFilename;
}

@Override
public void deleteImages(String profileImage) {
try {
String key = keyExtractor.extractKey(profileImage);
amazonS3.deleteObject(builder -> builder
.bucket(bucket)
.key(key)

Check warning on line 61 in src/main/java/com/ClubAccount_BE/user/adapter/out/persistence/ProfileImageRepositoryAdapter.java

View check run for this annotation

Codecov / codecov/patch

src/main/java/com/ClubAccount_BE/user/adapter/out/persistence/ProfileImageRepositoryAdapter.java#L58-L61

Added lines #L58 - L61 were not covered by tests
);
} catch (Exception e) {
throw new ApiException(ErrorCode.S3_DELETE_FAIL);
}
}

Check warning on line 66 in src/main/java/com/ClubAccount_BE/user/adapter/out/persistence/ProfileImageRepositoryAdapter.java

View check run for this annotation

Codecov / codecov/patch

src/main/java/com/ClubAccount_BE/user/adapter/out/persistence/ProfileImageRepositoryAdapter.java#L63-L66

Added lines #L63 - L66 were not covered by tests
}
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,12 @@
UserMapper.toDomain(saved);
}

@Override
public void delete(User user) {
UserEntity entity = UserMapper.toEntity(user);
userRepository.delete(entity);
}

Check warning on line 38 in src/main/java/com/ClubAccount_BE/user/adapter/out/persistence/UserPersistenceAdapter.java

View check run for this annotation

Codecov / codecov/patch

src/main/java/com/ClubAccount_BE/user/adapter/out/persistence/UserPersistenceAdapter.java#L36-L38

Added lines #L36 - L38 were not covered by tests

@Override
public User getUserByAuthId(String authId) {
return userRepository.getByAuthId(authId)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package com.ClubAccount_BE.user.adapter.out.persistence.entity;

import com.ClubAccount_BE.core.entity.TimeBaseEntity;
import com.ClubAccount_BE.receipt.adapter.out.persistence.entity.ReceiptEntity;
import jakarta.persistence.*;
import lombok.AccessLevel;
import lombok.Getter;
Expand All @@ -10,6 +11,8 @@
import org.hibernate.type.SqlTypes;
import org.springframework.data.jpa.domain.support.AuditingEntityListener;

import java.util.ArrayList;
import java.util.List;
import java.util.UUID;


Expand Down Expand Up @@ -38,4 +41,7 @@ public class UserEntity extends TimeBaseEntity {
@Column(length = 36, nullable = false, unique = true)
@JdbcTypeCode(SqlTypes.CHAR)
private UUID link;

@OneToMany(mappedBy = "user", cascade = CascadeType.ALL, orphanRemoval = true)
private List<ReceiptEntity> receipts = new ArrayList<>();
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
package com.ClubAccount_BE.user.application.port.in.delete;

import com.ClubAccount_BE.user.domain.User;

public interface DeleteUserUseCase {
void deleteUser(User user);
}
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,5 @@

public interface UserPort {
void save(User user);
void delete(User user);
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
package com.ClubAccount_BE.user.application.port.out.delete;

public interface DeleteProfileImagePort {
void deleteImages(String profileImage);
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
package com.ClubAccount_BE.user.application.service.delete;

import com.ClubAccount_BE.receipt.application.port.out.DeleteReceiptImagePort;
import com.ClubAccount_BE.receipt.application.port.out.FindReceiptPort;
import com.ClubAccount_BE.receipt.domain.Receipt;
import com.ClubAccount_BE.user.application.port.in.delete.DeleteUserUseCase;
import com.ClubAccount_BE.user.application.port.out.UserPort;

import com.ClubAccount_BE.user.application.port.out.delete.DeleteProfileImagePort;
import com.ClubAccount_BE.user.domain.User;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

import java.util.List;
import java.util.Objects;

@Service
@RequiredArgsConstructor
@Transactional
public class DeleteUserService implements DeleteUserUseCase {

private final UserPort userPort;
private final FindReceiptPort findReceiptPort;
private final DeleteReceiptImagePort deleteReceiptImagePort;
private final DeleteProfileImagePort deleteProfileImagePort;

@Override
public void deleteUser(User user) {

deleteProfileImagePort.deleteImages(user.getProfileUrl());

Check warning on line 31 in src/main/java/com/ClubAccount_BE/user/application/service/delete/DeleteUserService.java

View check run for this annotation

Codecov / codecov/patch

src/main/java/com/ClubAccount_BE/user/application/service/delete/DeleteUserService.java#L31

Added line #L31 was not covered by tests

List<Receipt> receipts = findReceiptPort.getAllReceipts(user);
List<String> receiptImageKeys = receipts.stream()
.map(Receipt::getReceiptImageUrl)
.filter(Objects::nonNull)
.toList();
deleteReceiptImagePort.deleteImages(receiptImageKeys);

Check warning on line 38 in src/main/java/com/ClubAccount_BE/user/application/service/delete/DeleteUserService.java

View check run for this annotation

Codecov / codecov/patch

src/main/java/com/ClubAccount_BE/user/application/service/delete/DeleteUserService.java#L33-L38

Added lines #L33 - L38 were not covered by tests

// 회원 삭제
userPort.delete(user);
}

Check warning on line 42 in src/main/java/com/ClubAccount_BE/user/application/service/delete/DeleteUserService.java

View check run for this annotation

Codecov / codecov/patch

src/main/java/com/ClubAccount_BE/user/application/service/delete/DeleteUserService.java#L41-L42

Added lines #L41 - L42 were not covered by tests
}
Original file line number Diff line number Diff line change
Expand Up @@ -6,19 +6,23 @@
import com.ClubAccount_BE.user.application.port.in.update.ProfileUseCase;
import com.ClubAccount_BE.user.application.port.out.UploadProfileImagePort;
import com.ClubAccount_BE.user.application.port.out.UserPort;
import com.ClubAccount_BE.user.application.port.out.delete.DeleteProfileImagePort;
import com.ClubAccount_BE.user.domain.User;
import lombok.RequiredArgsConstructor;
import org.springframework.security.crypto.password.PasswordEncoder;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.multipart.MultipartFile;

import static com.ClubAccount_BE.core.exception.ErrorCode.AUTH_PASSWORD_CONFIRM_MISMATCH;

@Service
@Transactional
@RequiredArgsConstructor
public class ProfileService implements ProfileUseCase {

private final UploadProfileImagePort uploadProfileImagePort;
private final DeleteProfileImagePort deleteProfileImagePort;
private final UserPort userPort;
private final PasswordEncoder passwordEncoder;

Expand All @@ -35,6 +39,11 @@
}

if (profileImage != null && !profileImage.isEmpty()) {
String existingUrl = user.getProfileUrl();

Check warning on line 42 in src/main/java/com/ClubAccount_BE/user/application/service/update/ProfileService.java

View check run for this annotation

Codecov / codecov/patch

src/main/java/com/ClubAccount_BE/user/application/service/update/ProfileService.java#L42

Added line #L42 was not covered by tests
if (existingUrl != null && !existingUrl.isBlank()) {
deleteProfileImagePort.deleteImages(existingUrl);

Check warning on line 44 in src/main/java/com/ClubAccount_BE/user/application/service/update/ProfileService.java

View check run for this annotation

Codecov / codecov/patch

src/main/java/com/ClubAccount_BE/user/application/service/update/ProfileService.java#L44

Added line #L44 was not covered by tests
}

String url = uploadProfileImagePort.uploadProfileImage(user.getId(), profileImage);
user.updateProfileUrl(url);
}
Expand Down