Feat/#76 아키텍처 정의에 따른 패키지 및 클래스 이름 변경

src/main/java/coffeemeet/server/auth/domain/AuthTokensGenerator.java

@@ -1,6 +1,6 @@
 package coffeemeet.server.auth.domain;
 
-import coffeemeet.server.auth.service.cq.RefreshTokenCommand;
+import coffeemeet.server.auth.implement.RefreshTokenCommand;
 import java.util.Date;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;

src/main/java/coffeemeet/server/auth/service/cq/RefreshTokenCommand.java → src/main/java/coffeemeet/server/auth/implement/RefreshTokenCommand.java

@@ -1,7 +1,7 @@
-package coffeemeet.server.auth.service.cq;
+package coffeemeet.server.auth.implement;
 
 import coffeemeet.server.auth.domain.RefreshToken;
-import coffeemeet.server.auth.repository.RefreshTokenRepository;
+import coffeemeet.server.auth.infrastructure.RefreshTokenRepository;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;

src/main/java/coffeemeet/server/auth/service/cq/RefreshTokenQuery.java → src/main/java/coffeemeet/server/auth/implement/RefreshTokenQuery.java

@@ -1,9 +1,9 @@
-package coffeemeet.server.auth.service.cq;
+package coffeemeet.server.auth.implement;
 
 import static coffeemeet.server.auth.exception.AuthErrorCode.AUTHENTICATION_FAILED;
 
 import coffeemeet.server.auth.domain.RefreshToken;
-import coffeemeet.server.auth.repository.RefreshTokenRepository;
+import coffeemeet.server.auth.infrastructure.RefreshTokenRepository;
 import coffeemeet.server.common.execption.InvalidInputException;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;

src/main/java/coffeemeet/server/auth/repository/RefreshTokenRepository.java → src/main/java/coffeemeet/server/auth/infrastructure/RefreshTokenRepository.java

@@ -1,4 +1,4 @@
-package coffeemeet.server.auth.repository;
+package coffeemeet.server.auth.infrastructure;
 
 import coffeemeet.server.auth.domain.RefreshToken;
 import org.springframework.data.repository.CrudRepository;

src/main/java/coffeemeet/server/auth/controller/AuthController.java → src/main/java/coffeemeet/server/auth/presentation/AuthController.java

@@ -1,9 +1,9 @@
-package coffeemeet.server.auth.controller;
+package coffeemeet.server.auth.presentation;
 
 import coffeemeet.server.auth.domain.AuthTokens;
 import coffeemeet.server.auth.service.AuthService;
-import coffeemeet.server.common.annotation.Login;
-import coffeemeet.server.user.controller.dto.AuthInfo;
+import coffeemeet.server.common.presentation.annotation.Login;
+import coffeemeet.server.user.presentation.dto.AuthInfo;
 import lombok.RequiredArgsConstructor;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.PostMapping;

src/main/java/coffeemeet/server/auth/service/AuthService.java

@@ -5,7 +5,7 @@
 import coffeemeet.server.auth.domain.AuthTokens;
 import coffeemeet.server.auth.domain.AuthTokensGenerator;
 import coffeemeet.server.auth.domain.JwtTokenProvider;
-import coffeemeet.server.auth.service.cq.RefreshTokenCommand;
+import coffeemeet.server.auth.implement.RefreshTokenCommand;
 import coffeemeet.server.common.execption.InvalidAuthException;
 import coffeemeet.server.user.service.UserService;
 import lombok.RequiredArgsConstructor;

src/main/java/coffeemeet/server/certification/service/cq/CertificationCommand.java → src/main/java/coffeemeet/server/certification/implement/CertificationCommand.java

@@ -1,11 +1,11 @@
-package coffeemeet.server.certification.service.cq;
+package coffeemeet.server.certification.implement;
 
 import static coffeemeet.server.certification.exception.CertificationErrorCode.EXISTED_COMPANY_EMAIL;
 
 import coffeemeet.server.certification.domain.Certification;
 import coffeemeet.server.certification.domain.CompanyEmail;
 import coffeemeet.server.certification.domain.Department;
