diff --git a/src/main/java/org/sopt/sweet/domain/gift/controller/GiftApi.java b/src/main/java/org/sopt/sweet/domain/gift/controller/GiftApi.java index 3dbebe5..d53d4e9 100644 --- a/src/main/java/org/sopt/sweet/domain/gift/controller/GiftApi.java +++ b/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( diff --git a/src/main/java/org/sopt/sweet/domain/gift/dto/response/FriendGiftDto.java b/src/main/java/org/sopt/sweet/domain/gift/dto/response/FriendGiftDto.java index 3126072..6546059 100644 --- a/src/main/java/org/sopt/sweet/domain/gift/dto/response/FriendGiftDto.java +++ b/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; diff --git a/src/main/java/org/sopt/sweet/domain/gift/dto/response/TournamentInfoDto.java b/src/main/java/org/sopt/sweet/domain/gift/dto/response/TournamentInfoDto.java index 42bc0d6..0d8b4e3 100644 --- a/src/main/java/org/sopt/sweet/domain/gift/dto/response/TournamentInfoDto.java +++ b/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(); } } diff --git a/src/main/java/org/sopt/sweet/domain/gift/dto/response/TournamentRankingResponseDto.java b/src/main/java/org/sopt/sweet/domain/gift/dto/response/TournamentRankingResponseDto.java index bed8081..6119435 100644 --- a/src/main/java/org/sopt/sweet/domain/gift/dto/response/TournamentRankingResponseDto.java +++ b/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) diff --git a/src/main/java/org/sopt/sweet/domain/gift/entity/Gift.java b/src/main/java/org/sopt/sweet/domain/gift/entity/Gift.java index 325f631..49edd1a 100644 --- a/src/main/java/org/sopt/sweet/domain/gift/entity/Gift.java +++ b/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 diff --git a/src/main/java/org/sopt/sweet/domain/gift/repository/GiftRepository.java b/src/main/java/org/sopt/sweet/domain/gift/repository/GiftRepository.java index e72d361..87df65b 100644 --- a/src/main/java/org/sopt/sweet/domain/gift/repository/GiftRepository.java +++ b/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 { long countByRoomAndMember(Room room, Member member); @@ -20,6 +19,7 @@ public interface GiftRepository extends JpaRepository { List findLatestGiftsByRoomAndNotMember(@Param("room") Room room, @Param("member") Member member, Pageable pageable); List findByRoom(Room room); + List findByRoomOrderByScoreDesc(Room room); List findByRoomAndMemberNot(Room room, Member member); diff --git a/src/main/java/org/sopt/sweet/domain/gift/service/GiftService.java b/src/main/java/org/sopt/sweet/domain/gift/service/GiftService.java index c50f4d0..43bfc4a 100644 --- a/src/main/java/org/sopt/sweet/domain/gift/service/GiftService.java +++ b/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 getTournamentGiftList(Long roomId) { Room room = findRoomByIdOrThrow(roomId); diff --git a/src/main/java/org/sopt/sweet/domain/member/controller/MemberController.java b/src/main/java/org/sopt/sweet/domain/member/controller/MemberController.java index e3f88d4..80977fa 100644 --- a/src/main/java/org/sopt/sweet/domain/member/controller/MemberController.java +++ b/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> testSwagger() { // 임시 발급 API 입니다. 추후 로그인 기능이 완성되면 삭제할 예정입니다. @PostMapping("/token/{memberId}") - public ResponseEntity> getToken(@PathVariable Long memberId){ + public ResponseEntity> getToken(@PathVariable Long memberId) { final MemberTokenResponseDto memberTokenResponseDto = memberService.getToken(memberId); return SuccessResponse.created(memberTokenResponseDto); } @@ -38,7 +38,7 @@ public ResponseEntity> getClosedRoom(@UserId Long userId) { @GetMapping("/active-room") public ResponseEntity> getActiveRoom(@UserId Long userId) { - final ListactiveRoomResponseDto = memberService.getActiveRoom(userId); + final List activeRoomResponseDto = memberService.getActiveRoom(userId); return SuccessResponse.ok(activeRoomResponseDto); } diff --git a/src/main/java/org/sopt/sweet/domain/member/controller/OAuthApi.java b/src/main/java/org/sopt/sweet/domain/member/controller/OAuthApi.java index e4417e8..eb76c75 100644 --- a/src/main/java/org/sopt/sweet/domain/member/controller/OAuthApi.java +++ b/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 { diff --git a/src/main/java/org/sopt/sweet/domain/member/controller/OAuthController.java b/src/main/java/org/sopt/sweet/domain/member/controller/OAuthController.java index c8f2024..44b912d 100644 --- a/src/main/java/org/sopt/sweet/domain/member/controller/OAuthController.java +++ b/src/main/java/org/sopt/sweet/domain/member/controller/OAuthController.java @@ -31,12 +31,10 @@ public ResponseEntity> kakaoLogin(@RequestParam("code") Strin return SuccessResponse.ok(loginResponse); } - @PostMapping("/kakao/logout") public ResponseEntity> kakaoLogout(@UserId Long userId) { oAuthService.kakaoLogout(userId); return SuccessResponse.ok("로그아웃 성공"); } - } diff --git a/src/main/java/org/sopt/sweet/domain/member/dto/response/ActiveRoomResponseDto.java b/src/main/java/org/sopt/sweet/domain/member/dto/response/ActiveRoomResponseDto.java index 20b8fb3..e238e67 100644 --- a/src/main/java/org/sopt/sweet/domain/member/dto/response/ActiveRoomResponseDto.java +++ b/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 ) { - - } \ No newline at end of file diff --git a/src/main/java/org/sopt/sweet/domain/member/dto/response/ClosedRoomResponseDto.java b/src/main/java/org/sopt/sweet/domain/member/dto/response/ClosedRoomResponseDto.java index 49a8098..5e5199f 100644 --- a/src/main/java/org/sopt/sweet/domain/member/dto/response/ClosedRoomResponseDto.java +++ b/src/main/java/org/sopt/sweet/domain/member/dto/response/ClosedRoomResponseDto.java @@ -6,5 +6,4 @@ public record ClosedRoomResponseDto( String gifteeName, int gifterNumber ) { - } diff --git a/src/main/java/org/sopt/sweet/domain/member/dto/response/KakaoUserInfoResponseDto.java b/src/main/java/org/sopt/sweet/domain/member/dto/response/KakaoUserInfoResponseDto.java index 7768944..c9f6774 100644 --- a/src/main/java/org/sopt/sweet/domain/member/dto/response/KakaoUserInfoResponseDto.java +++ b/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() ); } - - } \ No newline at end of file diff --git a/src/main/java/org/sopt/sweet/domain/member/entity/Member.java b/src/main/java/org/sopt/sweet/domain/member/entity/Member.java index c7b5bf2..835ad68 100644 --- a/src/main/java/org/sopt/sweet/domain/member/entity/Member.java +++ b/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; diff --git a/src/main/java/org/sopt/sweet/domain/member/service/MemberService.java b/src/main/java/org/sopt/sweet/domain/member/service/MemberService.java index dd20cf5..8380675 100644 --- a/src/main/java/org/sopt/sweet/domain/member/service/MemberService.java +++ b/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 = roomMemberRepository.findByMemberIdAndRoom(memberId, room); return roomMember.map(RoomMember::getCreateDate).orElse(LocalDateTime.MIN); @@ -111,7 +111,6 @@ public List getTop2ActiveRooms(Long memberId) { return activeRooms.size() > 2 ? activeRooms.subList(0, 2) : activeRooms; } - public MemberInfoDto getMemberInfo(Long memberId) { Optional member = memberRepository.findById(memberId); return new MemberInfoDto( diff --git a/src/main/java/org/sopt/sweet/domain/member/service/OAuthService.java b/src/main/java/org/sopt/sweet/domain/member/service/OAuthService.java index 48b727d..88dfe3f 100644 --- a/src/main/java/org/sopt/sweet/domain/member/service/OAuthService.java +++ b/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); diff --git a/src/main/java/org/sopt/sweet/domain/opengraph/controller/OpengraphController.java b/src/main/java/org/sopt/sweet/domain/opengraph/controller/OpengraphController.java index 79abd81..7391cfa 100644 --- a/src/main/java/org/sopt/sweet/domain/opengraph/controller/OpengraphController.java +++ b/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; diff --git a/src/main/java/org/sopt/sweet/domain/opengraph/dto/OpengraphResponseDto.java b/src/main/java/org/sopt/sweet/domain/opengraph/dto/OpengraphResponseDto.java index 24234a6..331bc0a 100644 --- a/src/main/java/org/sopt/sweet/domain/opengraph/dto/OpengraphResponseDto.java +++ b/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) diff --git a/src/main/java/org/sopt/sweet/domain/opengraph/service/OpengraphService.java b/src/main/java/org/sopt/sweet/domain/opengraph/service/OpengraphService.java index fcf41b8..d3a3905 100644 --- a/src/main/java/org/sopt/sweet/domain/opengraph/service/OpengraphService.java +++ b/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; diff --git a/src/main/java/org/sopt/sweet/domain/product/dto/response/HotProductsResponseDto.java b/src/main/java/org/sopt/sweet/domain/product/dto/response/HotProductsResponseDto.java index a5dd596..62b331a 100644 --- a/src/main/java/org/sopt/sweet/domain/product/dto/response/HotProductsResponseDto.java +++ b/src/main/java/org/sopt/sweet/domain/product/dto/response/HotProductsResponseDto.java @@ -11,7 +11,7 @@ public record HotProductsResponseDto( List hotProductDtoList ) { public static HotProductsResponseDto of(LocalDateTime tournamentStartDate, - List hotProductDtoList){ + List hotProductDtoList) { return HotProductsResponseDto.builder() .tournamentStartDate(tournamentStartDate) .hotProductDtoList(hotProductDtoList) diff --git a/src/main/java/org/sopt/sweet/domain/product/entity/Product.java b/src/main/java/org/sopt/sweet/domain/product/entity/Product.java index ff32696..bb1e49e 100644 --- a/src/main/java/org/sopt/sweet/domain/product/entity/Product.java +++ b/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 diff --git a/src/main/java/org/sopt/sweet/domain/product/service/ProductService.java b/src/main/java/org/sopt/sweet/domain/product/service/ProductService.java index 492c380..df8c86e 100644 --- a/src/main/java/org/sopt/sweet/domain/product/service/ProductService.java +++ b/src/main/java/org/sopt/sweet/domain/product/service/ProductService.java @@ -1,7 +1,6 @@ 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; @@ -9,7 +8,6 @@ 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 allProducts = productRepository.findAll(); diff --git a/src/main/java/org/sopt/sweet/domain/room/controller/RoomController.java b/src/main/java/org/sopt/sweet/domain/room/controller/RoomController.java index 394fcbf..773eaf4 100644 --- a/src/main/java/org/sopt/sweet/domain/room/controller/RoomController.java +++ b/src/main/java/org/sopt/sweet/domain/room/controller/RoomController.java @@ -20,55 +20,55 @@ public class RoomController implements RoomApi { private final RoomService roomService; @PostMapping - public ResponseEntity> createNewRoom(@UserId Long userId, @RequestBody CreateRoomRequestDto createRoomRequestDto){ + public ResponseEntity> createNewRoom(@UserId Long userId, @RequestBody CreateRoomRequestDto createRoomRequestDto) { final CreateRoomResponseDto newRoom = roomService.createNewRoom(userId, createRoomRequestDto); return SuccessResponse.created(newRoom); } @GetMapping("/invitations/{invitationCode}") - public ResponseEntity> getRoomInviteInfo(@PathVariable String invitationCode){ + public ResponseEntity> getRoomInviteInfo(@PathVariable String invitationCode) { final RoomInviteResponseDto roomInviteResponseDto = roomService.getRoomInviteInfo(invitationCode); return SuccessResponse.ok(roomInviteResponseDto); } @PostMapping("/participation") - public ResponseEntity> joinRoom(@UserId Long userId, @RequestBody JoinRoomRequestDto joinRoomRequestDto){ + public ResponseEntity> joinRoom(@UserId Long userId, @RequestBody JoinRoomRequestDto joinRoomRequestDto) { final JoinRoomResponseDto joinRoomResponseDto = roomService.findAndJoinRoom(userId, joinRoomRequestDto); return SuccessResponse.ok(joinRoomResponseDto); } @GetMapping("/{roomId}") - public ResponseEntity> getRoomMainInfo(@UserId Long userId, @PathVariable Long roomId){ + public ResponseEntity> getRoomMainInfo(@UserId Long userId, @PathVariable Long roomId) { final RoomMainResponseDto roomMainResponseDto = roomService.getRoomMainInfo(userId, roomId); return SuccessResponse.ok(roomMainResponseDto); } @GetMapping("/detail/{roomId}") - public ResponseEntity> getRoomDetailInfo(@UserId Long userId, @PathVariable Long roomId){ + public ResponseEntity> getRoomDetailInfo(@UserId Long userId, @PathVariable Long roomId) { final RoomDetailResponseDto roomDetailResponseDto = roomService.getRoomDetailInfo(userId, roomId); return SuccessResponse.ok(roomDetailResponseDto); } @PatchMapping("/{roomId}/thumbnail") - public ResponseEntity> modifyRoomThumbnail(@UserId Long userId, @PathVariable Long roomId, @RequestBody RoomImageRequestDto roomImageRequestDto){ + public ResponseEntity> modifyRoomThumbnail(@UserId Long userId, @PathVariable Long roomId, @RequestBody RoomImageRequestDto roomImageRequestDto) { roomService.modifyRoomThumbnail(userId, roomId, roomImageRequestDto); return SuccessResponse.ok(null); } @PatchMapping("/{roomId}/giftee-name") - public ResponseEntity> modifyRoomGifteeName(@UserId Long userId, @PathVariable Long roomId, @RequestBody RoomNameRequestDto roomNameRequestDto){ + public ResponseEntity> modifyRoomGifteeName(@UserId Long userId, @PathVariable Long roomId, @RequestBody RoomNameRequestDto roomNameRequestDto) { roomService.modifyRoomGifteeName(userId, roomId, roomNameRequestDto); return SuccessResponse.ok(null); } @GetMapping("/{roomId}/members") - public ResponseEntity> getRoomMembers(@UserId Long userId, @PathVariable Long roomId){ + public ResponseEntity> getRoomMembers(@UserId Long userId, @PathVariable Long roomId) { final RoomMembersResponseDto roomMembersResponseDto = roomService.getRoomMembers(userId, roomId); return SuccessResponse.ok(roomMembersResponseDto); } @DeleteMapping("/{roomId}/members/{memberId}") - public ResponseEntity> deleteRoomMember(@UserId Long userId, @PathVariable Long roomId, @PathVariable Long memberId){ + public ResponseEntity> deleteRoomMember(@UserId Long userId, @PathVariable Long roomId, @PathVariable Long memberId) { roomService.deleteRoomMember(userId, roomId, memberId); return SuccessResponse.ok(null); } diff --git a/src/main/java/org/sopt/sweet/domain/room/dto/response/CreateRoomResponseDto.java b/src/main/java/org/sopt/sweet/domain/room/dto/response/CreateRoomResponseDto.java index 6af1ed5..a1daa7a 100644 --- a/src/main/java/org/sopt/sweet/domain/room/dto/response/CreateRoomResponseDto.java +++ b/src/main/java/org/sopt/sweet/domain/room/dto/response/CreateRoomResponseDto.java @@ -7,7 +7,7 @@ public record CreateRoomResponseDto( Long roomId, String invitationCode ) { - public static CreateRoomResponseDto of(Long roomId, String invitationCode){ + public static CreateRoomResponseDto of(Long roomId, String invitationCode) { return CreateRoomResponseDto.builder() .roomId(roomId) .invitationCode(invitationCode) diff --git a/src/main/java/org/sopt/sweet/domain/room/dto/response/HotProductGiftDto.java b/src/main/java/org/sopt/sweet/domain/room/dto/response/HotProductGiftDto.java index 85a199c..abba153 100644 --- a/src/main/java/org/sopt/sweet/domain/room/dto/response/HotProductGiftDto.java +++ b/src/main/java/org/sopt/sweet/domain/room/dto/response/HotProductGiftDto.java @@ -10,7 +10,7 @@ public record HotProductGiftDto( String url, int cost ) { - public static HotProductGiftDto of(Long productId, String imageUrl, String name, String url, int cost){ + public static HotProductGiftDto of(Long productId, String imageUrl, String name, String url, int cost) { return HotProductGiftDto.builder() .productId(productId) .imageUrl(imageUrl) diff --git a/src/main/java/org/sopt/sweet/domain/room/dto/response/RoomDetailResponseDto.java b/src/main/java/org/sopt/sweet/domain/room/dto/response/RoomDetailResponseDto.java index 886f9a0..27962e6 100644 --- a/src/main/java/org/sopt/sweet/domain/room/dto/response/RoomDetailResponseDto.java +++ b/src/main/java/org/sopt/sweet/domain/room/dto/response/RoomDetailResponseDto.java @@ -21,7 +21,7 @@ public static RoomDetailResponseDto of(Long roomId, int gifterNumber, LocalDateTime deliveryDate, LocalDateTime tournamentStartDate, - TournamentDuration tournamentDuration){ + TournamentDuration tournamentDuration) { return RoomDetailResponseDto.builder() .roomId(roomId) .imageUrl(imageUrl) diff --git a/src/main/java/org/sopt/sweet/domain/room/dto/response/RoomInviteResponseDto.java b/src/main/java/org/sopt/sweet/domain/room/dto/response/RoomInviteResponseDto.java index 9498a83..ee5e095 100644 --- a/src/main/java/org/sopt/sweet/domain/room/dto/response/RoomInviteResponseDto.java +++ b/src/main/java/org/sopt/sweet/domain/room/dto/response/RoomInviteResponseDto.java @@ -23,7 +23,7 @@ public static RoomInviteResponseDto of(Long roomId, LocalDateTime deliveryDate, LocalDateTime tournamentStartDate, TournamentDuration tournamentDuration, - String invitationCode){ + String invitationCode) { return RoomInviteResponseDto.builder() .roomId(roomId) .gifterNumber(gifterNumber) diff --git a/src/main/java/org/sopt/sweet/domain/room/dto/response/RoomMainResponseDto.java b/src/main/java/org/sopt/sweet/domain/room/dto/response/RoomMainResponseDto.java index c0375db..8ce3abf 100644 --- a/src/main/java/org/sopt/sweet/domain/room/dto/response/RoomMainResponseDto.java +++ b/src/main/java/org/sopt/sweet/domain/room/dto/response/RoomMainResponseDto.java @@ -4,6 +4,7 @@ import java.time.LocalDateTime; import java.util.List; + @Builder public record RoomMainResponseDto( int gifterNumber, @@ -20,7 +21,7 @@ public static RoomMainResponseDto of(int gifterNumber, LocalDateTime tournamentStartDate, List roomMyGiftDtoList, List roomFriendsGiftDtoList, - List hotProductGiftDtoList){ + List hotProductGiftDtoList) { return RoomMainResponseDto.builder() .gifterNumber(gifterNumber) .gifteeName(gifteeName) diff --git a/src/main/java/org/sopt/sweet/domain/room/dto/response/RoomMemberDto.java b/src/main/java/org/sopt/sweet/domain/room/dto/response/RoomMemberDto.java index 878a8ba..f22e992 100644 --- a/src/main/java/org/sopt/sweet/domain/room/dto/response/RoomMemberDto.java +++ b/src/main/java/org/sopt/sweet/domain/room/dto/response/RoomMemberDto.java @@ -8,7 +8,7 @@ public record RoomMemberDto( String profileImageUrl, String name ) { - public static RoomMemberDto of(Long memberId, String profileImageUrl, String name){ + public static RoomMemberDto of(Long memberId, String profileImageUrl, String name) { return RoomMemberDto.builder() .memberId(memberId) .profileImageUrl(profileImageUrl) diff --git a/src/main/java/org/sopt/sweet/domain/room/dto/response/RoomMembersResponseDto.java b/src/main/java/org/sopt/sweet/domain/room/dto/response/RoomMembersResponseDto.java index f2f6e7a..461a88f 100644 --- a/src/main/java/org/sopt/sweet/domain/room/dto/response/RoomMembersResponseDto.java +++ b/src/main/java/org/sopt/sweet/domain/room/dto/response/RoomMembersResponseDto.java @@ -11,7 +11,7 @@ public record RoomMembersResponseDto( List roomMemberDtoList ) { public static RoomMembersResponseDto of(Long myId, int gifterNumber, - List roomMemberDtoList){ + List roomMemberDtoList) { return RoomMembersResponseDto.builder() .myId(myId) .gifterNumber(gifterNumber) diff --git a/src/main/java/org/sopt/sweet/domain/room/dto/response/RoomMyGiftDto.java b/src/main/java/org/sopt/sweet/domain/room/dto/response/RoomMyGiftDto.java index d862d4f..00aaf64 100644 --- a/src/main/java/org/sopt/sweet/domain/room/dto/response/RoomMyGiftDto.java +++ b/src/main/java/org/sopt/sweet/domain/room/dto/response/RoomMyGiftDto.java @@ -10,7 +10,7 @@ public record RoomMyGiftDto( String url, int cost ) { - public static RoomMyGiftDto of(Long giftId, String imageUrl, String name, String url, int cost){ + public static RoomMyGiftDto of(Long giftId, String imageUrl, String name, String url, int cost) { return RoomMyGiftDto.builder() .giftId(giftId) .imageUrl(imageUrl) diff --git a/src/main/java/org/sopt/sweet/domain/room/entity/Room.java b/src/main/java/org/sopt/sweet/domain/room/entity/Room.java index 7e448d4..2d7f52a 100644 --- a/src/main/java/org/sopt/sweet/domain/room/entity/Room.java +++ b/src/main/java/org/sopt/sweet/domain/room/entity/Room.java @@ -1,9 +1,12 @@ package org.sopt.sweet.domain.room.entity; import jakarta.persistence.*; -import lombok.*; -import org.sopt.sweet.domain.room.constant.TournamentDuration; +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.constant.TournamentDuration; import org.sopt.sweet.global.common.BaseTimeEntity; import java.time.LocalDateTime; @@ -44,7 +47,7 @@ public class Room extends BaseTimeEntity { private Member host; @Builder - public Room(String gifteeName, String imageUrl, LocalDateTime deliveryDate, LocalDateTime tournamentStartDate, TournamentDuration tournamentDuration, String invitationCode, Member host){ + public Room(String gifteeName, String imageUrl, LocalDateTime deliveryDate, LocalDateTime tournamentStartDate, TournamentDuration tournamentDuration, String invitationCode, Member host) { this.gifteeName = gifteeName; this.imageUrl = imageUrl; this.gifterNumber = DEFAULT_NUMBER; @@ -58,9 +61,11 @@ public Room(String gifteeName, String imageUrl, LocalDateTime deliveryDate, Loca public void setGifterNumber(int gifterNumber) { this.gifterNumber = gifterNumber; } + public void setImageUrl(String imageUrl) { this.imageUrl = imageUrl; } + public void setGifteeName(String gifteeName) { this.gifteeName = gifteeName; } diff --git a/src/main/java/org/sopt/sweet/domain/room/entity/RoomMember.java b/src/main/java/org/sopt/sweet/domain/room/entity/RoomMember.java index b5f654c..5453a7f 100644 --- a/src/main/java/org/sopt/sweet/domain/room/entity/RoomMember.java +++ b/src/main/java/org/sopt/sweet/domain/room/entity/RoomMember.java @@ -1,7 +1,10 @@ package org.sopt.sweet.domain.room.entity; import jakarta.persistence.*; -import lombok.*; +import lombok.AccessLevel; +import lombok.Builder; +import lombok.Getter; +import lombok.NoArgsConstructor; import org.sopt.sweet.domain.member.entity.Member; import org.sopt.sweet.global.common.BaseTimeEntity; @@ -27,7 +30,7 @@ public class RoomMember extends BaseTimeEntity { private boolean tournamentParticipation; @Builder - public RoomMember(Room room, Member member){ + public RoomMember(Room room, Member member) { this.room = room; this.member = member; } diff --git a/src/main/java/org/sopt/sweet/domain/room/repository/RoomMemberRepository.java b/src/main/java/org/sopt/sweet/domain/room/repository/RoomMemberRepository.java index 86e856d..e46e803 100644 --- a/src/main/java/org/sopt/sweet/domain/room/repository/RoomMemberRepository.java +++ b/src/main/java/org/sopt/sweet/domain/room/repository/RoomMemberRepository.java @@ -10,9 +10,11 @@ public interface RoomMemberRepository extends JpaRepository { Optional findByRoomAndMember(Room room, Member member); + List findByRoomId(Long roomId); int countByRoomIdAndTournamentParticipationIsTrue(Long roomId); + RoomMember findByRoomIdAndMemberId(Long roomId, Long memberId); List findByMemberId(Long memberId); diff --git a/src/main/java/org/sopt/sweet/domain/room/repository/RoomRepository.java b/src/main/java/org/sopt/sweet/domain/room/repository/RoomRepository.java index 0286a4e..0371c35 100644 --- a/src/main/java/org/sopt/sweet/domain/room/repository/RoomRepository.java +++ b/src/main/java/org/sopt/sweet/domain/room/repository/RoomRepository.java @@ -1,7 +1,6 @@ package org.sopt.sweet.domain.room.repository; import org.sopt.sweet.domain.room.entity.Room; -import org.sopt.sweet.domain.room.entity.RoomMember; import org.springframework.data.jpa.repository.JpaRepository; import java.util.Optional; @@ -11,5 +10,4 @@ public interface RoomRepository extends JpaRepository { Optional findByInvitationCode(String invitationCode); - } diff --git a/src/main/java/org/sopt/sweet/domain/s3/dto/response/PresignedUrlResponseDto.java b/src/main/java/org/sopt/sweet/domain/s3/dto/response/PresignedUrlResponseDto.java index cfac8fe..c9bbf6d 100644 --- a/src/main/java/org/sopt/sweet/domain/s3/dto/response/PresignedUrlResponseDto.java +++ b/src/main/java/org/sopt/sweet/domain/s3/dto/response/PresignedUrlResponseDto.java @@ -6,7 +6,7 @@ public record PresignedUrlResponseDto( String presignedUrl ) { - public static PresignedUrlResponseDto of(String presignedUrl){ + public static PresignedUrlResponseDto of(String presignedUrl) { return PresignedUrlResponseDto.builder() .presignedUrl(presignedUrl) .build(); diff --git a/src/main/java/org/sopt/sweet/global/common/BaseTimeEntity.java b/src/main/java/org/sopt/sweet/global/common/BaseTimeEntity.java index a3c370a..07acf85 100644 --- a/src/main/java/org/sopt/sweet/global/common/BaseTimeEntity.java +++ b/src/main/java/org/sopt/sweet/global/common/BaseTimeEntity.java @@ -19,5 +19,4 @@ public abstract class BaseTimeEntity { private LocalDateTime createDate; @LastModifiedDate private LocalDateTime lastModifiedDate; -} - +} \ No newline at end of file diff --git a/src/main/java/org/sopt/sweet/global/common/HealthCheckApiController.java b/src/main/java/org/sopt/sweet/global/common/HealthCheckApiController.java index e44f9b1..ab5ebfc 100644 --- a/src/main/java/org/sopt/sweet/global/common/HealthCheckApiController.java +++ b/src/main/java/org/sopt/sweet/global/common/HealthCheckApiController.java @@ -6,10 +6,9 @@ @RestController public class HealthCheckApiController { - @Hidden @RequestMapping("/") public String SweetServer() { return "Sweet little kitty!"; } -} +} \ No newline at end of file diff --git a/src/main/java/org/sopt/sweet/global/common/SuccessCode.java b/src/main/java/org/sopt/sweet/global/common/SuccessCode.java index 86688cb..d62b06b 100644 --- a/src/main/java/org/sopt/sweet/global/common/SuccessCode.java +++ b/src/main/java/org/sopt/sweet/global/common/SuccessCode.java @@ -20,5 +20,4 @@ public enum SuccessCode { private final HttpStatus httpStatus; private final String message; -} - +} \ No newline at end of file diff --git a/src/main/java/org/sopt/sweet/global/common/SuccessResponse.java b/src/main/java/org/sopt/sweet/global/common/SuccessResponse.java index 5bfd727..69f1e66 100644 --- a/src/main/java/org/sopt/sweet/global/common/SuccessResponse.java +++ b/src/main/java/org/sopt/sweet/global/common/SuccessResponse.java @@ -34,4 +34,4 @@ public static SuccessResponse of(SuccessCode successCode, T data) { .build(); } -} +} \ No newline at end of file diff --git a/src/main/java/org/sopt/sweet/global/config/CorsConfig.java b/src/main/java/org/sopt/sweet/global/config/CorsConfig.java index 6644b52..4744c9a 100644 --- a/src/main/java/org/sopt/sweet/global/config/CorsConfig.java +++ b/src/main/java/org/sopt/sweet/global/config/CorsConfig.java @@ -20,7 +20,7 @@ public CorsFilter corsFilter() { config.addAllowedOrigin("https://sweetgift.vercel.app"); config.addAllowedHeader("*"); config.setAllowedMethods(Arrays.asList("HEAD", "GET", "POST", "PUT", "DELETE", "PATCH", "OPTIONS")); - source.registerCorsConfiguration("/**",config); + source.registerCorsConfiguration("/**", config); return new CorsFilter(source); } -} +} \ No newline at end of file diff --git a/src/main/java/org/sopt/sweet/global/config/JpaConfig.java b/src/main/java/org/sopt/sweet/global/config/JpaConfig.java index d2425a7..633bec2 100644 --- a/src/main/java/org/sopt/sweet/global/config/JpaConfig.java +++ b/src/main/java/org/sopt/sweet/global/config/JpaConfig.java @@ -6,5 +6,4 @@ @EnableJpaAuditing @Configuration public class JpaConfig { -} - +} \ No newline at end of file diff --git a/src/main/java/org/sopt/sweet/global/config/RedisConfig.java b/src/main/java/org/sopt/sweet/global/config/RedisConfig.java index 11a4643..64c41b9 100644 --- a/src/main/java/org/sopt/sweet/global/config/RedisConfig.java +++ b/src/main/java/org/sopt/sweet/global/config/RedisConfig.java @@ -17,4 +17,4 @@ public RedisTemplate redisTemplate(RedisConnectionFactory connec redisTemplate.setValueSerializer(new StringRedisSerializer()); return redisTemplate; } -} +} \ No newline at end of file diff --git a/src/main/java/org/sopt/sweet/global/config/SwaggerConfig.java b/src/main/java/org/sopt/sweet/global/config/SwaggerConfig.java index 63de796..20712ab 100644 --- a/src/main/java/org/sopt/sweet/global/config/SwaggerConfig.java +++ b/src/main/java/org/sopt/sweet/global/config/SwaggerConfig.java @@ -34,5 +34,4 @@ public OpenAPI openAPI() { .info(info) .components(components); } - -} +} \ No newline at end of file diff --git a/src/main/java/org/sopt/sweet/global/config/WebConfig.java b/src/main/java/org/sopt/sweet/global/config/WebConfig.java index 226fed5..c1a44e9 100644 --- a/src/main/java/org/sopt/sweet/global/config/WebConfig.java +++ b/src/main/java/org/sopt/sweet/global/config/WebConfig.java @@ -18,4 +18,4 @@ public class WebConfig implements WebMvcConfigurer { public void addArgumentResolvers(List resolvers) { resolvers.add(userIdArgumentResolver); } -} +} \ No newline at end of file diff --git a/src/main/java/org/sopt/sweet/global/config/auth/ExceptionHandlerFilter.java b/src/main/java/org/sopt/sweet/global/config/auth/ExceptionHandlerFilter.java index 62eeeec..213a7d3 100644 --- a/src/main/java/org/sopt/sweet/global/config/auth/ExceptionHandlerFilter.java +++ b/src/main/java/org/sopt/sweet/global/config/auth/ExceptionHandlerFilter.java @@ -48,4 +48,4 @@ private void handleException(HttpServletResponse response) throws IOException { response.setStatus(ErrorCode.INTERNAL_SERVER_ERROR.getHttpStatus().value()); response.getWriter().write(objectMapper.writeValueAsString(ErrorResponse.of(ErrorCode.INTERNAL_SERVER_ERROR))); } -} +} \ No newline at end of file diff --git a/src/main/java/org/sopt/sweet/global/config/auth/UserId.java b/src/main/java/org/sopt/sweet/global/config/auth/UserId.java index 090d1c0..13f05db 100644 --- a/src/main/java/org/sopt/sweet/global/config/auth/UserId.java +++ b/src/main/java/org/sopt/sweet/global/config/auth/UserId.java @@ -8,5 +8,4 @@ @Target(ElementType.PARAMETER) @Retention(RetentionPolicy.RUNTIME) public @interface UserId { -} - +} \ No newline at end of file diff --git a/src/main/java/org/sopt/sweet/global/config/auth/UserIdArgumentResolver.java b/src/main/java/org/sopt/sweet/global/config/auth/UserIdArgumentResolver.java index 9ecd6bf..73a25d4 100644 --- a/src/main/java/org/sopt/sweet/global/config/auth/UserIdArgumentResolver.java +++ b/src/main/java/org/sopt/sweet/global/config/auth/UserIdArgumentResolver.java @@ -23,4 +23,4 @@ public Object resolveArgument(MethodParameter parameter, ModelAndViewContainer m .getAuthentication() .getPrincipal(); } -} +} \ No newline at end of file diff --git a/src/main/java/org/sopt/sweet/global/error/dto/ErrorResponse.java b/src/main/java/org/sopt/sweet/global/error/dto/ErrorResponse.java index c1f9118..cf6df69 100644 --- a/src/main/java/org/sopt/sweet/global/error/dto/ErrorResponse.java +++ b/src/main/java/org/sopt/sweet/global/error/dto/ErrorResponse.java @@ -19,4 +19,4 @@ public static ErrorResponse of(ErrorCode errorCode) { .message(errorCode.getMessage()) .build(); } -} +} \ No newline at end of file diff --git a/src/main/java/org/sopt/sweet/global/error/exception/ConflictException.java b/src/main/java/org/sopt/sweet/global/error/exception/ConflictException.java index 92aa8f7..a6bd9c3 100644 --- a/src/main/java/org/sopt/sweet/global/error/exception/ConflictException.java +++ b/src/main/java/org/sopt/sweet/global/error/exception/ConflictException.java @@ -10,5 +10,4 @@ public ConflictException() { public ConflictException(ErrorCode errorCode) { super(errorCode); } -} - +} \ No newline at end of file diff --git a/src/main/java/org/sopt/sweet/global/error/exception/EntityNotFoundException.java b/src/main/java/org/sopt/sweet/global/error/exception/EntityNotFoundException.java index 69cd8dd..42f2d20 100644 --- a/src/main/java/org/sopt/sweet/global/error/exception/EntityNotFoundException.java +++ b/src/main/java/org/sopt/sweet/global/error/exception/EntityNotFoundException.java @@ -10,4 +10,4 @@ public EntityNotFoundException() { public EntityNotFoundException(ErrorCode errorCode) { super(errorCode); } -} +} \ No newline at end of file diff --git a/src/main/java/org/sopt/sweet/global/error/exception/ForbiddenException.java b/src/main/java/org/sopt/sweet/global/error/exception/ForbiddenException.java index 5b58c34..cc846ea 100644 --- a/src/main/java/org/sopt/sweet/global/error/exception/ForbiddenException.java +++ b/src/main/java/org/sopt/sweet/global/error/exception/ForbiddenException.java @@ -10,4 +10,4 @@ public ForbiddenException() { public ForbiddenException(ErrorCode errorCode) { super(errorCode); } -} +} \ No newline at end of file diff --git a/src/main/java/org/sopt/sweet/global/error/exception/InternalServerException.java b/src/main/java/org/sopt/sweet/global/error/exception/InternalServerException.java index cee9b97..3d21b12 100644 --- a/src/main/java/org/sopt/sweet/global/error/exception/InternalServerException.java +++ b/src/main/java/org/sopt/sweet/global/error/exception/InternalServerException.java @@ -6,4 +6,4 @@ public class InternalServerException extends BusinessException { public InternalServerException(ErrorCode errorCode) { super(errorCode); } -} +} \ No newline at end of file diff --git a/src/main/java/org/sopt/sweet/global/error/exception/InvalidValueException.java b/src/main/java/org/sopt/sweet/global/error/exception/InvalidValueException.java index 130d761..21e16b3 100644 --- a/src/main/java/org/sopt/sweet/global/error/exception/InvalidValueException.java +++ b/src/main/java/org/sopt/sweet/global/error/exception/InvalidValueException.java @@ -10,4 +10,4 @@ public InvalidValueException() { public InvalidValueException(ErrorCode errorCode) { super(errorCode); } -} +} \ No newline at end of file diff --git a/src/main/java/org/sopt/sweet/global/error/exception/UnauthorizedException.java b/src/main/java/org/sopt/sweet/global/error/exception/UnauthorizedException.java index 47e10c9..1352593 100644 --- a/src/main/java/org/sopt/sweet/global/error/exception/UnauthorizedException.java +++ b/src/main/java/org/sopt/sweet/global/error/exception/UnauthorizedException.java @@ -10,4 +10,4 @@ public UnauthorizedException() { public UnauthorizedException(ErrorCode errorCode) { super(errorCode); } -} +} \ No newline at end of file diff --git a/src/main/java/org/sopt/sweet/global/external/s3/config/S3Config.java b/src/main/java/org/sopt/sweet/global/external/s3/config/S3Config.java index 1bf590c..f9b44f4 100644 --- a/src/main/java/org/sopt/sweet/global/external/s3/config/S3Config.java +++ b/src/main/java/org/sopt/sweet/global/external/s3/config/S3Config.java @@ -21,7 +21,7 @@ public class S3Config { @Bean @Primary - public BasicAWSCredentials awsCredentialsProvider(){ + public BasicAWSCredentials awsCredentialsProvider() { BasicAWSCredentials basicAWSCredentials = new BasicAWSCredentials(accessKey, secretKey); return basicAWSCredentials; }