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,8 +1,8 @@
package clap.server.adapter.inbound.web.admin;

import clap.server.adapter.inbound.security.SecurityUserDetails;
import clap.server.adapter.inbound.web.dto.label.CreateLabelRequest;
import clap.server.adapter.inbound.web.dto.label.EditLabelRequest;
import clap.server.adapter.inbound.web.dto.label.request.CreateLabelRequest;
import clap.server.adapter.inbound.web.dto.label.request.EditLabelRequest;
import clap.server.application.port.inbound.label.AddLabelUsecase;
import clap.server.application.port.inbound.admin.DeleteLabelUsecase;
import clap.server.application.port.inbound.label.UpdateLabelUsecase;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
import clap.server.application.port.inbound.auth.LoginUsecase;
import clap.server.application.port.inbound.auth.LogoutUsecase;
import clap.server.common.annotation.architecture.WebAdapter;
import clap.server.config.annotation.LogType;
import clap.server.common.annotation.log.LogType;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.tags.Tag;
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package clap.server.adapter.inbound.web.dto.comment;
package clap.server.adapter.inbound.web.dto.history;

import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.constraints.NotBlank;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package clap.server.adapter.inbound.web.dto.comment;
package clap.server.adapter.inbound.web.dto.history;

import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.constraints.NotBlank;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package clap.server.adapter.inbound.web.dto.task.response;
package clap.server.adapter.inbound.web.dto.history.response;

import clap.server.adapter.outbound.persistense.entity.task.constant.TaskHistoryType;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package clap.server.adapter.inbound.web.dto.label;
package clap.server.adapter.inbound.web.dto.label.request;

import clap.server.adapter.outbound.persistense.entity.task.constant.LabelColor;
import io.swagger.v3.oas.annotations.media.Schema;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package clap.server.adapter.inbound.web.dto.label;
package clap.server.adapter.inbound.web.dto.label.request;

import clap.server.adapter.outbound.persistense.entity.task.constant.LabelColor;
import io.swagger.v3.oas.annotations.media.Schema;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package clap.server.adapter.inbound.web.dto.label;
package clap.server.adapter.inbound.web.dto.label.response;

import clap.server.adapter.outbound.persistense.entity.task.constant.LabelColor;
import io.swagger.v3.oas.annotations.media.Schema;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package clap.server.adapter.inbound.web.dto.log;
package clap.server.adapter.inbound.web.dto.log.request;

import clap.server.adapter.outbound.persistense.entity.log.constant.LogStatus;
import io.swagger.v3.oas.annotations.media.Schema;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
package clap.server.adapter.inbound.web.dto.log;
package clap.server.adapter.inbound.web.dto.log.response;

import clap.server.adapter.outbound.persistense.entity.log.constant.LogStatus;
import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.NotNull;

import java.time.LocalDateTime;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
package clap.server.adapter.inbound.web.dto.log;
package clap.server.adapter.inbound.web.dto.log.response;

import clap.server.adapter.outbound.persistense.entity.log.constant.LogStatus;
import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.NotNull;

import java.time.LocalDateTime;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package clap.server.adapter.inbound.web.dto.member;
package clap.server.adapter.inbound.web.dto.member.request;

import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.constraints.NotBlank;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package clap.server.adapter.inbound.web.dto.member;
package clap.server.adapter.inbound.web.dto.member.response;

import clap.server.adapter.outbound.persistense.entity.member.constant.MemberRole;
import io.swagger.v3.oas.annotations.media.Schema;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package clap.server.adapter.inbound.web.dto.member;
package clap.server.adapter.inbound.web.dto.member.response;

import clap.server.adapter.outbound.persistense.entity.member.constant.MemberRole;
import io.swagger.v3.oas.annotations.media.Schema;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package clap.server.adapter.inbound.web.dto.notification;
package clap.server.adapter.inbound.web.dto.notification.request;

import clap.server.adapter.outbound.persistense.entity.notification.constant.NotificationType;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package clap.server.adapter.inbound.web.dto.notification;
package clap.server.adapter.inbound.web.dto.notification.response;

