Merge pull request #65 from SWEET-DEVELOPERS/feature/#64-refactor

[refactor] #64 불필요한 import, 중복되는 코드 제거

src/main/java/org/sopt/sweet/domain/gift/controller/GiftApi.java

@@ -19,8 +19,6 @@
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 
-import java.util.Map;
-
 @Tag(name = "선물", description = "선물 관련 API")
 public interface GiftApi {
     @Operation(

src/main/java/org/sopt/sweet/domain/gift/dto/response/FriendGiftDto.java

@@ -1,7 +1,6 @@
 package org.sopt.sweet.domain.gift.dto.response;
 
 import lombok.Builder;
-import org.sopt.sweet.domain.gift.dto.request.TournamentScoreRequestDto;
 import org.sopt.sweet.domain.gift.entity.Gift;
 
 import java.time.LocalDateTime;

src/main/java/org/sopt/sweet/domain/gift/dto/response/TournamentInfoDto.java

@@ -4,6 +4,7 @@
 import org.sopt.sweet.domain.room.constant.TournamentDuration;
 
 import java.time.LocalDateTime;
+
 @Builder
 public record TournamentInfoDto(
         LocalDateTime tournamentStartDate,
@@ -17,12 +18,12 @@ public static TournamentInfoDto of(LocalDateTime tournamentStartDate,
                                        TournamentDuration tournamentDuration,
                                        int TotalParticipantsCount,
                                        int ParticipantsCount) {
-       return TournamentInfoDto.builder()
-               .tournamentStartDate(tournamentStartDate)
-               .tournamentDuration(tournamentDuration)
-               .TotalParticipantsCount(TotalParticipantsCount)
-               .ParticipantsCount(ParticipantsCount)
-               .build();
+        return TournamentInfoDto.builder()
+                .tournamentStartDate(tournamentStartDate)
+                .tournamentDuration(tournamentDuration)
+                .TotalParticipantsCount(TotalParticipantsCount)
+                .ParticipantsCount(ParticipantsCount)
+                .build();
     }
 
 }

src/main/java/org/sopt/sweet/domain/gift/dto/response/TournamentRankingResponseDto.java

@@ -13,7 +13,7 @@ public record TournamentRankingResponseDto(
 
 ) {
 
-    public static TournamentRankingResponseDto of(  Long ranking,Long giftId, String imageUrl, String name, int cost, String url) {
+    public static TournamentRankingResponseDto of(Long ranking, Long giftId, String imageUrl, String name, int cost, String url) {
         return TournamentRankingResponseDto.builder()
                 .ranking(ranking)
                 .giftId(giftId)

src/main/java/org/sopt/sweet/domain/gift/entity/Gift.java

@@ -1,9 +1,12 @@
 package org.sopt.sweet.domain.gift.entity;
 
 import jakarta.persistence.*;
-import lombok.*;
-import org.sopt.sweet.domain.room.entity.Room;
+import lombok.AccessLevel;
+import lombok.Builder;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
 import org.sopt.sweet.domain.member.entity.Member;
+import org.sopt.sweet.domain.room.entity.Room;
 import org.sopt.sweet.global.common.BaseTimeEntity;
 
 @Getter

src/main/java/org/sopt/sweet/domain/gift/repository/GiftRepository.java

@@ -9,7 +9,6 @@
 import org.springframework.data.repository.query.Param;
 
 import java.util.List;
-import java.util.Optional;
 
 public interface GiftRepository extends JpaRepository<Gift, Long> {
     long countByRoomAndMember(Room room, Member member);
@@ -20,6 +19,7 @@ public interface GiftRepository extends JpaRepository<Gift, Long> {
     List<Gift> findLatestGiftsByRoomAndNotMember(@Param("room") Room room, @Param("member") Member member, Pageable pageable);
 
     List<Gift> findByRoom(Room room);
+
     List<Gift> findByRoomOrderByScoreDesc(Room room);
 
     List<Gift> findByRoomAndMemberNot(Room room, Member member);

src/main/java/org/sopt/sweet/domain/gift/service/GiftService.java

@@ -133,12 +133,6 @@ private Gift findByIdOrThrow(Long giftId) {
                 .orElseThrow(() -> new EntityNotFoundException(GIFT_NOT_FOUND));
     }
 
-    private Room findGiftByIdOrThrow(Long roomId) {
-        return roomRepository.findById(roomId)
-                .orElseThrow(() -> new EntityNotFoundException(GIFT_NOT_FOUND));
-    }
-
-
     @Transactional(readOnly = true)
     public List<TournamentListsResponseDto> getTournamentGiftList(Long roomId) {
         Room room = findRoomByIdOrThrow(roomId);

src/main/java/org/sopt/sweet/domain/member/controller/MemberController.java

@@ -13,7 +13,7 @@
 @RequiredArgsConstructor
 @RequestMapping("/api/member")
 @RestController
-public class MemberController implements MemberApi{
+public class MemberController implements MemberApi {
 
     private final MemberService memberService;
 
@@ -25,7 +25,7 @@ public ResponseEntity<SuccessResponse<?>> testSwagger() {
 
     // 임시 발급 API 입니다. 추후 로그인 기능이 완성되면 삭제할 예정입니다.
     @PostMapping("/token/{memberId}")
-    public ResponseEntity<SuccessResponse<?>> getToken(@PathVariable Long memberId){
+    public ResponseEntity<SuccessResponse<?>> getToken(@PathVariable Long memberId) {
         final MemberTokenResponseDto memberTokenResponseDto = memberService.getToken(memberId);
         return SuccessResponse.created(memberTokenResponseDto);
     }
@@ -38,7 +38,7 @@ public ResponseEntity<SuccessResponse<?>> getClosedRoom(@UserId Long userId) {
 
     @GetMapping("/active-room")
     public ResponseEntity<SuccessResponse<?>> getActiveRoom(@UserId Long userId) {
-        final List<ActiveRoomResponseDto>activeRoomResponseDto = memberService.getActiveRoom(userId);
+        final List<ActiveRoomResponseDto> activeRoomResponseDto = memberService.getActiveRoom(userId);
         return SuccessResponse.ok(activeRoomResponseDto);
     }
 

src/main/java/org/sopt/sweet/domain/member/controller/OAuthApi.java

@@ -2,18 +2,16 @@
 
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.headers.Header;
 import io.swagger.v3.oas.annotations.media.Content;
 import io.swagger.v3.oas.annotations.media.Schema;
 import io.swagger.v3.oas.annotations.responses.ApiResponse;
 import io.swagger.v3.oas.annotations.responses.ApiResponses;
-import io.swagger.v3.oas.annotations.security.SecurityRequirement;
 import io.swagger.v3.oas.annotations.tags.Tag;
-import jakarta.validation.Valid;
 import org.sopt.sweet.global.common.SuccessResponse;
 import org.sopt.sweet.global.config.auth.UserId;
 import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestParam;
 
 @Tag(name = "소셜로그인", description = "소셜로그인 관련 API")
 public interface OAuthApi {

src/main/java/org/sopt/sweet/domain/member/controller/OAuthController.java

@@ -31,12 +31,10 @@ public ResponseEntity<SuccessResponse<?>> kakaoLogin(@RequestParam("code") Strin
         return SuccessResponse.ok(loginResponse);
     }
 
-
     @PostMapping("/kakao/logout")
     public ResponseEntity<SuccessResponse<?>> kakaoLogout(@UserId Long userId) {
         oAuthService.kakaoLogout(userId);
         return SuccessResponse.ok("로그아웃 성공");
     }
 
-
 }

src/main/java/org/sopt/sweet/domain/member/dto/response/ActiveRoomResponseDto.java

@@ -2,8 +2,6 @@
 
 import java.time.LocalDateTime;
 
-;
-
 public record ActiveRoomResponseDto(
         Long roomId,
         String imageUrl,
@@ -13,6 +11,4 @@ public record ActiveRoomResponseDto(
         Boolean isOwner
 
 ) {
-
-
 }

src/main/java/org/sopt/sweet/domain/member/dto/response/ClosedRoomResponseDto.java

@@ -6,5 +6,4 @@ public record ClosedRoomResponseDto(
         String gifteeName,
         int gifterNumber
 ) {
-
 }

src/main/java/org/sopt/sweet/domain/member/dto/response/KakaoUserInfoResponseDto.java

@@ -1,17 +1,13 @@
 package org.sopt.sweet.domain.member.dto.response;
 
-
 import org.sopt.sweet.domain.member.entity.Member;
 
-
 public record KakaoUserInfoResponseDto(
         Long memberId,
         Long socialId,
         String nickname,
         String profileImage
 ) {
-
-
     KakaoUserInfoResponseDto of(Member member) {
         return new KakaoUserInfoResponseDto(
                 member.getId(),
@@ -20,6 +16,4 @@ KakaoUserInfoResponseDto of(Member member) {
                 member.getProfileImg()
         );
     }
-
-
 }

src/main/java/org/sopt/sweet/domain/member/entity/Member.java

@@ -1,7 +1,10 @@
 package org.sopt.sweet.domain.member.entity;
 
 import jakarta.persistence.*;
-import lombok.*;
+import lombok.AccessLevel;
+import lombok.Builder;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
 import org.sopt.sweet.domain.member.constant.SocialType;
 import org.sopt.sweet.global.common.BaseTimeEntity;
 

src/main/java/org/sopt/sweet/domain/member/service/MemberService.java

@@ -1,7 +1,6 @@
 package org.sopt.sweet.domain.member.service;
 
 import lombok.RequiredArgsConstructor;
-
 import org.sopt.sweet.domain.member.dto.response.ActiveRoomResponseDto;
 import org.sopt.sweet.domain.member.dto.response.ClosedRoomResponseDto;
 import org.sopt.sweet.domain.member.dto.response.MemberInfoDto;
@@ -89,6 +88,7 @@ private ActiveRoomResponseDto mapToActiveRoomResponseDto(Room room, Long memberI
                 isOwner(memberId, room.getId())
         );
     }
+
     private LocalDateTime getRoomMemberCreationTime(Room room, Long memberId) {
         Optional<RoomMember> roomMember = roomMemberRepository.findByMemberIdAndRoom(memberId, room);
         return roomMember.map(RoomMember::getCreateDate).orElse(LocalDateTime.MIN);
@@ -111,7 +111,6 @@ public List<ActiveRoomResponseDto> getTop2ActiveRooms(Long memberId) {
         return activeRooms.size() > 2 ? activeRooms.subList(0, 2) : activeRooms;
     }
 
-
     public MemberInfoDto getMemberInfo(Long memberId) {
         Optional<Member> member = memberRepository.findById(memberId);
         return new MemberInfoDto(

src/main/java/org/sopt/sweet/domain/member/service/OAuthService.java

@@ -121,7 +121,6 @@ public KakaoUserInfoResponseDto saveMember(Long socialId, String nickname, Strin
             memberRepository.save(member);
             return new KakaoUserInfoResponseDto(member.getId(), socialId, nickname, profileImage);
         }
-
         return new KakaoUserInfoResponseDto(existMember.getId(), socialId, nickname, profileImage);
     }
 
@@ -130,7 +129,6 @@ public KakaoUserInfoResponseDto saveMember(Long socialId, String nickname, Strin
     public MemberTokenResponseDto saveToken(Long memberId) {
         String refreshToken = null;
         String accessToken = issueNewAccessToken(memberId);
-
         String redisKey = "RT:" + memberId;
         String storedRefreshToken = redisTemplate.opsForValue().get(redisKey);
 
@@ -142,13 +140,10 @@ public MemberTokenResponseDto saveToken(Long memberId) {
         }
 
         System.out.println("카카오 로그인 성공 memberId: " + memberId + " accessToken :" + accessToken + " refreshToken: " + refreshToken);
-
         return new MemberTokenResponseDto(accessToken, refreshToken);
     }
 
-
     public void kakaoLogout(Long memberId) {
-
         String redisKey = "RT:" + memberId;
         redisTemplate.delete(redisKey);
 

src/main/java/org/sopt/sweet/domain/opengraph/controller/OpengraphController.java

@@ -1,8 +1,8 @@
 package org.sopt.sweet.domain.opengraph.controller;
 
 import lombok.RequiredArgsConstructor;
-import org.sopt.sweet.domain.opengraph.dto.OpengraphResponseDto;
 import org.sopt.sweet.domain.opengraph.dto.OpengraphRequestDto;
+import org.sopt.sweet.domain.opengraph.dto.OpengraphResponseDto;
 import org.sopt.sweet.domain.opengraph.service.OpengraphService;
 import org.sopt.sweet.global.common.SuccessResponse;
 import org.springframework.http.ResponseEntity;
@@ -11,7 +11,7 @@
 @RequiredArgsConstructor
 @RequestMapping("/api/opengraph")
 @RestController
-public class OpengraphController implements OpengraphAPI{
+public class OpengraphController implements OpengraphAPI {
 
     private final OpengraphService opengraphService;
 

src/main/java/org/sopt/sweet/domain/opengraph/dto/OpengraphResponseDto.java

@@ -8,7 +8,7 @@ public record OpengraphResponseDto(
         String image
 ) {
     public static OpengraphResponseDto of(String title,
-                                          String image){
+                                          String image) {
         return OpengraphResponseDto.builder()
                 .title(title)
                 .image(image)

src/main/java/org/sopt/sweet/domain/opengraph/service/OpengraphService.java

@@ -1,10 +1,10 @@
 package org.sopt.sweet.domain.opengraph.service;
 
 import lombok.RequiredArgsConstructor;
-import org.sopt.sweet.domain.opengraph.dto.OpengraphResponseDto;
 import org.sopt.sweet.domain.opengraph.dto.OpengraphRequestDto;
-import org.sopt.sweet.global.external.opengraph.lib.OpenGraph;
+import org.sopt.sweet.domain.opengraph.dto.OpengraphResponseDto;
 import org.sopt.sweet.global.error.exception.EntityNotFoundException;
+import org.sopt.sweet.global.external.opengraph.lib.OpenGraph;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 

src/main/java/org/sopt/sweet/domain/product/dto/response/HotProductsResponseDto.java

@@ -11,7 +11,7 @@ public record HotProductsResponseDto(
         List<HotProductDto> hotProductDtoList
 ) {
     public static HotProductsResponseDto of(LocalDateTime tournamentStartDate,
-                                            List<HotProductDto> hotProductDtoList){
+                                            List<HotProductDto> hotProductDtoList) {
         return HotProductsResponseDto.builder()
                 .tournamentStartDate(tournamentStartDate)
                 .hotProductDtoList(hotProductDtoList)

src/main/java/org/sopt/sweet/domain/product/entity/Product.java

@@ -1,7 +1,9 @@
 package org.sopt.sweet.domain.product.entity;
 
 import jakarta.persistence.*;
-import lombok.*;
+import lombok.AccessLevel;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
 import org.sopt.sweet.global.common.BaseTimeEntity;
 
 @Getter

src/main/java/org/sopt/sweet/domain/product/service/ProductService.java

@@ -1,15 +1,13 @@
 package org.sopt.sweet.domain.product.service;
 
 import lombok.RequiredArgsConstructor;
-import org.sopt.sweet.domain.gift.repository.GiftRepository;
 import org.sopt.sweet.domain.member.entity.Member;
 import org.sopt.sweet.domain.member.repository.MemberRepository;
 import org.sopt.sweet.domain.product.dto.response.HotProductDto;
 import org.sopt.sweet.domain.product.dto.response.HotProductsResponseDto;
 import org.sopt.sweet.domain.product.entity.Product;
 import org.sopt.sweet.domain.product.repository.ProductRepository;
 import org.sopt.sweet.domain.room.entity.Room;
-import org.sopt.sweet.domain.room.repository.RoomMemberRepository;
 import org.sopt.sweet.domain.room.repository.RoomRepository;
 import org.sopt.sweet.global.error.exception.EntityNotFoundException;
 import org.springframework.stereotype.Service;
@@ -30,7 +28,7 @@ public class ProductService {
     private final ProductRepository productRepository;
     private final RoomRepository roomRepository;
 
-    public HotProductsResponseDto getHotGift(Long memberId, Long roomId){
+    public HotProductsResponseDto getHotGift(Long memberId, Long roomId) {
         Member member = findMemberByIdOrThrow(memberId);
         Room room = findRoomByIdOrThrow(roomId);
         List<Product> allProducts = productRepository.findAll();