diff --git a/src/main/java/com/kusithm/meetupd/common/config/SecurityConfig.java b/src/main/java/com/kusithm/meetupd/common/config/SecurityConfig.java index d233025..16ec1d3 100644 --- a/src/main/java/com/kusithm/meetupd/common/config/SecurityConfig.java +++ b/src/main/java/com/kusithm/meetupd/common/config/SecurityConfig.java @@ -9,7 +9,6 @@ import org.springframework.context.annotation.Configuration; import org.springframework.security.config.annotation.web.builders.HttpSecurity; import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; -import org.springframework.security.config.annotation.web.configuration.WebSecurityCustomizer; import org.springframework.security.config.annotation.web.configurers.AbstractHttpConfigurer; import org.springframework.security.config.http.SessionCreationPolicy; import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; diff --git a/src/main/java/com/kusithm/meetupd/common/error/dto/ErrorResponse.java b/src/main/java/com/kusithm/meetupd/common/error/dto/ErrorResponse.java index defc1c1..2b672dd 100644 --- a/src/main/java/com/kusithm/meetupd/common/error/dto/ErrorResponse.java +++ b/src/main/java/com/kusithm/meetupd/common/error/dto/ErrorResponse.java @@ -1,6 +1,5 @@ package com.kusithm.meetupd.common.error.dto; -import com.kusithm.meetupd.common.error.ApplicationException; import com.kusithm.meetupd.common.error.ErrorCode; import lombok.AccessLevel; import lombok.AllArgsConstructor; diff --git a/src/main/java/com/kusithm/meetupd/common/jwt/TokenProvider.java b/src/main/java/com/kusithm/meetupd/common/jwt/TokenProvider.java index e60e2b4..9ccc49b 100644 --- a/src/main/java/com/kusithm/meetupd/common/jwt/TokenProvider.java +++ b/src/main/java/com/kusithm/meetupd/common/jwt/TokenProvider.java @@ -6,10 +6,8 @@ import com.kusithm.meetupd.common.error.ErrorCode; import com.kusithm.meetupd.common.error.UnauthorizedException; import io.jsonwebtoken.*; -import jakarta.servlet.http.HttpServletRequest; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; -import org.springframework.context.annotation.PropertySource; import org.springframework.stereotype.Component; import javax.crypto.spec.SecretKeySpec; diff --git a/src/main/java/com/kusithm/meetupd/domain/contest/controller/ContestController.java b/src/main/java/com/kusithm/meetupd/domain/contest/controller/ContestController.java index 014100a..5bb03d3 100644 --- a/src/main/java/com/kusithm/meetupd/domain/contest/controller/ContestController.java +++ b/src/main/java/com/kusithm/meetupd/domain/contest/controller/ContestController.java @@ -8,11 +8,12 @@ import com.kusithm.meetupd.domain.contest.dto.response.GetMainRecommendationResponseDto; import com.kusithm.meetupd.domain.contest.service.ContestService; import lombok.RequiredArgsConstructor; -import org.springframework.format.annotation.DateTimeFormat; import org.springframework.http.ResponseEntity; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; -import java.time.LocalDate; import java.util.List; @RequiredArgsConstructor diff --git a/src/main/java/com/kusithm/meetupd/domain/contest/dto/response/FindContestsResponseDto.java b/src/main/java/com/kusithm/meetupd/domain/contest/dto/response/FindContestsResponseDto.java index d63b43e..aed2b3f 100644 --- a/src/main/java/com/kusithm/meetupd/domain/contest/dto/response/FindContestsResponseDto.java +++ b/src/main/java/com/kusithm/meetupd/domain/contest/dto/response/FindContestsResponseDto.java @@ -3,7 +3,6 @@ import com.kusithm.meetupd.domain.contest.entity.Contest; import com.kusithm.meetupd.domain.contest.entity.ContestType; -import jdk.jfr.ContentType; import lombok.Builder; import lombok.Getter; @@ -23,8 +22,6 @@ public class FindContestsResponseDto { private String company; -// private List types; - private List types; private List images; diff --git a/src/main/java/com/kusithm/meetupd/domain/contest/entity/Contest.java b/src/main/java/com/kusithm/meetupd/domain/contest/entity/Contest.java index dc69a0b..81594ce 100644 --- a/src/main/java/com/kusithm/meetupd/domain/contest/entity/Contest.java +++ b/src/main/java/com/kusithm/meetupd/domain/contest/entity/Contest.java @@ -7,7 +7,6 @@ import java.time.LocalDate; import java.util.ArrayList; -import java.util.Date; import java.util.List; @Getter diff --git a/src/main/java/com/kusithm/meetupd/domain/contest/service/ContestService.java b/src/main/java/com/kusithm/meetupd/domain/contest/service/ContestService.java index 68682b2..5cffbc1 100644 --- a/src/main/java/com/kusithm/meetupd/domain/contest/service/ContestService.java +++ b/src/main/java/com/kusithm/meetupd/domain/contest/service/ContestService.java @@ -31,7 +31,6 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import java.util.Optional; import static com.kusithm.meetupd.common.error.ErrorCode.USER_REVIEW_NOT_FOUND; import static com.kusithm.meetupd.domain.contest.dto.response.FindContestsResponseDto.createListOf; diff --git a/src/main/java/com/kusithm/meetupd/domain/email/service/EmailService.java b/src/main/java/com/kusithm/meetupd/domain/email/service/EmailService.java index d862a75..bcec8f8 100644 --- a/src/main/java/com/kusithm/meetupd/domain/email/service/EmailService.java +++ b/src/main/java/com/kusithm/meetupd/domain/email/service/EmailService.java @@ -7,8 +7,8 @@ import org.springframework.mail.javamail.JavaMailSender; import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; -import org.thymeleaf.spring6.SpringTemplateEngine; import org.thymeleaf.context.Context; +import org.thymeleaf.spring6.SpringTemplateEngine; import java.io.UnsupportedEncodingException; diff --git a/src/main/java/com/kusithm/meetupd/domain/fileUpload/controller/S3FileUploadController.java b/src/main/java/com/kusithm/meetupd/domain/fileUpload/controller/S3FileUploadController.java index 8a97318..2793698 100644 --- a/src/main/java/com/kusithm/meetupd/domain/fileUpload/controller/S3FileUploadController.java +++ b/src/main/java/com/kusithm/meetupd/domain/fileUpload/controller/S3FileUploadController.java @@ -3,7 +3,10 @@ import com.kusithm.meetupd.domain.fileUpload.dto.response.FileUploadResponse; import com.kusithm.meetupd.domain.fileUpload.service.AwsS3Service; import lombok.RequiredArgsConstructor; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestPart; +import org.springframework.web.bind.annotation.RestController; import org.springframework.web.multipart.MultipartFile; import java.util.List; @@ -21,4 +24,4 @@ public FileUploadResponse uploadFile( return awsS3Service.uploadFile(images); } -} \ No newline at end of file +} diff --git a/src/main/java/com/kusithm/meetupd/domain/fileUpload/dto/response/FileUploadResponse.java b/src/main/java/com/kusithm/meetupd/domain/fileUpload/dto/response/FileUploadResponse.java index ef79057..7b39a46 100644 --- a/src/main/java/com/kusithm/meetupd/domain/fileUpload/dto/response/FileUploadResponse.java +++ b/src/main/java/com/kusithm/meetupd/domain/fileUpload/dto/response/FileUploadResponse.java @@ -2,8 +2,6 @@ import lombok.Builder; import lombok.Getter; -import lombok.Setter; -import org.springframework.stereotype.Service; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/com/kusithm/meetupd/domain/fileUpload/service/AwsS3Service.java b/src/main/java/com/kusithm/meetupd/domain/fileUpload/service/AwsS3Service.java index d770d31..c53b4e3 100644 --- a/src/main/java/com/kusithm/meetupd/domain/fileUpload/service/AwsS3Service.java +++ b/src/main/java/com/kusithm/meetupd/domain/fileUpload/service/AwsS3Service.java @@ -4,8 +4,6 @@ import com.amazonaws.services.s3.model.CannedAccessControlList; import com.amazonaws.services.s3.model.ObjectMetadata; import com.amazonaws.services.s3.model.PutObjectRequest; -import com.amazonaws.services.s3.model.PutObjectResult; -import com.kusithm.meetupd.common.error.ErrorCode; import com.kusithm.meetupd.common.error.FileUploadFailedException; import com.kusithm.meetupd.domain.fileUpload.dto.response.FileUploadResponse; import com.kusithm.meetupd.domain.fileUpload.entity.Image; @@ -57,4 +55,4 @@ public FileUploadResponse uploadFile(List images) { return new FileUploadResponse(fileUrls); } -} \ No newline at end of file +} diff --git a/src/main/java/com/kusithm/meetupd/domain/review/dto/request/NonUserReviewRequestDto.java b/src/main/java/com/kusithm/meetupd/domain/review/dto/request/NonUserReviewRequestDto.java index 91a4587..58690f9 100644 --- a/src/main/java/com/kusithm/meetupd/domain/review/dto/request/NonUserReviewRequestDto.java +++ b/src/main/java/com/kusithm/meetupd/domain/review/dto/request/NonUserReviewRequestDto.java @@ -1,6 +1,5 @@ package com.kusithm.meetupd.domain.review.dto.request; -import lombok.Builder; import lombok.Getter; import java.util.List; diff --git a/src/main/java/com/kusithm/meetupd/domain/review/entity/UserReviewedTeam.java b/src/main/java/com/kusithm/meetupd/domain/review/entity/UserReviewedTeam.java index 8e12e31..8946233 100644 --- a/src/main/java/com/kusithm/meetupd/domain/review/entity/UserReviewedTeam.java +++ b/src/main/java/com/kusithm/meetupd/domain/review/entity/UserReviewedTeam.java @@ -15,22 +15,9 @@ public class UserReviewedTeam { @Column(name = "user_reviewed_team_id") private Long id; - // TODO : User 확실하게 생성되면 User ID로 넣기 -// @ManyToOne -// @JoinColumn(name = "user_id") -// private User user; private Long userId; - // TODO : Team 생성되면 Team ID로 넣기 -// @ManyToOne -// @JoinColumn(name = "team_id") -// private Team team; private Long teamId; -// -// @CreatedDate -// @Column(name = "reviewed_at", updatable = false) -// @Convert(converter = LocalDateTimeConverter.class) -// private LocalDateTime reviewedAt; public static UserReviewedTeam of(Long userId, Long teamId) { return UserReviewedTeam.builder() diff --git a/src/main/java/com/kusithm/meetupd/domain/review/entity/inner/SelectKeyword.java b/src/main/java/com/kusithm/meetupd/domain/review/entity/inner/SelectKeyword.java index ae4159a..b927b35 100644 --- a/src/main/java/com/kusithm/meetupd/domain/review/entity/inner/SelectKeyword.java +++ b/src/main/java/com/kusithm/meetupd/domain/review/entity/inner/SelectKeyword.java @@ -1,6 +1,5 @@ package com.kusithm.meetupd.domain.review.entity.inner; -import com.kusithm.meetupd.domain.review.dto.request.UploadReviewRequestDto; import com.kusithm.meetupd.domain.review.dto.request.UploadReviewRequestDto.SelectKeywordDto; import lombok.Builder; import lombok.Getter; diff --git a/src/main/java/com/kusithm/meetupd/domain/review/entity/inner/SelectTeamCulture.java b/src/main/java/com/kusithm/meetupd/domain/review/entity/inner/SelectTeamCulture.java index 166af76..c530a4d 100644 --- a/src/main/java/com/kusithm/meetupd/domain/review/entity/inner/SelectTeamCulture.java +++ b/src/main/java/com/kusithm/meetupd/domain/review/entity/inner/SelectTeamCulture.java @@ -1,6 +1,5 @@ package com.kusithm.meetupd.domain.review.entity.inner; -import com.kusithm.meetupd.domain.review.dto.request.UploadReviewRequestDto; import com.kusithm.meetupd.domain.review.dto.request.UploadReviewRequestDto.SelectTeamCultureDto; import lombok.Builder; import lombok.Getter; diff --git a/src/main/java/com/kusithm/meetupd/domain/review/mongo/NonUserReviewRepository.java b/src/main/java/com/kusithm/meetupd/domain/review/mongo/NonUserReviewRepository.java index d93964c..7e24a18 100644 --- a/src/main/java/com/kusithm/meetupd/domain/review/mongo/NonUserReviewRepository.java +++ b/src/main/java/com/kusithm/meetupd/domain/review/mongo/NonUserReviewRepository.java @@ -3,8 +3,6 @@ import com.kusithm.meetupd.domain.review.entity.NonUserReview; import org.springframework.data.mongodb.repository.MongoRepository; -import java.util.List; - public interface NonUserReviewRepository extends MongoRepository { Boolean existsByUserId(Long userId); diff --git a/src/main/java/com/kusithm/meetupd/domain/review/mysql/UserReviewedTeamRepository.java b/src/main/java/com/kusithm/meetupd/domain/review/mysql/UserReviewedTeamRepository.java index 08401a5..c68c6f8 100644 --- a/src/main/java/com/kusithm/meetupd/domain/review/mysql/UserReviewedTeamRepository.java +++ b/src/main/java/com/kusithm/meetupd/domain/review/mysql/UserReviewedTeamRepository.java @@ -3,8 +3,6 @@ import com.kusithm.meetupd.domain.review.entity.UserReviewedTeam; import org.springframework.data.jpa.repository.JpaRepository; -import java.util.List; - public interface UserReviewedTeamRepository extends JpaRepository { Boolean existsByUserIdAndTeamId(Long userId, Long teamId); diff --git a/src/main/java/com/kusithm/meetupd/domain/sample/controller/SampleController.java b/src/main/java/com/kusithm/meetupd/domain/sample/controller/SampleController.java deleted file mode 100644 index 1d27e6e..0000000 --- a/src/main/java/com/kusithm/meetupd/domain/sample/controller/SampleController.java +++ /dev/null @@ -1,24 +0,0 @@ -package com.kusithm.meetupd.domain.sample.controller; - -import com.kusithm.meetupd.common.dto.SuccessResponse; -import com.kusithm.meetupd.common.dto.code.SuccessCode; -import com.kusithm.meetupd.domain.sample.dto.request.CreateSampleRequestDto; -import com.kusithm.meetupd.domain.sample.dto.response.CreateSampleResponseDto; -import com.kusithm.meetupd.domain.sample.service.SampleService; -import lombok.RequiredArgsConstructor; -import org.springframework.http.ResponseEntity; -import org.springframework.web.bind.annotation.*; - -@RequiredArgsConstructor -@RestController -@RequestMapping("/api/samples") -public class SampleController { - - private final SampleService sampleService; - - @PostMapping - public ResponseEntity> createSample(@RequestBody CreateSampleRequestDto createSample) { - CreateSampleResponseDto response = sampleService.createSample(createSample.getText()); - return SuccessResponse.of(SuccessCode.CREATED, response); - } -} diff --git a/src/main/java/com/kusithm/meetupd/domain/sample/dto/request/CreateSampleRequestDto.java b/src/main/java/com/kusithm/meetupd/domain/sample/dto/request/CreateSampleRequestDto.java deleted file mode 100644 index c65a8ab..0000000 --- a/src/main/java/com/kusithm/meetupd/domain/sample/dto/request/CreateSampleRequestDto.java +++ /dev/null @@ -1,8 +0,0 @@ -package com.kusithm.meetupd.domain.sample.dto.request; - -import lombok.Getter; - -@Getter -public class CreateSampleRequestDto { - private String text; -} diff --git a/src/main/java/com/kusithm/meetupd/domain/sample/dto/response/CreateSampleResponseDto.java b/src/main/java/com/kusithm/meetupd/domain/sample/dto/response/CreateSampleResponseDto.java deleted file mode 100644 index cd60c64..0000000 --- a/src/main/java/com/kusithm/meetupd/domain/sample/dto/response/CreateSampleResponseDto.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.kusithm.meetupd.domain.sample.dto.response; - -import com.kusithm.meetupd.domain.sample.entity.Sample; -import lombok.Builder; -import lombok.Getter; - -@Builder -@Getter -public class CreateSampleResponseDto { - private String text; - - public static CreateSampleResponseDto of(Sample sample) { - return CreateSampleResponseDto.builder() - .text(sample.getText()) - .build(); - } -} diff --git a/src/main/java/com/kusithm/meetupd/domain/sample/entity/Sample.java b/src/main/java/com/kusithm/meetupd/domain/sample/entity/Sample.java deleted file mode 100644 index c89dd64..0000000 --- a/src/main/java/com/kusithm/meetupd/domain/sample/entity/Sample.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.kusithm.meetupd.domain.sample.entity; - - -import jakarta.persistence.*; -import lombok.*; - -@Getter -@NoArgsConstructor(access = AccessLevel.PROTECTED) -@AllArgsConstructor -@Builder -@Entity -public class Sample { - - @Id - @Column(name = "sample_id") - @GeneratedValue(strategy = GenerationType.AUTO) - private Long id; - - private String text; - - public static Sample createSample(String text) { - return Sample.builder() - .text(text) - .build(); - } -} diff --git a/src/main/java/com/kusithm/meetupd/domain/sample/mysql/SampleRepository.java b/src/main/java/com/kusithm/meetupd/domain/sample/mysql/SampleRepository.java deleted file mode 100644 index e803198..0000000 --- a/src/main/java/com/kusithm/meetupd/domain/sample/mysql/SampleRepository.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.kusithm.meetupd.domain.sample.mysql; - - -import com.kusithm.meetupd.domain.sample.entity.Sample; -import org.springframework.data.jpa.repository.JpaRepository; - -public interface SampleRepository extends JpaRepository { - Boolean existsByText(String text); -} diff --git a/src/main/java/com/kusithm/meetupd/domain/sample/service/SampleService.java b/src/main/java/com/kusithm/meetupd/domain/sample/service/SampleService.java deleted file mode 100644 index 48a0929..0000000 --- a/src/main/java/com/kusithm/meetupd/domain/sample/service/SampleService.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.kusithm.meetupd.domain.sample.service; - -import com.kusithm.meetupd.common.error.ConflictException; -import com.kusithm.meetupd.domain.sample.dto.response.CreateSampleResponseDto; -import com.kusithm.meetupd.domain.sample.entity.Sample; -import com.kusithm.meetupd.domain.sample.mysql.SampleRepository; -import lombok.RequiredArgsConstructor; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import static com.kusithm.meetupd.common.error.ErrorCode.DUPLICATE_SAMPLE_TEXT; - - -@RequiredArgsConstructor -@Service -@Transactional -public class SampleService { - - private final SampleRepository sampleRepository; - - public CreateSampleResponseDto createSample(String text) { - validateDuplicateText(text); - Sample sample = saveText(text); - return CreateSampleResponseDto.of(sample); - } - - private void validateDuplicateText(String text) { - if(sampleRepository.existsByText(text)) { - throw new ConflictException(DUPLICATE_SAMPLE_TEXT); - } - } - private Sample saveText(String text) { - Sample sample = Sample.createSample(text); - sampleRepository.save(sample); - return sample; - } -} diff --git a/src/main/java/com/kusithm/meetupd/domain/team/controller/TeamController.java b/src/main/java/com/kusithm/meetupd/domain/team/controller/TeamController.java index 553dd4d..b2323db 100644 --- a/src/main/java/com/kusithm/meetupd/domain/team/controller/TeamController.java +++ b/src/main/java/com/kusithm/meetupd/domain/team/controller/TeamController.java @@ -5,19 +5,16 @@ import com.kusithm.meetupd.common.dto.code.SuccessCode; import com.kusithm.meetupd.domain.review.dto.request.UpdateTeamProgressRecruitmentRequestDto; import com.kusithm.meetupd.domain.team.dto.TeamIOpenedResponseDto; -import com.kusithm.meetupd.domain.team.dto.TestDto; import com.kusithm.meetupd.domain.team.dto.request.*; import com.kusithm.meetupd.domain.team.dto.response.*; import com.kusithm.meetupd.domain.team.entity.Team; import com.kusithm.meetupd.domain.team.service.TeamService; import com.kusithm.meetupd.domain.user.dto.response.ReviewPageUserResponseDto; -import feign.Response; import jakarta.mail.MessagingException; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.data.domain.Page; import org.springframework.http.ResponseEntity; -import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import java.io.UnsupportedEncodingException; diff --git a/src/main/java/com/kusithm/meetupd/domain/team/dto/TeamIOpenedResponseDto.java b/src/main/java/com/kusithm/meetupd/domain/team/dto/TeamIOpenedResponseDto.java index 61f4fcb..4209b40 100644 --- a/src/main/java/com/kusithm/meetupd/domain/team/dto/TeamIOpenedResponseDto.java +++ b/src/main/java/com/kusithm/meetupd/domain/team/dto/TeamIOpenedResponseDto.java @@ -2,7 +2,6 @@ import com.kusithm.meetupd.domain.contest.entity.Contest; import com.kusithm.meetupd.domain.team.dto.response.ResponseTeamMemeberDto; -import com.kusithm.meetupd.domain.team.dto.response.TeamDetailResponseDto; import com.kusithm.meetupd.domain.team.entity.Team; import com.kusithm.meetupd.domain.user.entity.User; import lombok.Builder; diff --git a/src/main/java/com/kusithm/meetupd/domain/team/dto/request/PageDto.java b/src/main/java/com/kusithm/meetupd/domain/team/dto/request/PageDto.java index db5f4d2..5630453 100644 --- a/src/main/java/com/kusithm/meetupd/domain/team/dto/request/PageDto.java +++ b/src/main/java/com/kusithm/meetupd/domain/team/dto/request/PageDto.java @@ -1,10 +1,6 @@ package com.kusithm.meetupd.domain.team.dto.request; import lombok.*; -import org.springframework.data.domain.PageRequest; -import org.springframework.data.domain.Sort; - -import java.awt.print.Pageable; @Getter @Setter diff --git a/src/main/java/com/kusithm/meetupd/domain/team/dto/request/TeamProceedResponseDto.java b/src/main/java/com/kusithm/meetupd/domain/team/dto/request/TeamProceedResponseDto.java index 27ca6e4..58a950a 100644 --- a/src/main/java/com/kusithm/meetupd/domain/team/dto/request/TeamProceedResponseDto.java +++ b/src/main/java/com/kusithm/meetupd/domain/team/dto/request/TeamProceedResponseDto.java @@ -10,10 +10,6 @@ import lombok.Builder; import lombok.Getter; -import java.text.DateFormat; -import java.text.SimpleDateFormat; -import java.time.OffsetDateTime; -import java.time.format.DateTimeFormatter; import java.util.List; import java.util.stream.Collectors; diff --git a/src/main/java/com/kusithm/meetupd/domain/team/dto/response/PageResponseDTO.java b/src/main/java/com/kusithm/meetupd/domain/team/dto/response/PageResponseDTO.java index 68ef961..4b4a496 100644 --- a/src/main/java/com/kusithm/meetupd/domain/team/dto/response/PageResponseDTO.java +++ b/src/main/java/com/kusithm/meetupd/domain/team/dto/response/PageResponseDTO.java @@ -1,14 +1,11 @@ package com.kusithm.meetupd.domain.team.dto.response; -import com.kusithm.meetupd.domain.team.entity.Team; import lombok.Getter; import lombok.Setter; import lombok.ToString; import org.springframework.data.domain.Page; -import java.util.List; - @Setter @Getter @ToString public class PageResponseDTO { diff --git a/src/main/java/com/kusithm/meetupd/domain/team/dto/response/RecruitingContestTeamResponseDto.java b/src/main/java/com/kusithm/meetupd/domain/team/dto/response/RecruitingContestTeamResponseDto.java index 8199c43..1b9fb24 100644 --- a/src/main/java/com/kusithm/meetupd/domain/team/dto/response/RecruitingContestTeamResponseDto.java +++ b/src/main/java/com/kusithm/meetupd/domain/team/dto/response/RecruitingContestTeamResponseDto.java @@ -6,8 +6,6 @@ import lombok.Getter; import java.util.List; -import java.util.Optional; -import java.util.OptionalInt; import java.util.stream.Collectors; @Builder diff --git a/src/main/java/com/kusithm/meetupd/domain/team/dto/response/RecruitingTeamResponseDto.java b/src/main/java/com/kusithm/meetupd/domain/team/dto/response/RecruitingTeamResponseDto.java index ae8e057..19bb900 100644 --- a/src/main/java/com/kusithm/meetupd/domain/team/dto/response/RecruitingTeamResponseDto.java +++ b/src/main/java/com/kusithm/meetupd/domain/team/dto/response/RecruitingTeamResponseDto.java @@ -1,17 +1,10 @@ package com.kusithm.meetupd.domain.team.dto.response; -import com.kusithm.meetupd.common.error.EnumNotFoundException; import com.kusithm.meetupd.domain.contest.entity.Contest; import com.kusithm.meetupd.domain.team.entity.Team; -import com.kusithm.meetupd.domain.team.entity.TeamUser; import com.kusithm.meetupd.domain.user.entity.User; import lombok.*; -import java.util.List; - -import static com.kusithm.meetupd.common.error.ErrorCode.ENUM_NOT_FOUND; -import static com.kusithm.meetupd.domain.team.entity.TeamUserRoleType.TEAM_LEADER; - @Getter @Setter @ToString diff --git a/src/main/java/com/kusithm/meetupd/domain/team/dto/response/TeamDetailResponseDto.java b/src/main/java/com/kusithm/meetupd/domain/team/dto/response/TeamDetailResponseDto.java index b12d7c0..c795811 100644 --- a/src/main/java/com/kusithm/meetupd/domain/team/dto/response/TeamDetailResponseDto.java +++ b/src/main/java/com/kusithm/meetupd/domain/team/dto/response/TeamDetailResponseDto.java @@ -8,9 +8,6 @@ import java.text.DateFormat; import java.text.SimpleDateFormat; -import java.time.OffsetDateTime; -import java.time.format.DateTimeFormatter; -import java.util.Date; import java.util.List; import java.util.stream.Collectors; diff --git a/src/main/java/com/kusithm/meetupd/domain/team/dto/response/TeamIappliedResponseDto.java b/src/main/java/com/kusithm/meetupd/domain/team/dto/response/TeamIappliedResponseDto.java index 6436c00..9f2ea26 100644 --- a/src/main/java/com/kusithm/meetupd/domain/team/dto/response/TeamIappliedResponseDto.java +++ b/src/main/java/com/kusithm/meetupd/domain/team/dto/response/TeamIappliedResponseDto.java @@ -2,7 +2,6 @@ import com.kusithm.meetupd.domain.contest.entity.Contest; import com.kusithm.meetupd.domain.team.entity.Team; -import com.kusithm.meetupd.domain.team.entity.TeamUserRoleType; import com.kusithm.meetupd.domain.user.entity.LocationType; import com.kusithm.meetupd.domain.user.entity.User; import lombok.Builder; diff --git a/src/main/java/com/kusithm/meetupd/domain/team/entity/Team.java b/src/main/java/com/kusithm/meetupd/domain/team/entity/Team.java index 2841ef8..be584b1 100644 --- a/src/main/java/com/kusithm/meetupd/domain/team/entity/Team.java +++ b/src/main/java/com/kusithm/meetupd/domain/team/entity/Team.java @@ -2,7 +2,6 @@ import com.kusithm.meetupd.common.entity.BaseEntity; -import com.kusithm.meetupd.domain.user.entity.UserLocation; import jakarta.persistence.*; import lombok.*; diff --git a/src/main/java/com/kusithm/meetupd/domain/team/entity/TeamLocation.java b/src/main/java/com/kusithm/meetupd/domain/team/entity/TeamLocation.java index 45505ab..bc4be52 100644 --- a/src/main/java/com/kusithm/meetupd/domain/team/entity/TeamLocation.java +++ b/src/main/java/com/kusithm/meetupd/domain/team/entity/TeamLocation.java @@ -1,8 +1,6 @@ package com.kusithm.meetupd.domain.team.entity; import com.kusithm.meetupd.common.entity.BaseEntity; -import com.kusithm.meetupd.domain.user.entity.User; -import com.kusithm.meetupd.domain.user.entity.UserLocation; import jakarta.persistence.*; import lombok.*; diff --git a/src/main/java/com/kusithm/meetupd/domain/team/mysql/TeamUserRepository.java b/src/main/java/com/kusithm/meetupd/domain/team/mysql/TeamUserRepository.java index 76a046d..e63e3fa 100644 --- a/src/main/java/com/kusithm/meetupd/domain/team/mysql/TeamUserRepository.java +++ b/src/main/java/com/kusithm/meetupd/domain/team/mysql/TeamUserRepository.java @@ -3,7 +3,6 @@ import com.kusithm.meetupd.domain.team.entity.TeamUser; import org.springframework.data.jpa.repository.JpaRepository; -import javax.swing.text.html.Option; import java.util.List; import java.util.Optional; diff --git a/src/main/java/com/kusithm/meetupd/domain/team/scheduler/TeamScheduler.java b/src/main/java/com/kusithm/meetupd/domain/team/scheduler/TeamScheduler.java index a5b9e71..cdf3509 100644 --- a/src/main/java/com/kusithm/meetupd/domain/team/scheduler/TeamScheduler.java +++ b/src/main/java/com/kusithm/meetupd/domain/team/scheduler/TeamScheduler.java @@ -1,6 +1,5 @@ package com.kusithm.meetupd.domain.team.scheduler; -import com.kusithm.meetupd.domain.contest.entity.Contest; import com.kusithm.meetupd.domain.contest.service.ContestService; import com.kusithm.meetupd.domain.team.entity.Team; import com.kusithm.meetupd.domain.team.service.TeamService; diff --git a/src/main/java/com/kusithm/meetupd/domain/team/service/TeamService.java b/src/main/java/com/kusithm/meetupd/domain/team/service/TeamService.java index caf2bc8..47939ec 100644 --- a/src/main/java/com/kusithm/meetupd/domain/team/service/TeamService.java +++ b/src/main/java/com/kusithm/meetupd/domain/team/service/TeamService.java @@ -6,7 +6,6 @@ import com.kusithm.meetupd.domain.contest.entity.Contest; import com.kusithm.meetupd.domain.contest.mongo.ContestRepository; import com.kusithm.meetupd.domain.email.service.EmailService; -import com.kusithm.meetupd.domain.review.mongo.WaitReviewRepository; import com.kusithm.meetupd.domain.review.mysql.UserReviewedTeamRepository; import com.kusithm.meetupd.domain.team.dto.TeamIOpenedResponseDto; import com.kusithm.meetupd.domain.team.dto.request.PageDto; @@ -25,14 +24,14 @@ import jakarta.mail.MessagingException; import lombok.RequiredArgsConstructor; import org.bson.types.ObjectId; -import org.springframework.data.mongodb.core.query.Criteria; import org.springframework.data.domain.Page; import org.springframework.data.domain.PageRequest; import org.springframework.data.domain.Pageable; import org.springframework.data.domain.Sort; +import org.springframework.data.mongodb.core.MongoTemplate; +import org.springframework.data.mongodb.core.query.Criteria; import org.springframework.data.mongodb.core.query.Query; import org.springframework.data.mongodb.core.query.Update; -import org.springframework.data.mongodb.core.MongoTemplate; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -42,11 +41,7 @@ import static com.kusithm.meetupd.common.error.ErrorCode.*; import static com.kusithm.meetupd.domain.team.entity.TeamProgressType.*; -import static com.kusithm.meetupd.domain.team.entity.TeamProgressType.PROCEEDING; -import static com.kusithm.meetupd.domain.team.entity.TeamProgressType.RECRUITING; import static com.kusithm.meetupd.domain.team.entity.TeamUserRoleType.*; -import static com.kusithm.meetupd.domain.team.entity.TeamUserRoleType.TEAM_LEADER; -import static com.kusithm.meetupd.domain.team.entity.TeamUserRoleType.TEAM_MEMBER; @Service @RequiredArgsConstructor diff --git a/src/main/java/com/kusithm/meetupd/domain/user/controller/UserController.java b/src/main/java/com/kusithm/meetupd/domain/user/controller/UserController.java index 17f3711..38522a6 100644 --- a/src/main/java/com/kusithm/meetupd/domain/user/controller/UserController.java +++ b/src/main/java/com/kusithm/meetupd/domain/user/controller/UserController.java @@ -10,8 +10,8 @@ import com.kusithm.meetupd.domain.user.dto.request.UserProfileUpdateRequestDto; import com.kusithm.meetupd.domain.user.dto.response.IsUserUseTicketResponseDto; import com.kusithm.meetupd.domain.user.dto.response.SpendUserTicketResponseDto; -import com.kusithm.meetupd.domain.user.dto.response.UserTicketCountResponseDto; import com.kusithm.meetupd.domain.user.dto.response.UserCheckResponseDto; +import com.kusithm.meetupd.domain.user.dto.response.UserTicketCountResponseDto; import com.kusithm.meetupd.domain.user.service.UserService; import lombok.RequiredArgsConstructor; import org.springframework.http.ResponseEntity; diff --git a/src/main/java/com/kusithm/meetupd/domain/user/dto/UserMypageResponseDto.java b/src/main/java/com/kusithm/meetupd/domain/user/dto/UserMypageResponseDto.java index 125cd3a..2183dc9 100644 --- a/src/main/java/com/kusithm/meetupd/domain/user/dto/UserMypageResponseDto.java +++ b/src/main/java/com/kusithm/meetupd/domain/user/dto/UserMypageResponseDto.java @@ -4,8 +4,6 @@ import com.kusithm.meetupd.domain.user.entity.*; import lombok.*; -import java.lang.annotation.Target; -import java.util.ArrayList; import java.util.List; import java.util.stream.Collectors; diff --git a/src/main/java/com/kusithm/meetupd/domain/user/dto/response/ReviewPageUserResponseDto.java b/src/main/java/com/kusithm/meetupd/domain/user/dto/response/ReviewPageUserResponseDto.java index b3f5f2f..bc3cd4e 100644 --- a/src/main/java/com/kusithm/meetupd/domain/user/dto/response/ReviewPageUserResponseDto.java +++ b/src/main/java/com/kusithm/meetupd/domain/user/dto/response/ReviewPageUserResponseDto.java @@ -1,7 +1,5 @@ package com.kusithm.meetupd.domain.user.dto.response; -import com.kusithm.meetupd.domain.team.entity.Team; -import com.kusithm.meetupd.domain.user.entity.User; import lombok.Builder; import lombok.Getter; diff --git a/src/main/java/com/kusithm/meetupd/domain/user/dto/response/UserReviewResponseDto.java b/src/main/java/com/kusithm/meetupd/domain/user/dto/response/UserReviewResponseDto.java index e45c7bc..5cd7971 100644 --- a/src/main/java/com/kusithm/meetupd/domain/user/dto/response/UserReviewResponseDto.java +++ b/src/main/java/com/kusithm/meetupd/domain/user/dto/response/UserReviewResponseDto.java @@ -1,6 +1,5 @@ package com.kusithm.meetupd.domain.user.dto.response; -import com.kusithm.meetupd.domain.team.entity.Team; import com.kusithm.meetupd.domain.user.entity.User; import lombok.Builder; import lombok.Getter; diff --git a/src/main/java/com/kusithm/meetupd/domain/user/entity/LocationType.java b/src/main/java/com/kusithm/meetupd/domain/user/entity/LocationType.java index 90bcf47..01be4f3 100644 --- a/src/main/java/com/kusithm/meetupd/domain/user/entity/LocationType.java +++ b/src/main/java/com/kusithm/meetupd/domain/user/entity/LocationType.java @@ -1,7 +1,6 @@ package com.kusithm.meetupd.domain.user.entity; import com.kusithm.meetupd.common.error.EnumNotFoundException; -import com.kusithm.meetupd.domain.contest.entity.ContestType; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/src/main/java/com/kusithm/meetupd/domain/user/entity/User.java b/src/main/java/com/kusithm/meetupd/domain/user/entity/User.java index 89db1ea..4fbad21 100644 --- a/src/main/java/com/kusithm/meetupd/domain/user/entity/User.java +++ b/src/main/java/com/kusithm/meetupd/domain/user/entity/User.java @@ -10,7 +10,7 @@ import static com.kusithm.meetupd.domain.user.entity.Major.createMajor; import static com.kusithm.meetupd.domain.user.entity.Task.createTask; -import static com.kusithm.meetupd.domain.user.entity.Ticket.*; +import static com.kusithm.meetupd.domain.user.entity.Ticket.createInitTicket; @Getter @NoArgsConstructor(access = AccessLevel.PROTECTED) diff --git a/src/main/java/com/kusithm/meetupd/domain/user/mysql/UserTicketSpendRepository.java b/src/main/java/com/kusithm/meetupd/domain/user/mysql/UserTicketSpendRepository.java index 7340c9d..732d455 100644 --- a/src/main/java/com/kusithm/meetupd/domain/user/mysql/UserTicketSpendRepository.java +++ b/src/main/java/com/kusithm/meetupd/domain/user/mysql/UserTicketSpendRepository.java @@ -5,8 +5,6 @@ public interface UserTicketSpendRepository extends JpaRepository { - Boolean existsByUserIdAndPurchaseUserId(Long userId, Long purchaseUserId); -// Boolean existsByBuyUserIdAndSoldUserId(Long buyUserId, Long soldUserId); } diff --git a/src/main/java/com/kusithm/meetupd/domain/user/service/UserService.java b/src/main/java/com/kusithm/meetupd/domain/user/service/UserService.java index 78437e1..9bde1fa 100644 --- a/src/main/java/com/kusithm/meetupd/domain/user/service/UserService.java +++ b/src/main/java/com/kusithm/meetupd/domain/user/service/UserService.java @@ -10,9 +10,10 @@ import com.kusithm.meetupd.domain.user.dto.request.UserProfileUpdateRequestDto; import com.kusithm.meetupd.domain.user.dto.response.IsUserUseTicketResponseDto; import com.kusithm.meetupd.domain.user.dto.response.SpendUserTicketResponseDto; -import com.kusithm.meetupd.domain.user.dto.response.UserTicketCountResponseDto; import com.kusithm.meetupd.domain.user.dto.response.UserCheckResponseDto; -import com.kusithm.meetupd.domain.user.entity.*; +import com.kusithm.meetupd.domain.user.dto.response.UserTicketCountResponseDto; +import com.kusithm.meetupd.domain.user.entity.User; +import com.kusithm.meetupd.domain.user.entity.UserTicketSpend; import com.kusithm.meetupd.domain.user.mysql.UserRepository; import com.kusithm.meetupd.domain.user.mysql.UserTicketSpendRepository; import lombok.RequiredArgsConstructor; @@ -20,7 +21,7 @@ import org.springframework.transaction.annotation.Transactional; import static com.kusithm.meetupd.common.error.ErrorCode.*; -import static com.kusithm.meetupd.domain.user.entity.UserTicketSpend.*; +import static com.kusithm.meetupd.domain.user.entity.UserTicketSpend.createUserTicketSpend; @RequiredArgsConstructor @Transactional