-import coffeemeet.server.certification.repository.CertificationRepository;
+import coffeemeet.server.certification.infrastructure.CertificationRepository;
 import coffeemeet.server.common.execption.InvalidInputException;
 import coffeemeet.server.user.domain.User;
 import java.util.function.Consumer;

src/main/java/coffeemeet/server/certification/service/cq/CertificationQuery.java → src/main/java/coffeemeet/server/certification/implement/CertificationQuery.java

@@ -1,9 +1,9 @@
-package coffeemeet.server.certification.service.cq;
+package coffeemeet.server.certification.implement;
 
 import static coffeemeet.server.certification.exception.CertificationErrorCode.CERTIFICATION_NOT_FOUND;
 
 import coffeemeet.server.certification.domain.Certification;
-import coffeemeet.server.certification.repository.CertificationRepository;
+import coffeemeet.server.certification.infrastructure.CertificationRepository;
 import coffeemeet.server.common.execption.InvalidInputException;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;

src/main/java/coffeemeet/server/certification/service/cq/EmailVerificationCommand.java → src/main/java/coffeemeet/server/certification/implement/EmailVerificationCommand.java

@@ -1,8 +1,8 @@
-package coffeemeet.server.certification.service.cq;
+package coffeemeet.server.certification.implement;
 
 import coffeemeet.server.certification.domain.CompanyEmail;
 import coffeemeet.server.certification.domain.EmailVerification;
-import coffeemeet.server.certification.repository.EmailVerificationRepository;
+import coffeemeet.server.certification.infrastructure.EmailVerificationRepository;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 

src/main/java/coffeemeet/server/certification/service/cq/EmailVerificationQuery.java → src/main/java/coffeemeet/server/certification/implement/EmailVerificationQuery.java

@@ -1,9 +1,9 @@
-package coffeemeet.server.certification.service.cq;
+package coffeemeet.server.certification.implement;
 
 import static coffeemeet.server.certification.exception.CertificationErrorCode.VERIFICATION_CODE_NOT_FOUND;
 
 import coffeemeet.server.certification.domain.EmailVerification;
-import coffeemeet.server.certification.repository.EmailVerificationRepository;
+import coffeemeet.server.certification.infrastructure.EmailVerificationRepository;
 import coffeemeet.server.common.execption.InvalidInputException;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
