1.71차 배포

build.gradle

@@ -21,12 +21,6 @@ dependencies {
     implementation 'org.springframework.boot:spring-boot-starter-web'
     implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
 
-    // Thymeleaf
-    implementation 'org.springframework.boot:spring-boot-starter-thymeleaf'
-
-    // Mail
-    implementation 'org.springframework.boot:spring-boot-starter-mail'
-
     // Bean Validation
     implementation 'org.springframework.boot:spring-boot-starter-validation'
 

src/main/java/ject/componote/domain/auth/application/AuthService.java

@@ -3,6 +3,7 @@
 import ject.componote.domain.auth.dao.MemberRepository;
 import ject.componote.domain.auth.dao.SocialAccountRepository;
 import ject.componote.domain.auth.domain.Member;
+import ject.componote.domain.auth.dto.image.event.ProfileImageMoveEvent;
 import ject.componote.domain.auth.dto.login.request.MemberLoginRequest;
 import ject.componote.domain.auth.dto.login.response.MemberLoginResponse;
 import ject.componote.domain.auth.dto.signup.request.MemberSignupRequest;
@@ -15,16 +16,16 @@
 import ject.componote.domain.auth.model.AuthPrincipal;
 import ject.componote.domain.auth.model.Nickname;
 import ject.componote.domain.auth.token.application.TokenService;
-import ject.componote.infra.storage.application.StorageService;
 import lombok.RequiredArgsConstructor;
+import org.springframework.context.ApplicationEventPublisher;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 @RequiredArgsConstructor
 @Service
 @Transactional(readOnly = true)
 public class AuthService {
-    private final StorageService storageService;
+    private final ApplicationEventPublisher eventPublisher;
     private final MemberRepository memberRepository;
     private final SocialAccountRepository socialAccountRepository;
     private final TokenService tokenService;
@@ -41,7 +42,7 @@ public MemberSignupResponse signup(final MemberSignupRequest request) {
         }
 
         final Member member = memberRepository.save(request.toMember(socialAccountId));
-        storageService.moveImage(member.getProfileImage());
+        eventPublisher.publishEvent(ProfileImageMoveEvent.from(member));
         final String accessToken = createAccessToken(member);
         return MemberSignupResponse.of(accessToken, member);
     }

src/main/java/ject/componote/domain/auth/application/MemberEmailVerificationEventListener.java

@@ -0,0 +1,32 @@
+package ject.componote.domain.auth.application;
+
+import ject.componote.domain.auth.dao.VerificationCodeRepository;
+import ject.componote.domain.auth.domain.VerificationCode;
+import ject.componote.domain.auth.dto.verify.event.EmailVerificationCodeSendEvent;
+import ject.componote.domain.auth.util.VerificationCodeProvider;
+import ject.componote.infra.mail.application.MailProducer;
+import ject.componote.infra.mail.dto.VerificationCodeMailRequest;
+import lombok.RequiredArgsConstructor;
+import org.springframework.context.event.EventListener;
+import org.springframework.scheduling.annotation.Async;
+import org.springframework.stereotype.Component;
+
+@Component
+@RequiredArgsConstructor
+public class MemberEmailVerificationEventListener {
+    private final MailProducer mailProducer;
+    private final VerificationCodeProvider verificationCodeProvider;
+    private final VerificationCodeRepository verificationCodeRepository;
+
+    @Async
+    @EventListener
+    public void handleVerificationCodeSendEvent(final EmailVerificationCodeSendEvent event) {
+        final String email = event.email();
+        if (email == null || email.isBlank()) {
+            return;
+        }
+        final VerificationCode verificationCode = verificationCodeProvider.createVerificationCode();
+        verificationCodeRepository.save(email, verificationCode);
+        mailProducer.sendVerificationMail(VerificationCodeMailRequest.of(email, verificationCode));
+    }
+}

src/main/java/ject/componote/domain/auth/application/MemberService.java

@@ -3,9 +3,11 @@
 import ject.componote.domain.auth.dao.MemberRepository;
 import ject.componote.domain.auth.domain.Member;
 import ject.componote.domain.auth.dto.find.response.MemberSummaryResponse;
+import ject.componote.domain.auth.dto.image.event.ProfileImageMoveEvent;
 import ject.componote.domain.auth.dto.update.request.MemberEmailUpdateRequest;
 import ject.componote.domain.auth.dto.update.request.MemberNicknameUpdateRequest;
 import ject.componote.domain.auth.dto.update.request.MemberProfileImageUpdateRequest;
+import ject.componote.domain.auth.dto.verify.event.EmailVerificationCodeSendEvent;
 import ject.componote.domain.auth.dto.verify.request.MemberEmailVerificationRequest;
 import ject.componote.domain.auth.error.DuplicatedEmailException;
 import ject.componote.domain.auth.error.DuplicatedNicknameException;
@@ -15,19 +17,18 @@
 import ject.componote.domain.auth.model.Email;
 import ject.componote.domain.auth.model.Nickname;
 import ject.componote.domain.auth.model.ProfileImage;
-import ject.componote.infra.mail.application.MailService;
-import ject.componote.infra.storage.application.StorageService;
 import lombok.RequiredArgsConstructor;
+import org.springframework.context.ApplicationEventPublisher;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 @Service
 @RequiredArgsConstructor
 @Transactional(readOnly = true)
 public class MemberService {
-    private final StorageService storageService;
-    private final MailService mailService;
+    private final ApplicationEventPublisher eventPublisher;
     private final MemberRepository memberRepository;
+    private final VerificationCodeService verificationCodeService;
 
     public MemberSummaryResponse getMemberSummary(final AuthPrincipal authPrincipal) {
         final Long memberId = authPrincipal.id();
@@ -44,9 +45,8 @@ public void updateProfileImage(final AuthPrincipal authPrincipal, final MemberPr
             return;
         }
 
-        storageService.moveImage(profileImage);
         member.updateProfileImage(profileImage);
-        memberRepository.save(member);
+        eventPublisher.publishEvent(ProfileImageMoveEvent.from(member));
     }
 
     @Transactional
@@ -62,18 +62,15 @@ public void updateNickname(final AuthPrincipal authPrincipal, final MemberNickna
         }
 
         member.updateNickname(nickname);
-        memberRepository.save(member);
     }
 
     @Transactional
     public void updateEmail(final AuthPrincipal authPrincipal, final MemberEmailUpdateRequest request) {
-        final Email email = Email.from(request.email());
-        validateDuplicatedEmail(email);
-
         final Member member = findMemberById(authPrincipal.id());
+        final Email email = Email.from(request.email());
         validateSameEmail(member, email);
-
-        mailService.verifyEmailCode(request.email(), request.verificationCode());
+        validateDuplicatedEmail(email);
+        verificationCodeService.verifyEmailCode(request.email(), request.verificationCode());
         member.updateEmail(email);
     }
 
@@ -84,7 +81,7 @@ public void sendVerificationCode(final AuthPrincipal authPrincipal, final Member
         final Member member = findMemberById(authPrincipal.id());
         validateSameEmail(member, email);
 
-        mailService.sendVerificationCode(request.email());
+        eventPublisher.publishEvent(EmailVerificationCodeSendEvent.from(email));
     }
 
     private Member findMemberById(final Long memberId) {

src/main/java/ject/componote/domain/auth/application/ProfileImageEventListener.java

@@ -0,0 +1,28 @@
+package ject.componote.domain.auth.application;
+
+import ject.componote.domain.auth.dto.image.event.ProfileImageMoveEvent;
+import ject.componote.domain.auth.model.ProfileImage;
+import ject.componote.infra.storage.application.StorageProducer;
+import ject.componote.infra.storage.dto.move.request.ImageMoveRequest;
+import lombok.RequiredArgsConstructor;
+import org.springframework.scheduling.annotation.Async;
+import org.springframework.stereotype.Component;
+import org.springframework.transaction.event.TransactionPhase;
+import org.springframework.transaction.event.TransactionalEventListener;
+
+@Component
+@RequiredArgsConstructor
+public class ProfileImageEventListener {
+    private final StorageProducer storageProducer;
+
+    @Async
+    @TransactionalEventListener(phase = TransactionPhase.AFTER_COMMIT)
+    public void handleImageMove(final ProfileImageMoveEvent event) {
+        final ProfileImage image = event.image();
+        if (image.isDefaultImage()) {
+            return;
+        }
+
+        storageProducer.sendImageMoveMessage(ImageMoveRequest.from(image));
+    }
+}

src/main/java/ject/componote/domain/auth/application/VerificationCodeService.java

@@ -0,0 +1,26 @@
+package ject.componote.domain.auth.application;
+
+import ject.componote.domain.auth.dao.VerificationCodeRepository;
+import ject.componote.domain.auth.domain.VerificationCode;
+import ject.componote.domain.auth.error.NotFoundVerificationCodeException;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+
+@Service
+@RequiredArgsConstructor
+public class VerificationCodeService {
+    private final VerificationCodeRepository verificationCodeRepository;
+
+    public void verifyEmailCode(final String email, final String codeValue) {
+        final VerificationCode verificationCode = findVerificationCodeByEmail(email);
+        if (!verificationCode.equalsValue(codeValue)) {
+            throw new NotFoundVerificationCodeException();
+        }
+        verificationCodeRepository.deleteByEmail(email);
+    }
+
+    private VerificationCode findVerificationCodeByEmail(final String email) {
+        return verificationCodeRepository.findByEmail(email)
+                .orElseThrow(NotFoundVerificationCodeException::new);
+    }
+}

src/main/java/ject/componote/infra/mail/repository/VerificationCodeRepository.java → src/main/java/ject/componote/domain/auth/dao/VerificationCodeRepository.java

@@ -1,6 +1,6 @@
-package ject.componote.infra.mail.repository;
+package ject.componote.domain.auth.dao;
 
-import ject.componote.infra.mail.model.VerificationCode;
+import ject.componote.domain.auth.domain.VerificationCode;
 
 import java.util.Optional;
 

src/main/java/ject/componote/infra/mail/repository/impl/InMemoryVerificationCodeRepository.java → src/main/java/ject/componote/domain/auth/dao/impl/InMemoryVerificationCodeRepository.java

@@ -1,12 +1,14 @@
-package ject.componote.infra.mail.repository.impl;
+package ject.componote.domain.auth.dao.impl;
 
-import ject.componote.infra.mail.model.VerificationCode;
-import ject.componote.infra.mail.repository.VerificationCodeRepository;
+import ject.componote.domain.auth.dao.VerificationCodeRepository;
+import ject.componote.domain.auth.domain.VerificationCode;
+import org.springframework.stereotype.Repository;
 
 import java.util.Map;
 import java.util.Optional;
 import java.util.concurrent.ConcurrentHashMap;
 
+@Repository
 public class InMemoryVerificationCodeRepository implements VerificationCodeRepository {
     private final Map<String, VerificationCode> storage = new ConcurrentHashMap<>();
 

src/main/java/ject/componote/infra/mail/model/VerificationCode.java → src/main/java/ject/componote/domain/auth/domain/VerificationCode.java

@@ -1,4 +1,4 @@
-package ject.componote.infra.mail.model;
+package ject.componote.domain.auth.domain;
 
 import java.time.LocalDateTime;
 

src/main/java/ject/componote/domain/auth/dto/image/event/ProfileImageMoveEvent.java

@@ -0,0 +1,10 @@
+package ject.componote.domain.auth.dto.image.event;
+
+import ject.componote.domain.auth.domain.Member;
+import ject.componote.domain.auth.model.ProfileImage;
+
+public record ProfileImageMoveEvent(ProfileImage image) {
+    public static ProfileImageMoveEvent from(final Member member) {
+        return new ProfileImageMoveEvent(member.getProfileImage());
+    }
+}

src/main/java/ject/componote/domain/auth/dto/verify/event/EmailVerificationCodeSendEvent.java

@@ -0,0 +1,9 @@
+package ject.componote.domain.auth.dto.verify.event;
+
+import ject.componote.domain.auth.model.Email;
+
+public record EmailVerificationCodeSendEvent(String email) {
+    public static EmailVerificationCodeSendEvent from(final Email email) {
+        return new EmailVerificationCodeSendEvent(email.getValue());
+    }
+}

src/main/java/ject/componote/infra/mail/error/NotFoundVerificationCodeException.java → src/main/java/ject/componote/domain/auth/error/NotFoundVerificationCodeException.java

@@ -1,9 +1,9 @@
-package ject.componote.infra.mail.error;
+package ject.componote.domain.auth.error;
 
 import org.springframework.http.HttpStatus;
 
-public class NotFoundVerificationCodeException extends MailException {
+public class NotFoundVerificationCodeException extends AuthException {
     public NotFoundVerificationCodeException() {
         super("인증 코드가 만료되었거나 잘못되었습니다.", HttpStatus.NOT_FOUND);
     }
-}
+}

src/main/java/ject/componote/domain/auth/model/ProfileImage.java

@@ -31,4 +31,8 @@ public static ProfileImage from(final String objectKey) {
 
         return new ProfileImage(objectKey);
     }
+
+    public boolean isDefaultImage() {
+        return this == DEFAULT_PROFILE_IMAGE;
+    }
 }

src/main/java/ject/componote/infra/mail/util/VerificationCodeProvider.java → src/main/java/ject/componote/domain/auth/util/VerificationCodeProvider.java

@@ -1,6 +1,6 @@
-package ject.componote.infra.mail.util;
+package ject.componote.domain.auth.util;
 
-import ject.componote.infra.mail.model.VerificationCode;
+import ject.componote.domain.auth.domain.VerificationCode;
 import org.springframework.stereotype.Component;
 
 import java.time.LocalDateTime;

src/main/java/ject/componote/domain/bookmark/dao/ComponentBookmarkQueryDsl.java

@@ -0,0 +1,7 @@
+package ject.componote.domain.bookmark.dao;
+
+import java.util.Set;
+
+public interface ComponentBookmarkQueryDsl {
+    Set<Long> findAllComponentIdsByMemberIdAndComponentIds(final Long memberId, final Set<Long> componentIds);
+}

src/main/java/ject/componote/domain/bookmark/dao/ComponentBookmarkQueryDslImpl.java

@@ -0,0 +1,28 @@
+package ject.componote.domain.bookmark.dao;
+
+import com.querydsl.jpa.impl.JPAQueryFactory;
+import lombok.RequiredArgsConstructor;
+
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Set;
+
+import static ject.componote.domain.bookmark.domain.QComponentBookmark.componentBookmark;
+
+@RequiredArgsConstructor
+public class ComponentBookmarkQueryDslImpl implements ComponentBookmarkQueryDsl {
+    private final JPAQueryFactory queryFactory;
+
+    @Override
+    public Set<Long> findAllComponentIdsByMemberIdAndComponentIds(final Long memberId, final Set<Long> componentIds) {
+        if (memberId == null || componentIds.isEmpty()) {
+            return Collections.emptySet();
+        }
+        return new HashSet<>(
+                queryFactory.select(componentBookmark.componentId)
+                .from(componentBookmark)
+                .where(componentBookmark.memberId.eq(memberId).and(componentBookmark.componentId.in(componentIds)))
+                .fetch()
+        );
+    }
+}

src/main/java/ject/componote/domain/bookmark/dao/ComponentBookmarkRepository.java

@@ -9,7 +9,7 @@
 import java.util.Optional;
 
 @Repository
-public interface ComponentBookmarkRepository extends JpaRepository<ComponentBookmark, Long> {
+public interface ComponentBookmarkRepository extends JpaRepository<ComponentBookmark, Long>, ComponentBookmarkQueryDsl {
     Page<ComponentBookmark> findAllByMemberId(Long memberId, Pageable pageable);
     boolean existsByMemberIdAndComponentId(Long memberId, Long componentId);
     Optional<ComponentBookmark> findByMemberIdAndComponentId(Long memberId, Long componentId);

src/main/java/ject/componote/domain/component/api/ComponentController.java

@@ -6,6 +6,8 @@
 import ject.componote.domain.common.dto.response.PageResponse;
 import ject.componote.domain.component.application.ComponentService;
 import ject.componote.domain.component.dto.find.request.ComponentSearchRequest;
+import ject.componote.domain.component.dto.find.request.ComponentSummaryRequest;
+import ject.componote.domain.component.dto.find.response.ComponentSearchResponse;
 import ject.componote.domain.component.dto.find.response.ComponentSummaryResponse;
 import lombok.RequiredArgsConstructor;
 import org.springframework.data.domain.Pageable;
@@ -23,14 +25,24 @@
 public class ComponentController {
     private final ComponentService componentService;
 
-    @GetMapping("/search")
-    public ResponseEntity<PageResponse<ComponentSummaryResponse>> search(
+    @GetMapping
+    public ResponseEntity<PageResponse<ComponentSummaryResponse>> getAllComponentSummaries(
             @Authenticated final AuthPrincipal authPrincipal,
+            @ModelAttribute @Valid final ComponentSummaryRequest request,
+            @PageableDefault final Pageable pageable
+    ) {
+        return ResponseEntity.ok(
+                componentService.getAllComponentSummaries(authPrincipal, request, pageable)
+        );
+    }
+
+    @GetMapping("/search")
+    public ResponseEntity<PageResponse<ComponentSearchResponse>> search(
             @ModelAttribute @Valid final ComponentSearchRequest request,
             @PageableDefault final Pageable pageable
-            ) {
+    ) {
         return ResponseEntity.ok(
-                componentService.search(authPrincipal, request, pageable)
+                componentService.search(request, pageable)
         );
     }