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
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package clap.server.adapter.outbound.api.dto;
package clap.server.adapter.outbound.api.data;

public record EmailTemplate(
String email,
Expand Down
Original file line number Diff line number Diff line change
@@ -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;

Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,11 @@ public class S3UploadAdapter implements S3UploadPort {
private final KakaoS3Config kakaoS3Config;
private final S3Client s3Client;

public List<String> uploadFiles(FilePathPolicyConstants filePrefix, List<MultipartFile> multipartFiles) {
public List<String> uploadFiles(final FilePathPolicyConstants filePrefix,final List<MultipartFile> 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());
Expand All @@ -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)
Expand All @@ -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);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
}
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -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;
Expand All @@ -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<MemberLog> filterMemberLogs(FilterLogRequest memberLogRequest, Pageable pageable, String sortDirection) {
public Page<MemberLog> filterMemberLogs(final FilterLogRequest memberLogRequest, final Pageable pageable, final String sortDirection) {
return memberLogRepository.filterMemberLogs(memberLogRequest, pageable, sortDirection)
.map(apiLogPersistenceMapper::mapMemberLogEntityToDomain);
}

@Override
public Page<AnonymousLog> filterAnonymousLogs(FilterLogRequest anonymousLogRequest, Pageable pageable, String sortDirection) {
public Page<AnonymousLog> filterAnonymousLogs(final FilterLogRequest anonymousLogRequest, final Pageable pageable, final String sortDirection) {
return anonymousLogRepository.filterAnonymousLogs(anonymousLogRequest, pageable, sortDirection)
.map(apiLogPersistenceMapper::mapAnonymousLogEntityToDomain);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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<Attachment> attachments) {
public void saveAll(final List<Attachment> attachments) {
List<AttachmentEntity> attachmentEntities = attachments.stream()
.map(attachmentPersistenceMapper::toEntity)
.collect(Collectors.toList());
Expand All @@ -54,7 +53,7 @@ public List<Attachment> findAllByTaskIdAndCommentIsNullAndAttachmentId(final Lon
}

@Override
public Optional<Attachment> findByCommentId(Long commentId) {
public Optional<Attachment> findByCommentId(final Long commentId) {
Optional<AttachmentEntity> attachmentEntity = attachmentRepository.findByComment_CommentId(commentId);
return attachmentEntity.map(attachmentPersistenceMapper::toDomain);
}
Expand All @@ -68,7 +67,7 @@ public List<Attachment> findAllByTaskIdAndCommentIsNotNull(final Long taskId) {
}

@Override
public boolean exitsByCommentId(Long commentId) {
public boolean exitsByCommentId(final Long commentId) {
return attachmentRepository.existsByComment_CommentId(commentId);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ public class CategoryPersistenceAdapter implements LoadCategoryPort, CommandCate
private final CategoryPersistenceMapper categoryPersistenceMapper;

@Override
public Optional<Category> findById(Long id) {
public Optional<Category> findById(final Long id) {
Optional<CategoryEntity> categoryEntity = categoryRepository.findById(id);
return categoryEntity.map(categoryPersistenceMapper::toDomain);
}
Expand Down Expand Up @@ -50,7 +50,7 @@ public List<Category> findSubCategory() {
}

@Override
public void save(Category category) {
public void save(final Category category) {
categoryRepository.save(categoryPersistenceMapper.toEntity(category));
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -19,24 +19,24 @@ public class CommentPersistenceAdapter implements LoadCommentPort, CommandCommen
private final CommentPersistenceMapper commentPersistenceMapper;

@Override
public Optional<Comment> findById(Long commentId) {
public Optional<Comment> findById(final Long commentId) {
Optional<CommentEntity> 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));
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ public class LabelPersistenceAdapter implements LoadLabelPort, CommandLabelPort
private final LabelPersistenceMapper labelPersistenceMapper;

@Override
public Optional<Label> findById(Long labelId) {
public Optional<Label> findById(final Long labelId) {
Optional<LabelEntity> labelEntity = labelRepository.findById(labelId);
return labelEntity.map(labelPersistenceMapper::toDomain);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,30 +4,28 @@
import clap.server.adapter.outbound.persistense.entity.member.MemberEntity;
import clap.server.adapter.outbound.persistense.entity.member.constant.MemberRole;
import clap.server.adapter.outbound.persistense.entity.member.constant.MemberStatus;
import clap.server.adapter.outbound.persistense.entity.task.TaskEntity;
import clap.server.adapter.outbound.persistense.entity.task.constant.TaskStatus;
import clap.server.adapter.outbound.persistense.mapper.MemberPersistenceMapper;
import clap.server.adapter.outbound.persistense.mapper.TaskPersistenceMapper;
import clap.server.adapter.outbound.persistense.repository.member.MemberRepository;
import clap.server.adapter.outbound.persistense.repository.task.TaskRepository;
import clap.server.application.port.outbound.member.CommandMemberPort;
import clap.server.application.port.outbound.member.LoadMemberPort;
import clap.server.common.annotation.architecture.PersistenceAdapter;
import clap.server.domain.model.task.Task;
import clap.server.adapter.outbound.persistense.entity.task.constant.TaskStatus ;
import clap.server.adapter.outbound.persistense.entity.task.TaskEntity;
import clap.server.adapter.outbound.persistense.repository.task.TaskRepository;
import clap.server.adapter.outbound.persistense.mapper.TaskPersistenceMapper;
import java.util.stream.Collectors;
import java.util.List;

import clap.server.domain.model.member.Member;
import com.querydsl.jpa.impl.JPAQueryFactory;
import clap.server.domain.model.task.Task;
import lombok.RequiredArgsConstructor;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.Pageable;

import java.util.List;
import java.util.Optional;
import java.util.stream.Collectors;

@PersistenceAdapter
@RequiredArgsConstructor
public class MemberPersistenceAdapter implements LoadMemberPort, CommandMemberPort {
public class MemberPersistenceAdapter implements LoadMemberPort, CommandMemberPort {
private final MemberRepository memberRepository;
private final MemberPersistenceMapper memberPersistenceMapper;
private final TaskRepository taskRepository;
Expand All @@ -51,7 +49,6 @@ public Optional<Member> findByNickname(final String nickname) {
return memberEntity.map(memberPersistenceMapper::toDomain);
}

// 검토자인 담당자들 조회
@Override
public List<Member> findReviewers() {
List<MemberEntity> memberEntities = memberRepository.findByIsReviewerTrue();
Expand All @@ -61,8 +58,8 @@ public List<Member> findReviewers() {
}

@Override
public Optional<Member> findReviewerById(Long id) {
Optional<MemberEntity> memberEntity = memberRepository.findByMemberIdAndIsReviewerTrue(id);
public Optional<Member> findReviewerById(final Long id) {
Optional<MemberEntity> memberEntity = memberRepository.findByMemberIdAndIsReviewerTrue(id);
return memberEntity.map(memberPersistenceMapper::toDomain);
}

Expand All @@ -73,7 +70,7 @@ public void save(final Member member) {
}

@Override
public void saveAll(List<Member> members) {
public void saveAll(final List<Member> members) {
List<MemberEntity> memberEntities = members.stream().map(memberPersistenceMapper::toEntity).toList();
memberRepository.saveAll(memberEntities);
}
Expand All @@ -87,35 +84,35 @@ public List<Member> findActiveManagers() {
}

@Override
public List<Task> findTasksByMemberIdAndStatus(Long memberId, List<TaskStatus> taskStatuses) {
public List<Task> findTasksByMemberIdAndStatus(final Long memberId, final List<TaskStatus> taskStatuses) {
List<TaskEntity> taskEntities = taskRepository.findByProcessor_MemberIdAndTaskStatusIn(memberId, taskStatuses);
return taskEntities.stream()
.map(taskPersistenceMapper::toDomain)
.collect(Collectors.toList());
}

@Override
public Page<Member> findAllMembers(Pageable pageable) {
public Page<Member> findAllMembers(final Pageable pageable) {
return memberRepository.findAllMembers(pageable).map(memberPersistenceMapper::toDomain);
}

@Override
public Page<Member> findMembersWithFilter(Pageable pageable, FindMemberRequest filterRequest, String sortDirection) {
return memberRepository.findMembersWithFilter(pageable, filterRequest,sortDirection).map(memberPersistenceMapper::toDomain);
public Page<Member> findMembersWithFilter(final Pageable pageable, final FindMemberRequest filterRequest, final String sortDirection) {
return memberRepository.findMembersWithFilter(pageable, filterRequest, sortDirection).map(memberPersistenceMapper::toDomain);
}

@Override
public Optional<Member> findByNicknameAndEmail(String nickname, String email) {
public Optional<Member> findByNicknameAndEmail(final String nickname, final String email) {
return memberRepository.findByNicknameAndEmail(nickname, email).map(memberPersistenceMapper::toDomain);
}

@Override
public Optional<Member> findByNameAndEmail(String name, String email) {
public Optional<Member> findByNameAndEmail(final String name, final String email) {
return memberRepository.findByNameAndEmail(name, email).map(memberPersistenceMapper::toDomain);
}

@Override
public Optional<Member> findByEmail(String email) {
public Optional<Member> findByEmail(final String email) {
return memberRepository.findByEmail(email)
.map(memberPersistenceMapper::toDomain);
}
Expand Down
Loading