@@ -12,7 +12,7 @@
 @RequiredArgsConstructor
 public class EmailVerificationQuery {
 
-  private static final String VERIFICATION_CODE_NOT_FOUND_MESSAGE = "인증코드 기간이 만료되었거나 해당 유저(%s)가 인증 번호를 요청한 기록이 없습니다.";
+  private static final String VERIFICATION_CODE_NOT_FOUND_MESSAGE = "인증코드 기간이 만료되었거나 해당 유저(%s)가 인증코드를 요청한 기록이 없습니다.";
 
   private final EmailVerificationRepository emailVerificationRepository;
 

src/main/java/coffeemeet/server/certification/repository/CertificationRepository.java → src/main/java/coffeemeet/server/certification/infrastructure/CertificationRepository.java

@@ -1,4 +1,4 @@
-package coffeemeet.server.certification.repository;
+package coffeemeet.server.certification.infrastructure;
 
 import coffeemeet.server.certification.domain.Certification;
 import coffeemeet.server.certification.domain.CompanyEmail;

src/main/java/coffeemeet/server/certification/repository/EmailVerificationRepository.java → src/main/java/coffeemeet/server/certification/infrastructure/EmailVerificationRepository.java

@@ -1,4 +1,4 @@
-package coffeemeet.server.certification.repository;
+package coffeemeet.server.certification.infrastructure;
 
 import coffeemeet.server.certification.domain.EmailVerification;
 import org.springframework.data.repository.CrudRepository;

src/main/java/coffeemeet/server/certification/controller/CertificationController.java → src/main/java/coffeemeet/server/certification/presentation/CertificationController.java

@@ -1,11 +1,11 @@
-package coffeemeet.server.certification.controller;
+package coffeemeet.server.certification.presentation;
 
-import coffeemeet.server.certification.controller.dto.EmailDto;
-import coffeemeet.server.certification.controller.dto.VerificationCodeDto;
+import coffeemeet.server.certification.presentation.dto.EmailDto;
+import coffeemeet.server.certification.presentation.dto.VerificationCodeDto;
 import coffeemeet.server.certification.service.CertificationService;
-import coffeemeet.server.common.annotation.Login;
+import coffeemeet.server.common.presentation.annotation.Login;
 import coffeemeet.server.common.util.FileUtils;
-import coffeemeet.server.user.controller.dto.AuthInfo;
+import coffeemeet.server.user.presentation.dto.AuthInfo;
 import jakarta.validation.Valid;
 import jakarta.validation.constraints.NotNull;
 import lombok.RequiredArgsConstructor;

src/main/java/coffeemeet/server/certification/controller/dto/EmailDto.java → src/main/java/coffeemeet/server/certification/presentation/dto/EmailDto.java

@@ -1,4 +1,4 @@
-package coffeemeet.server.certification.controller.dto;
+package coffeemeet.server.certification.presentation.dto;
 
 import jakarta.validation.constraints.Email;
 import jakarta.validation.constraints.NotNull;

src/main/java/coffeemeet/server/certification/controller/dto/VerificationCodeDto.java → src/main/java/coffeemeet/server/certification/presentation/dto/VerificationCodeDto.java

@@ -1,4 +1,4 @@
-package coffeemeet.server.certification.controller.dto;
+package coffeemeet.server.certification.presentation.dto;
 
 import jakarta.validation.constraints.NotNull;
 import org.hibernate.validator.constraints.Length;

src/main/java/coffeemeet/server/certification/service/CertificationService.java

@@ -1,19 +1,19 @@
 package coffeemeet.server.certification.service;
 
 import static coffeemeet.server.certification.exception.CertificationErrorCode.INVALID_VERIFICATION_CODE;
-import static coffeemeet.server.common.media.S3MediaService.KeyType.BUSINESS_CARD;
+import static coffeemeet.server.common.implement.KeyType.BUSINESS_CARD;
 
 import coffeemeet.server.certification.domain.CompanyEmail;
 import coffeemeet.server.certification.domain.Department;
-import coffeemeet.server.certification.service.cq.CertificationCommand;
-import coffeemeet.server.certification.service.cq.EmailVerificationCommand;
-import coffeemeet.server.certification.service.cq.EmailVerificationQuery;
+import coffeemeet.server.certification.implement.CertificationCommand;
+import coffeemeet.server.certification.implement.EmailVerificationCommand;
+import coffeemeet.server.certification.implement.EmailVerificationQuery;
 import coffeemeet.server.common.execption.InvalidInputException;
-import coffeemeet.server.common.media.EmailService;
-import coffeemeet.server.common.media.S3MediaService;
+import coffeemeet.server.common.implement.EmailSender;
+import coffeemeet.server.common.implement.MediaManager;
 import coffeemeet.server.common.util.FileUtils;
 import coffeemeet.server.user.domain.User;
-import coffeemeet.server.user.service.cq.UserQuery;
+import coffeemeet.server.user.implement.UserQuery;
 import java.io.File;
 import java.util.random.RandomGenerator;
 import lombok.RequiredArgsConstructor;
@@ -26,32 +26,32 @@ public class CertificationService {
   private static final String WRONG_VERIFICATION_CODE_MESSAGE = "사용자(%s)가 잘못된 인증코드(%s)를 입력했습니다.";
   private static final RandomGenerator RANDOM_GENERATOR = RandomGenerator.getDefault();
 
-  private final S3MediaService s3MediaService;
-  private final EmailService emailService;
+  private final MediaManager mediaManager;
+  private final EmailSender emailSender;
   private final UserQuery userQuery;
   private final CertificationCommand certificationCommand;
   private final EmailVerificationCommand emailVerificationCommand;
   private final EmailVerificationQuery emailVerificationQuery;
 
   public void registerCertification(long userId, String email, String departmentName,
       File businessCardImage) {
-    String key = s3MediaService.generateKey(BUSINESS_CARD);
+    String key = mediaManager.generateKey(BUSINESS_CARD);
     uploadBusinessCard(userId, key, businessCardImage);
 
     CompanyEmail companyEmail = new CompanyEmail(email);
-    String businessCardUrl = s3MediaService.getUrl(key);
+    String businessCardUrl = mediaManager.getUrl(key);
     Department department = Department.valueOf(departmentName);
     User user = userQuery.getUserById(userId);
     certificationCommand.createCertification(companyEmail, businessCardUrl, department, user);
   }
 
   private void uploadBusinessCard(long userId, String key, File businessCardUrl) {
     certificationCommand.applyIfCertifiedUser(userId, certification -> {
-      String oldKey = s3MediaService.extractKey(certification.getBusinessCardUrl(), BUSINESS_CARD);
-      s3MediaService.delete(oldKey);
+      String oldKey = mediaManager.extractKey(certification.getBusinessCardUrl(), BUSINESS_CARD);
+      mediaManager.delete(oldKey);
     });
 
-    s3MediaService.upload(key, businessCardUrl);
+    mediaManager.upload(key, businessCardUrl);
     FileUtils.delete(businessCardUrl);
   }
 
@@ -60,7 +60,7 @@ public void sendVerificationMail(Long userId, String email) {
     certificationCommand.hasDuplicatedCompanyEmail(companyEmail);
 
     String verificationCode = generateVerificationCode();
-    emailService.sendVerificationCode(companyEmail, verificationCode);
+    emailSender.sendVerificationCode(companyEmail, verificationCode);
     emailVerificationCommand.createEmailVerification(userId, companyEmail, verificationCode);
   }
 

src/main/java/coffeemeet/server/chatting/message/exception/MessageErrorCode.java → src/main/java/coffeemeet/server/chatting/exception/ChattingErrorCode.java

@@ -1,12 +1,12 @@
-package coffeemeet.server.chatting.message.exception;
+package coffeemeet.server.chatting.exception;
 
 import coffeemeet.server.common.execption.ErrorCode;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 
 @Getter
 @RequiredArgsConstructor
-public enum MessageErrorCode implements ErrorCode {
+public enum ChattingErrorCode implements ErrorCode {
   INVALID_MESSAGE("CM000", "유효하지 않은 메세지 형식입니다."),
   ;
 

src/main/java/coffeemeet/server/chatting/message/domain/ChattingMessage.java

@@ -1,8 +1,7 @@
 package coffeemeet.server.chatting.message.domain;
 
-import static coffeemeet.server.chatting.message.exception.MessageErrorCode.INVALID_MESSAGE;
+import static coffeemeet.server.chatting.exception.ChattingErrorCode.INVALID_MESSAGE;
 
-import coffeemeet.server.chatting.room.domain.ChattingRoom;
 import coffeemeet.server.common.entity.BaseEntity;
 import coffeemeet.server.common.execption.InvalidInputException;
 import jakarta.persistence.Column;

src/main/java/coffeemeet/server/chatting/room/domain/ChattingRoom.java → src/main/java/coffeemeet/server/chatting/message/domain/ChattingRoom.java

@@ -1,4 +1,4 @@
-package coffeemeet.server.chatting.room.domain;
+package coffeemeet.server.chatting.message.domain;
 
 import coffeemeet.server.common.entity.BaseEntity;
 import jakarta.persistence.Entity;

src/main/java/coffeemeet/server/chatting/message/domain/ChattingMessageHistory.java → src/main/java/coffeemeet/server/chatting/room/domain/ChattingMessageHistory.java

@@ -1,8 +1,7 @@
-package coffeemeet.server.chatting.message.domain;
+package coffeemeet.server.chatting.room.domain;
 
-import static coffeemeet.server.chatting.message.exception.MessageErrorCode.INVALID_MESSAGE;
+import static coffeemeet.server.chatting.exception.ChattingErrorCode.INVALID_MESSAGE;
 
-import coffeemeet.server.chatting.room.domain.ChattingRoomHistory;
 import coffeemeet.server.common.entity.BaseEntity;
 import coffeemeet.server.common.execption.InvalidInputException;
 import jakarta.persistence.Column;

src/main/java/coffeemeet/server/user_chatting_history/domain/UserChattingHistory.java → src/main/java/coffeemeet/server/chatting/room/domain/UserChattingHistory.java

@@ -1,6 +1,5 @@
-package coffeemeet.server.user_chatting_history.domain;
+package coffeemeet.server.chatting.room.domain;
 
-import coffeemeet.server.chatting.room.domain.ChattingRoomHistory;
 import coffeemeet.server.common.entity.BaseEntity;
 import coffeemeet.server.user.domain.User;
 import jakarta.persistence.Entity;

src/main/java/coffeemeet/server/common/config/S3Config.java → src/main/java/coffeemeet/server/common/config/AWSConfig.java

@@ -9,13 +9,13 @@
 import org.springframework.context.annotation.Configuration;
 
 @Configuration
-public class S3Config {
+public class AWSConfig {
 
   private final String accessKey;
   private final String secretKey;
   private final String region;
 
-  public S3Config(
+  public AWSConfig(
       @Value("${cloud.aws.credentials.access-key}") String accessKey,
       @Value("${cloud.aws.credentials.secret-key}") String secretKey,
       @Value("${cloud.aws.region.static}") String region) {

src/main/java/coffeemeet/server/common/config/AuthWebConfig.java

@@ -1,8 +1,8 @@
 package coffeemeet.server.common.config;
 
 import coffeemeet.server.auth.domain.JwtTokenProvider;
-import coffeemeet.server.auth.service.cq.RefreshTokenQuery;
-import coffeemeet.server.common.UserArgumentResolver;
+import coffeemeet.server.auth.implement.RefreshTokenQuery;
+import coffeemeet.server.common.presentation.resolver.UserArgumentResolver;
 import coffeemeet.server.oauth.utils.converter.OAuthProviderConverter;
 import java.util.List;
 import lombok.RequiredArgsConstructor;

src/main/java/coffeemeet/server/common/media/EmailService.java → src/main/java/coffeemeet/server/common/implement/EmailSender.java

@@ -1,4 +1,4 @@
-package coffeemeet.server.common.media;
+package coffeemeet.server.common.implement;
 
 import coffeemeet.server.certification.domain.CompanyEmail;
 import org.springframework.beans.factory.annotation.Value;
@@ -7,12 +7,12 @@
 import org.springframework.stereotype.Service;
 
 @Service
-public class EmailService {
+public class EmailSender {
 
   private final JavaMailSender javaMailSender;
   private final String sender;
 
-  public EmailService(JavaMailSender javaMailSender,
+  public EmailSender(JavaMailSender javaMailSender,
       @Value("${spring.mail.username}") String sender) {
     this.javaMailSender = javaMailSender;
     this.sender = sender;

src/main/java/coffeemeet/server/common/implement/KeyType.java

@@ -0,0 +1,18 @@
+package coffeemeet.server.common.implement;
+
+import lombok.Getter;
+
+@Getter
+public enum KeyType {
+
+  BUSINESS_CARD("BusinessCard"),
+  PROFILE_IMAGE("ProfileImage"),
+  ;
+
+  private final String value;
+
+  KeyType(String value) {
+    this.value = value;
+  }
+
+}

src/main/java/coffeemeet/server/common/implement/MediaManager.java

@@ -0,0 +1,17 @@
+package coffeemeet.server.common.implement;
+
+import java.io.File;
+
+public interface MediaManager {
+
+  void upload(String key, File file);
+
+  void delete(String key);
+
+  String getUrl(String key);
+
+  String generateKey(KeyType keyType);
+
+  String extractKey(String s3Url, KeyType keyType);
+
+}