-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #80 from Drink-Easy/feature/wineWishList
Feature/wine wish list
- Loading branch information
Showing
9 changed files
with
227 additions
and
1 deletion.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
42 changes: 42 additions & 0 deletions
42
src/main/java/com/drinkeg/drinkeg/controller/WineWishlist.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,42 @@ | ||
package com.drinkeg.drinkeg.controller; | ||
|
||
import com.drinkeg.drinkeg.apipayLoad.ApiResponse; | ||
import com.drinkeg.drinkeg.domain.Member; | ||
import com.drinkeg.drinkeg.dto.WineWishlistDTO.request.WineWishlistRequestDTO; | ||
import com.drinkeg.drinkeg.dto.WineWishlistDTO.response.WineWishlistResponseDTO; | ||
import com.drinkeg.drinkeg.dto.loginDTO.commonDTO.PrincipalDetail; | ||
import com.drinkeg.drinkeg.service.memberService.MemberService; | ||
import com.drinkeg.drinkeg.service.wineWishlistService.WineWishlistService; | ||
import lombok.RequiredArgsConstructor; | ||
import org.springframework.security.core.annotation.AuthenticationPrincipal; | ||
import org.springframework.web.bind.annotation.*; | ||
|
||
import java.util.List; | ||
|
||
@RestController | ||
@RequiredArgsConstructor | ||
@RequestMapping("/wine-wishlist") | ||
public class WineWishlist { | ||
private final WineWishlistService wineWishlistService; | ||
private final MemberService memberService; | ||
|
||
@PostMapping("") | ||
public ApiResponse<WineWishlistResponseDTO> createWineWishlist(@RequestBody WineWishlistRequestDTO wineWishlistRequestDTO, @AuthenticationPrincipal PrincipalDetail principalDetail) { | ||
WineWishlistResponseDTO wineWishlistResponseDTO = wineWishlistService.createWineWishlist(wineWishlistRequestDTO, principalDetail.getUsername()); | ||
return ApiResponse.onSuccess(wineWishlistResponseDTO); | ||
} | ||
|
||
@GetMapping("") | ||
public ApiResponse<List<WineWishlistResponseDTO>> getWineWishlist(@AuthenticationPrincipal PrincipalDetail principalDetail) { | ||
List<WineWishlistResponseDTO> wineWishlistResponseDTOS = wineWishlistService.getAllWineWishlistByMember(principalDetail.getUsername()); | ||
return ApiResponse.onSuccess(wineWishlistResponseDTOS); | ||
} | ||
|
||
@DeleteMapping("/{wineWishlistId}") | ||
public ApiResponse<String> deleteWineWishlist(@PathVariable("wineWishlistId") Long wineWishlistId, @AuthenticationPrincipal PrincipalDetail principalDetail) { | ||
wineWishlistService.deleteWineWishlistById(wineWishlistId, principalDetail.getUsername()); | ||
return ApiResponse.onSuccess("와인 위시리트스 삭제 완료"); | ||
} | ||
|
||
|
||
} |
22 changes: 22 additions & 0 deletions
22
src/main/java/com/drinkeg/drinkeg/converter/WineWishlistConverter.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,22 @@ | ||
package com.drinkeg.drinkeg.converter; | ||
|
||
import com.drinkeg.drinkeg.domain.Member; | ||
import com.drinkeg.drinkeg.domain.Wine; | ||
import com.drinkeg.drinkeg.domain.WineWishlist; | ||
import com.drinkeg.drinkeg.dto.WineWishlistDTO.response.WineWishlistResponseDTO; | ||
|
||
public class WineWishlistConverter { | ||
public static WineWishlistResponseDTO toWineWishlistResponseDTO(WineWishlist wineWishlist) { | ||
return WineWishlistResponseDTO.builder() | ||
.id(wineWishlist.getId()) | ||
.wine(WineConverter.toSearchWineDTO(wineWishlist.getWine())) | ||
.build(); | ||
} | ||
|
||
public static WineWishlist toWineWishlist(Wine wine, Member member) { | ||
return WineWishlist.builder() | ||
.wine(wine) | ||
.member(member) | ||
.build(); | ||
} | ||
} |
29 changes: 29 additions & 0 deletions
29
src/main/java/com/drinkeg/drinkeg/domain/WineWishlist.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,29 @@ | ||
package com.drinkeg.drinkeg.domain; | ||
|
||
import jakarta.persistence.*; | ||
import lombok.AllArgsConstructor; | ||
import lombok.Builder; | ||
import lombok.Getter; | ||
import lombok.NoArgsConstructor; | ||
|
||
import static jakarta.persistence.FetchType.LAZY; | ||
|
||
@Entity | ||
@Getter | ||
@Builder | ||
@AllArgsConstructor | ||
@NoArgsConstructor | ||
public class WineWishlist { | ||
@Id | ||
@GeneratedValue(strategy = GenerationType.IDENTITY) | ||
private Long id; | ||
|
||
@ManyToOne(fetch = LAZY) | ||
@JoinColumn(name = "member_id") | ||
private Member member; | ||
|
||
@ManyToOne(fetch = LAZY) | ||
@JoinColumn(name = "wine_id") | ||
private Wine wine; | ||
|
||
} |
14 changes: 14 additions & 0 deletions
14
src/main/java/com/drinkeg/drinkeg/dto/WineWishlistDTO/request/WineWishlistRequestDTO.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,14 @@ | ||
package com.drinkeg.drinkeg.dto.WineWishlistDTO.request; | ||
|
||
import lombok.AllArgsConstructor; | ||
import lombok.Builder; | ||
import lombok.Getter; | ||
import lombok.NoArgsConstructor; | ||
|
||
@Getter | ||
@Builder | ||
@AllArgsConstructor | ||
@NoArgsConstructor | ||
public class WineWishlistRequestDTO { | ||
private long wineId; | ||
} |
16 changes: 16 additions & 0 deletions
16
src/main/java/com/drinkeg/drinkeg/dto/WineWishlistDTO/response/WineWishlistResponseDTO.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,16 @@ | ||
package com.drinkeg.drinkeg.dto.WineWishlistDTO.response; | ||
|
||
import com.drinkeg.drinkeg.dto.WineDTO.response.SearchWineResponseDTO; | ||
import lombok.AllArgsConstructor; | ||
import lombok.Builder; | ||
import lombok.Getter; | ||
import lombok.NoArgsConstructor; | ||
|
||
@Getter | ||
@Builder | ||
@AllArgsConstructor | ||
@NoArgsConstructor | ||
public class WineWishlistResponseDTO { | ||
private Long id; | ||
private SearchWineResponseDTO wine; | ||
} |
18 changes: 18 additions & 0 deletions
18
src/main/java/com/drinkeg/drinkeg/repository/WineWishlistRepository.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,18 @@ | ||
package com.drinkeg.drinkeg.repository; | ||
|
||
import com.drinkeg.drinkeg.domain.Member; | ||
import com.drinkeg.drinkeg.domain.Wine; | ||
import com.drinkeg.drinkeg.domain.WineWishlist; | ||
import com.drinkeg.drinkeg.dto.WineWishlistDTO.response.WineWishlistResponseDTO; | ||
import org.springframework.data.jpa.repository.JpaRepository; | ||
|
||
import java.util.List; | ||
|
||
|
||
public interface WineWishlistRepository extends JpaRepository<WineWishlist, Long> { | ||
|
||
List<WineWishlist> findAllByMember(Member member); | ||
|
||
Boolean existsByMemberAndWine(Member member, Wine wine); | ||
|
||
} |
14 changes: 14 additions & 0 deletions
14
src/main/java/com/drinkeg/drinkeg/service/wineWishlistService/WineWishlistService.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,14 @@ | ||
package com.drinkeg.drinkeg.service.wineWishlistService; | ||
|
||
import com.drinkeg.drinkeg.dto.WineWishlistDTO.request.WineWishlistRequestDTO; | ||
import com.drinkeg.drinkeg.dto.WineWishlistDTO.response.WineWishlistResponseDTO; | ||
|
||
import java.util.List; | ||
|
||
public interface WineWishlistService { | ||
WineWishlistResponseDTO createWineWishlist(WineWishlistRequestDTO wineWishlistRequestDTO, String username); | ||
|
||
List<WineWishlistResponseDTO> getAllWineWishlistByMember(String username); | ||
|
||
void deleteWineWishlistById(Long wineWishlistId, String username); | ||
} |
66 changes: 66 additions & 0 deletions
66
src/main/java/com/drinkeg/drinkeg/service/wineWishlistService/WineWishlistServiceImpl.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,66 @@ | ||
package com.drinkeg.drinkeg.service.wineWishlistService; | ||
|
||
import com.drinkeg.drinkeg.apipayLoad.code.status.ErrorStatus; | ||
import com.drinkeg.drinkeg.converter.WineWishlistConverter; | ||
import com.drinkeg.drinkeg.domain.Member; | ||
import com.drinkeg.drinkeg.domain.Wine; | ||
import com.drinkeg.drinkeg.domain.WineWishlist; | ||
import com.drinkeg.drinkeg.dto.WineWishlistDTO.request.WineWishlistRequestDTO; | ||
import com.drinkeg.drinkeg.dto.WineWishlistDTO.response.WineWishlistResponseDTO; | ||
import com.drinkeg.drinkeg.exception.GeneralException; | ||
import com.drinkeg.drinkeg.repository.MemberRepository; | ||
import com.drinkeg.drinkeg.repository.WineRepository; | ||
import com.drinkeg.drinkeg.repository.WineWishlistRepository; | ||
import com.drinkeg.drinkeg.service.memberService.MemberService; | ||
import com.drinkeg.drinkeg.service.wineService.WineService; | ||
import lombok.RequiredArgsConstructor; | ||
import org.springframework.stereotype.Service; | ||
|
||
import java.util.List; | ||
import java.util.stream.Collectors; | ||
|
||
@Service | ||
@RequiredArgsConstructor | ||
public class WineWishlistServiceImpl implements WineWishlistService{ | ||
private final WineWishlistRepository wineWishlistRepository; | ||
private final MemberRepository memberRepository; | ||
private final WineRepository wineRepository; | ||
|
||
@Override | ||
public WineWishlistResponseDTO createWineWishlist(WineWishlistRequestDTO wineWishlistRequestDTO, String username) { | ||
Member member = memberRepository.findByUsername(username) | ||
.orElseThrow(() -> new GeneralException(ErrorStatus.MEMBER_NOT_FOUND)); | ||
Wine wine = wineRepository.findById(wineWishlistRequestDTO.getWineId()) | ||
.orElseThrow(() -> new GeneralException(ErrorStatus.WINE_NOT_FOUND)); | ||
|
||
if (wineWishlistRepository.existsByMemberAndWine(member, wine)) | ||
throw new GeneralException(ErrorStatus.WINE_WISHLIST_ALREADY_EXISTS); | ||
|
||
WineWishlist wineWishlist = wineWishlistRepository.save(WineWishlistConverter.toWineWishlist(wine, member)); | ||
|
||
return WineWishlistConverter.toWineWishlistResponseDTO(wineWishlist); | ||
} | ||
|
||
@Override | ||
public List<WineWishlistResponseDTO> getAllWineWishlistByMember(String username) { | ||
Member member = memberRepository.findByUsername(username) | ||
.orElseThrow(() -> new GeneralException(ErrorStatus.MEMBER_NOT_FOUND)); | ||
|
||
return wineWishlistRepository.findAllByMember(member).stream() | ||
.map(WineWishlistConverter::toWineWishlistResponseDTO) | ||
.collect(Collectors.toList()); | ||
} | ||
|
||
@Override | ||
public void deleteWineWishlistById(Long wineWishlistId, String username) { | ||
Member member = memberRepository.findByUsername(username) | ||
.orElseThrow(() -> new GeneralException(ErrorStatus.MEMBER_NOT_FOUND)); | ||
WineWishlist wineWishlist = wineWishlistRepository.findById(wineWishlistId) | ||
.orElseThrow(() -> new GeneralException(ErrorStatus.WINE_WISHLIST_NOT_FOUND)); | ||
|
||
if (!wineWishlist.getMember().getId().equals(member.getId())) | ||
throw new GeneralException(ErrorStatus.WINE_WISHLIST_UNAUTHORIZED); | ||
|
||
wineWishlistRepository.deleteById(wineWishlistId); | ||
} | ||
} |