public record CountNotificationResponse(
Long memberId,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package clap.server.adapter.inbound.web.dto.notification;
package clap.server.adapter.inbound.web.dto.notification.response;


import clap.server.adapter.outbound.persistense.entity.notification.constant.NotificationType;
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
package clap.server.adapter.inbound.web.dto.task.response;

public record FindManagersResponse(
Long memberId,
String nickname,
String imageUrl,
int remainingTasks
) {
}
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

import clap.server.common.annotation.architecture.WebAdapter;
import clap.server.common.annotation.swagger.ApiErrorCodes;
import clap.server.common.annotation.architecture.DevelopOnlyApi;
import clap.server.common.annotation.swagger.DevelopOnlyApi;
import clap.server.exception.code.*;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package clap.server.adapter.inbound.web.comment;
package clap.server.adapter.inbound.web.history;

import clap.server.adapter.inbound.security.SecurityUserDetails;
import clap.server.adapter.inbound.web.dto.comment.EditCommentRequest;
import clap.server.application.port.inbound.comment.DeleteCommentUsecase;
import clap.server.application.port.inbound.comment.EditCommentUsecase;
import clap.server.adapter.inbound.web.dto.history.EditCommentRequest;
import clap.server.application.port.inbound.history.DeleteCommentUsecase;
import clap.server.application.port.inbound.history.EditCommentUsecase;
import clap.server.common.annotation.architecture.WebAdapter;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
Expand All @@ -15,7 +15,7 @@
import org.springframework.security.core.annotation.AuthenticationPrincipal;
import org.springframework.web.bind.annotation.*;

@Tag(name = "02. Task [생성/수정]", description = "작업 생성/수정 API")
@Tag(name = "03. Task History", description = "히스토리 및 댓글 관련 API")
@WebAdapter
@RestController
@RequiredArgsConstructor
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
package clap.server.adapter.inbound.web.task;
package clap.server.adapter.inbound.web.history;

import clap.server.adapter.inbound.security.SecurityUserDetails;
import clap.server.adapter.inbound.web.dto.task.response.FindTaskHistoryResponse;
import clap.server.adapter.inbound.web.dto.history.response.FindTaskHistoryResponse;
import clap.server.adapter.outbound.persistense.entity.log.constant.LogStatus;
import clap.server.application.port.inbound.task.FindTaskHistoriesUsecase;
import clap.server.application.port.inbound.history.FindTaskHistoriesUsecase;
import clap.server.common.annotation.architecture.WebAdapter;
import clap.server.config.annotation.LogType;
import clap.server.common.annotation.log.LogType;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.RequiredArgsConstructor;
Expand All @@ -18,7 +18,7 @@
import org.springframework.web.bind.annotation.RestController;


@Tag(name = "02. Task [조회]", description = "작업 조회 API")
@Tag(name = "03. Task History")
@WebAdapter
@RestController
@RequiredArgsConstructor
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package clap.server.adapter.inbound.web.comment;
package clap.server.adapter.inbound.web.history;

import clap.server.adapter.inbound.security.SecurityUserDetails;
import clap.server.adapter.inbound.web.dto.comment.CreateCommentRequest;
import clap.server.application.port.inbound.comment.SaveCommentAttachmentUsecase;
import clap.server.application.port.inbound.comment.SaveCommentUsecase;
import clap.server.adapter.inbound.web.dto.history.CreateCommentRequest;
import clap.server.application.port.inbound.history.SaveCommentAttachmentUsecase;
import clap.server.application.port.inbound.history.SaveCommentUsecase;
import clap.server.common.annotation.architecture.WebAdapter;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
Expand All @@ -17,7 +17,7 @@
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;

@Tag(name = "02. Task [생성/수정]", description = "작업 생성/수정 API")
@Tag(name = "03. Task History")
@WebAdapter
@RestController
@RequiredArgsConstructor
Expand Down
Original file line number Diff line number Diff line change
@@ -1,17 +1,12 @@
package clap.server.adapter.inbound.web.label;

import clap.server.adapter.inbound.security.SecurityUserDetails;
import clap.server.adapter.inbound.web.dto.common.SliceResponse;
import clap.server.adapter.inbound.web.dto.label.FindLabelListResponse;
import clap.server.adapter.inbound.web.dto.label.response.FindLabelListResponse;
import clap.server.application.port.inbound.label.FindLabelListUsecase;
import clap.server.common.annotation.architecture.WebAdapter;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.Parameters;
import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.RequiredArgsConstructor;
import org.springframework.data.domain.PageRequest;
import org.springframework.data.domain.Pageable;
import org.springframework.http.ResponseEntity;
import org.springframework.security.access.annotation.Secured;
import org.springframework.security.core.annotation.AuthenticationPrincipal;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@

import clap.server.adapter.inbound.security.SecurityUserDetails;
import clap.server.adapter.inbound.web.dto.common.PageResponse;
import clap.server.adapter.inbound.web.dto.log.AnonymousLogResponse;
import clap.server.adapter.inbound.web.dto.log.FilterLogRequest;
import clap.server.adapter.inbound.web.dto.log.MemberLogResponse;
import clap.server.adapter.inbound.web.dto.log.response.AnonymousLogResponse;
import clap.server.adapter.inbound.web.dto.log.request.FilterLogRequest;
import clap.server.adapter.inbound.web.dto.log.response.MemberLogResponse;
import clap.server.application.port.inbound.log.FindApiLogsUsecase;
import clap.server.common.annotation.architecture.WebAdapter;
import io.swagger.v3.oas.annotations.Operation;
Expand All @@ -13,12 +13,10 @@
import lombok.RequiredArgsConstructor;
import org.springframework.data.domain.PageRequest;
import org.springframework.data.domain.Pageable;
import org.springframework.data.domain.Sort;
import org.springframework.http.ResponseEntity;
import org.springframework.security.access.annotation.Secured;
import org.springframework.security.core.annotation.AuthenticationPrincipal;
import org.springframework.web.bind.annotation.*;
import java.util.List;

@Tag(name = "05. Admin [로깅]")
@WebAdapter
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package clap.server.adapter.inbound.web.member;

import clap.server.adapter.inbound.security.SecurityUserDetails;
import clap.server.adapter.inbound.web.dto.member.MemberDetailInfoResponse;
import clap.server.adapter.inbound.web.dto.member.MemberProfileResponse;
import clap.server.adapter.inbound.web.dto.member.UpdateMemberInfoRequest;
import clap.server.adapter.inbound.web.dto.member.response.MemberDetailInfoResponse;
import clap.server.adapter.inbound.web.dto.member.response.MemberProfileResponse;
import clap.server.adapter.inbound.web.dto.member.request.UpdateMemberInfoRequest;
import clap.server.application.port.inbound.member.UpdateMemberInfoUsecase;
import clap.server.application.port.inbound.member.MemberDetailInfoUsecase;
import clap.server.application.port.inbound.member.MemberProfileUsecase;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

import clap.server.adapter.inbound.security.SecurityUserDetails;
import clap.server.adapter.inbound.web.dto.common.SliceResponse;
import clap.server.adapter.inbound.web.dto.notification.CountNotificationResponse;
import clap.server.adapter.inbound.web.dto.notification.FindNotificationListResponse;
import clap.server.adapter.inbound.web.dto.notification.response.CountNotificationResponse;
import clap.server.adapter.inbound.web.dto.notification.response.FindNotificationListResponse;
import clap.server.application.port.inbound.notification.CountNotificationUseCase;
import clap.server.application.port.inbound.notification.FindNotificationListUsecase;
import clap.server.common.annotation.architecture.WebAdapter;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,6 @@ public class FindStatisticsController {
@GetMapping
@Secured("ROLE_MANAGER")
public ResponseEntity<List<StatisticsResponse>> aggregateTaskStatistics(@RequestParam PeriodType periodType, @RequestParam StatisticsType statisticsType) {
System.out.println("periodType = " + periodType);
System.out.println("statisticsType = " + statisticsType);
return switch (statisticsType) {
case REQUEST_BY_PERIOD ->
ResponseEntity.ok(findTaskProcessUsecase.aggregatePeriodTaskRequest(periodType.getType()));
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
package clap.server.adapter.inbound.web.task;

import clap.server.application.port.inbound.task.FindManagersUsecase;
import clap.server.adapter.inbound.web.dto.task.response.FindManagersResponse;
import clap.server.common.annotation.architecture.WebAdapter;
import lombok.RequiredArgsConstructor;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;

import java.util.List;
@WebAdapter
@RequestMapping("/api/managers")
@RequiredArgsConstructor
public class ManagerController {
private final FindManagersUsecase findManagersUsecase;

@GetMapping
public ResponseEntity<List<FindManagersResponse>> findManagers() {
return ResponseEntity.ok(findManagersUsecase.findManagers());
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import clap.server.application.port.outbound.s3.S3UploadPort;
import clap.server.common.annotation.architecture.InfrastructureAdapter;
import clap.server.config.s3.KakaoS3Config;
import clap.server.common.constants.FilePathConstants;
import clap.server.domain.policy.attachment.FilePathPolicy;
import clap.server.exception.S3Exception;
import clap.server.exception.code.FileErrorcode;
import lombok.RequiredArgsConstructor;
Expand All @@ -26,11 +26,11 @@ public class S3UploadAdapter implements S3UploadPort {
private final KakaoS3Config kakaoS3Config;
private final S3Client s3Client;

public List<String> uploadFiles(FilePathConstants filePrefix, List<MultipartFile> multipartFiles) {
public List<String> uploadFiles(FilePathPolicy filePrefix, List<MultipartFile> multipartFiles) {
return multipartFiles.stream().map((file) -> uploadSingleFile(filePrefix, file)).toList();
}

public String uploadSingleFile(FilePathConstants filePrefix, MultipartFile file) {
public String uploadSingleFile(FilePathPolicy filePrefix, MultipartFile file) {
try {
Path filePath = getFilePath(file);
String objectKey = createObjectKey(filePrefix.getPath(), file.getOriginalFilename());
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package clap.server.adapter.outbound.persistense;

import clap.server.adapter.inbound.web.dto.log.FilterLogRequest;
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;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package clap.server.adapter.outbound.persistense;

import clap.server.adapter.inbound.web.dto.common.SliceResponse;
import clap.server.adapter.inbound.web.dto.notification.FindNotificationListResponse;
import clap.server.adapter.inbound.web.dto.notification.response.FindNotificationListResponse;
import clap.server.adapter.outbound.persistense.mapper.NotificationPersistenceMapper;
import clap.server.adapter.outbound.persistense.repository.notification.NotificationRepository;
import clap.server.application.mapper.NotificationMapper;
Expand Down
Loading