diff --git a/src/main/java/clap/server/adapter/outbound/api/AgitClient.java b/src/main/java/clap/server/adapter/outbound/api/agit/AgitClient.java similarity index 94% rename from src/main/java/clap/server/adapter/outbound/api/AgitClient.java rename to src/main/java/clap/server/adapter/outbound/api/agit/AgitClient.java index 257b4bbe..d16dc964 100644 --- a/src/main/java/clap/server/adapter/outbound/api/AgitClient.java +++ b/src/main/java/clap/server/adapter/outbound/api/agit/AgitClient.java @@ -1,6 +1,6 @@ -package clap.server.adapter.outbound.api; +package clap.server.adapter.outbound.api.agit; -import clap.server.adapter.outbound.api.dto.PushNotificationTemplate; +import clap.server.adapter.outbound.api.data.PushNotificationTemplate; import clap.server.adapter.outbound.persistense.entity.notification.constant.NotificationType; import clap.server.application.port.outbound.webhook.SendAgitPort; import clap.server.common.annotation.architecture.ExternalApiAdapter; diff --git a/src/main/java/clap/server/adapter/outbound/api/AgitTemplateBuilder.java b/src/main/java/clap/server/adapter/outbound/api/agit/AgitTemplateBuilder.java similarity index 95% rename from src/main/java/clap/server/adapter/outbound/api/AgitTemplateBuilder.java rename to src/main/java/clap/server/adapter/outbound/api/agit/AgitTemplateBuilder.java index 82ece92a..452956bb 100644 --- a/src/main/java/clap/server/adapter/outbound/api/AgitTemplateBuilder.java +++ b/src/main/java/clap/server/adapter/outbound/api/agit/AgitTemplateBuilder.java @@ -1,6 +1,6 @@ -package clap.server.adapter.outbound.api; +package clap.server.adapter.outbound.api.agit; -import clap.server.adapter.outbound.api.dto.PushNotificationTemplate; +import clap.server.adapter.outbound.api.data.PushNotificationTemplate; import clap.server.adapter.outbound.persistense.entity.notification.constant.NotificationType; import clap.server.domain.model.task.Task; import org.springframework.http.HttpEntity; diff --git a/src/main/java/clap/server/adapter/outbound/api/dto/EmailTemplate.java b/src/main/java/clap/server/adapter/outbound/api/data/EmailTemplate.java similarity index 68% rename from src/main/java/clap/server/adapter/outbound/api/dto/EmailTemplate.java rename to src/main/java/clap/server/adapter/outbound/api/data/EmailTemplate.java index d5215de2..5850568c 100644 --- a/src/main/java/clap/server/adapter/outbound/api/dto/EmailTemplate.java +++ b/src/main/java/clap/server/adapter/outbound/api/data/EmailTemplate.java @@ -1,4 +1,4 @@ -package clap.server.adapter.outbound.api.dto; +package clap.server.adapter.outbound.api.data; public record EmailTemplate( String email, diff --git a/src/main/java/clap/server/adapter/outbound/api/dto/PushNotificationTemplate.java b/src/main/java/clap/server/adapter/outbound/api/data/PushNotificationTemplate.java similarity index 86% rename from src/main/java/clap/server/adapter/outbound/api/dto/PushNotificationTemplate.java rename to src/main/java/clap/server/adapter/outbound/api/data/PushNotificationTemplate.java index 1e15dcfd..2a077a4b 100644 --- a/src/main/java/clap/server/adapter/outbound/api/dto/PushNotificationTemplate.java +++ b/src/main/java/clap/server/adapter/outbound/api/data/PushNotificationTemplate.java @@ -1,4 +1,4 @@ -package clap.server.adapter.outbound.api.dto; +package clap.server.adapter.outbound.api.data; import clap.server.adapter.outbound.persistense.entity.notification.constant.NotificationType; diff --git a/src/main/java/clap/server/adapter/outbound/api/EmailClient.java b/src/main/java/clap/server/adapter/outbound/api/email/EmailClient.java similarity index 95% rename from src/main/java/clap/server/adapter/outbound/api/EmailClient.java rename to src/main/java/clap/server/adapter/outbound/api/email/EmailClient.java index 00ab7452..567709ec 100644 --- a/src/main/java/clap/server/adapter/outbound/api/EmailClient.java +++ b/src/main/java/clap/server/adapter/outbound/api/email/EmailClient.java @@ -1,7 +1,7 @@ -package clap.server.adapter.outbound.api; +package clap.server.adapter.outbound.api.email; -import clap.server.adapter.outbound.api.dto.EmailTemplate; -import clap.server.adapter.outbound.api.dto.PushNotificationTemplate; +import clap.server.adapter.outbound.api.data.EmailTemplate; +import clap.server.adapter.outbound.api.data.PushNotificationTemplate; import clap.server.application.port.outbound.email.SendEmailPort; import clap.server.application.port.outbound.webhook.SendWebhookEmailPort; import clap.server.common.annotation.architecture.ExternalApiAdapter; diff --git a/src/main/java/clap/server/adapter/outbound/api/EmailTemplateBuilder.java b/src/main/java/clap/server/adapter/outbound/api/email/EmailTemplateBuilder.java similarity index 96% rename from src/main/java/clap/server/adapter/outbound/api/EmailTemplateBuilder.java rename to src/main/java/clap/server/adapter/outbound/api/email/EmailTemplateBuilder.java index 37cf00fa..a6a7ec49 100644 --- a/src/main/java/clap/server/adapter/outbound/api/EmailTemplateBuilder.java +++ b/src/main/java/clap/server/adapter/outbound/api/email/EmailTemplateBuilder.java @@ -1,7 +1,7 @@ -package clap.server.adapter.outbound.api; +package clap.server.adapter.outbound.api.email; -import clap.server.adapter.outbound.api.dto.EmailTemplate; -import clap.server.adapter.outbound.api.dto.PushNotificationTemplate; +import clap.server.adapter.outbound.api.data.EmailTemplate; +import clap.server.adapter.outbound.api.data.PushNotificationTemplate; import lombok.RequiredArgsConstructor; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Component; diff --git a/src/main/java/clap/server/adapter/outbound/api/KakaoWorkBlockBuilder.java b/src/main/java/clap/server/adapter/outbound/api/kakaoWork/KakaoWorkBlockBuilder.java similarity index 99% rename from src/main/java/clap/server/adapter/outbound/api/KakaoWorkBlockBuilder.java rename to src/main/java/clap/server/adapter/outbound/api/kakaoWork/KakaoWorkBlockBuilder.java index f4575a53..97a5399f 100644 --- a/src/main/java/clap/server/adapter/outbound/api/KakaoWorkBlockBuilder.java +++ b/src/main/java/clap/server/adapter/outbound/api/kakaoWork/KakaoWorkBlockBuilder.java @@ -1,6 +1,6 @@ -package clap.server.adapter.outbound.api; +package clap.server.adapter.outbound.api.kakaoWork; -import clap.server.adapter.outbound.api.dto.PushNotificationTemplate; +import clap.server.adapter.outbound.api.data.PushNotificationTemplate; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.ObjectMapper; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/clap/server/adapter/outbound/api/KakaoWorkClient.java b/src/main/java/clap/server/adapter/outbound/api/kakaoWork/KakaoWorkClient.java similarity index 93% rename from src/main/java/clap/server/adapter/outbound/api/KakaoWorkClient.java rename to src/main/java/clap/server/adapter/outbound/api/kakaoWork/KakaoWorkClient.java index 00632f83..15968493 100644 --- a/src/main/java/clap/server/adapter/outbound/api/KakaoWorkClient.java +++ b/src/main/java/clap/server/adapter/outbound/api/kakaoWork/KakaoWorkClient.java @@ -1,6 +1,6 @@ -package clap.server.adapter.outbound.api; +package clap.server.adapter.outbound.api.kakaoWork; -import clap.server.adapter.outbound.api.dto.PushNotificationTemplate; +import clap.server.adapter.outbound.api.data.PushNotificationTemplate; import clap.server.application.port.outbound.webhook.SendKaKaoWorkPort; import clap.server.common.annotation.architecture.ExternalApiAdapter; import clap.server.exception.AdapterException; diff --git a/src/main/java/clap/server/adapter/outbound/infrastructure/s3/S3UploadAdapter.java b/src/main/java/clap/server/adapter/outbound/infrastructure/s3/S3UploadAdapter.java index 485cc6c5..33163073 100644 --- a/src/main/java/clap/server/adapter/outbound/infrastructure/s3/S3UploadAdapter.java +++ b/src/main/java/clap/server/adapter/outbound/infrastructure/s3/S3UploadAdapter.java @@ -26,11 +26,11 @@ public class S3UploadAdapter implements S3UploadPort { private final KakaoS3Config kakaoS3Config; private final S3Client s3Client; - public List uploadFiles(FilePathPolicyConstants filePrefix, List multipartFiles) { + public List uploadFiles(final FilePathPolicyConstants filePrefix,final List multipartFiles) { return multipartFiles.stream().map((file) -> uploadSingleFile(filePrefix, file)).toList(); } - public String uploadSingleFile(FilePathPolicyConstants filePrefix, MultipartFile file) { + public String uploadSingleFile(final FilePathPolicyConstants filePrefix,final MultipartFile file) { try { Path filePath = getFilePath(file); String objectKey = createObjectKey(filePrefix.getPath(), file.getOriginalFilename()); @@ -43,17 +43,17 @@ public String uploadSingleFile(FilePathPolicyConstants filePrefix, MultipartFile } } - private String getFileUrl(String objectKey) { + private String getFileUrl(final String objectKey) { return kakaoS3Config.getEndpoint() + "/v1/" + kakaoS3Config.getProjectId() + '/' + kakaoS3Config.getBucketName() + '/' + objectKey; } - private static Path getFilePath(MultipartFile file) throws IOException { + private static Path getFilePath(final MultipartFile file) throws IOException { Path path = Files.createTempFile(null,null); Files.copy(file.getInputStream(),path, StandardCopyOption.REPLACE_EXISTING); return path; } - private void uploadToS3(String filePath, Path path) { + private void uploadToS3(final String filePath,final Path path) { PutObjectRequest putObjectRequest = PutObjectRequest.builder() .bucket(kakaoS3Config.getBucketName()) .key(filePath) @@ -62,7 +62,7 @@ private void uploadToS3(String filePath, Path path) { s3Client.putObject(putObjectRequest, path); } - private String createObjectKey(String filepath, String fileName) { + private String createObjectKey(final String filepath,final String fileName) { String fileId = FileIDGenerator.createFileId(); return String.format("%s/%s-%s", filepath, fileId, fileName); } diff --git a/src/main/java/clap/server/adapter/outbound/infrastructure/sse/SseAdapter.java b/src/main/java/clap/server/adapter/outbound/infrastructure/sse/SseAdapter.java index e0ebd34d..7daf6946 100644 --- a/src/main/java/clap/server/adapter/outbound/infrastructure/sse/SseAdapter.java +++ b/src/main/java/clap/server/adapter/outbound/infrastructure/sse/SseAdapter.java @@ -13,12 +13,12 @@ public class SseAdapter implements CommandSsePort { private final EmitterRepository emitterRepository; @Override - public void save(Long receiverId, SseEmitter emitter) { + public void save(final Long receiverId,final SseEmitter emitter) { emitterRepository.save(receiverId, emitter); } @Override - public void delete(Long receiverId) { + public void delete(final Long receiverId) { emitterRepository.delete(receiverId); } } diff --git a/src/main/java/clap/server/adapter/outbound/persistense/ApiLogPersistenceAdapter.java b/src/main/java/clap/server/adapter/outbound/persistense/ApiLogPersistenceAdapter.java index c25947e2..71541026 100644 --- a/src/main/java/clap/server/adapter/outbound/persistense/ApiLogPersistenceAdapter.java +++ b/src/main/java/clap/server/adapter/outbound/persistense/ApiLogPersistenceAdapter.java @@ -1,7 +1,6 @@ package clap.server.adapter.outbound.persistense; import clap.server.adapter.inbound.web.dto.log.request.FilterLogRequest; - import clap.server.adapter.outbound.persistense.mapper.ApiLogPersistenceMapper; import clap.server.adapter.outbound.persistense.mapper.MemberPersistenceMapper; import clap.server.adapter.outbound.persistense.repository.log.AnonymousLogRepository; @@ -12,7 +11,6 @@ import clap.server.common.annotation.architecture.PersistenceAdapter; import clap.server.domain.model.log.AnonymousLog; import clap.server.domain.model.log.MemberLog; - import lombok.RequiredArgsConstructor; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; @@ -31,25 +29,25 @@ public class ApiLogPersistenceAdapter implements CommandLogPort, LoadLogPort { @Transactional @Override - public void saveMemberLog(MemberLog memberLog) { + public void saveMemberLog(final MemberLog memberLog) { apiLogRepository.save(apiLogPersistenceMapper.mapMemberLogToEntity(memberLog, memberPersistenceMapper.toEntity(memberLog.getMember()))); } @Override - public void saveAnonymousLog(AnonymousLog anonymousLog) { + public void saveAnonymousLog(final AnonymousLog anonymousLog) { apiLogRepository.save(apiLogPersistenceMapper.mapAnonymousLogToEntity(anonymousLog, anonymousLog.getLoginNickname())); } @Override - public Page filterMemberLogs(FilterLogRequest memberLogRequest, Pageable pageable, String sortDirection) { + public Page filterMemberLogs(final FilterLogRequest memberLogRequest, final Pageable pageable, final String sortDirection) { return memberLogRepository.filterMemberLogs(memberLogRequest, pageable, sortDirection) .map(apiLogPersistenceMapper::mapMemberLogEntityToDomain); } @Override - public Page filterAnonymousLogs(FilterLogRequest anonymousLogRequest, Pageable pageable, String sortDirection) { + public Page filterAnonymousLogs(final FilterLogRequest anonymousLogRequest, final Pageable pageable, final String sortDirection) { return anonymousLogRepository.filterAnonymousLogs(anonymousLogRequest, pageable, sortDirection) .map(apiLogPersistenceMapper::mapAnonymousLogEntityToDomain); } diff --git a/src/main/java/clap/server/adapter/outbound/persistense/AttachmentPersistenceAdapter.java b/src/main/java/clap/server/adapter/outbound/persistense/AttachmentPersistenceAdapter.java index fd38930e..03e031e9 100644 --- a/src/main/java/clap/server/adapter/outbound/persistense/AttachmentPersistenceAdapter.java +++ b/src/main/java/clap/server/adapter/outbound/persistense/AttachmentPersistenceAdapter.java @@ -7,7 +7,6 @@ import clap.server.application.port.outbound.task.LoadAttachmentPort; import clap.server.common.annotation.architecture.PersistenceAdapter; import clap.server.domain.model.task.Attachment; - import lombok.RequiredArgsConstructor; import java.util.List; @@ -24,13 +23,13 @@ public class AttachmentPersistenceAdapter implements CommandAttachmentPort, Load @Override - public void save(Attachment attachment) { + public void save(final Attachment attachment) { attachmentRepository.save(attachmentPersistenceMapper.toEntity(attachment)); } @Override - public void saveAll(List attachments) { + public void saveAll(final List attachments) { List attachmentEntities = attachments.stream() .map(attachmentPersistenceMapper::toEntity) .collect(Collectors.toList()); @@ -54,7 +53,7 @@ public List findAllByTaskIdAndCommentIsNullAndAttachmentId(final Lon } @Override - public Optional findByCommentId(Long commentId) { + public Optional findByCommentId(final Long commentId) { Optional attachmentEntity = attachmentRepository.findByComment_CommentId(commentId); return attachmentEntity.map(attachmentPersistenceMapper::toDomain); } @@ -68,7 +67,7 @@ public List findAllByTaskIdAndCommentIsNotNull(final Long taskId) { } @Override - public boolean exitsByCommentId(Long commentId) { + public boolean exitsByCommentId(final Long commentId) { return attachmentRepository.existsByComment_CommentId(commentId); } } diff --git a/src/main/java/clap/server/adapter/outbound/persistense/CategoryPersistenceAdapter.java b/src/main/java/clap/server/adapter/outbound/persistense/CategoryPersistenceAdapter.java index 5fa85209..ef4b1d69 100644 --- a/src/main/java/clap/server/adapter/outbound/persistense/CategoryPersistenceAdapter.java +++ b/src/main/java/clap/server/adapter/outbound/persistense/CategoryPersistenceAdapter.java @@ -20,7 +20,7 @@ public class CategoryPersistenceAdapter implements LoadCategoryPort, CommandCate private final CategoryPersistenceMapper categoryPersistenceMapper; @Override - public Optional findById(Long id) { + public Optional findById(final Long id) { Optional categoryEntity = categoryRepository.findById(id); return categoryEntity.map(categoryPersistenceMapper::toDomain); } @@ -50,7 +50,7 @@ public List findSubCategory() { } @Override - public void save(Category category) { + public void save(final Category category) { categoryRepository.save(categoryPersistenceMapper.toEntity(category)); } } \ No newline at end of file diff --git a/src/main/java/clap/server/adapter/outbound/persistense/CommentPersistenceAdapter.java b/src/main/java/clap/server/adapter/outbound/persistense/CommentPersistenceAdapter.java index 7601f9bc..72aa69d2 100644 --- a/src/main/java/clap/server/adapter/outbound/persistense/CommentPersistenceAdapter.java +++ b/src/main/java/clap/server/adapter/outbound/persistense/CommentPersistenceAdapter.java @@ -19,24 +19,24 @@ public class CommentPersistenceAdapter implements LoadCommentPort, CommandCommen private final CommentPersistenceMapper commentPersistenceMapper; @Override - public Optional findById(Long commentId) { + public Optional findById(final Long commentId) { Optional commentEntity = commentRepository.findById(commentId); return commentEntity.map(commentPersistenceMapper::toDomain); } @Override - public Comment saveComment(Comment comment) { + public Comment saveComment(final Comment comment) { CommentEntity commentEntity = commentRepository.save(commentPersistenceMapper.toEntity(comment)); return commentPersistenceMapper.toDomain(commentEntity); } @Override - public void deleteCommentWithTaskHistory(Long commentId) { + public void deleteCommentWithTaskHistory(final Long commentId) { commentRepository.deleteCommentWithTaskHistory(commentId); } @Override - public void deleteComment(Comment comment) { + public void deleteComment(final Comment comment) { commentRepository.delete(commentPersistenceMapper.toEntity(comment)); } } diff --git a/src/main/java/clap/server/adapter/outbound/persistense/LabelPersistenceAdapter.java b/src/main/java/clap/server/adapter/outbound/persistense/LabelPersistenceAdapter.java index 02887e0f..88887a6a 100644 --- a/src/main/java/clap/server/adapter/outbound/persistense/LabelPersistenceAdapter.java +++ b/src/main/java/clap/server/adapter/outbound/persistense/LabelPersistenceAdapter.java @@ -21,7 +21,7 @@ public class LabelPersistenceAdapter implements LoadLabelPort, CommandLabelPort private final LabelPersistenceMapper labelPersistenceMapper; @Override - public Optional