code stringlengths 41 34.3k | lang stringclasses 8
values | review stringlengths 1 4.74k |
|---|---|---|
@@ -0,0 +1,70 @@
+package com.frame2.server.core.board.application;
+
+import com.frame2.server.core.board.domain.ProductReview;
+import com.frame2.server.core.board.infrastructure.ProductReviewRepository;
+import com.frame2.server.core.board.payload.request.ProductReviewModifyRequest;
+import com.frame2.server.core.board.payload.request.ProductReviewRequest;
+import com.frame2.server.core.board.payload.response.ProductReviewResponse;
+import com.frame2.server.core.member.domain.Member;
+import com.frame2.server.core.member.infrastructure.MemberRepository;
+import com.frame2.server.core.order.domain.OrderDetail;
+import com.frame2.server.core.order.infrastructure.OrderDetailRepository;
+import com.frame2.server.core.product.domain.SaleProduct;
+import com.frame2.server.core.product.infrastructure.SaleProductRepository;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+
+@Service
+@Transactional
+@RequiredArgsConstructor
+public class ProductReviewServiceImpl implements ProductReviewService {
+
+ private final ProductReviewRepository productReviewRepository;
+ private final SaleProductRepository saleProductRepository;
+ private final MemberRepository memberRepository;
+ private final OrderDetailRepository orderDetailRepository;
+
+ // 생성
+ @Override
+ public void productReviewCreate(ProductReviewRequest request, Long memberId, Long saleProductId) {
+ Member member = memberRepository.findOne(memberId);
+ SaleProduct saleProduct = saleProductRepository.findOne(saleProductId);
+ OrderDetail orderDetail = orderDetailRepository.findOne(request.orderDetailId());
+
+ ProductReview productReview = request.toEntity(member, saleProduct, orderDetail);
+ productReviewRepository.save(productReview);
+ }
+
+ // 수정
+ @Override
+ public void productReviewModify(ProductReviewModifyRequest request, Long productReviewId) {
+ productReviewRepository.findOne(productReviewId).updateProductReview(request.toEntity());
+ }
+
+ // 삭제
+ @Override
+ public void remove(Long productReviewId) {
+ productReviewRepository.findOne(productReviewId).delete();
+ }
+
+ // 단건 조회
+ @Override
+ @Transactional(readOnly = true)
+ public ProductReviewResponse getProductReview(Long productReviewId) {
+ ProductReview productReview = productReviewRepository.findOne(productReviewId);
+ return ProductReviewResponse.from(productReview);
+ }
+
+ // 한 상품에 대한 전체 리뷰 조회
+ @Override
+ @Transactional(readOnly = true)
+ public List<ProductReviewResponse> getProductReviewList(Long saleProductId) {
+ List<ProductReview> productReviewList = productReviewRepository.findAllBySaleProductId(saleProductId);
+ return productReviewList.stream()
+ .map(ProductReviewResponse::from)
+ .toList();
+ }
+} | Java | productReview와 findProductReview 두 개의 엔티티가 필요할까요?👀 |
@@ -0,0 +1,70 @@
+package com.frame2.server.core.board.application;
+
+import com.frame2.server.core.board.domain.ProductReview;
+import com.frame2.server.core.board.infrastructure.ProductReviewRepository;
+import com.frame2.server.core.board.payload.request.ProductReviewModifyRequest;
+import com.frame2.server.core.board.payload.request.ProductReviewRequest;
+import com.frame2.server.core.board.payload.response.ProductReviewResponse;
+import com.frame2.server.core.member.domain.Member;
+import com.frame2.server.core.member.infrastructure.MemberRepository;
+import com.frame2.server.core.order.domain.OrderDetail;
+import com.frame2.server.core.order.infrastructure.OrderDetailRepository;
+import com.frame2.server.core.product.domain.SaleProduct;
+import com.frame2.server.core.product.infrastructure.SaleProductRepository;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+
+@Service
+@Transactional
+@RequiredArgsConstructor
+public class ProductReviewServiceImpl implements ProductReviewService {
+
+ private final ProductReviewRepository productReviewRepository;
+ private final SaleProductRepository saleProductRepository;
+ private final MemberRepository memberRepository;
+ private final OrderDetailRepository orderDetailRepository;
+
+ // 생성
+ @Override
+ public void productReviewCreate(ProductReviewRequest request, Long memberId, Long saleProductId) {
+ Member member = memberRepository.findOne(memberId);
+ SaleProduct saleProduct = saleProductRepository.findOne(saleProductId);
+ OrderDetail orderDetail = orderDetailRepository.findOne(request.orderDetailId());
+
+ ProductReview productReview = request.toEntity(member, saleProduct, orderDetail);
+ productReviewRepository.save(productReview);
+ }
+
+ // 수정
+ @Override
+ public void productReviewModify(ProductReviewModifyRequest request, Long productReviewId) {
+ productReviewRepository.findOne(productReviewId).updateProductReview(request.toEntity());
+ }
+
+ // 삭제
+ @Override
+ public void remove(Long productReviewId) {
+ productReviewRepository.findOne(productReviewId).delete();
+ }
+
+ // 단건 조회
+ @Override
+ @Transactional(readOnly = true)
+ public ProductReviewResponse getProductReview(Long productReviewId) {
+ ProductReview productReview = productReviewRepository.findOne(productReviewId);
+ return ProductReviewResponse.from(productReview);
+ }
+
+ // 한 상품에 대한 전체 리뷰 조회
+ @Override
+ @Transactional(readOnly = true)
+ public List<ProductReviewResponse> getProductReviewList(Long saleProductId) {
+ List<ProductReview> productReviewList = productReviewRepository.findAllBySaleProductId(saleProductId);
+ return productReviewList.stream()
+ .map(ProductReviewResponse::from)
+ .toList();
+ }
+} | Java | 상품 전체 조회는 모든 상품에 대한 모든 리뷰 조회인지,
아니면 특정 상품에 대한 모든 리뷰 조회인지 궁금합니다 !! |
@@ -0,0 +1,70 @@
+package com.frame2.server.core.board.application;
+
+import com.frame2.server.core.board.domain.ProductReview;
+import com.frame2.server.core.board.infrastructure.ProductReviewRepository;
+import com.frame2.server.core.board.payload.request.ProductReviewModifyRequest;
+import com.frame2.server.core.board.payload.request.ProductReviewRequest;
+import com.frame2.server.core.board.payload.response.ProductReviewResponse;
+import com.frame2.server.core.member.domain.Member;
+import com.frame2.server.core.member.infrastructure.MemberRepository;
+import com.frame2.server.core.order.domain.OrderDetail;
+import com.frame2.server.core.order.infrastructure.OrderDetailRepository;
+import com.frame2.server.core.product.domain.SaleProduct;
+import com.frame2.server.core.product.infrastructure.SaleProductRepository;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+
+@Service
+@Transactional
+@RequiredArgsConstructor
+public class ProductReviewServiceImpl implements ProductReviewService {
+
+ private final ProductReviewRepository productReviewRepository;
+ private final SaleProductRepository saleProductRepository;
+ private final MemberRepository memberRepository;
+ private final OrderDetailRepository orderDetailRepository;
+
+ // 생성
+ @Override
+ public void productReviewCreate(ProductReviewRequest request, Long memberId, Long saleProductId) {
+ Member member = memberRepository.findOne(memberId);
+ SaleProduct saleProduct = saleProductRepository.findOne(saleProductId);
+ OrderDetail orderDetail = orderDetailRepository.findOne(request.orderDetailId());
+
+ ProductReview productReview = request.toEntity(member, saleProduct, orderDetail);
+ productReviewRepository.save(productReview);
+ }
+
+ // 수정
+ @Override
+ public void productReviewModify(ProductReviewModifyRequest request, Long productReviewId) {
+ productReviewRepository.findOne(productReviewId).updateProductReview(request.toEntity());
+ }
+
+ // 삭제
+ @Override
+ public void remove(Long productReviewId) {
+ productReviewRepository.findOne(productReviewId).delete();
+ }
+
+ // 단건 조회
+ @Override
+ @Transactional(readOnly = true)
+ public ProductReviewResponse getProductReview(Long productReviewId) {
+ ProductReview productReview = productReviewRepository.findOne(productReviewId);
+ return ProductReviewResponse.from(productReview);
+ }
+
+ // 한 상품에 대한 전체 리뷰 조회
+ @Override
+ @Transactional(readOnly = true)
+ public List<ProductReviewResponse> getProductReviewList(Long saleProductId) {
+ List<ProductReview> productReviewList = productReviewRepository.findAllBySaleProductId(saleProductId);
+ return productReviewList.stream()
+ .map(ProductReviewResponse::from)
+ .toList();
+ }
+} | Java | 그리고 `ProductReviewModifyRequest` 에서 수정에 필요한 내용을 모두 받고 있는데,
엔티티로 변환할 필요가 있을까요~?
`updateProductReivew()`에서 `ProductReviewModifyRequest` 를 바로 받는 방법도 고려해보면 좋을 것 같아요! |
@@ -0,0 +1,72 @@
+package com.frame2.server.core.board.api;
+
+import com.frame2.server.core.board.application.ProductReviewService;
+import com.frame2.server.core.board.payload.request.ProductReviewModifyRequest;
+import com.frame2.server.core.board.payload.request.ProductReviewRequest;
+import com.frame2.server.core.board.payload.response.ProductReviewResponse;
+import com.frame2.server.core.support.annotations.Auth;
+import com.frame2.server.core.support.annotations.MemberOnly;
+import com.frame2.server.core.support.request.User;
+import jakarta.validation.Valid;
+import lombok.RequiredArgsConstructor;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("/products/{saleProductId}/reviews")
+public class ProductReviewApi implements ProductReviewApiSpec {
+
+ private final ProductReviewService productReviewService;
+
+ // create
+ @Override
+ @MemberOnly
+ @PostMapping
+ public void createProductReview(
+ @Valid @RequestBody ProductReviewRequest productReviewRequest,
+ @Auth User user,
+ @PathVariable("saleProductId") Long saleProductId
+ ) {
+ productReviewService.productReviewCreate(productReviewRequest, user.id(), saleProductId);
+ }
+
+ // update
+ @Override
+ @MemberOnly
+ @PatchMapping("/{productReviewId}")
+ public void updateProductReview(
+ @Valid @RequestBody ProductReviewModifyRequest ProductReviewModifyRequest,
+ @Auth User user,
+ @PathVariable("productReviewId") Long productReviewId
+ ) {
+ productReviewService.productReviewModify(ProductReviewModifyRequest, productReviewId);
+ }
+
+ // delete
+ @Override
+ @MemberOnly
+ @DeleteMapping("/{productReviewId}")
+ public void deleteProductReview(@PathVariable("productReviewId") Long id, @Auth User user) {
+ productReviewService.remove(id);
+ }
+
+ // 단건 조회
+ @Override
+ @GetMapping("/{productReviewId}")
+ public ResponseEntity<ProductReviewResponse> getProductReview(@PathVariable("productReviewId") Long productReviewId) {
+ ProductReviewResponse productReviewResponse = productReviewService.getProductReview(productReviewId);
+ return ResponseEntity.ok().body(productReviewResponse);
+ }
+
+ // 한 상품에 대한 전체 리뷰 조회
+ @Override
+ @GetMapping
+ public ResponseEntity<List<ProductReviewResponse>> getProductReviewList(
+ @PathVariable("saleProductId") Long saleProductId) {
+ List<ProductReviewResponse> productReviewList = productReviewService.getProductReviewList(saleProductId);
+ return ResponseEntity.ok().body(productReviewList);
+ }
+} | Java | 단건 조회를 한 리뷰를 수정하는 것입니다.
일단 괄호는 지워야 하는게 맞는데 자꾸 이런 실수를 하네요..
리뷰 수정은 수정할 때 어떤 순서로 이루어 지는지를 생각해 봤는데요
1.먼저 단건 조회를 한다 /reviews/{productReviewId}
2. 단건 조회 화면에서 수정을 누른다.
3. 수정 화면에서 수정을 요청한다. patch 요청 /reviews
3-1. 1번에서 productReviewId를 이미 가지고 있으니까 클라이언트에서 수정 요청 때 같이 값이 넘어오면 되지 않을까 하여 url에는 넣지 않았습니다.
답변을 작성하면서 느꼈는데 이렇게 하면 url에 일관성이 없는 것 같긴 하네요
좀 더 명확하게 알기 위해서 @PatchMapping("/reviews/{productReviewId}") 로 수정하겠습니다 |
@@ -0,0 +1,72 @@
+package com.frame2.server.core.board.api;
+
+import com.frame2.server.core.board.application.ProductReviewService;
+import com.frame2.server.core.board.payload.request.ProductReviewModifyRequest;
+import com.frame2.server.core.board.payload.request.ProductReviewRequest;
+import com.frame2.server.core.board.payload.response.ProductReviewResponse;
+import com.frame2.server.core.support.annotations.Auth;
+import com.frame2.server.core.support.annotations.MemberOnly;
+import com.frame2.server.core.support.request.User;
+import jakarta.validation.Valid;
+import lombok.RequiredArgsConstructor;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("/products/{saleProductId}/reviews")
+public class ProductReviewApi implements ProductReviewApiSpec {
+
+ private final ProductReviewService productReviewService;
+
+ // create
+ @Override
+ @MemberOnly
+ @PostMapping
+ public void createProductReview(
+ @Valid @RequestBody ProductReviewRequest productReviewRequest,
+ @Auth User user,
+ @PathVariable("saleProductId") Long saleProductId
+ ) {
+ productReviewService.productReviewCreate(productReviewRequest, user.id(), saleProductId);
+ }
+
+ // update
+ @Override
+ @MemberOnly
+ @PatchMapping("/{productReviewId}")
+ public void updateProductReview(
+ @Valid @RequestBody ProductReviewModifyRequest ProductReviewModifyRequest,
+ @Auth User user,
+ @PathVariable("productReviewId") Long productReviewId
+ ) {
+ productReviewService.productReviewModify(ProductReviewModifyRequest, productReviewId);
+ }
+
+ // delete
+ @Override
+ @MemberOnly
+ @DeleteMapping("/{productReviewId}")
+ public void deleteProductReview(@PathVariable("productReviewId") Long id, @Auth User user) {
+ productReviewService.remove(id);
+ }
+
+ // 단건 조회
+ @Override
+ @GetMapping("/{productReviewId}")
+ public ResponseEntity<ProductReviewResponse> getProductReview(@PathVariable("productReviewId") Long productReviewId) {
+ ProductReviewResponse productReviewResponse = productReviewService.getProductReview(productReviewId);
+ return ResponseEntity.ok().body(productReviewResponse);
+ }
+
+ // 한 상품에 대한 전체 리뷰 조회
+ @Override
+ @GetMapping
+ public ResponseEntity<List<ProductReviewResponse>> getProductReviewList(
+ @PathVariable("saleProductId") Long saleProductId) {
+ List<ProductReviewResponse> productReviewList = productReviewService.getProductReviewList(saleProductId);
+ return ResponseEntity.ok().body(productReviewList);
+ }
+} | Java | 아주 좋은 것 같습니다 수정했습니다 |
@@ -0,0 +1,72 @@
+package com.frame2.server.core.board.api;
+
+import com.frame2.server.core.board.application.ProductReviewService;
+import com.frame2.server.core.board.payload.request.ProductReviewModifyRequest;
+import com.frame2.server.core.board.payload.request.ProductReviewRequest;
+import com.frame2.server.core.board.payload.response.ProductReviewResponse;
+import com.frame2.server.core.support.annotations.Auth;
+import com.frame2.server.core.support.annotations.MemberOnly;
+import com.frame2.server.core.support.request.User;
+import jakarta.validation.Valid;
+import lombok.RequiredArgsConstructor;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("/products/{saleProductId}/reviews")
+public class ProductReviewApi implements ProductReviewApiSpec {
+
+ private final ProductReviewService productReviewService;
+
+ // create
+ @Override
+ @MemberOnly
+ @PostMapping
+ public void createProductReview(
+ @Valid @RequestBody ProductReviewRequest productReviewRequest,
+ @Auth User user,
+ @PathVariable("saleProductId") Long saleProductId
+ ) {
+ productReviewService.productReviewCreate(productReviewRequest, user.id(), saleProductId);
+ }
+
+ // update
+ @Override
+ @MemberOnly
+ @PatchMapping("/{productReviewId}")
+ public void updateProductReview(
+ @Valid @RequestBody ProductReviewModifyRequest ProductReviewModifyRequest,
+ @Auth User user,
+ @PathVariable("productReviewId") Long productReviewId
+ ) {
+ productReviewService.productReviewModify(ProductReviewModifyRequest, productReviewId);
+ }
+
+ // delete
+ @Override
+ @MemberOnly
+ @DeleteMapping("/{productReviewId}")
+ public void deleteProductReview(@PathVariable("productReviewId") Long id, @Auth User user) {
+ productReviewService.remove(id);
+ }
+
+ // 단건 조회
+ @Override
+ @GetMapping("/{productReviewId}")
+ public ResponseEntity<ProductReviewResponse> getProductReview(@PathVariable("productReviewId") Long productReviewId) {
+ ProductReviewResponse productReviewResponse = productReviewService.getProductReview(productReviewId);
+ return ResponseEntity.ok().body(productReviewResponse);
+ }
+
+ // 한 상품에 대한 전체 리뷰 조회
+ @Override
+ @GetMapping
+ public ResponseEntity<List<ProductReviewResponse>> getProductReviewList(
+ @PathVariable("saleProductId") Long saleProductId) {
+ List<ProductReviewResponse> productReviewList = productReviewService.getProductReviewList(saleProductId);
+ return ResponseEntity.ok().body(productReviewList);
+ }
+} | Java | 말씀해주신 부분 공부해 보고 적용해 보겠습니다. |
@@ -0,0 +1,70 @@
+package com.frame2.server.core.board.application;
+
+import com.frame2.server.core.board.domain.ProductReview;
+import com.frame2.server.core.board.infrastructure.ProductReviewRepository;
+import com.frame2.server.core.board.payload.request.ProductReviewModifyRequest;
+import com.frame2.server.core.board.payload.request.ProductReviewRequest;
+import com.frame2.server.core.board.payload.response.ProductReviewResponse;
+import com.frame2.server.core.member.domain.Member;
+import com.frame2.server.core.member.infrastructure.MemberRepository;
+import com.frame2.server.core.order.domain.OrderDetail;
+import com.frame2.server.core.order.infrastructure.OrderDetailRepository;
+import com.frame2.server.core.product.domain.SaleProduct;
+import com.frame2.server.core.product.infrastructure.SaleProductRepository;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+
+@Service
+@Transactional
+@RequiredArgsConstructor
+public class ProductReviewServiceImpl implements ProductReviewService {
+
+ private final ProductReviewRepository productReviewRepository;
+ private final SaleProductRepository saleProductRepository;
+ private final MemberRepository memberRepository;
+ private final OrderDetailRepository orderDetailRepository;
+
+ // 생성
+ @Override
+ public void productReviewCreate(ProductReviewRequest request, Long memberId, Long saleProductId) {
+ Member member = memberRepository.findOne(memberId);
+ SaleProduct saleProduct = saleProductRepository.findOne(saleProductId);
+ OrderDetail orderDetail = orderDetailRepository.findOne(request.orderDetailId());
+
+ ProductReview productReview = request.toEntity(member, saleProduct, orderDetail);
+ productReviewRepository.save(productReview);
+ }
+
+ // 수정
+ @Override
+ public void productReviewModify(ProductReviewModifyRequest request, Long productReviewId) {
+ productReviewRepository.findOne(productReviewId).updateProductReview(request.toEntity());
+ }
+
+ // 삭제
+ @Override
+ public void remove(Long productReviewId) {
+ productReviewRepository.findOne(productReviewId).delete();
+ }
+
+ // 단건 조회
+ @Override
+ @Transactional(readOnly = true)
+ public ProductReviewResponse getProductReview(Long productReviewId) {
+ ProductReview productReview = productReviewRepository.findOne(productReviewId);
+ return ProductReviewResponse.from(productReview);
+ }
+
+ // 한 상품에 대한 전체 리뷰 조회
+ @Override
+ @Transactional(readOnly = true)
+ public List<ProductReviewResponse> getProductReviewList(Long saleProductId) {
+ List<ProductReview> productReviewList = productReviewRepository.findAllBySaleProductId(saleProductId);
+ return productReviewList.stream()
+ .map(ProductReviewResponse::from)
+ .toList();
+ }
+} | Java | 테스트 코드를 작성하지 않았지만 테스트를 좀 더 쉽게 하기 위해 엔티티를 반환 하도록 만들었습니다
불필요한 설계라면 바로 바꾸겠습니다. |
@@ -0,0 +1,70 @@
+package com.frame2.server.core.board.application;
+
+import com.frame2.server.core.board.domain.ProductReview;
+import com.frame2.server.core.board.infrastructure.ProductReviewRepository;
+import com.frame2.server.core.board.payload.request.ProductReviewModifyRequest;
+import com.frame2.server.core.board.payload.request.ProductReviewRequest;
+import com.frame2.server.core.board.payload.response.ProductReviewResponse;
+import com.frame2.server.core.member.domain.Member;
+import com.frame2.server.core.member.infrastructure.MemberRepository;
+import com.frame2.server.core.order.domain.OrderDetail;
+import com.frame2.server.core.order.infrastructure.OrderDetailRepository;
+import com.frame2.server.core.product.domain.SaleProduct;
+import com.frame2.server.core.product.infrastructure.SaleProductRepository;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+
+@Service
+@Transactional
+@RequiredArgsConstructor
+public class ProductReviewServiceImpl implements ProductReviewService {
+
+ private final ProductReviewRepository productReviewRepository;
+ private final SaleProductRepository saleProductRepository;
+ private final MemberRepository memberRepository;
+ private final OrderDetailRepository orderDetailRepository;
+
+ // 생성
+ @Override
+ public void productReviewCreate(ProductReviewRequest request, Long memberId, Long saleProductId) {
+ Member member = memberRepository.findOne(memberId);
+ SaleProduct saleProduct = saleProductRepository.findOne(saleProductId);
+ OrderDetail orderDetail = orderDetailRepository.findOne(request.orderDetailId());
+
+ ProductReview productReview = request.toEntity(member, saleProduct, orderDetail);
+ productReviewRepository.save(productReview);
+ }
+
+ // 수정
+ @Override
+ public void productReviewModify(ProductReviewModifyRequest request, Long productReviewId) {
+ productReviewRepository.findOne(productReviewId).updateProductReview(request.toEntity());
+ }
+
+ // 삭제
+ @Override
+ public void remove(Long productReviewId) {
+ productReviewRepository.findOne(productReviewId).delete();
+ }
+
+ // 단건 조회
+ @Override
+ @Transactional(readOnly = true)
+ public ProductReviewResponse getProductReview(Long productReviewId) {
+ ProductReview productReview = productReviewRepository.findOne(productReviewId);
+ return ProductReviewResponse.from(productReview);
+ }
+
+ // 한 상품에 대한 전체 리뷰 조회
+ @Override
+ @Transactional(readOnly = true)
+ public List<ProductReviewResponse> getProductReviewList(Long saleProductId) {
+ List<ProductReview> productReviewList = productReviewRepository.findAllBySaleProductId(saleProductId);
+ return productReviewList.stream()
+ .map(ProductReviewResponse::from)
+ .toList();
+ }
+} | Java | 말씀하신 것처럼 ProductReviewModifyRequest 객체가 필요한 정보를 다 받고 있기 때문에 굳이 엔티티로 변환할 필요는 없지만 엔티티로 변환하고 반환하면 테스트를 좀 더 쉽게 할 수 있지 않을까 하여 이렇게 작성 하였습니다. |
@@ -0,0 +1,70 @@
+package com.frame2.server.core.board.application;
+
+import com.frame2.server.core.board.domain.ProductReview;
+import com.frame2.server.core.board.infrastructure.ProductReviewRepository;
+import com.frame2.server.core.board.payload.request.ProductReviewModifyRequest;
+import com.frame2.server.core.board.payload.request.ProductReviewRequest;
+import com.frame2.server.core.board.payload.response.ProductReviewResponse;
+import com.frame2.server.core.member.domain.Member;
+import com.frame2.server.core.member.infrastructure.MemberRepository;
+import com.frame2.server.core.order.domain.OrderDetail;
+import com.frame2.server.core.order.infrastructure.OrderDetailRepository;
+import com.frame2.server.core.product.domain.SaleProduct;
+import com.frame2.server.core.product.infrastructure.SaleProductRepository;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+
+@Service
+@Transactional
+@RequiredArgsConstructor
+public class ProductReviewServiceImpl implements ProductReviewService {
+
+ private final ProductReviewRepository productReviewRepository;
+ private final SaleProductRepository saleProductRepository;
+ private final MemberRepository memberRepository;
+ private final OrderDetailRepository orderDetailRepository;
+
+ // 생성
+ @Override
+ public void productReviewCreate(ProductReviewRequest request, Long memberId, Long saleProductId) {
+ Member member = memberRepository.findOne(memberId);
+ SaleProduct saleProduct = saleProductRepository.findOne(saleProductId);
+ OrderDetail orderDetail = orderDetailRepository.findOne(request.orderDetailId());
+
+ ProductReview productReview = request.toEntity(member, saleProduct, orderDetail);
+ productReviewRepository.save(productReview);
+ }
+
+ // 수정
+ @Override
+ public void productReviewModify(ProductReviewModifyRequest request, Long productReviewId) {
+ productReviewRepository.findOne(productReviewId).updateProductReview(request.toEntity());
+ }
+
+ // 삭제
+ @Override
+ public void remove(Long productReviewId) {
+ productReviewRepository.findOne(productReviewId).delete();
+ }
+
+ // 단건 조회
+ @Override
+ @Transactional(readOnly = true)
+ public ProductReviewResponse getProductReview(Long productReviewId) {
+ ProductReview productReview = productReviewRepository.findOne(productReviewId);
+ return ProductReviewResponse.from(productReview);
+ }
+
+ // 한 상품에 대한 전체 리뷰 조회
+ @Override
+ @Transactional(readOnly = true)
+ public List<ProductReviewResponse> getProductReviewList(Long saleProductId) {
+ List<ProductReview> productReviewList = productReviewRepository.findAllBySaleProductId(saleProductId);
+ return productReviewList.stream()
+ .map(ProductReviewResponse::from)
+ .toList();
+ }
+} | Java | request
productReviewRepository.findOne(request.id())
이렇게 사용 하는 것 보다는 가독성 측면과 의미가 좀 더 명확하게 할 수 있지 않을까 하여 사용했습니다. |
@@ -0,0 +1,70 @@
+package com.frame2.server.core.board.application;
+
+import com.frame2.server.core.board.domain.ProductReview;
+import com.frame2.server.core.board.infrastructure.ProductReviewRepository;
+import com.frame2.server.core.board.payload.request.ProductReviewModifyRequest;
+import com.frame2.server.core.board.payload.request.ProductReviewRequest;
+import com.frame2.server.core.board.payload.response.ProductReviewResponse;
+import com.frame2.server.core.member.domain.Member;
+import com.frame2.server.core.member.infrastructure.MemberRepository;
+import com.frame2.server.core.order.domain.OrderDetail;
+import com.frame2.server.core.order.infrastructure.OrderDetailRepository;
+import com.frame2.server.core.product.domain.SaleProduct;
+import com.frame2.server.core.product.infrastructure.SaleProductRepository;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+
+@Service
+@Transactional
+@RequiredArgsConstructor
+public class ProductReviewServiceImpl implements ProductReviewService {
+
+ private final ProductReviewRepository productReviewRepository;
+ private final SaleProductRepository saleProductRepository;
+ private final MemberRepository memberRepository;
+ private final OrderDetailRepository orderDetailRepository;
+
+ // 생성
+ @Override
+ public void productReviewCreate(ProductReviewRequest request, Long memberId, Long saleProductId) {
+ Member member = memberRepository.findOne(memberId);
+ SaleProduct saleProduct = saleProductRepository.findOne(saleProductId);
+ OrderDetail orderDetail = orderDetailRepository.findOne(request.orderDetailId());
+
+ ProductReview productReview = request.toEntity(member, saleProduct, orderDetail);
+ productReviewRepository.save(productReview);
+ }
+
+ // 수정
+ @Override
+ public void productReviewModify(ProductReviewModifyRequest request, Long productReviewId) {
+ productReviewRepository.findOne(productReviewId).updateProductReview(request.toEntity());
+ }
+
+ // 삭제
+ @Override
+ public void remove(Long productReviewId) {
+ productReviewRepository.findOne(productReviewId).delete();
+ }
+
+ // 단건 조회
+ @Override
+ @Transactional(readOnly = true)
+ public ProductReviewResponse getProductReview(Long productReviewId) {
+ ProductReview productReview = productReviewRepository.findOne(productReviewId);
+ return ProductReviewResponse.from(productReview);
+ }
+
+ // 한 상품에 대한 전체 리뷰 조회
+ @Override
+ @Transactional(readOnly = true)
+ public List<ProductReviewResponse> getProductReviewList(Long saleProductId) {
+ List<ProductReview> productReviewList = productReviewRepository.findAllBySaleProductId(saleProductId);
+ return productReviewList.stream()
+ .map(ProductReviewResponse::from)
+ .toList();
+ }
+} | Java | 제 의도로는 한 상품에 대한 모든 리뷰 조회 였는데 생각이 많이 짧았던 것 같습니다 코드 수정 후 다시 올리겠습니다 |
@@ -0,0 +1,70 @@
+package com.frame2.server.core.board.application;
+
+import com.frame2.server.core.board.domain.ProductReview;
+import com.frame2.server.core.board.infrastructure.ProductReviewRepository;
+import com.frame2.server.core.board.payload.request.ProductReviewModifyRequest;
+import com.frame2.server.core.board.payload.request.ProductReviewRequest;
+import com.frame2.server.core.board.payload.response.ProductReviewResponse;
+import com.frame2.server.core.member.domain.Member;
+import com.frame2.server.core.member.infrastructure.MemberRepository;
+import com.frame2.server.core.order.domain.OrderDetail;
+import com.frame2.server.core.order.infrastructure.OrderDetailRepository;
+import com.frame2.server.core.product.domain.SaleProduct;
+import com.frame2.server.core.product.infrastructure.SaleProductRepository;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.List;
+
+@Service
+@Transactional
+@RequiredArgsConstructor
+public class ProductReviewServiceImpl implements ProductReviewService {
+
+ private final ProductReviewRepository productReviewRepository;
+ private final SaleProductRepository saleProductRepository;
+ private final MemberRepository memberRepository;
+ private final OrderDetailRepository orderDetailRepository;
+
+ // 생성
+ @Override
+ public void productReviewCreate(ProductReviewRequest request, Long memberId, Long saleProductId) {
+ Member member = memberRepository.findOne(memberId);
+ SaleProduct saleProduct = saleProductRepository.findOne(saleProductId);
+ OrderDetail orderDetail = orderDetailRepository.findOne(request.orderDetailId());
+
+ ProductReview productReview = request.toEntity(member, saleProduct, orderDetail);
+ productReviewRepository.save(productReview);
+ }
+
+ // 수정
+ @Override
+ public void productReviewModify(ProductReviewModifyRequest request, Long productReviewId) {
+ productReviewRepository.findOne(productReviewId).updateProductReview(request.toEntity());
+ }
+
+ // 삭제
+ @Override
+ public void remove(Long productReviewId) {
+ productReviewRepository.findOne(productReviewId).delete();
+ }
+
+ // 단건 조회
+ @Override
+ @Transactional(readOnly = true)
+ public ProductReviewResponse getProductReview(Long productReviewId) {
+ ProductReview productReview = productReviewRepository.findOne(productReviewId);
+ return ProductReviewResponse.from(productReview);
+ }
+
+ // 한 상품에 대한 전체 리뷰 조회
+ @Override
+ @Transactional(readOnly = true)
+ public List<ProductReviewResponse> getProductReviewList(Long saleProductId) {
+ List<ProductReview> productReviewList = productReviewRepository.findAllBySaleProductId(saleProductId);
+ return productReviewList.stream()
+ .map(ProductReviewResponse::from)
+ .toList();
+ }
+} | Java | 레포지토리 부분에서 id로 엔티티를 찾지 못하는 경우에 예외 처리를 해놨습니다
"존재하지 않는 리뷰입니다" 라는 에러 메시지가 나타나게 됩니다 |
@@ -0,0 +1,45 @@
+package com.frame2.server.core.board.domain;
+
+import com.frame2.server.core.member.domain.Member;
+import com.frame2.server.core.order.domain.OrderDetail;
+import com.frame2.server.core.product.domain.SaleProduct;
+import com.frame2.server.core.support.entity.BaseEntity;
+import jakarta.persistence.*;
+import lombok.*;
+
+@Entity
+@Getter
+@Builder
+@AllArgsConstructor
+@Table(name = "product_reviews")
+@NoArgsConstructor(access = AccessLevel.PROTECTED)
+public class ProductReview extends BaseEntity {
+
+ @ManyToOne(fetch = FetchType.LAZY)
+ @JoinColumn(name = "sale_product_id", nullable = false)
+ private SaleProduct saleProduct;
+
+ @ManyToOne(fetch = FetchType.LAZY)
+ @JoinColumn(name = "member_id", nullable = false)
+ private Member member;
+
+ @OneToOne(fetch = FetchType.LAZY)
+ @JoinColumn(name = "order_detail_id", nullable = false)
+ private OrderDetail orderDetail;
+
+ // 평점
+ @Column(nullable = false)
+ private int rating;
+
+ //리뷰 내용
+ @Column(nullable = false)
+ private String contents;
+
+ private String image;
+
+ public void updateProductReview(ProductReview newProductReview) {
+ this.rating = newProductReview.getRating();
+ this.contents = newProductReview.getContents();
+ this.image = newProductReview.getImage();
+ }
+} | Java | 엔티티에서는 validation 사용하지 않는게 좋습니다. |
@@ -0,0 +1,45 @@
+package com.frame2.server.core.board.domain;
+
+import com.frame2.server.core.member.domain.Member;
+import com.frame2.server.core.order.domain.OrderDetail;
+import com.frame2.server.core.product.domain.SaleProduct;
+import com.frame2.server.core.support.entity.BaseEntity;
+import jakarta.persistence.*;
+import lombok.*;
+
+@Entity
+@Getter
+@Builder
+@AllArgsConstructor
+@Table(name = "product_reviews")
+@NoArgsConstructor(access = AccessLevel.PROTECTED)
+public class ProductReview extends BaseEntity {
+
+ @ManyToOne(fetch = FetchType.LAZY)
+ @JoinColumn(name = "sale_product_id", nullable = false)
+ private SaleProduct saleProduct;
+
+ @ManyToOne(fetch = FetchType.LAZY)
+ @JoinColumn(name = "member_id", nullable = false)
+ private Member member;
+
+ @OneToOne(fetch = FetchType.LAZY)
+ @JoinColumn(name = "order_detail_id", nullable = false)
+ private OrderDetail orderDetail;
+
+ // 평점
+ @Column(nullable = false)
+ private int rating;
+
+ //리뷰 내용
+ @Column(nullable = false)
+ private String contents;
+
+ private String image;
+
+ public void updateProductReview(ProductReview newProductReview) {
+ this.rating = newProductReview.getRating();
+ this.contents = newProductReview.getContents();
+ this.image = newProductReview.getImage();
+ }
+} | Java | ProductReview는 반환하지 않아도 됩니다. |
@@ -0,0 +1,26 @@
+package com.frame2.server.core.board.infrastructure;
+
+import com.frame2.server.core.board.domain.ProductReview;
+import com.frame2.server.core.support.exception.DomainException;
+import com.frame2.server.core.support.exception.ExceptionType;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
+
+import java.util.List;
+import java.util.Optional;
+
+public interface ProductReviewRepository extends JpaRepository<ProductReview, Long> {
+
+ default ProductReview findOne(Long id) {
+ return findById(id).orElseThrow(() -> new DomainException(ExceptionType.PRODUCT_REVIEW_NOT_FOUND));
+ }
+
+ @Override
+ @Query("SELECT pr FROM ProductReview pr WHERE pr.id = :id and pr.deleteStatus = false")
+ Optional<ProductReview> findById(@Param("id") Long id);
+
+ // deleteStatus가 false이고, saleProduct의 id가 주어진 값인 데이터를 조회
+ @Query("SELECT pr FROM ProductReview pr WHERE pr.deleteStatus = false AND pr.saleProduct.id = :saleProductId")
+ List<ProductReview> findAllBySaleProductId(@Param("saleProductId") Long saleProductId);
+} | Java | 삭제된 상품 리뷰의 경우 조회를 막아야 하지 않나요? |
@@ -1,9 +1,13 @@
package com.hanahakdangserver.faq.service;
+import java.util.ArrayList;
import java.util.List;
import java.util.stream.Collectors;
import lombok.RequiredArgsConstructor;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.PageRequest;
+import org.springframework.data.domain.Pageable;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -31,32 +35,45 @@ public class FaqService {
private final LectureRepository lectureRepository;
private final UserRepository userRepository;
+ private static final int PAGE_SIZE = 3; // 페이지 크기 상수 정의
+
+ /**
+ * FAQ + Answer를 합쳐서 페이지네이션 처리
+ */
+ public List<FaqResponse> getPaginatedFaqs(Long lectureId, int page) {
+ Pageable pageable = PageRequest.of(page, PAGE_SIZE); // Service에서 Pageable 생성
+ Page<Faq> faqPage = faqRepository.findByLectureId(lectureId, pageable);
+
+ // FAQ와 답변 데이터를 DTO로 변환
+ return faqPage.stream()
+ .map(faq -> {
+ List<Answer> answers = answerRepository.findByFaqId(faq.getId());
+ return FaqMapper.toDto(faq, answers);
+ })
+ .toList();
+ }
+
@Transactional
public FaqResponse createFaq(Long lectureId, FaqRequest request, Long userId) {
+ // 사용자 조회
User user = userRepository.findById(userId)
.orElseThrow(USER_NOT_FOUND::createResponseStatusException);
+ // 강의 조회
Lecture lecture = lectureRepository.findById(lectureId)
.orElseThrow(LECTURE_NOT_FOUND::createResponseStatusException);
+ // Faq 엔티티 생성 및 저장
Faq faq = Faq.builder()
.lecture(lecture)
+ .user(user) // user 설정
.content(request.getContent())
.build();
Faq savedFaq = faqRepository.save(faq);
- return FaqMapper.toDto(savedFaq, List.of());
- }
-
- public List<FaqResponse> getFaqsByLectureId(Long lectureId) {
- List<Faq> faqs = faqRepository.findByLectureId(lectureId);
- return faqs.stream()
- .map(faq -> {
- List<Answer> answers = answerRepository.findByFaqId(faq.getId());
- return FaqMapper.toDto(faq, answers);
- })
- .collect(Collectors.toList());
+ // DTO 변환 후 반환
+ return FaqMapper.toDto(savedFaq, List.of());
}
@Transactional
@@ -70,5 +87,4 @@ public void deleteFaq(Long faqId, Long userId) {
faqRepository.delete(faq);
}
-
} | Java | `List<FaqResponse>`가 아니고 `List<Object>`라 한 이유가 있나요? |
@@ -1,6 +1,10 @@
package com.hanahakdangserver.review.dto;
import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer;
+import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.AccessLevel;
import lombok.AllArgsConstructor;
@@ -9,40 +13,76 @@
import lombok.NoArgsConstructor;
import lombok.ToString;
-@Getter
+import java.time.LocalDateTime;
+import java.util.List;
+
+
@NoArgsConstructor(access = AccessLevel.PROTECTED)
@AllArgsConstructor
@Builder
+@Getter
@ToString
@Schema(description = "리뷰 응답 DTO")
public class ReviewResponse {
- @Schema(description = "리뷰 ID", example = "1")
- private Long id; // 리뷰 ID
+ @Schema(description = "평균 별점", example = "4.5")
+ private String averageScore; // 평균 별점
+
+ @Schema(description = "총 리뷰 수", example = "19")
+ private int count; // 전체 리뷰 수
+
+ @Schema(description = "별점별 개수")
+ private List<SubScore> subScores; // 별점별 개수 리스트
+
+ @Schema(description = "리뷰 리스트")
+ private List<DetailedReview> reviews; // 리뷰 리스트
+
+ @Getter
+ @Builder
+ @AllArgsConstructor
+ public static class SubScore {
+
+ @Schema(description = "별점", example = "5")
+ private int score;
+
+ @Schema(description = "별점 개수", example = "10")
+ private int count;
+ }
+
+ @Getter
+ @Builder
+ @AllArgsConstructor
+ public static class DetailedReview {
+
+ @Schema(description = "리뷰 ID", example = "1")
+ private Long id;
+
+ @Schema(description = "강의 ID", example = "101")
+ private Long lectureId;
- @Schema(description = "강의 ID", example = "101")
- private Long lectureId; // 강의 ID
+ @Schema(description = "작성자 ID", example = "501")
+ private Long userId;
- @Schema(description = "작성자 ID", example = "501")
- private Long userId; // 작성자 ID
+ @Schema(description = "작성자 이름", example = "양지은")
+ private String userName;
- @Schema(description = "작성자 이름", example = "양지은")
- private String userName; // 작성자 이름
+ @Schema(description = "작성자 프로필 이미지 URL", example = "http://example.com/profile.jpg")
+ private String imageUrl;
- @Schema(description = "강의 제목", example = "자바 기본 강의")
- private String lectureTitle; // 강의 제목
+ @Schema(description = "강의 제목", example = "자바 기본 강의")
+ private String lectureTitle;
- @Schema(description = "리뷰 내용", example = "강의가 매우 유익했습니다.")
- private String content; // 리뷰 내용
+ @Schema(description = "리뷰 내용", example = "강의가 매우 유익했습니다.")
+ private String content;
- @Schema(description = "평점", example = "4.5")
- private Double score; // 평점
+ @Schema(description = "평점", example = "5")
+ private int score;
- @Schema(description = "리뷰 작성 시간", example = "2025년 01월 20일")
- @JsonFormat(pattern = "yyyy년 MM월 dd일", timezone = "Asia/Seoul")
- private String createdAt; // 작성 시간 (yyyy년 MM월 dd일)
+ @Schema(description = "리뷰 작성 시간", example = "2025-01-20T10:00:00")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Seoul")
+ @JsonDeserialize(using = LocalDateTimeDeserializer.class)
+ @JsonSerialize(using = LocalDateTimeSerializer.class)
+ private LocalDateTime createdAt;
- @Schema(description = "리뷰 수정 시간", example = "2025냔 01월 21일")
- @JsonFormat(pattern = "yyyy년 MM월 dd일", timezone = "Asia/Seoul")
- private String updatedAt; // 수정 시간 (yyyy년 MM월 dd일)
+ }
} | Java | int형인데 4.5 이런 식으로 나오나요? |
@@ -4,15 +4,18 @@
import lombok.RequiredArgsConstructor;
import lombok.extern.log4j.Log4j2;
-import org.springframework.http.HttpStatus;
+import org.springframework.data.domain.PageRequest;
+import org.springframework.data.domain.Pageable;
import org.springframework.http.ResponseEntity;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.security.core.annotation.AuthenticationPrincipal;
import org.springframework.web.bind.annotation.*;
import com.hanahakdangserver.auth.security.CustomUserDetails;
+import com.hanahakdangserver.common.ResponseDTO;
import com.hanahakdangserver.faq.dto.FaqRequest;
import com.hanahakdangserver.faq.dto.FaqResponse;
+import com.hanahakdangserver.faq.enums.FaqResponseSuccessEnum;
import com.hanahakdangserver.faq.service.FaqService;
import io.swagger.v3.oas.annotations.Operation;
@@ -23,12 +26,28 @@
@Tag(name = "FAQ", description = "FAQ 관련 API")
@RestController
@RequiredArgsConstructor
-@RequestMapping("/faq")
+@RequestMapping("/lectures/faq")
@Log4j2
public class FaqController {
private final FaqService faqService;
+ @Operation(summary = "FAQ + Answer 조회", description = "FAQ와 답변을 합쳐 페이지네이션으로 조회합니다.")
+ @ApiResponses({
+ @ApiResponse(responseCode = "200", description = "조회 성공"),
+ @ApiResponse(responseCode = "404", description = "해당 강의가 존재하지 않습니다.")
+ })
+ @GetMapping("/{lectureId}")
+ public ResponseEntity<ResponseDTO<List<FaqResponse>>> getPaginatedFaqsByLectureId(
+ @PathVariable Long lectureId,
+ @RequestParam(defaultValue = "0") int page) {
+
+ List<FaqResponse> paginatedFaqs = faqService.getPaginatedFaqs(lectureId, page);
+
+ log.info("FAQ + 답변 조회 성공: lectureId={}, page={}", lectureId, page);
+ return FaqResponseSuccessEnum.GET_FAQ_LIST_SUCCESS.createResponseEntity(paginatedFaqs);
+ }
+
@PreAuthorize("isAuthenticated() and hasRole('MENTEE')")
@Operation(summary = "문의 등록", description = "특정 강의에 대한 문의를 등록합니다.")
@ApiResponses({
@@ -37,7 +56,7 @@ public class FaqController {
@ApiResponse(responseCode = "404", description = "해당 강의가 존재하지 않습니다.")
})
@PostMapping("/{lectureId}")
- public ResponseEntity<FaqResponse> createFaq(
+ public ResponseEntity<ResponseDTO<FaqResponse>> createFaq(
@AuthenticationPrincipal CustomUserDetails userDetails,
@PathVariable Long lectureId,
@RequestBody FaqRequest request) {
@@ -46,20 +65,9 @@ public ResponseEntity<FaqResponse> createFaq(
FaqResponse response = faqService.createFaq(lectureId, request, userId);
log.info("문의 등록 성공: lectureId={}, userId={}", lectureId, userId);
- return ResponseEntity.status(HttpStatus.CREATED).body(response);
+ return FaqResponseSuccessEnum.CREATE_FAQ_SUCCESS.createResponseEntity(response);
}
- @PreAuthorize("isAuthenticated()")
- @Operation(summary = "문의 조회", description = "특정 강의에 대한 모든 문의를 조회합니다.")
- @ApiResponses({
- @ApiResponse(responseCode = "200", description = "문의 조회 성공"),
- @ApiResponse(responseCode = "404", description = "해당 강의가 존재하지 않습니다.")
- })
- @GetMapping("/{lectureId}")
- public ResponseEntity<List<FaqResponse>> getFaqsByLectureId(@PathVariable Long lectureId) {
- List<FaqResponse> faqs = faqService.getFaqsByLectureId(lectureId);
- return ResponseEntity.ok(faqs);
- }
@PreAuthorize("isAuthenticated()")
@Operation(summary = "문의 삭제", description = "특정 문의를 삭제합니다.")
@@ -77,7 +85,6 @@ public ResponseEntity<Void> deleteFaq(
faqService.deleteFaq(faqId, userId);
log.info("문의 삭제 성공: faqId={}, userId={}", faqId, userId);
- return ResponseEntity.noContent().build();
+ return FaqResponseSuccessEnum.DELETE_FAQ_SUCCESS.createEmptyResponse();
}
-
} | Java | Pageable 객체 생성은 Controller 보다는 Service단에서 하는 것이 더 좋을 것 같습니다~
비슷하게 size 역시 쿼리 파라미터로 받기 보다는 Service 코드에서 상수로 관리하는 것이 더 좋습니다! |
@@ -1,6 +1,10 @@
package com.hanahakdangserver.review.dto;
import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.datatype.jsr310.deser.LocalDateTimeDeserializer;
+import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.AccessLevel;
import lombok.AllArgsConstructor;
@@ -9,40 +13,76 @@
import lombok.NoArgsConstructor;
import lombok.ToString;
-@Getter
+import java.time.LocalDateTime;
+import java.util.List;
+
+
@NoArgsConstructor(access = AccessLevel.PROTECTED)
@AllArgsConstructor
@Builder
+@Getter
@ToString
@Schema(description = "리뷰 응답 DTO")
public class ReviewResponse {
- @Schema(description = "리뷰 ID", example = "1")
- private Long id; // 리뷰 ID
+ @Schema(description = "평균 별점", example = "4.5")
+ private String averageScore; // 평균 별점
+
+ @Schema(description = "총 리뷰 수", example = "19")
+ private int count; // 전체 리뷰 수
+
+ @Schema(description = "별점별 개수")
+ private List<SubScore> subScores; // 별점별 개수 리스트
+
+ @Schema(description = "리뷰 리스트")
+ private List<DetailedReview> reviews; // 리뷰 리스트
+
+ @Getter
+ @Builder
+ @AllArgsConstructor
+ public static class SubScore {
+
+ @Schema(description = "별점", example = "5")
+ private int score;
+
+ @Schema(description = "별점 개수", example = "10")
+ private int count;
+ }
+
+ @Getter
+ @Builder
+ @AllArgsConstructor
+ public static class DetailedReview {
+
+ @Schema(description = "리뷰 ID", example = "1")
+ private Long id;
+
+ @Schema(description = "강의 ID", example = "101")
+ private Long lectureId;
- @Schema(description = "강의 ID", example = "101")
- private Long lectureId; // 강의 ID
+ @Schema(description = "작성자 ID", example = "501")
+ private Long userId;
- @Schema(description = "작성자 ID", example = "501")
- private Long userId; // 작성자 ID
+ @Schema(description = "작성자 이름", example = "양지은")
+ private String userName;
- @Schema(description = "작성자 이름", example = "양지은")
- private String userName; // 작성자 이름
+ @Schema(description = "작성자 프로필 이미지 URL", example = "http://example.com/profile.jpg")
+ private String imageUrl;
- @Schema(description = "강의 제목", example = "자바 기본 강의")
- private String lectureTitle; // 강의 제목
+ @Schema(description = "강의 제목", example = "자바 기본 강의")
+ private String lectureTitle;
- @Schema(description = "리뷰 내용", example = "강의가 매우 유익했습니다.")
- private String content; // 리뷰 내용
+ @Schema(description = "리뷰 내용", example = "강의가 매우 유익했습니다.")
+ private String content;
- @Schema(description = "평점", example = "4.5")
- private Double score; // 평점
+ @Schema(description = "평점", example = "5")
+ private int score;
- @Schema(description = "리뷰 작성 시간", example = "2025년 01월 20일")
- @JsonFormat(pattern = "yyyy년 MM월 dd일", timezone = "Asia/Seoul")
- private String createdAt; // 작성 시간 (yyyy년 MM월 dd일)
+ @Schema(description = "리뷰 작성 시간", example = "2025-01-20T10:00:00")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Seoul")
+ @JsonDeserialize(using = LocalDateTimeDeserializer.class)
+ @JsonSerialize(using = LocalDateTimeSerializer.class)
+ private LocalDateTime createdAt;
- @Schema(description = "리뷰 수정 시간", example = "2025냔 01월 21일")
- @JsonFormat(pattern = "yyyy년 MM월 dd일", timezone = "Asia/Seoul")
- private String updatedAt; // 수정 시간 (yyyy년 MM월 dd일)
+ }
} | Java | 아 이거 수정하겠습니다. 끝에 바꾸다 보니깐 example 수정을 못 했네요 |
@@ -47,11 +47,15 @@ public class User extends BaseTimeEntity {
@Enumerated(value = EnumType.STRING)
private LoginMethod loginMethod = LoginMethod.LOCAL;
- @OneToOne(cascade = CascadeType.ALL,orphanRemoval = true)
+ @OneToOne(cascade = CascadeType.ALL, orphanRemoval = true)
@JoinColumn(name = "account_id")
private Account account;
- public User() {}
+ @Column(nullable = false, columnDefinition = "INT DEFAULT 0")
+ private int point;
+
+ public User() {
+ }
public User(String email, String nickname, String password, String profileImage, String address, String phoneNumber, Role role) {
this.email = email;
@@ -85,4 +89,8 @@ public User(String nickname, String email) {
this.loginMethod = LoginMethod.KAKAO;
}
+ public void addPoint(int point) {
+ this.point += point;
+ }
+
}
\ No newline at end of file | Java | _:hammer_and_wrench: Refactor suggestion_
**포인트 증가 메소드에 유효성 검사가 필요합니다.**
현재 구현은 기본적인 기능은 제공하지만, 다음과 같은 보완이 필요합니다:
- 음수 포인트 검증
- 최대 포인트 제한
- 포인트 증가 로깅
다음과 같은 개선을 제안드립니다:
```diff
+ private static final int MAX_POINT = 1000000; // 100만 포인트 제한
+
public void addPoint(int point) {
+ if (point < 0) {
+ throw new IllegalArgumentException("포인트는 음수일 수 없습니다");
+ }
+ if (this.point + point > MAX_POINT) {
+ throw new IllegalArgumentException("최대 포인트 제한을 초과했습니다");
+ }
this.point += point;
}
```
<!-- suggestion_start -->
<details>
<summary>📝 Committable suggestion</summary>
> ‼️ **IMPORTANT**
> Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.
`````suggestion
private static final int MAX_POINT = 1000000; // 100만 포인트 제한
public void addPoint(int point) {
if (point < 0) {
throw new IllegalArgumentException("포인트는 음수일 수 없습니다");
}
if (this.point + point > MAX_POINT) {
throw new IllegalArgumentException("최대 포인트 제한을 초과했습니다");
}
this.point += point;
}
`````
</details>
<!-- suggestion_end -->
<!-- This is an auto-generated comment by CodeRabbit --> |
@@ -8,6 +8,7 @@
import com.doubleowner.revibe.domain.review.entity.Review;
import com.doubleowner.revibe.domain.review.repository.ReviewRepository;
import com.doubleowner.revibe.domain.user.entity.User;
+import com.doubleowner.revibe.domain.user.repository.UserRepository;
import com.doubleowner.revibe.global.config.auth.UserDetailsImpl;
import com.doubleowner.revibe.global.exception.CommonException;
import com.doubleowner.revibe.global.exception.errorCode.ErrorCode;
@@ -28,17 +29,23 @@
public class ReviewService {
private final ReviewRepository reviewRepository;
private final ExecutionRepository executionRepository;
+ private final UserRepository userRepository;
private final S3Uploader s3Uploader;
+ private static final int TEXT_ONLY_POINT=100;
+ private static final int TEXT_IMAGE_POINT=500;
+
@Transactional
public ReviewResponseDto write(ReviewRequestDto reviewRequestDto, MultipartFile file, User user) {
+
Execution execution = executionRepository.findExecutionById(reviewRequestDto.getExecutionId(), reviewRequestDto.getPaymentId(), user.getEmail())
.orElseThrow(() -> new CommonException(ErrorCode.NOT_FOUND_VALUE, "내역을 찾을 수 없습니다"));
String image = null;
-
+ int point=TEXT_ONLY_POINT;
if (file != null) {
image = uploadImage(file);
+ point=TEXT_IMAGE_POINT;
}
@@ -53,6 +60,9 @@ public ReviewResponseDto write(ReviewRequestDto reviewRequestDto, MultipartFile
.build();
Review save = reviewRepository.save(review);
+ user.addPoint(point);
+ userRepository.save(user);
+
return toDto(save);
} | Java | _:hammer_and_wrench: Refactor suggestion_
**포인트 적립 로깅 및 예외 처리가 필요합니다.**
포인트 적립 시 감사(audit) 목적의 로깅과 실패 시의 예외 처리가 필요합니다.
다음과 같은 개선을 제안드립니다:
```diff
+ @Transactional
+ private void awardPoints(User user, int point) {
+ try {
user.addPoint(point);
userRepository.save(user);
+ log.info("포인트 적립 완료 - 사용자: {}, 포인트: {}", user.getEmail(), point);
+ } catch (Exception e) {
+ log.error("포인트 적립 실패 - 사용자: {}, 포인트: {}", user.getEmail(), point, e);
+ throw new CommonException(ErrorCode.FAILED_POINT_AWARD, "포인트 적립에 실패했습니다");
+ }
+ }
```
그리고 write 메소드에서는 다음과 같이 호출:
```diff
- user.addPoint(point);
- userRepository.save(user);
+ awardPoints(user, point);
```
> Committable suggestion skipped: line range outside the PR's diff.
<!-- This is an auto-generated comment by CodeRabbit --> |
@@ -8,6 +8,7 @@
import com.doubleowner.revibe.domain.review.entity.Review;
import com.doubleowner.revibe.domain.review.repository.ReviewRepository;
import com.doubleowner.revibe.domain.user.entity.User;
+import com.doubleowner.revibe.domain.user.repository.UserRepository;
import com.doubleowner.revibe.global.config.auth.UserDetailsImpl;
import com.doubleowner.revibe.global.exception.CommonException;
import com.doubleowner.revibe.global.exception.errorCode.ErrorCode;
@@ -28,17 +29,23 @@
public class ReviewService {
private final ReviewRepository reviewRepository;
private final ExecutionRepository executionRepository;
+ private final UserRepository userRepository;
private final S3Uploader s3Uploader;
+ private static final int TEXT_ONLY_POINT=100;
+ private static final int TEXT_IMAGE_POINT=500;
+
@Transactional
public ReviewResponseDto write(ReviewRequestDto reviewRequestDto, MultipartFile file, User user) {
+
Execution execution = executionRepository.findExecutionById(reviewRequestDto.getExecutionId(), reviewRequestDto.getPaymentId(), user.getEmail())
.orElseThrow(() -> new CommonException(ErrorCode.NOT_FOUND_VALUE, "내역을 찾을 수 없습니다"));
String image = null;
-
+ int point=TEXT_ONLY_POINT;
if (file != null) {
image = uploadImage(file);
+ point=TEXT_IMAGE_POINT;
}
@@ -53,6 +60,9 @@ public ReviewResponseDto write(ReviewRequestDto reviewRequestDto, MultipartFile
.build();
Review save = reviewRepository.save(review);
+ user.addPoint(point);
+ userRepository.save(user);
+
return toDto(save);
} | Java | _:warning: Potential issue_
**포인트 적립 실패 시의 처리가 필요합니다.**
현재 구현에서 포인트 적립 실패 시의 예외 처리가 누락되어 있습니다.
다음과 같은 개선을 제안드립니다:
```diff
int point=TEXT_ONLY_POINT;
if (file != null) {
- image = uploadImage(file);
- point=TEXT_IMAGE_POINT;
+ try {
+ image = uploadImage(file);
+ point=TEXT_IMAGE_POINT;
+ } catch (Exception e) {
+ // 이미지 업로드 실패 시에도 텍스트 리뷰 포인트는 지급
+ log.warn("이미지 업로드 실패로 인해 기본 포인트만 지급됩니다", e);
+ }
}
```
<!-- suggestion_start -->
<details>
<summary>📝 Committable suggestion</summary>
> ‼️ **IMPORTANT**
> Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.
`````suggestion
int point=TEXT_ONLY_POINT;
if (file != null) {
try {
image = uploadImage(file);
point=TEXT_IMAGE_POINT;
} catch (Exception e) {
// 이미지 업로드 실패 시에도 텍스트 리뷰 포인트는 지급
log.warn("이미지 업로드 실패로 인해 기본 포인트만 지급됩니다", e);
}
}
`````
</details>
<!-- suggestion_end -->
<!-- This is an auto-generated comment by CodeRabbit --> |
@@ -0,0 +1,23 @@
+package kdt.prgrms.kazedon.everevent.common;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import kdt.prgrms.kazedon.everevent.domain.user.UserType;
+import org.springframework.security.test.context.support.WithSecurityContext;
+
+@Retention(RetentionPolicy.RUNTIME)
+@WithSecurityContext(factory = WithMockAuthUserSecurityContextFactory.class)
+public @interface WithMockAuthUser {
+
+ long id() default 1L;
+
+ String email() default "password";
+
+ String password() default "Password123!";
+
+ String nickname() default "kazedon";
+
+ String location() default "경기도 남양주시 와부읍";
+
+ UserType roles() default UserType.ROLE_USER;
+} | Java | Long 으로 하는게 더 좋아보이네요 :) |
@@ -0,0 +1,23 @@
+package kdt.prgrms.kazedon.everevent.common;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import kdt.prgrms.kazedon.everevent.domain.user.UserType;
+import org.springframework.security.test.context.support.WithSecurityContext;
+
+@Retention(RetentionPolicy.RUNTIME)
+@WithSecurityContext(factory = WithMockAuthUserSecurityContextFactory.class)
+public @interface WithMockAuthUser {
+
+ long id() default 1L;
+
+ String email() default "password";
+
+ String password() default "Password123!";
+
+ String nickname() default "kazedon";
+
+ String location() default "경기도 남양주시 와부읍";
+
+ UserType roles() default UserType.ROLE_USER;
+} | Java | 앗 그러네요! 감사함니당 👍👍 |
@@ -0,0 +1,185 @@
+package kdt.prgrms.kazedon.everevent.domain.like;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.time.LocalDateTime;
+import java.util.Optional;
+import kdt.prgrms.kazedon.everevent.domain.event.Event;
+import kdt.prgrms.kazedon.everevent.domain.event.repository.EventRepository;
+import kdt.prgrms.kazedon.everevent.domain.like.dto.response.SimpleEventLike;
+import kdt.prgrms.kazedon.everevent.domain.like.repository.EventLikeRepository;
+import kdt.prgrms.kazedon.everevent.domain.market.Market;
+import kdt.prgrms.kazedon.everevent.domain.market.repository.MarketRepository;
+import kdt.prgrms.kazedon.everevent.domain.user.User;
+import kdt.prgrms.kazedon.everevent.domain.user.repository.UserRepository;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest;
+import org.springframework.boot.test.autoconfigure.orm.jpa.TestEntityManager;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.PageRequest;
+import org.springframework.data.domain.Pageable;
+import org.springframework.data.domain.Sort;
+
+@DataJpaTest
+public class EventLikeRepositoryTest {
+
+ @Autowired
+ EventLikeRepository eventLikeRepository;
+
+ @Autowired
+ EventRepository eventRepository;
+
+ @Autowired
+ UserRepository userRepository;
+
+ @Autowired
+ MarketRepository marketRepository;
+
+ @Autowired
+ private TestEntityManager entityManager;
+
+ private EventLike eventLike;
+
+ private User user;
+
+ private Event event;
+
+ private Market market;
+
+ private Pageable pageable;
+
+ @BeforeEach
+ void setUp() {
+ user = User.builder()
+ .email("email@gmail.com")
+ .password("Pw123!")
+ .nickname("에디")
+ .location("경기도 남양주시 와부읍")
+ .build();
+
+ market = Market.builder()
+ .user(user)
+ .name("햄찌네 가게")
+ .description("햄스터 말고 커피팝니다!")
+ .address("경기도 남양주시 와부읍 석실로")
+ .build();
+
+ event = Event.builder()
+ .market(market)
+ .name("커피 10퍼센트 할인 이벤트")
+ .expiredAt(LocalDateTime.now())
+ .description("1주일 동안 진행합니다! 선착순 5명!")
+ .maxParticipants(5)
+ .build();
+
+ eventLike = EventLike.builder()
+ .user(user)
+ .event(event)
+ .build();
+
+ pageable = PageRequest.of(0, 5, Sort.by("createdAt").descending());
+
+ userRepository.save(user);
+ marketRepository.save(market);
+ eventRepository.save(event);
+ }
+
+ @AfterEach
+ void tearDown() {
+ eventRepository.deleteAll();
+ marketRepository.deleteAll();
+ userRepository.deleteAll();
+ eventLikeRepository.deleteAll();
+ }
+
+ @Test
+ @DisplayName("좋아요 성공")
+ void save() {
+ // when
+ EventLike savedEventLike = eventLikeRepository.save(eventLike);
+
+ // then
+ assertThat(savedEventLike.getEvent()).isEqualTo(eventLike.getEvent());
+ assertThat(savedEventLike.getUser()).isEqualTo(eventLike.getUser());
+ }
+
+ @Test
+ @DisplayName("좋아요 취소 성공")
+ void deleteById() {
+ // given
+ entityManager.persist(eventLike);
+ entityManager.clear();
+
+ // when
+ eventLikeRepository.deleteById(eventLike.getId());
+
+ // then
+ assertThat(eventLikeRepository.findAll()).isEmpty();
+ }
+
+ @Test
+ @DisplayName("유저 pk와 이벤트 pk로 좋아요 여부 조회")
+ void existsEventLikeByUserIdAndEventId() {
+ // given
+ entityManager.persist(eventLike);
+ entityManager.clear();
+
+ // when
+ boolean actualBoolValue = eventLikeRepository.existsEventLikeByUserIdAndEventId(user.getId(),
+ event.getId());
+
+ // then
+ assertThat(actualBoolValue).isTrue();
+ }
+
+ @Test
+ @DisplayName("유저 pk와 이벤트 pk로 단일 좋아요 조회")
+ void findByUserIdAndEventId() {
+ // given
+ entityManager.persist(eventLike);
+ entityManager.clear();
+
+ // when
+ Optional<EventLike> searchedEventLike = eventLikeRepository.findByUserIdAndEventId(user.getId(),
+ event.getId());
+
+ // then
+ assertThat(searchedEventLike).isPresent();
+ searchedEventLike.ifPresent(
+ actualEventLike -> assertThat(actualEventLike.getEvent().getId()).isEqualTo(
+ eventLike.getEvent().getId()));
+ searchedEventLike.ifPresent(
+ actualEventLike -> assertThat(actualEventLike.getUser().getId()).isEqualTo(
+ eventLike.getUser().getId()));
+ }
+
+ @Test
+ @DisplayName("유저 pk로 SimpleLike 목록 페이지 조회")
+ void findSimpleLikeByUserId() {
+ // given
+ entityManager.persist(eventLike);
+ entityManager.clear();
+
+ // when
+ Page<SimpleEventLike> searchedSimpleEventLikes = eventLikeRepository.findSimpleLikeByUserId(
+ user.getId(), pageable);
+
+ // then
+ assertThat(searchedSimpleEventLikes.getTotalElements()).isEqualTo(1L);
+ searchedSimpleEventLikes.get()
+ .findFirst()
+ .ifPresent(
+ actualSimpleEventLike -> assertThat(actualSimpleEventLike.getEventId()).isEqualTo(
+ event.getId()));
+ searchedSimpleEventLikes.get()
+ .findFirst()
+ .ifPresent(
+ actualSimpleEventLike -> assertThat(actualSimpleEventLike.getMarketName()).isEqualTo(
+ market.getName()));
+ }
+
+} | Java | 아래서 검증하니깐 이건 괜찮지 않을까요? |
@@ -0,0 +1,164 @@
+package kdt.prgrms.kazedon.everevent.domain.review;
+
+import static org.assertj.core.api.Assertions.*;
+
+import java.time.LocalDateTime;
+import kdt.prgrms.kazedon.everevent.domain.event.Event;
+import kdt.prgrms.kazedon.everevent.domain.event.repository.EventRepository;
+import kdt.prgrms.kazedon.everevent.domain.market.Market;
+import kdt.prgrms.kazedon.everevent.domain.market.repository.MarketRepository;
+import kdt.prgrms.kazedon.everevent.domain.review.dto.response.UserReview;
+import kdt.prgrms.kazedon.everevent.domain.review.repository.ReviewRepository;
+import kdt.prgrms.kazedon.everevent.domain.user.User;
+import kdt.prgrms.kazedon.everevent.domain.user.repository.UserRepository;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest;
+import org.springframework.boot.test.autoconfigure.orm.jpa.TestEntityManager;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.PageRequest;
+import org.springframework.data.domain.Pageable;
+import org.springframework.data.domain.Sort;
+
+@DataJpaTest
+class ReviewRepositoryTest {
+
+ @Autowired
+ ReviewRepository reviewRepository;
+
+ @Autowired
+ EventRepository eventRepository;
+
+ @Autowired
+ UserRepository userRepository;
+
+ @Autowired
+ MarketRepository marketRepository;
+
+ @Autowired
+ private TestEntityManager entityManager;
+
+ private Review review;
+
+ private User user;
+
+ private Event event;
+
+ private Market market;
+
+ private Pageable pageable;
+
+ @BeforeEach
+ void setUp() {
+ user = User.builder()
+ .email("email@gmail.com")
+ .password("Pw123!")
+ .nickname("에디")
+ .location("경기도 남양주시 와부읍")
+ .build();
+
+ market = Market.builder()
+ .user(user)
+ .name("햄찌네 가게")
+ .description("햄스터 말고 커피팝니다!")
+ .address("경기도 남양주시 와부읍 석실로")
+ .build();
+
+ event = Event.builder()
+ .market(market)
+ .name("커피 10퍼센트 할인 이벤트")
+ .expiredAt(LocalDateTime.now())
+ .description("1주일 동안 진행합니다! 선착순 5명!")
+ .maxParticipants(5)
+ .build();
+
+ review = Review.builder()
+ .user(user)
+ .event(event)
+ .description("정말 좋은 이벤트!")
+ .pictureUrl("pictureUrl")
+ .build();
+
+ pageable = PageRequest.of(0, 5, Sort.by("createdAt").descending());
+
+ userRepository.save(user);
+ marketRepository.save(market);
+ eventRepository.save(event);
+ }
+
+ @AfterEach
+ void tearDown() {
+ eventRepository.deleteAll();
+ marketRepository.deleteAll();
+ userRepository.deleteAll();
+ reviewRepository.deleteAll();
+ }
+
+ @Test
+ @DisplayName("리뷰 저장 성공")
+ void save() {
+ // when
+ Review savedReview = reviewRepository.save(review);
+
+ // then
+ assertThat(savedReview.getDescription()).isEqualTo(review.getDescription());
+ assertThat(savedReview.getPictureUrl()).isEqualTo(review.getPictureUrl());
+ }
+
+ @Test
+ @DisplayName("리뷰 목록 이벤트로 페이지 조회 성공")
+ void findByEvent() {
+ // given
+ entityManager.persist(review);
+ entityManager.clear();
+
+ // when
+ Page<Review> searchedReviews = reviewRepository.findByEvent(event, pageable);
+
+ // then
+ assertThat(searchedReviews.getTotalElements()).isEqualTo(1L);
+ assertThat(searchedReviews.get().findFirst()).isPresent();
+ searchedReviews.get()
+ .findFirst()
+ .ifPresent(
+ actualReviews -> assertThat(actualReviews.getEvent().getId()).isEqualTo(event.getId()));
+ }
+
+ @Test
+ @DisplayName("UserReview 목록 유저로 페이지 조회 성공")
+ void findByUser() {
+ // given
+ entityManager.persist(review);
+ entityManager.clear();
+
+ // when
+ Page<UserReview> searchedUserReviews = reviewRepository.findByUser(user.getId(), pageable);
+
+ // then
+ assertThat(searchedUserReviews.getTotalElements()).isEqualTo(1L);
+ assertThat(searchedUserReviews.get().findFirst()).isPresent();
+ searchedUserReviews.get()
+ .findFirst()
+ .ifPresent(
+ actualUserReviews -> assertThat(actualUserReviews.getDescription()).isEqualTo(
+ review.getDescription()));
+ }
+
+ @Test
+ @DisplayName("리뷰 갯수 유저로 조회")
+ void countByUser() {
+ // given
+ entityManager.persist(review);
+ entityManager.clear();
+
+ // when
+ long reviewCount = reviewRepository.countByUser(user);
+
+ // then
+ assertThat(reviewCount).isEqualTo(1L);
+ }
+
+} | Java | assertAll()을 한번 써보면 좋을거 같네요 :) |
@@ -0,0 +1,197 @@
+package kdt.prgrms.kazedon.everevent.service;
+
+import static org.assertj.core.api.Assertions.*;
+import static org.mockito.BDDMockito.given;
+import static org.mockito.BDDMockito.willDoNothing;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+
+import java.time.LocalDateTime;
+import java.util.List;
+import java.util.Optional;
+import kdt.prgrms.kazedon.everevent.domain.event.Event;
+import kdt.prgrms.kazedon.everevent.domain.event.repository.EventRepository;
+import kdt.prgrms.kazedon.everevent.domain.like.EventLike;
+import kdt.prgrms.kazedon.everevent.domain.like.dto.response.SimpleEventLike;
+import kdt.prgrms.kazedon.everevent.domain.like.dto.response.SimpleEventLikeReadResponse;
+import kdt.prgrms.kazedon.everevent.domain.like.repository.EventLikeRepository;
+import kdt.prgrms.kazedon.everevent.domain.market.Market;
+import kdt.prgrms.kazedon.everevent.domain.user.User;
+import kdt.prgrms.kazedon.everevent.service.converter.EventLikeConverter;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.springframework.data.domain.*;
+import org.springframework.test.util.ReflectionTestUtils;
+
+@ExtendWith(MockitoExtension.class)
+public class LikeServiceTest {
+
+ @Mock
+ private EventLikeRepository eventLikeRepository;
+
+ @Mock
+ private EventRepository eventRepository;
+
+ @Mock
+ private EventLikeConverter eventLikeConverter;
+
+ @InjectMocks
+ private LikeService likeService;
+
+ private User user;
+
+ private Market market;
+
+ private Event event;
+
+ private Pageable pageable;
+
+ private SimpleEventLikeReadResponse simpleEventLikeReadResponse;
+
+ private SimpleEventLike simpleEventLike;
+
+ private Page<SimpleEventLike> simpleEventLikes;
+
+ private EventLike eventLike;
+
+ private Event likedEvent;
+
+ private EventLike likedEventLike;
+
+ @BeforeEach
+ void setUp() {
+ user = User.builder()
+ .email("email@gmail.com")
+ .password("Pw123!")
+ .nickname("에디")
+ .location("경기도 남양주시 와부읍")
+ .build();
+
+ ReflectionTestUtils.setField(user, "id", 1L);
+
+ market = Market.builder()
+ .user(user)
+ .name("햄찌네 가게")
+ .description("햄스터 말고 커피팝니다!")
+ .address("경기도 남양주시 와부읍 석실로")
+ .build();
+
+ event = Event.builder()
+ .market(market)
+ .name("커피 10퍼센트 할인 이벤트")
+ .expiredAt(LocalDateTime.now())
+ .description("1주일 동안 진행합니다! 선착순 5명!")
+ .maxParticipants(5)
+ .build();
+
+ ReflectionTestUtils.setField(event, "id", 1L);
+
+ likedEvent = Event.builder()
+ .market(market)
+ .name("커피 10퍼센트 할인 이벤트")
+ .expiredAt(LocalDateTime.now())
+ .description("1주일 동안 진행합니다! 선착순 5명!")
+ .maxParticipants(5)
+ .build();
+
+ ReflectionTestUtils.setField(likedEvent, "id", 2L);
+
+ eventLike = EventLike.builder()
+ .event(event)
+ .user(user)
+ .build();
+
+ ReflectionTestUtils.setField(eventLike, "id", 1L);
+
+ likedEventLike = EventLike.builder()
+ .event(event)
+ .user(user)
+ .build();
+
+ ReflectionTestUtils.setField(likedEventLike, "id", 2L);
+
+ likedEvent.plusOneLike();
+
+ simpleEventLike = SimpleEventLike.builder()
+ .eventId(1L)
+ .name("커피 10퍼센트 할인 이벤트")
+ .expiredAt(LocalDateTime.now())
+ .marketName("햄찌네 가게")
+ .reviewCount(1)
+ .likeCount(1)
+ .build();
+
+ simpleEventLikes = new PageImpl<>(List.of(simpleEventLike));
+
+ pageable = PageRequest.of(0, 20, Sort.by("createdAt").descending());
+ }
+
+ @Test
+ @DisplayName("좋아요 등록 성공")
+ void addLike() {
+ // given
+ Long eventId = 1L;
+ Long userId = 1L;
+ given(eventRepository.findById(eventId)).willReturn(Optional.of(event));
+ given(eventLikeRepository.existsEventLikeByUserIdAndEventId(userId, eventId)).willReturn(false);
+ given(eventLikeConverter.convertToEventLike(user, event)).willReturn(eventLike);
+ given(eventLikeRepository.save(eventLike)).willReturn(eventLike);
+
+ // when
+ likeService.addLike(user, eventId);
+
+ // then
+ verify(eventRepository, times(1)).findById(eventId);
+ verify(eventLikeRepository, times(1)).existsEventLikeByUserIdAndEventId(userId, eventId);
+ verify(eventLikeConverter, times(1)).convertToEventLike(user, event);
+ verify(eventLikeRepository, times(1)).save(eventLike);
+ assertThat(event.getLikeCount()).isEqualTo(1L);
+ }
+
+ @Test
+ @DisplayName("좋아요 취소 성공")
+ void deleteLike() {
+ // given
+ Long eventId = 2L;
+ Long userId = 1L;
+ given(eventRepository.findById(eventId)).willReturn(Optional.of(likedEvent));
+ given(eventLikeRepository.findByUserIdAndEventId(userId, eventId)).willReturn(
+ Optional.of(likedEventLike));
+ willDoNothing().given(eventLikeRepository).deleteById(likedEventLike.getId());
+
+ // when
+ likeService.deleteLike(user, eventId);
+
+ // then
+ verify(eventRepository, times(1)).findById(eventId);
+ verify(eventLikeRepository, times(1)).findByUserIdAndEventId(userId, eventId);
+ verify(eventLikeRepository, times(1)).deleteById(likedEventLike.getId());
+ assertThat(event.getLikeCount()).isZero();
+
+ }
+
+ @Test
+ @DisplayName("좋아요 누른 이벤트 조회 성공")
+ void getLikes() {
+ // given
+ Long memberId = 1L;
+ given(eventLikeRepository.findSimpleLikeByUserId(memberId, pageable)).willReturn(
+ simpleEventLikes);
+ given(eventLikeConverter.convertToSimpleEventLikeReadResponse(simpleEventLikes)).willReturn(
+ simpleEventLikeReadResponse);
+
+ // when
+ likeService.getLikes(memberId, pageable);
+
+ // then
+ verify(eventLikeRepository, times(1)).findSimpleLikeByUserId(memberId, pageable);
+ verify(eventLikeConverter, times(1)).convertToSimpleEventLikeReadResponse(simpleEventLikes);
+ }
+
+
+} | Java | 프로젝트가 거대해지면서 테스트에 대해서 중복코드가 굉장히 많아 지죠 :)
TestFixture라는걸 한번 적용해보면 어떠신가요? |
@@ -0,0 +1,197 @@
+package kdt.prgrms.kazedon.everevent.service;
+
+import static org.assertj.core.api.Assertions.*;
+import static org.mockito.BDDMockito.given;
+import static org.mockito.BDDMockito.willDoNothing;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+
+import java.time.LocalDateTime;
+import java.util.List;
+import java.util.Optional;
+import kdt.prgrms.kazedon.everevent.domain.event.Event;
+import kdt.prgrms.kazedon.everevent.domain.event.repository.EventRepository;
+import kdt.prgrms.kazedon.everevent.domain.like.EventLike;
+import kdt.prgrms.kazedon.everevent.domain.like.dto.response.SimpleEventLike;
+import kdt.prgrms.kazedon.everevent.domain.like.dto.response.SimpleEventLikeReadResponse;
+import kdt.prgrms.kazedon.everevent.domain.like.repository.EventLikeRepository;
+import kdt.prgrms.kazedon.everevent.domain.market.Market;
+import kdt.prgrms.kazedon.everevent.domain.user.User;
+import kdt.prgrms.kazedon.everevent.service.converter.EventLikeConverter;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.springframework.data.domain.*;
+import org.springframework.test.util.ReflectionTestUtils;
+
+@ExtendWith(MockitoExtension.class)
+public class LikeServiceTest {
+
+ @Mock
+ private EventLikeRepository eventLikeRepository;
+
+ @Mock
+ private EventRepository eventRepository;
+
+ @Mock
+ private EventLikeConverter eventLikeConverter;
+
+ @InjectMocks
+ private LikeService likeService;
+
+ private User user;
+
+ private Market market;
+
+ private Event event;
+
+ private Pageable pageable;
+
+ private SimpleEventLikeReadResponse simpleEventLikeReadResponse;
+
+ private SimpleEventLike simpleEventLike;
+
+ private Page<SimpleEventLike> simpleEventLikes;
+
+ private EventLike eventLike;
+
+ private Event likedEvent;
+
+ private EventLike likedEventLike;
+
+ @BeforeEach
+ void setUp() {
+ user = User.builder()
+ .email("email@gmail.com")
+ .password("Pw123!")
+ .nickname("에디")
+ .location("경기도 남양주시 와부읍")
+ .build();
+
+ ReflectionTestUtils.setField(user, "id", 1L);
+
+ market = Market.builder()
+ .user(user)
+ .name("햄찌네 가게")
+ .description("햄스터 말고 커피팝니다!")
+ .address("경기도 남양주시 와부읍 석실로")
+ .build();
+
+ event = Event.builder()
+ .market(market)
+ .name("커피 10퍼센트 할인 이벤트")
+ .expiredAt(LocalDateTime.now())
+ .description("1주일 동안 진행합니다! 선착순 5명!")
+ .maxParticipants(5)
+ .build();
+
+ ReflectionTestUtils.setField(event, "id", 1L);
+
+ likedEvent = Event.builder()
+ .market(market)
+ .name("커피 10퍼센트 할인 이벤트")
+ .expiredAt(LocalDateTime.now())
+ .description("1주일 동안 진행합니다! 선착순 5명!")
+ .maxParticipants(5)
+ .build();
+
+ ReflectionTestUtils.setField(likedEvent, "id", 2L);
+
+ eventLike = EventLike.builder()
+ .event(event)
+ .user(user)
+ .build();
+
+ ReflectionTestUtils.setField(eventLike, "id", 1L);
+
+ likedEventLike = EventLike.builder()
+ .event(event)
+ .user(user)
+ .build();
+
+ ReflectionTestUtils.setField(likedEventLike, "id", 2L);
+
+ likedEvent.plusOneLike();
+
+ simpleEventLike = SimpleEventLike.builder()
+ .eventId(1L)
+ .name("커피 10퍼센트 할인 이벤트")
+ .expiredAt(LocalDateTime.now())
+ .marketName("햄찌네 가게")
+ .reviewCount(1)
+ .likeCount(1)
+ .build();
+
+ simpleEventLikes = new PageImpl<>(List.of(simpleEventLike));
+
+ pageable = PageRequest.of(0, 20, Sort.by("createdAt").descending());
+ }
+
+ @Test
+ @DisplayName("좋아요 등록 성공")
+ void addLike() {
+ // given
+ Long eventId = 1L;
+ Long userId = 1L;
+ given(eventRepository.findById(eventId)).willReturn(Optional.of(event));
+ given(eventLikeRepository.existsEventLikeByUserIdAndEventId(userId, eventId)).willReturn(false);
+ given(eventLikeConverter.convertToEventLike(user, event)).willReturn(eventLike);
+ given(eventLikeRepository.save(eventLike)).willReturn(eventLike);
+
+ // when
+ likeService.addLike(user, eventId);
+
+ // then
+ verify(eventRepository, times(1)).findById(eventId);
+ verify(eventLikeRepository, times(1)).existsEventLikeByUserIdAndEventId(userId, eventId);
+ verify(eventLikeConverter, times(1)).convertToEventLike(user, event);
+ verify(eventLikeRepository, times(1)).save(eventLike);
+ assertThat(event.getLikeCount()).isEqualTo(1L);
+ }
+
+ @Test
+ @DisplayName("좋아요 취소 성공")
+ void deleteLike() {
+ // given
+ Long eventId = 2L;
+ Long userId = 1L;
+ given(eventRepository.findById(eventId)).willReturn(Optional.of(likedEvent));
+ given(eventLikeRepository.findByUserIdAndEventId(userId, eventId)).willReturn(
+ Optional.of(likedEventLike));
+ willDoNothing().given(eventLikeRepository).deleteById(likedEventLike.getId());
+
+ // when
+ likeService.deleteLike(user, eventId);
+
+ // then
+ verify(eventRepository, times(1)).findById(eventId);
+ verify(eventLikeRepository, times(1)).findByUserIdAndEventId(userId, eventId);
+ verify(eventLikeRepository, times(1)).deleteById(likedEventLike.getId());
+ assertThat(event.getLikeCount()).isZero();
+
+ }
+
+ @Test
+ @DisplayName("좋아요 누른 이벤트 조회 성공")
+ void getLikes() {
+ // given
+ Long memberId = 1L;
+ given(eventLikeRepository.findSimpleLikeByUserId(memberId, pageable)).willReturn(
+ simpleEventLikes);
+ given(eventLikeConverter.convertToSimpleEventLikeReadResponse(simpleEventLikes)).willReturn(
+ simpleEventLikeReadResponse);
+
+ // when
+ likeService.getLikes(memberId, pageable);
+
+ // then
+ verify(eventLikeRepository, times(1)).findSimpleLikeByUserId(memberId, pageable);
+ verify(eventLikeConverter, times(1)).convertToSimpleEventLikeReadResponse(simpleEventLikes);
+ }
+
+
+} | Java | 오 한번 적용해보겠습니다!! Fixture 클래스에 static 변수로 객체 생성해놓고 사용하면 코드가 많이 깔끔해지겠네용 😸 |
@@ -0,0 +1,164 @@
+package kdt.prgrms.kazedon.everevent.domain.review;
+
+import static org.assertj.core.api.Assertions.*;
+
+import java.time.LocalDateTime;
+import kdt.prgrms.kazedon.everevent.domain.event.Event;
+import kdt.prgrms.kazedon.everevent.domain.event.repository.EventRepository;
+import kdt.prgrms.kazedon.everevent.domain.market.Market;
+import kdt.prgrms.kazedon.everevent.domain.market.repository.MarketRepository;
+import kdt.prgrms.kazedon.everevent.domain.review.dto.response.UserReview;
+import kdt.prgrms.kazedon.everevent.domain.review.repository.ReviewRepository;
+import kdt.prgrms.kazedon.everevent.domain.user.User;
+import kdt.prgrms.kazedon.everevent.domain.user.repository.UserRepository;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest;
+import org.springframework.boot.test.autoconfigure.orm.jpa.TestEntityManager;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.PageRequest;
+import org.springframework.data.domain.Pageable;
+import org.springframework.data.domain.Sort;
+
+@DataJpaTest
+class ReviewRepositoryTest {
+
+ @Autowired
+ ReviewRepository reviewRepository;
+
+ @Autowired
+ EventRepository eventRepository;
+
+ @Autowired
+ UserRepository userRepository;
+
+ @Autowired
+ MarketRepository marketRepository;
+
+ @Autowired
+ private TestEntityManager entityManager;
+
+ private Review review;
+
+ private User user;
+
+ private Event event;
+
+ private Market market;
+
+ private Pageable pageable;
+
+ @BeforeEach
+ void setUp() {
+ user = User.builder()
+ .email("email@gmail.com")
+ .password("Pw123!")
+ .nickname("에디")
+ .location("경기도 남양주시 와부읍")
+ .build();
+
+ market = Market.builder()
+ .user(user)
+ .name("햄찌네 가게")
+ .description("햄스터 말고 커피팝니다!")
+ .address("경기도 남양주시 와부읍 석실로")
+ .build();
+
+ event = Event.builder()
+ .market(market)
+ .name("커피 10퍼센트 할인 이벤트")
+ .expiredAt(LocalDateTime.now())
+ .description("1주일 동안 진행합니다! 선착순 5명!")
+ .maxParticipants(5)
+ .build();
+
+ review = Review.builder()
+ .user(user)
+ .event(event)
+ .description("정말 좋은 이벤트!")
+ .pictureUrl("pictureUrl")
+ .build();
+
+ pageable = PageRequest.of(0, 5, Sort.by("createdAt").descending());
+
+ userRepository.save(user);
+ marketRepository.save(market);
+ eventRepository.save(event);
+ }
+
+ @AfterEach
+ void tearDown() {
+ eventRepository.deleteAll();
+ marketRepository.deleteAll();
+ userRepository.deleteAll();
+ reviewRepository.deleteAll();
+ }
+
+ @Test
+ @DisplayName("리뷰 저장 성공")
+ void save() {
+ // when
+ Review savedReview = reviewRepository.save(review);
+
+ // then
+ assertThat(savedReview.getDescription()).isEqualTo(review.getDescription());
+ assertThat(savedReview.getPictureUrl()).isEqualTo(review.getPictureUrl());
+ }
+
+ @Test
+ @DisplayName("리뷰 목록 이벤트로 페이지 조회 성공")
+ void findByEvent() {
+ // given
+ entityManager.persist(review);
+ entityManager.clear();
+
+ // when
+ Page<Review> searchedReviews = reviewRepository.findByEvent(event, pageable);
+
+ // then
+ assertThat(searchedReviews.getTotalElements()).isEqualTo(1L);
+ assertThat(searchedReviews.get().findFirst()).isPresent();
+ searchedReviews.get()
+ .findFirst()
+ .ifPresent(
+ actualReviews -> assertThat(actualReviews.getEvent().getId()).isEqualTo(event.getId()));
+ }
+
+ @Test
+ @DisplayName("UserReview 목록 유저로 페이지 조회 성공")
+ void findByUser() {
+ // given
+ entityManager.persist(review);
+ entityManager.clear();
+
+ // when
+ Page<UserReview> searchedUserReviews = reviewRepository.findByUser(user.getId(), pageable);
+
+ // then
+ assertThat(searchedUserReviews.getTotalElements()).isEqualTo(1L);
+ assertThat(searchedUserReviews.get().findFirst()).isPresent();
+ searchedUserReviews.get()
+ .findFirst()
+ .ifPresent(
+ actualUserReviews -> assertThat(actualUserReviews.getDescription()).isEqualTo(
+ review.getDescription()));
+ }
+
+ @Test
+ @DisplayName("리뷰 갯수 유저로 조회")
+ void countByUser() {
+ // given
+ entityManager.persist(review);
+ entityManager.clear();
+
+ // when
+ long reviewCount = reviewRepository.countByUser(user);
+
+ // then
+ assertThat(reviewCount).isEqualTo(1L);
+ }
+
+} | Java | 넵! |
@@ -0,0 +1,185 @@
+package kdt.prgrms.kazedon.everevent.domain.like;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.time.LocalDateTime;
+import java.util.Optional;
+import kdt.prgrms.kazedon.everevent.domain.event.Event;
+import kdt.prgrms.kazedon.everevent.domain.event.repository.EventRepository;
+import kdt.prgrms.kazedon.everevent.domain.like.dto.response.SimpleEventLike;
+import kdt.prgrms.kazedon.everevent.domain.like.repository.EventLikeRepository;
+import kdt.prgrms.kazedon.everevent.domain.market.Market;
+import kdt.prgrms.kazedon.everevent.domain.market.repository.MarketRepository;
+import kdt.prgrms.kazedon.everevent.domain.user.User;
+import kdt.prgrms.kazedon.everevent.domain.user.repository.UserRepository;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest;
+import org.springframework.boot.test.autoconfigure.orm.jpa.TestEntityManager;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.PageRequest;
+import org.springframework.data.domain.Pageable;
+import org.springframework.data.domain.Sort;
+
+@DataJpaTest
+public class EventLikeRepositoryTest {
+
+ @Autowired
+ EventLikeRepository eventLikeRepository;
+
+ @Autowired
+ EventRepository eventRepository;
+
+ @Autowired
+ UserRepository userRepository;
+
+ @Autowired
+ MarketRepository marketRepository;
+
+ @Autowired
+ private TestEntityManager entityManager;
+
+ private EventLike eventLike;
+
+ private User user;
+
+ private Event event;
+
+ private Market market;
+
+ private Pageable pageable;
+
+ @BeforeEach
+ void setUp() {
+ user = User.builder()
+ .email("email@gmail.com")
+ .password("Pw123!")
+ .nickname("에디")
+ .location("경기도 남양주시 와부읍")
+ .build();
+
+ market = Market.builder()
+ .user(user)
+ .name("햄찌네 가게")
+ .description("햄스터 말고 커피팝니다!")
+ .address("경기도 남양주시 와부읍 석실로")
+ .build();
+
+ event = Event.builder()
+ .market(market)
+ .name("커피 10퍼센트 할인 이벤트")
+ .expiredAt(LocalDateTime.now())
+ .description("1주일 동안 진행합니다! 선착순 5명!")
+ .maxParticipants(5)
+ .build();
+
+ eventLike = EventLike.builder()
+ .user(user)
+ .event(event)
+ .build();
+
+ pageable = PageRequest.of(0, 5, Sort.by("createdAt").descending());
+
+ userRepository.save(user);
+ marketRepository.save(market);
+ eventRepository.save(event);
+ }
+
+ @AfterEach
+ void tearDown() {
+ eventRepository.deleteAll();
+ marketRepository.deleteAll();
+ userRepository.deleteAll();
+ eventLikeRepository.deleteAll();
+ }
+
+ @Test
+ @DisplayName("좋아요 성공")
+ void save() {
+ // when
+ EventLike savedEventLike = eventLikeRepository.save(eventLike);
+
+ // then
+ assertThat(savedEventLike.getEvent()).isEqualTo(eventLike.getEvent());
+ assertThat(savedEventLike.getUser()).isEqualTo(eventLike.getUser());
+ }
+
+ @Test
+ @DisplayName("좋아요 취소 성공")
+ void deleteById() {
+ // given
+ entityManager.persist(eventLike);
+ entityManager.clear();
+
+ // when
+ eventLikeRepository.deleteById(eventLike.getId());
+
+ // then
+ assertThat(eventLikeRepository.findAll()).isEmpty();
+ }
+
+ @Test
+ @DisplayName("유저 pk와 이벤트 pk로 좋아요 여부 조회")
+ void existsEventLikeByUserIdAndEventId() {
+ // given
+ entityManager.persist(eventLike);
+ entityManager.clear();
+
+ // when
+ boolean actualBoolValue = eventLikeRepository.existsEventLikeByUserIdAndEventId(user.getId(),
+ event.getId());
+
+ // then
+ assertThat(actualBoolValue).isTrue();
+ }
+
+ @Test
+ @DisplayName("유저 pk와 이벤트 pk로 단일 좋아요 조회")
+ void findByUserIdAndEventId() {
+ // given
+ entityManager.persist(eventLike);
+ entityManager.clear();
+
+ // when
+ Optional<EventLike> searchedEventLike = eventLikeRepository.findByUserIdAndEventId(user.getId(),
+ event.getId());
+
+ // then
+ assertThat(searchedEventLike).isPresent();
+ searchedEventLike.ifPresent(
+ actualEventLike -> assertThat(actualEventLike.getEvent().getId()).isEqualTo(
+ eventLike.getEvent().getId()));
+ searchedEventLike.ifPresent(
+ actualEventLike -> assertThat(actualEventLike.getUser().getId()).isEqualTo(
+ eventLike.getUser().getId()));
+ }
+
+ @Test
+ @DisplayName("유저 pk로 SimpleLike 목록 페이지 조회")
+ void findSimpleLikeByUserId() {
+ // given
+ entityManager.persist(eventLike);
+ entityManager.clear();
+
+ // when
+ Page<SimpleEventLike> searchedSimpleEventLikes = eventLikeRepository.findSimpleLikeByUserId(
+ user.getId(), pageable);
+
+ // then
+ assertThat(searchedSimpleEventLikes.getTotalElements()).isEqualTo(1L);
+ searchedSimpleEventLikes.get()
+ .findFirst()
+ .ifPresent(
+ actualSimpleEventLike -> assertThat(actualSimpleEventLike.getEventId()).isEqualTo(
+ event.getId()));
+ searchedSimpleEventLikes.get()
+ .findFirst()
+ .ifPresent(
+ actualSimpleEventLike -> assertThat(actualSimpleEventLike.getMarketName()).isEqualTo(
+ market.getName()));
+ }
+
+} | Java | 그러네여..ㅠ 삭제해도 괜찮을 것 같숨다 |
@@ -0,0 +1,68 @@
+package com.example.review.controller;
+
+import com.example.review.dto.request.ReviewCreateRequestDto;
+import com.example.review.dto.request.ReviewUpdateRequestDto;
+import com.example.review.dto.response.ReviewResponseSimpleDto;
+import com.example.review.dto.response.ReviewResponseDetailDto;
+import com.example.review.service.ReviewService;
+import com.example.utils.AuthUtil;
+import com.example.utils.PageQuery;
+import lombok.RequiredArgsConstructor;
+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.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+@RestController
+@RequestMapping("/reviews")
+@RequiredArgsConstructor
+public class ReviewController {
+
+ private final ReviewService reviewService;
+
+ // 리뷰 생성
+ @PostMapping
+ public ResponseEntity<ReviewResponseDetailDto> create(
+ @RequestBody ReviewCreateRequestDto requestDto
+ ) {
+ ReviewResponseDetailDto responseDto = reviewService.create(requestDto);
+ return ResponseEntity.status(HttpStatus.CREATED).body(responseDto);
+ }
+
+ // 리뷰 수정
+ @PatchMapping("/{id}")
+ public ResponseEntity<ReviewResponseDetailDto> update(
+ @PathVariable int id,
+ @RequestBody ReviewUpdateRequestDto requestDto
+ ) {
+ ReviewResponseDetailDto responseDto = reviewService.update(id, requestDto);
+ return ResponseEntity.ok(responseDto);
+ }
+
+ // 특정 상점의 리뷰 페이지 조회
+ @GetMapping("/shops/{shopId}")
+ public ResponseEntity<Page<ReviewResponseSimpleDto>> findAllReviewByShopId(
+ @PathVariable int shopId, @RequestParam int page) {
+ Pageable pageable = PageRequest.of(page, 10, Sort.by(Sort.Direction.DESC, "updatedAt"));
+ Page<ReviewResponseSimpleDto> reviews = reviewService.getReviewsByShopId(shopId, pageable);
+ return ResponseEntity.ok(reviews);
+ }
+
+ // 특정 유저의 모든 리뷰 조회
+ @GetMapping
+ public ResponseEntity<com.example.utils.Page<ReviewResponseSimpleDto>> findAllReviewByUserId(PageQuery pageQuery){
+ return ResponseEntity.ok(reviewService.findAllByUserId(pageQuery));
+ }
+
+ // 리뷰 삭제
+ @DeleteMapping("/{reviewId}")
+ public ResponseEntity<Void> delete(@PathVariable int reviewId) {
+ reviewService.delete(reviewId);
+ return ResponseEntity.noContent().build();
+ }
+} | Java | 각 URL 이 RESTful 하지 않습니다.
통일된 URL 을 사용하거나, Controller 분리가 필요해보입니다. |
@@ -1,16 +1,18 @@
package com.example.review.entity;
+
+import com.example.common.entity.BaseEntity;
import com.example.order.entity.Order;
+import com.example.review.dto.request.ReviewUpdateRequestDto;
import jakarta.persistence.*;
+import lombok.AllArgsConstructor;
import lombok.Getter;
-import org.springframework.data.annotation.CreatedDate;
-import org.springframework.data.annotation.LastModifiedDate;
-
-import java.time.LocalDateTime;
+import lombok.NoArgsConstructor;
@Getter
-@Table(name = "reviews")
@Entity
-public class Review {
+@NoArgsConstructor
+@AllArgsConstructor
+public class Review extends BaseEntity {
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
private int id;
@@ -20,15 +22,32 @@ public class Review {
private Order order;
@Column(nullable = false)
- private Integer rating;
+ private int rating;
+
+ @Column(nullable = false, length = 50)
+ private String description;
- @Column(length = 50)
- private String content;
+ public Review(Order order, Integer rating, String description) {
+ this.order = order;
+ this.rating = rating;
+ this.description = description;
+ }
- @Column(updatable = false)
- @CreatedDate
- private LocalDateTime createdAt;
+ public Review partialUpdate(ReviewUpdateRequestDto dto){
+ this.rating = dto.rating();
+ this.description = dto.description();
+ return this;
+ }
- @LastModifiedDate
- private LocalDateTime updatedAt;
+ public static Review from(
+ Order order,
+ int rating,
+ String description
+ ) {
+ return new Review(
+ order,
+ rating,
+ description
+ );
+ }
} | Java | 해당 Entity 의 각 Setter 사용 지양부탁드립니다. |
@@ -1,16 +1,18 @@
package com.example.review.entity;
+
+import com.example.common.entity.BaseEntity;
import com.example.order.entity.Order;
+import com.example.review.dto.request.ReviewUpdateRequestDto;
import jakarta.persistence.*;
+import lombok.AllArgsConstructor;
import lombok.Getter;
-import org.springframework.data.annotation.CreatedDate;
-import org.springframework.data.annotation.LastModifiedDate;
-
-import java.time.LocalDateTime;
+import lombok.NoArgsConstructor;
@Getter
-@Table(name = "reviews")
@Entity
-public class Review {
+@NoArgsConstructor
+@AllArgsConstructor
+public class Review extends BaseEntity {
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
private int id;
@@ -20,15 +22,32 @@ public class Review {
private Order order;
@Column(nullable = false)
- private Integer rating;
+ private int rating;
+
+ @Column(nullable = false, length = 50)
+ private String description;
- @Column(length = 50)
- private String content;
+ public Review(Order order, Integer rating, String description) {
+ this.order = order;
+ this.rating = rating;
+ this.description = description;
+ }
- @Column(updatable = false)
- @CreatedDate
- private LocalDateTime createdAt;
+ public Review partialUpdate(ReviewUpdateRequestDto dto){
+ this.rating = dto.rating();
+ this.description = dto.description();
+ return this;
+ }
- @LastModifiedDate
- private LocalDateTime updatedAt;
+ public static Review from(
+ Order order,
+ int rating,
+ String description
+ ) {
+ return new Review(
+ order,
+ rating,
+ description
+ );
+ }
} | Java | DTO 내용 변경 시, Entity 일관성도 해칠 가능성이 있습니다.
각 내용 추출하여 인자로 받아주시기 바랍니다. |
@@ -0,0 +1,68 @@
+package com.example.review.controller;
+
+import com.example.review.dto.request.ReviewCreateRequestDto;
+import com.example.review.dto.request.ReviewUpdateRequestDto;
+import com.example.review.dto.response.ReviewResponseSimpleDto;
+import com.example.review.dto.response.ReviewResponseDetailDto;
+import com.example.review.service.ReviewService;
+import com.example.utils.AuthUtil;
+import com.example.utils.PageQuery;
+import lombok.RequiredArgsConstructor;
+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.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+@RestController
+@RequestMapping("/reviews")
+@RequiredArgsConstructor
+public class ReviewController {
+
+ private final ReviewService reviewService;
+
+ // 리뷰 생성
+ @PostMapping
+ public ResponseEntity<ReviewResponseDetailDto> create(
+ @RequestBody ReviewCreateRequestDto requestDto
+ ) {
+ ReviewResponseDetailDto responseDto = reviewService.create(requestDto);
+ return ResponseEntity.status(HttpStatus.CREATED).body(responseDto);
+ }
+
+ // 리뷰 수정
+ @PatchMapping("/{id}")
+ public ResponseEntity<ReviewResponseDetailDto> update(
+ @PathVariable int id,
+ @RequestBody ReviewUpdateRequestDto requestDto
+ ) {
+ ReviewResponseDetailDto responseDto = reviewService.update(id, requestDto);
+ return ResponseEntity.ok(responseDto);
+ }
+
+ // 특정 상점의 리뷰 페이지 조회
+ @GetMapping("/shops/{shopId}")
+ public ResponseEntity<Page<ReviewResponseSimpleDto>> findAllReviewByShopId(
+ @PathVariable int shopId, @RequestParam int page) {
+ Pageable pageable = PageRequest.of(page, 10, Sort.by(Sort.Direction.DESC, "updatedAt"));
+ Page<ReviewResponseSimpleDto> reviews = reviewService.getReviewsByShopId(shopId, pageable);
+ return ResponseEntity.ok(reviews);
+ }
+
+ // 특정 유저의 모든 리뷰 조회
+ @GetMapping
+ public ResponseEntity<com.example.utils.Page<ReviewResponseSimpleDto>> findAllReviewByUserId(PageQuery pageQuery){
+ return ResponseEntity.ok(reviewService.findAllByUserId(pageQuery));
+ }
+
+ // 리뷰 삭제
+ @DeleteMapping("/{reviewId}")
+ public ResponseEntity<Void> delete(@PathVariable int reviewId) {
+ reviewService.delete(reviewId);
+ return ResponseEntity.noContent().build();
+ }
+} | Java | Page 반환 부탁드립니다. |
@@ -0,0 +1,68 @@
+package com.example.review.controller;
+
+import com.example.review.dto.request.ReviewCreateRequestDto;
+import com.example.review.dto.request.ReviewUpdateRequestDto;
+import com.example.review.dto.response.ReviewResponseSimpleDto;
+import com.example.review.dto.response.ReviewResponseDetailDto;
+import com.example.review.service.ReviewService;
+import com.example.utils.AuthUtil;
+import com.example.utils.PageQuery;
+import lombok.RequiredArgsConstructor;
+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.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+@RestController
+@RequestMapping("/reviews")
+@RequiredArgsConstructor
+public class ReviewController {
+
+ private final ReviewService reviewService;
+
+ // 리뷰 생성
+ @PostMapping
+ public ResponseEntity<ReviewResponseDetailDto> create(
+ @RequestBody ReviewCreateRequestDto requestDto
+ ) {
+ ReviewResponseDetailDto responseDto = reviewService.create(requestDto);
+ return ResponseEntity.status(HttpStatus.CREATED).body(responseDto);
+ }
+
+ // 리뷰 수정
+ @PatchMapping("/{id}")
+ public ResponseEntity<ReviewResponseDetailDto> update(
+ @PathVariable int id,
+ @RequestBody ReviewUpdateRequestDto requestDto
+ ) {
+ ReviewResponseDetailDto responseDto = reviewService.update(id, requestDto);
+ return ResponseEntity.ok(responseDto);
+ }
+
+ // 특정 상점의 리뷰 페이지 조회
+ @GetMapping("/shops/{shopId}")
+ public ResponseEntity<Page<ReviewResponseSimpleDto>> findAllReviewByShopId(
+ @PathVariable int shopId, @RequestParam int page) {
+ Pageable pageable = PageRequest.of(page, 10, Sort.by(Sort.Direction.DESC, "updatedAt"));
+ Page<ReviewResponseSimpleDto> reviews = reviewService.getReviewsByShopId(shopId, pageable);
+ return ResponseEntity.ok(reviews);
+ }
+
+ // 특정 유저의 모든 리뷰 조회
+ @GetMapping
+ public ResponseEntity<com.example.utils.Page<ReviewResponseSimpleDto>> findAllReviewByUserId(PageQuery pageQuery){
+ return ResponseEntity.ok(reviewService.findAllByUserId(pageQuery));
+ }
+
+ // 리뷰 삭제
+ @DeleteMapping("/{reviewId}")
+ public ResponseEntity<Void> delete(@PathVariable int reviewId) {
+ reviewService.delete(reviewId);
+ return ResponseEntity.noContent().build();
+ }
+} | Java | 수정 했습니다! |
@@ -1,16 +1,18 @@
package com.example.review.entity;
+
+import com.example.common.entity.BaseEntity;
import com.example.order.entity.Order;
+import com.example.review.dto.request.ReviewUpdateRequestDto;
import jakarta.persistence.*;
+import lombok.AllArgsConstructor;
import lombok.Getter;
-import org.springframework.data.annotation.CreatedDate;
-import org.springframework.data.annotation.LastModifiedDate;
-
-import java.time.LocalDateTime;
+import lombok.NoArgsConstructor;
@Getter
-@Table(name = "reviews")
@Entity
-public class Review {
+@NoArgsConstructor
+@AllArgsConstructor
+public class Review extends BaseEntity {
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
private int id;
@@ -20,15 +22,32 @@ public class Review {
private Order order;
@Column(nullable = false)
- private Integer rating;
+ private int rating;
+
+ @Column(nullable = false, length = 50)
+ private String description;
- @Column(length = 50)
- private String content;
+ public Review(Order order, Integer rating, String description) {
+ this.order = order;
+ this.rating = rating;
+ this.description = description;
+ }
- @Column(updatable = false)
- @CreatedDate
- private LocalDateTime createdAt;
+ public Review partialUpdate(ReviewUpdateRequestDto dto){
+ this.rating = dto.rating();
+ this.description = dto.description();
+ return this;
+ }
- @LastModifiedDate
- private LocalDateTime updatedAt;
+ public static Review from(
+ Order order,
+ int rating,
+ String description
+ ) {
+ return new Review(
+ order,
+ rating,
+ description
+ );
+ }
} | Java | 수정 했습니다! |
@@ -1,16 +1,18 @@
package com.example.review.entity;
+
+import com.example.common.entity.BaseEntity;
import com.example.order.entity.Order;
+import com.example.review.dto.request.ReviewUpdateRequestDto;
import jakarta.persistence.*;
+import lombok.AllArgsConstructor;
import lombok.Getter;
-import org.springframework.data.annotation.CreatedDate;
-import org.springframework.data.annotation.LastModifiedDate;
-
-import java.time.LocalDateTime;
+import lombok.NoArgsConstructor;
@Getter
-@Table(name = "reviews")
@Entity
-public class Review {
+@NoArgsConstructor
+@AllArgsConstructor
+public class Review extends BaseEntity {
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
private int id;
@@ -20,15 +22,32 @@ public class Review {
private Order order;
@Column(nullable = false)
- private Integer rating;
+ private int rating;
+
+ @Column(nullable = false, length = 50)
+ private String description;
- @Column(length = 50)
- private String content;
+ public Review(Order order, Integer rating, String description) {
+ this.order = order;
+ this.rating = rating;
+ this.description = description;
+ }
- @Column(updatable = false)
- @CreatedDate
- private LocalDateTime createdAt;
+ public Review partialUpdate(ReviewUpdateRequestDto dto){
+ this.rating = dto.rating();
+ this.description = dto.description();
+ return this;
+ }
- @LastModifiedDate
- private LocalDateTime updatedAt;
+ public static Review from(
+ Order order,
+ int rating,
+ String description
+ ) {
+ return new Review(
+ order,
+ rating,
+ description
+ );
+ }
} | Java | 수정 했습니다! |
@@ -0,0 +1,68 @@
+package com.example.review.controller;
+
+import com.example.review.dto.request.ReviewCreateRequestDto;
+import com.example.review.dto.request.ReviewUpdateRequestDto;
+import com.example.review.dto.response.ReviewResponseSimpleDto;
+import com.example.review.dto.response.ReviewResponseDetailDto;
+import com.example.review.service.ReviewService;
+import com.example.utils.AuthUtil;
+import com.example.utils.PageQuery;
+import lombok.RequiredArgsConstructor;
+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.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+@RestController
+@RequestMapping("/reviews")
+@RequiredArgsConstructor
+public class ReviewController {
+
+ private final ReviewService reviewService;
+
+ // 리뷰 생성
+ @PostMapping
+ public ResponseEntity<ReviewResponseDetailDto> create(
+ @RequestBody ReviewCreateRequestDto requestDto
+ ) {
+ ReviewResponseDetailDto responseDto = reviewService.create(requestDto);
+ return ResponseEntity.status(HttpStatus.CREATED).body(responseDto);
+ }
+
+ // 리뷰 수정
+ @PatchMapping("/{id}")
+ public ResponseEntity<ReviewResponseDetailDto> update(
+ @PathVariable int id,
+ @RequestBody ReviewUpdateRequestDto requestDto
+ ) {
+ ReviewResponseDetailDto responseDto = reviewService.update(id, requestDto);
+ return ResponseEntity.ok(responseDto);
+ }
+
+ // 특정 상점의 리뷰 페이지 조회
+ @GetMapping("/shops/{shopId}")
+ public ResponseEntity<Page<ReviewResponseSimpleDto>> findAllReviewByShopId(
+ @PathVariable int shopId, @RequestParam int page) {
+ Pageable pageable = PageRequest.of(page, 10, Sort.by(Sort.Direction.DESC, "updatedAt"));
+ Page<ReviewResponseSimpleDto> reviews = reviewService.getReviewsByShopId(shopId, pageable);
+ return ResponseEntity.ok(reviews);
+ }
+
+ // 특정 유저의 모든 리뷰 조회
+ @GetMapping
+ public ResponseEntity<com.example.utils.Page<ReviewResponseSimpleDto>> findAllReviewByUserId(PageQuery pageQuery){
+ return ResponseEntity.ok(reviewService.findAllByUserId(pageQuery));
+ }
+
+ // 리뷰 삭제
+ @DeleteMapping("/{reviewId}")
+ public ResponseEntity<Void> delete(@PathVariable int reviewId) {
+ reviewService.delete(reviewId);
+ return ResponseEntity.noContent().build();
+ }
+} | Java | 수정 했습니다! |
@@ -1,6 +1,6 @@
import Rating from '@/components/@shared/rating/Rating';
import ProgressBar from '@/components/@shared/ProgressBar';
-import { useQuery } from '@tanstack/react-query';
+import { keepPreviousData, useQuery } from '@tanstack/react-query';
import { getReviewsRating } from '@/axios/allReview/apis';
interface RatingSectionProps {
@@ -11,6 +11,7 @@ export default function RatingSection({ selectedGenre }: RatingSectionProps) {
const { data: ratingsData, isLoading } = useQuery({
queryKey: ['ratings', selectedGenre],
queryFn: () => getReviewsRating(selectedGenre),
+ placeholderData: keepPreviousData,
});
if (isLoading) | Unknown | `placeholderData`는 여기서 어떤 역할을 하나요? |
@@ -1,6 +1,6 @@
import Rating from '@/components/@shared/rating/Rating';
import ProgressBar from '@/components/@shared/ProgressBar';
-import { useQuery } from '@tanstack/react-query';
+import { keepPreviousData, useQuery } from '@tanstack/react-query';
import { getReviewsRating } from '@/axios/allReview/apis';
interface RatingSectionProps {
@@ -11,6 +11,7 @@ export default function RatingSection({ selectedGenre }: RatingSectionProps) {
const { data: ratingsData, isLoading } = useQuery({
queryKey: ['ratings', selectedGenre],
queryFn: () => getReviewsRating(selectedGenre),
+ placeholderData: keepPreviousData,
});
if (isLoading) | Unknown | 장르를 바꿀 때 queryKey selecedGenre 가 같이 바뀌면서 데이터 패칭이 일어나는데, 그 데이터 패칭이 완료되기 전까지 기존데이터를 유지하는 역할을 합니다.
따라서, isLoading이 따로 실행되지 않아서 화면이 깜빡이는듯한 연출을 없앨 수 있습니다. |
@@ -1,6 +1,6 @@
import Rating from '@/components/@shared/rating/Rating';
import ProgressBar from '@/components/@shared/ProgressBar';
-import { useQuery } from '@tanstack/react-query';
+import { keepPreviousData, useQuery } from '@tanstack/react-query';
import { getReviewsRating } from '@/axios/allReview/apis';
interface RatingSectionProps {
@@ -11,6 +11,7 @@ export default function RatingSection({ selectedGenre }: RatingSectionProps) {
const { data: ratingsData, isLoading } = useQuery({
queryKey: ['ratings', selectedGenre],
queryFn: () => getReviewsRating(selectedGenre),
+ placeholderData: keepPreviousData,
});
if (isLoading) | Unknown | "데이터 페칭이 일어나는데" -> 왜 분명 데이터 페칭이 일어나는건데 isLoading이 실행되지 않을까요?
또 리액트쿼리는 캐시데이터가 있는데 왜 캐시데이터를 사용하지 않으실까요?
캐시데이터와 placeholderData는 어떻게 다를까요? |
@@ -16,9 +16,14 @@ export class MoveRepository implements IMoveRepository {
async findMany(options: MoveInfoGetQueries, driverId: string, driverAvailableAreas: Area[]) {
const { page = 1, pageSize = 10, orderBy, keyword, serviceType, serviceArea, designatedRequest } = options;
- const serviceTypes = options.serviceType ? options.serviceType.split(',') : undefined;
+ const serviceTypes = serviceType
+ ? serviceType
+ .split(/[,+\s]/)
+ .map(type => type.trim())
+ .filter(type => type)
+ : undefined;
- const whereCondition = {
+ const baseWhereCondition = {
AND: [
...(keyword
? [
@@ -31,7 +36,7 @@ export class MoveRepository implements IMoveRepository {
},
]
: []),
- ...(serviceType
+ ...(serviceTypes?.length
? [
{
serviceType: { in: serviceTypes },
@@ -70,26 +75,92 @@ export class MoveRepository implements IMoveRepository {
let orderByCondition;
if (orderBy === MoveInfoSortOrder.UpcomingMoveDate) {
- orderByCondition = { date: 'desc' };
+ orderByCondition = { date: 'asc' };
} else if (orderBy === MoveInfoSortOrder.RecentRequest) {
- orderByCondition = { createdAt: 'asc' };
+ orderByCondition = { createdAt: 'desc' };
} else {
- orderByCondition = { createdAt: 'asc' };
+ orderByCondition = { createdAt: 'desc' };
}
const list = await this.moveInfo.findMany({
- where: whereCondition,
+ where: baseWhereCondition,
skip: (page - 1) * pageSize,
take: pageSize,
orderBy: orderByCondition,
include: {
owner: { select: { name: true } },
+ requests: { select: { driverId: true } },
},
});
- const totalCount = await this.moveInfo.count({ where: whereCondition });
+ const totalCount = await this.moveInfo.count({ where: baseWhereCondition });
- return { totalCount, list };
+ const serviceTypeCounts = await Promise.all(
+ ['SMALL', 'HOME', 'OFFICE'].map(async type => ({
+ type,
+ count: await this.moveInfo.count({
+ where: {
+ ...baseWhereCondition,
+ AND: [
+ ...baseWhereCondition.AND,
+ {
+ serviceType: type,
+ },
+ ],
+ },
+ }),
+ })),
+ );
+
+ const serviceAreaCount = await this.moveInfo.count({
+ where: {
+ ...baseWhereCondition,
+ AND: [
+ ...baseWhereCondition.AND,
+ {
+ OR: [
+ ...driverAvailableAreas.map(area => ({
+ fromAddress: { contains: areaToKeyword(area) },
+ })),
+ ...driverAvailableAreas.map(area => ({
+ toAddress: { contains: areaToKeyword(area) },
+ })),
+ ],
+ },
+ ],
+ },
+ });
+
+ const designatedRequestCount = await this.moveInfo.count({
+ where: {
+ ...baseWhereCondition,
+ AND: [
+ ...baseWhereCondition.AND,
+ {
+ requests: {
+ some: {
+ driverId,
+ },
+ },
+ },
+ ],
+ },
+ });
+
+ const addedList = list.map(moveInfo => ({
+ ...moveInfo,
+ isSpecificRequest: moveInfo.requests.some(req => req.driverId === driverId),
+ }));
+
+ return {
+ totalCount,
+ counts: {
+ serviceTypeCounts,
+ serviceAreaCount,
+ designatedRequestCount,
+ },
+ list: addedList,
+ };
}
async findByUserId(userId: string) { | TypeScript | count와 findMany는 분리하는게 좋을 것 같습니다! |
@@ -3,7 +3,7 @@ import { IReviewController } from '#reviews/interfaces/review.controller.interfa
import { Body, Controller, Delete, Get, HttpStatus, Param, Patch, Post, Query, UseGuards } from '@nestjs/common';
import { ApiBearerAuth, ApiBody, ApiOperation, ApiParam, ApiResponse } from '@nestjs/swagger';
import { ReviewService } from './review.service.js';
-import { DriverReviewResponseDTO, MyReviewResponseDTO, ReviewInputDTO, ReviewOutputDTO } from './review.types.js';
+import { DriverReviewResponseDTO, MyReviewResponseDTO, ReviewBodyDTO, ReviewInputDTO, ReviewOutputDTO } from './review.types.js';
import { GetQueries } from '#types/queries.type.js';
import { SortOrder } from '#types/options.type.js';
@@ -39,23 +39,23 @@ export class ReviewController implements IReviewController {
const { page = 1, pageSize = 10, orderBy = SortOrder.Recent, keyword = '' } = query;
const options = { page, pageSize, orderBy, keyword };
- const { totalCount, list } = await this.reviewService.getDriverReviews(driverId, options);
+ const { totalCount, stats, list } = await this.reviewService.getDriverReviews(driverId, options);
- return { totalCount, list };
+ return { totalCount, stats, list };
}
- @Post(':driverId')
+ @Post(':estimationId')
@UseGuards(AccessTokenGuard)
@ApiBearerAuth('accessToken')
@ApiOperation({ summary: '리뷰 생성' })
- @ApiParam({ name: 'driverId', description: '기사 ID', type: 'string' })
- @ApiBody({ type: ReviewInputDTO })
+ @ApiParam({ name: 'estimationId', description: '견적 ID', type: 'string' })
+ @ApiBody({ type: ReviewBodyDTO })
@ApiResponse({
status: HttpStatus.CREATED,
type: ReviewOutputDTO,
})
- async postReview(@Param('driverId') driverId: string, @Body() body: ReviewInputDTO) {
- const review = await this.reviewService.postReview(driverId, body);
+ async postReview(@Param('estimationId') estimationId: string, @Body() body: ReviewInputDTO) {
+ const review = await this.reviewService.postReview(estimationId, body);
return review;
}
@@ -65,7 +65,7 @@ export class ReviewController implements IReviewController {
@ApiBearerAuth('accessToken')
@ApiOperation({ summary: '리뷰 수정' })
@ApiParam({ name: 'reviewId', description: '리뷰 ID', type: 'string' })
- @ApiBody({ type: ReviewInputDTO })
+ @ApiBody({ type: ReviewBodyDTO })
@ApiResponse({
status: HttpStatus.OK,
type: ReviewOutputDTO, | TypeScript | 여기도 각각의 메소드를 분리하는게 좋을 것 같습니다 |
@@ -1,2 +1,219 @@
-.MainKang {
+@mixin center {
+ display: flex;
+ justify-content: center;
+}
+
+@mixin middle {
+ display: flex;
+ flex-direction: column;
+}
+
+@mixin boxes {
+ width: 100%;
+ margin: 5px auto;
+ border: 1px solid rgb(220, 219, 219);
+ background-color: white;
+}
+
+.entire-area {
+ @include center;
+ background-color: rgb(250, 250, 250);
+
+ main {
+ @include center;
+
+ .feeds {
+ @include middle;
+ padding: 5px 20px 5px 20px;
+
+ .stories {
+ @include boxes;
+ display: flex;
+ justify-content: space-between;
+ padding: 5px 23px 5px 23px;
+
+ div {
+ @include middle;
+
+ img {
+ width: 50px;
+ margin: 5px 5px;
+ border-radius: 100%;
+ }
+
+ span {
+ font-size: 13px;
+ }
+ }
+ }
+
+ article {
+ @include boxes;
+ max-width: 600px;
+ padding: 10px 15px;
+
+ .uploader-header {
+ display: flex;
+ align-items: center;
+ margin-bottom: 10px;
+ font-size: 18px;
+
+ .uploader-profile {
+ width: 50px;
+ margin-right: 10px;
+ border-radius: 100%;
+ }
+ }
+
+ .upload-img {
+ width: 100%;
+ }
+
+ .activity {
+ display: flex;
+ justify-content: space-between;
+ padding: 10px 0px;
+
+ .far {
+ width: 25px;
+ margin-right: 8px;
+ font-size: 25px;
+ }
+ }
+
+ .liked-num {
+ margin: 15px 0 12px 0;
+ font-weight: 700;
+ font-size: 15px;
+ }
+
+ .uploader-comment {
+ display: flex;
+ justify-content: flex-start;
+ align-items: center;
+ margin-bottom: 10px;
+
+ .my-id {
+ margin-right: 10px;
+ font-weight: 700;
+ font-size: 15px;
+ }
+ .my-write {
+ font-size: 15px;
+ font-weight: 300;
+ }
+ }
+
+ ul {
+ @include middle;
+ justify-content: flex-start;
+ height: 120px;
+
+ li {
+ display: block;
+
+ .comments-id {
+ font-weight: 700;
+ }
+
+ span {
+ margin: 8px 10px 8px 0;
+ font-size: 15px;
+ }
+ }
+ }
+ }
+
+ .upload-time {
+ margin: 5px 0;
+ padding-left: 15px;
+ color: rgb(142, 142, 142);
+ font-size: 12px;
+ }
+
+ .add-comments {
+ display: flex;
+ align-items: center;
+ z-index: 0;
+ width: 100%;
+ padding: 25px 20px;
+ border-top: 1px solid rgb(220, 219, 219);
+
+ span {
+ margin-right: 15px;
+ font-size: 30px;
+ }
+
+ .comment-input {
+ width: 100%;
+ height: 30px;
+ border: none;
+ }
+
+ button {
+ border: none;
+ cursor: pointer;
+ background-color: transparent;
+ color: rgb(81, 155, 240);
+ font-size: 15px;
+ }
+ }
+ }
+ }
+
+ .aside {
+ max-width: 200px;
+ padding: 5px 10px 5px 10px;
+
+ .user-id {
+ display: flex;
+ justify-content: left;
+ align-items: center;
+ padding: 10px 20px 10px 10px;
+
+ img {
+ width: 50px;
+ margin-right: 10px;
+ border-radius: 100%;
+ }
+
+ span {
+ margin: 40px 0;
+ font-weight: 300;
+ font-size: 17px;
+ }
+ }
+
+ .recommend-header {
+ margin: 20px auto;
+ color: rgb(143, 142, 142);
+ font-weight: 700;
+ font-size: 15px;
+
+ .other-user {
+ display: flex;
+ align-items: center;
+ margin: 15px auto;
+
+ img {
+ width: 50px;
+ border-radius: 100%;
+ }
+
+ span {
+ margin: auto 10px;
+ font-weight: 700;
+ font-size: ㅁㅁㅁㅁㅁㅁㅁㅁ15px;
+ color: black;
+ }
+
+ button {
+ border: none;
+ background-color: transparent;
+ color: rgb(81, 155, 240);
+ font-weight: 700;
+ }
+ }
+ }
+ }
} | Unknown | 다른 부분에서는 잘 해주셨는데, 선택자 간에는 한 줄 띄워주세요!
그리고 `id` 선택자보다는, `className` 을 활용해주시기 바랍니다. 이유는 다음과 같습니다.
- HTML에서 `id` 는 문서 내에서 유일해야 합니다. 이러한 이유로 단일 요소를 다루는 경우 `id`를 사용할 수 있습니다.
- 하지만 정말로 해당 요소에 대한 이벤트나 스타일 핸들링이 프로젝트 전체에서 단 한번만 사용 되는지 충분히 고민해야합니다. 일반적으로 컴포넌트는 재사용 될 수 있기 때문에 같은 요소가 여러번 생성될 수 있습니다. 이러한 이유로 보통의 경우에는 `className` 을 사용합니다.
- 성능, 혹은 기타 이유로 `id` 를 반드시 사용해야 하는 경우가 생긴다면 충분히 unique한 네이밍을 해주셔야 합니다. |
@@ -1,9 +1,30 @@
import React from 'react';
import './LoginKang.scss';
+import LoginValidation from './components/LoginValidation';
class LoginKang extends React.Component {
render() {
- return <div className="LoginKang">LoginKang</div>;
+ return (
+ <div className="whole-area">
+ <section>
+ <main className="login-main">
+ <div className="login-wrapper">
+ <div className="brand-logo">westagram</div>
+ <LoginValidation />
+ </div>
+ <div className="forgot-pw">
+ <a href="https://www.instagram.com/accounts/password/reset/">
+ 비밀번호를 잊으셨나요?
+ </a>
+ </div>
+ </main>
+
+ <footer>
+ <span>© 2021 Instagram from Facebook</span>
+ </footer>
+ </section>
+ </div>
+ );
}
}
| JavaScript | kebab-case와 camelCase를 혼용하고 계시네요! 통일해서 사용해주셔야 합니다. |
@@ -1,9 +1,30 @@
import React from 'react';
import './LoginKang.scss';
+import LoginValidation from './components/LoginValidation';
class LoginKang extends React.Component {
render() {
- return <div className="LoginKang">LoginKang</div>;
+ return (
+ <div className="whole-area">
+ <section>
+ <main className="login-main">
+ <div className="login-wrapper">
+ <div className="brand-logo">westagram</div>
+ <LoginValidation />
+ </div>
+ <div className="forgot-pw">
+ <a href="https://www.instagram.com/accounts/password/reset/">
+ 비밀번호를 잊으셨나요?
+ </a>
+ </div>
+ </main>
+
+ <footer>
+ <span>© 2021 Instagram from Facebook</span>
+ </footer>
+ </section>
+ </div>
+ );
}
}
| JavaScript | 확인 후 수정하였습니다 :) |
@@ -1,2 +1,219 @@
-.MainKang {
+@mixin center {
+ display: flex;
+ justify-content: center;
+}
+
+@mixin middle {
+ display: flex;
+ flex-direction: column;
+}
+
+@mixin boxes {
+ width: 100%;
+ margin: 5px auto;
+ border: 1px solid rgb(220, 219, 219);
+ background-color: white;
+}
+
+.entire-area {
+ @include center;
+ background-color: rgb(250, 250, 250);
+
+ main {
+ @include center;
+
+ .feeds {
+ @include middle;
+ padding: 5px 20px 5px 20px;
+
+ .stories {
+ @include boxes;
+ display: flex;
+ justify-content: space-between;
+ padding: 5px 23px 5px 23px;
+
+ div {
+ @include middle;
+
+ img {
+ width: 50px;
+ margin: 5px 5px;
+ border-radius: 100%;
+ }
+
+ span {
+ font-size: 13px;
+ }
+ }
+ }
+
+ article {
+ @include boxes;
+ max-width: 600px;
+ padding: 10px 15px;
+
+ .uploader-header {
+ display: flex;
+ align-items: center;
+ margin-bottom: 10px;
+ font-size: 18px;
+
+ .uploader-profile {
+ width: 50px;
+ margin-right: 10px;
+ border-radius: 100%;
+ }
+ }
+
+ .upload-img {
+ width: 100%;
+ }
+
+ .activity {
+ display: flex;
+ justify-content: space-between;
+ padding: 10px 0px;
+
+ .far {
+ width: 25px;
+ margin-right: 8px;
+ font-size: 25px;
+ }
+ }
+
+ .liked-num {
+ margin: 15px 0 12px 0;
+ font-weight: 700;
+ font-size: 15px;
+ }
+
+ .uploader-comment {
+ display: flex;
+ justify-content: flex-start;
+ align-items: center;
+ margin-bottom: 10px;
+
+ .my-id {
+ margin-right: 10px;
+ font-weight: 700;
+ font-size: 15px;
+ }
+ .my-write {
+ font-size: 15px;
+ font-weight: 300;
+ }
+ }
+
+ ul {
+ @include middle;
+ justify-content: flex-start;
+ height: 120px;
+
+ li {
+ display: block;
+
+ .comments-id {
+ font-weight: 700;
+ }
+
+ span {
+ margin: 8px 10px 8px 0;
+ font-size: 15px;
+ }
+ }
+ }
+ }
+
+ .upload-time {
+ margin: 5px 0;
+ padding-left: 15px;
+ color: rgb(142, 142, 142);
+ font-size: 12px;
+ }
+
+ .add-comments {
+ display: flex;
+ align-items: center;
+ z-index: 0;
+ width: 100%;
+ padding: 25px 20px;
+ border-top: 1px solid rgb(220, 219, 219);
+
+ span {
+ margin-right: 15px;
+ font-size: 30px;
+ }
+
+ .comment-input {
+ width: 100%;
+ height: 30px;
+ border: none;
+ }
+
+ button {
+ border: none;
+ cursor: pointer;
+ background-color: transparent;
+ color: rgb(81, 155, 240);
+ font-size: 15px;
+ }
+ }
+ }
+ }
+
+ .aside {
+ max-width: 200px;
+ padding: 5px 10px 5px 10px;
+
+ .user-id {
+ display: flex;
+ justify-content: left;
+ align-items: center;
+ padding: 10px 20px 10px 10px;
+
+ img {
+ width: 50px;
+ margin-right: 10px;
+ border-radius: 100%;
+ }
+
+ span {
+ margin: 40px 0;
+ font-weight: 300;
+ font-size: 17px;
+ }
+ }
+
+ .recommend-header {
+ margin: 20px auto;
+ color: rgb(143, 142, 142);
+ font-weight: 700;
+ font-size: 15px;
+
+ .other-user {
+ display: flex;
+ align-items: center;
+ margin: 15px auto;
+
+ img {
+ width: 50px;
+ border-radius: 100%;
+ }
+
+ span {
+ margin: auto 10px;
+ font-weight: 700;
+ font-size: ㅁㅁㅁㅁㅁㅁㅁㅁ15px;
+ color: black;
+ }
+
+ button {
+ border: none;
+ background-color: transparent;
+ color: rgb(81, 155, 240);
+ font-weight: 700;
+ }
+ }
+ }
+ }
} | Unknown | 확인 후 수정했습니당 |
@@ -1,7 +1,77 @@
-import React from 'react';
+import React, { Component } from 'react';
+import './Login.scss';
-function Login() {
- return <div>Nav bar</div>;
+class Login extends Component {
+ constructor(props) {
+ super(props);
+ this.state = {
+ id: '',
+ pwd: '',
+ };
+ }
+
+ handleInput = event => {
+ const { name, value } = event.target;
+
+ this.setState({
+ [name]: value,
+ });
+ };
+
+ handleSubmit = event => {
+ event.preventDefault();
+ this.handleValidate();
+
+ this.setState({
+ id: '',
+ pwd: '',
+ });
+ };
+
+ render() {
+ const { id, pwd } = this.state;
+ return (
+ <div className="login">
+ <div className="login-container">
+ <h2 className="westagram-logo">westagram</h2>
+ <form className="login-form" onSubmit={this.handleSubmit}>
+ <input
+ type="email"
+ className="login-input"
+ name="id"
+ value={this.state.id}
+ placeholder="전화번호, 사용자 이름 또는 이메일"
+ onChange={this.handleInput}
+ aria-label="이메일"
+ />
+ <input
+ type="password"
+ className="login-input"
+ name="pwd"
+ value={this.state.pwd}
+ placeholder="비밀번호"
+ autoComplete="off"
+ aria-label="비밀번호"
+ onChange={this.handleInput}
+ />
+ <button
+ type="submit"
+ className={
+ id.includes('@') && pwd.length >= 5
+ ? 'login-btn--active'
+ : 'login-btn'
+ }
+ >
+ 로그인
+ </button>
+ </form>
+ <p className="singUp">
+ <span>비밀번호 찾기</span> / <a href="/signup">가입하기</a>
+ </p>
+ </div>
+ </div>
+ );
+ }
}
export default Login; | JavaScript | 송현님, validation을 기본값으로는 false로 주신 뒤
조건 (in.includes('@') && pwd.length>=5) 이 true일 경우 validation도 true로 변해서 버튼이 활성화 되는 기능을 구현하신 것이죠?
저는 render()안의 버튼에 조건에 따라 삼항 연산자로 class명을 주고, 스타일링을 다르게 해서 색상만 변경됐었는데 버튼 활성화 자체를 구현하신 것 보고 많이 배웠습니다👍 |
@@ -1,7 +1,77 @@
-import React from 'react';
+import React, { Component } from 'react';
+import './Login.scss';
-function Login() {
- return <div>Nav bar</div>;
+class Login extends Component {
+ constructor(props) {
+ super(props);
+ this.state = {
+ id: '',
+ pwd: '',
+ };
+ }
+
+ handleInput = event => {
+ const { name, value } = event.target;
+
+ this.setState({
+ [name]: value,
+ });
+ };
+
+ handleSubmit = event => {
+ event.preventDefault();
+ this.handleValidate();
+
+ this.setState({
+ id: '',
+ pwd: '',
+ });
+ };
+
+ render() {
+ const { id, pwd } = this.state;
+ return (
+ <div className="login">
+ <div className="login-container">
+ <h2 className="westagram-logo">westagram</h2>
+ <form className="login-form" onSubmit={this.handleSubmit}>
+ <input
+ type="email"
+ className="login-input"
+ name="id"
+ value={this.state.id}
+ placeholder="전화번호, 사용자 이름 또는 이메일"
+ onChange={this.handleInput}
+ aria-label="이메일"
+ />
+ <input
+ type="password"
+ className="login-input"
+ name="pwd"
+ value={this.state.pwd}
+ placeholder="비밀번호"
+ autoComplete="off"
+ aria-label="비밀번호"
+ onChange={this.handleInput}
+ />
+ <button
+ type="submit"
+ className={
+ id.includes('@') && pwd.length >= 5
+ ? 'login-btn--active'
+ : 'login-btn'
+ }
+ >
+ 로그인
+ </button>
+ </form>
+ <p className="singUp">
+ <span>비밀번호 찾기</span> / <a href="/signup">가입하기</a>
+ </p>
+ </div>
+ </div>
+ );
+ }
}
export default Login; | JavaScript | 송현님, 여기서 bind(this)를 사용하신 것은 어떤 의미인지 여쭤봐도 될까요?
꼭 필요한 요소인지 궁금합니다! |
@@ -1,7 +1,77 @@
-import React from 'react';
+import React, { Component } from 'react';
+import './Login.scss';
-function Login() {
- return <div>Nav bar</div>;
+class Login extends Component {
+ constructor(props) {
+ super(props);
+ this.state = {
+ id: '',
+ pwd: '',
+ };
+ }
+
+ handleInput = event => {
+ const { name, value } = event.target;
+
+ this.setState({
+ [name]: value,
+ });
+ };
+
+ handleSubmit = event => {
+ event.preventDefault();
+ this.handleValidate();
+
+ this.setState({
+ id: '',
+ pwd: '',
+ });
+ };
+
+ render() {
+ const { id, pwd } = this.state;
+ return (
+ <div className="login">
+ <div className="login-container">
+ <h2 className="westagram-logo">westagram</h2>
+ <form className="login-form" onSubmit={this.handleSubmit}>
+ <input
+ type="email"
+ className="login-input"
+ name="id"
+ value={this.state.id}
+ placeholder="전화번호, 사용자 이름 또는 이메일"
+ onChange={this.handleInput}
+ aria-label="이메일"
+ />
+ <input
+ type="password"
+ className="login-input"
+ name="pwd"
+ value={this.state.pwd}
+ placeholder="비밀번호"
+ autoComplete="off"
+ aria-label="비밀번호"
+ onChange={this.handleInput}
+ />
+ <button
+ type="submit"
+ className={
+ id.includes('@') && pwd.length >= 5
+ ? 'login-btn--active'
+ : 'login-btn'
+ }
+ >
+ 로그인
+ </button>
+ </form>
+ <p className="singUp">
+ <span>비밀번호 찾기</span> / <a href="/signup">가입하기</a>
+ </p>
+ </div>
+ </div>
+ );
+ }
}
export default Login; | JavaScript | 네 맞아요. form 자체에 submit 이벤트를 발생시키면 추후에 문제가 생길 수 있어서 유효성 검사 함수는 따로 빼주는게 좋습니다. |
@@ -1,7 +1,77 @@
-import React from 'react';
+import React, { Component } from 'react';
+import './Login.scss';
-function Login() {
- return <div>Nav bar</div>;
+class Login extends Component {
+ constructor(props) {
+ super(props);
+ this.state = {
+ id: '',
+ pwd: '',
+ };
+ }
+
+ handleInput = event => {
+ const { name, value } = event.target;
+
+ this.setState({
+ [name]: value,
+ });
+ };
+
+ handleSubmit = event => {
+ event.preventDefault();
+ this.handleValidate();
+
+ this.setState({
+ id: '',
+ pwd: '',
+ });
+ };
+
+ render() {
+ const { id, pwd } = this.state;
+ return (
+ <div className="login">
+ <div className="login-container">
+ <h2 className="westagram-logo">westagram</h2>
+ <form className="login-form" onSubmit={this.handleSubmit}>
+ <input
+ type="email"
+ className="login-input"
+ name="id"
+ value={this.state.id}
+ placeholder="전화번호, 사용자 이름 또는 이메일"
+ onChange={this.handleInput}
+ aria-label="이메일"
+ />
+ <input
+ type="password"
+ className="login-input"
+ name="pwd"
+ value={this.state.pwd}
+ placeholder="비밀번호"
+ autoComplete="off"
+ aria-label="비밀번호"
+ onChange={this.handleInput}
+ />
+ <button
+ type="submit"
+ className={
+ id.includes('@') && pwd.length >= 5
+ ? 'login-btn--active'
+ : 'login-btn'
+ }
+ >
+ 로그인
+ </button>
+ </form>
+ <p className="singUp">
+ <span>비밀번호 찾기</span> / <a href="/signup">가입하기</a>
+ </p>
+ </div>
+ </div>
+ );
+ }
}
export default Login; | JavaScript | 저도 궁금합니다! 펑션 안에서 this 쓸 때, 바깥의 this 받으려고 사용하는 걸로 알고 있었는데 this.setState 때문에 사용하신건가요? |
@@ -1,7 +1,77 @@
-import React from 'react';
+import React, { Component } from 'react';
+import './Login.scss';
-function Login() {
- return <div>Nav bar</div>;
+class Login extends Component {
+ constructor(props) {
+ super(props);
+ this.state = {
+ id: '',
+ pwd: '',
+ };
+ }
+
+ handleInput = event => {
+ const { name, value } = event.target;
+
+ this.setState({
+ [name]: value,
+ });
+ };
+
+ handleSubmit = event => {
+ event.preventDefault();
+ this.handleValidate();
+
+ this.setState({
+ id: '',
+ pwd: '',
+ });
+ };
+
+ render() {
+ const { id, pwd } = this.state;
+ return (
+ <div className="login">
+ <div className="login-container">
+ <h2 className="westagram-logo">westagram</h2>
+ <form className="login-form" onSubmit={this.handleSubmit}>
+ <input
+ type="email"
+ className="login-input"
+ name="id"
+ value={this.state.id}
+ placeholder="전화번호, 사용자 이름 또는 이메일"
+ onChange={this.handleInput}
+ aria-label="이메일"
+ />
+ <input
+ type="password"
+ className="login-input"
+ name="pwd"
+ value={this.state.pwd}
+ placeholder="비밀번호"
+ autoComplete="off"
+ aria-label="비밀번호"
+ onChange={this.handleInput}
+ />
+ <button
+ type="submit"
+ className={
+ id.includes('@') && pwd.length >= 5
+ ? 'login-btn--active'
+ : 'login-btn'
+ }
+ >
+ 로그인
+ </button>
+ </form>
+ <p className="singUp">
+ <span>비밀번호 찾기</span> / <a href="/signup">가입하기</a>
+ </p>
+ </div>
+ </div>
+ );
+ }
}
export default Login; | JavaScript | 리액트 클래스 컴포넌트에서 bind를 사용하지 this는 `undefined`로 인식해요 그래서 이 경우에 this를 알려줘야 하는데 두가지 방법이 있어요.
1. 태그 자체에서 이벤트를 화살표 함수로 써주는 것입니다. ex) `<input onChange={(e) => handleChange(e)} >`
2. 저는 첫 번째 방식이 가독성이 좋지 않아서 차라리 리액트 문서에서 권장하는 두 번째 방식으로 [this를 연결](https://ko.reactjs.org/docs/handling-events.html)했습니다. |
@@ -1,7 +1,77 @@
-import React from 'react';
+import React, { Component } from 'react';
+import './Login.scss';
-function Login() {
- return <div>Nav bar</div>;
+class Login extends Component {
+ constructor(props) {
+ super(props);
+ this.state = {
+ id: '',
+ pwd: '',
+ };
+ }
+
+ handleInput = event => {
+ const { name, value } = event.target;
+
+ this.setState({
+ [name]: value,
+ });
+ };
+
+ handleSubmit = event => {
+ event.preventDefault();
+ this.handleValidate();
+
+ this.setState({
+ id: '',
+ pwd: '',
+ });
+ };
+
+ render() {
+ const { id, pwd } = this.state;
+ return (
+ <div className="login">
+ <div className="login-container">
+ <h2 className="westagram-logo">westagram</h2>
+ <form className="login-form" onSubmit={this.handleSubmit}>
+ <input
+ type="email"
+ className="login-input"
+ name="id"
+ value={this.state.id}
+ placeholder="전화번호, 사용자 이름 또는 이메일"
+ onChange={this.handleInput}
+ aria-label="이메일"
+ />
+ <input
+ type="password"
+ className="login-input"
+ name="pwd"
+ value={this.state.pwd}
+ placeholder="비밀번호"
+ autoComplete="off"
+ aria-label="비밀번호"
+ onChange={this.handleInput}
+ />
+ <button
+ type="submit"
+ className={
+ id.includes('@') && pwd.length >= 5
+ ? 'login-btn--active'
+ : 'login-btn'
+ }
+ >
+ 로그인
+ </button>
+ </form>
+ <p className="singUp">
+ <span>비밀번호 찾기</span> / <a href="/signup">가입하기</a>
+ </p>
+ </div>
+ </div>
+ );
+ }
}
export default Login; | JavaScript | 궁금해서 질문 남깁니다! [event.target.name]은 위에 state 선언할 때 없는데,
input 태그에 이름을 주기 위한건가요?
그렇다면, 혹시 처음 render 할때는 'id'를 넣고, 값 변경될때 값을 이름에 넣어주신 이유가 궁금합니다! |
@@ -1,7 +1,77 @@
-import React from 'react';
+import React, { Component } from 'react';
+import './Login.scss';
-function Login() {
- return <div>Nav bar</div>;
+class Login extends Component {
+ constructor(props) {
+ super(props);
+ this.state = {
+ id: '',
+ pwd: '',
+ };
+ }
+
+ handleInput = event => {
+ const { name, value } = event.target;
+
+ this.setState({
+ [name]: value,
+ });
+ };
+
+ handleSubmit = event => {
+ event.preventDefault();
+ this.handleValidate();
+
+ this.setState({
+ id: '',
+ pwd: '',
+ });
+ };
+
+ render() {
+ const { id, pwd } = this.state;
+ return (
+ <div className="login">
+ <div className="login-container">
+ <h2 className="westagram-logo">westagram</h2>
+ <form className="login-form" onSubmit={this.handleSubmit}>
+ <input
+ type="email"
+ className="login-input"
+ name="id"
+ value={this.state.id}
+ placeholder="전화번호, 사용자 이름 또는 이메일"
+ onChange={this.handleInput}
+ aria-label="이메일"
+ />
+ <input
+ type="password"
+ className="login-input"
+ name="pwd"
+ value={this.state.pwd}
+ placeholder="비밀번호"
+ autoComplete="off"
+ aria-label="비밀번호"
+ onChange={this.handleInput}
+ />
+ <button
+ type="submit"
+ className={
+ id.includes('@') && pwd.length >= 5
+ ? 'login-btn--active'
+ : 'login-btn'
+ }
+ >
+ 로그인
+ </button>
+ </form>
+ <p className="singUp">
+ <span>비밀번호 찾기</span> / <a href="/signup">가입하기</a>
+ </p>
+ </div>
+ </div>
+ );
+ }
}
export default Login; | JavaScript | 옆집에서 구경왔습니다:)코드가 정말 섬세하세요!! 덕분에 bind, 유효성 검증 관련해서 배우고 갑니다:)! 감사합니다~ |
@@ -1,7 +1,77 @@
-import React from 'react';
+import React, { Component } from 'react';
+import './Login.scss';
-function Login() {
- return <div>Nav bar</div>;
+class Login extends Component {
+ constructor(props) {
+ super(props);
+ this.state = {
+ id: '',
+ pwd: '',
+ };
+ }
+
+ handleInput = event => {
+ const { name, value } = event.target;
+
+ this.setState({
+ [name]: value,
+ });
+ };
+
+ handleSubmit = event => {
+ event.preventDefault();
+ this.handleValidate();
+
+ this.setState({
+ id: '',
+ pwd: '',
+ });
+ };
+
+ render() {
+ const { id, pwd } = this.state;
+ return (
+ <div className="login">
+ <div className="login-container">
+ <h2 className="westagram-logo">westagram</h2>
+ <form className="login-form" onSubmit={this.handleSubmit}>
+ <input
+ type="email"
+ className="login-input"
+ name="id"
+ value={this.state.id}
+ placeholder="전화번호, 사용자 이름 또는 이메일"
+ onChange={this.handleInput}
+ aria-label="이메일"
+ />
+ <input
+ type="password"
+ className="login-input"
+ name="pwd"
+ value={this.state.pwd}
+ placeholder="비밀번호"
+ autoComplete="off"
+ aria-label="비밀번호"
+ onChange={this.handleInput}
+ />
+ <button
+ type="submit"
+ className={
+ id.includes('@') && pwd.length >= 5
+ ? 'login-btn--active'
+ : 'login-btn'
+ }
+ >
+ 로그인
+ </button>
+ </form>
+ <p className="singUp">
+ <span>비밀번호 찾기</span> / <a href="/signup">가입하기</a>
+ </p>
+ </div>
+ </div>
+ );
+ }
}
export default Login; | JavaScript | 송현님, 이해했습니다! 저는 bind를 하지 않고도 잘 실행되어서 의아했는데, arrow function을 사용했었네요~! 링크까지 걸어주시는 상세한 설명에 감동했습니다~ ㅠㅠ |
@@ -1,7 +1,77 @@
-import React from 'react';
+import React, { Component } from 'react';
+import './Login.scss';
-function Login() {
- return <div>Nav bar</div>;
+class Login extends Component {
+ constructor(props) {
+ super(props);
+ this.state = {
+ id: '',
+ pwd: '',
+ };
+ }
+
+ handleInput = event => {
+ const { name, value } = event.target;
+
+ this.setState({
+ [name]: value,
+ });
+ };
+
+ handleSubmit = event => {
+ event.preventDefault();
+ this.handleValidate();
+
+ this.setState({
+ id: '',
+ pwd: '',
+ });
+ };
+
+ render() {
+ const { id, pwd } = this.state;
+ return (
+ <div className="login">
+ <div className="login-container">
+ <h2 className="westagram-logo">westagram</h2>
+ <form className="login-form" onSubmit={this.handleSubmit}>
+ <input
+ type="email"
+ className="login-input"
+ name="id"
+ value={this.state.id}
+ placeholder="전화번호, 사용자 이름 또는 이메일"
+ onChange={this.handleInput}
+ aria-label="이메일"
+ />
+ <input
+ type="password"
+ className="login-input"
+ name="pwd"
+ value={this.state.pwd}
+ placeholder="비밀번호"
+ autoComplete="off"
+ aria-label="비밀번호"
+ onChange={this.handleInput}
+ />
+ <button
+ type="submit"
+ className={
+ id.includes('@') && pwd.length >= 5
+ ? 'login-btn--active'
+ : 'login-btn'
+ }
+ >
+ 로그인
+ </button>
+ </form>
+ <p className="singUp">
+ <span>비밀번호 찾기</span> / <a href="/signup">가입하기</a>
+ </p>
+ </div>
+ </div>
+ );
+ }
}
export default Login; | JavaScript | 맞습니다. input 태그에 name, value 속성을 이용해서 onChange이벤트가 발생하면 원하는 곳에 값을 넣어주기 위해서 입니다. 리액트 사이트에서 [다중 입력 제어하기](https://ko.reactjs.org/docs/forms.htmll) 읽으시면 도움 되실 거 같네요! |
@@ -1,7 +1,77 @@
-import React from 'react';
+import React, { Component } from 'react';
+import './Login.scss';
-function Login() {
- return <div>Nav bar</div>;
+class Login extends Component {
+ constructor(props) {
+ super(props);
+ this.state = {
+ id: '',
+ pwd: '',
+ };
+ }
+
+ handleInput = event => {
+ const { name, value } = event.target;
+
+ this.setState({
+ [name]: value,
+ });
+ };
+
+ handleSubmit = event => {
+ event.preventDefault();
+ this.handleValidate();
+
+ this.setState({
+ id: '',
+ pwd: '',
+ });
+ };
+
+ render() {
+ const { id, pwd } = this.state;
+ return (
+ <div className="login">
+ <div className="login-container">
+ <h2 className="westagram-logo">westagram</h2>
+ <form className="login-form" onSubmit={this.handleSubmit}>
+ <input
+ type="email"
+ className="login-input"
+ name="id"
+ value={this.state.id}
+ placeholder="전화번호, 사용자 이름 또는 이메일"
+ onChange={this.handleInput}
+ aria-label="이메일"
+ />
+ <input
+ type="password"
+ className="login-input"
+ name="pwd"
+ value={this.state.pwd}
+ placeholder="비밀번호"
+ autoComplete="off"
+ aria-label="비밀번호"
+ onChange={this.handleInput}
+ />
+ <button
+ type="submit"
+ className={
+ id.includes('@') && pwd.length >= 5
+ ? 'login-btn--active'
+ : 'login-btn'
+ }
+ >
+ 로그인
+ </button>
+ </form>
+ <p className="singUp">
+ <span>비밀번호 찾기</span> / <a href="/signup">가입하기</a>
+ </p>
+ </div>
+ </div>
+ );
+ }
}
export default Login; | JavaScript | this에 대해서 잘 고민해보시고 bind 메소드까지 잘 찾아서 적용해주셨네요!
- 다만 여기서 handleInput 함수는 이미 arrow function으로 작성을 했기에 내부적으로 this를 가지지않고 상위 스코프의 this를 사용하기에 필수적이지 않습니다
- 함수선언 + bind method로 this가 바인딩된 새로운 함수 재생성 보다는 arrow function 으로 한번 작성하는게 간편하고 가독성이 좋기에 arrow function 사용을 권장드립니다. |
@@ -1,7 +1,77 @@
-import React from 'react';
+import React, { Component } from 'react';
+import './Login.scss';
-function Login() {
- return <div>Nav bar</div>;
+class Login extends Component {
+ constructor(props) {
+ super(props);
+ this.state = {
+ id: '',
+ pwd: '',
+ };
+ }
+
+ handleInput = event => {
+ const { name, value } = event.target;
+
+ this.setState({
+ [name]: value,
+ });
+ };
+
+ handleSubmit = event => {
+ event.preventDefault();
+ this.handleValidate();
+
+ this.setState({
+ id: '',
+ pwd: '',
+ });
+ };
+
+ render() {
+ const { id, pwd } = this.state;
+ return (
+ <div className="login">
+ <div className="login-container">
+ <h2 className="westagram-logo">westagram</h2>
+ <form className="login-form" onSubmit={this.handleSubmit}>
+ <input
+ type="email"
+ className="login-input"
+ name="id"
+ value={this.state.id}
+ placeholder="전화번호, 사용자 이름 또는 이메일"
+ onChange={this.handleInput}
+ aria-label="이메일"
+ />
+ <input
+ type="password"
+ className="login-input"
+ name="pwd"
+ value={this.state.pwd}
+ placeholder="비밀번호"
+ autoComplete="off"
+ aria-label="비밀번호"
+ onChange={this.handleInput}
+ />
+ <button
+ type="submit"
+ className={
+ id.includes('@') && pwd.length >= 5
+ ? 'login-btn--active'
+ : 'login-btn'
+ }
+ >
+ 로그인
+ </button>
+ </form>
+ <p className="singUp">
+ <span>비밀번호 찾기</span> / <a href="/signup">가입하기</a>
+ </p>
+ </div>
+ </div>
+ );
+ }
}
export default Login; | JavaScript | 👍
구조분해할당까지 해주시면 더 깔끔하겠네요
```
const {name, value} = event;
this.setState{{[name] : value}}
``` |
@@ -1,7 +1,77 @@
-import React from 'react';
+import React, { Component } from 'react';
+import './Login.scss';
-function Login() {
- return <div>Nav bar</div>;
+class Login extends Component {
+ constructor(props) {
+ super(props);
+ this.state = {
+ id: '',
+ pwd: '',
+ };
+ }
+
+ handleInput = event => {
+ const { name, value } = event.target;
+
+ this.setState({
+ [name]: value,
+ });
+ };
+
+ handleSubmit = event => {
+ event.preventDefault();
+ this.handleValidate();
+
+ this.setState({
+ id: '',
+ pwd: '',
+ });
+ };
+
+ render() {
+ const { id, pwd } = this.state;
+ return (
+ <div className="login">
+ <div className="login-container">
+ <h2 className="westagram-logo">westagram</h2>
+ <form className="login-form" onSubmit={this.handleSubmit}>
+ <input
+ type="email"
+ className="login-input"
+ name="id"
+ value={this.state.id}
+ placeholder="전화번호, 사용자 이름 또는 이메일"
+ onChange={this.handleInput}
+ aria-label="이메일"
+ />
+ <input
+ type="password"
+ className="login-input"
+ name="pwd"
+ value={this.state.pwd}
+ placeholder="비밀번호"
+ autoComplete="off"
+ aria-label="비밀번호"
+ onChange={this.handleInput}
+ />
+ <button
+ type="submit"
+ className={
+ id.includes('@') && pwd.length >= 5
+ ? 'login-btn--active'
+ : 'login-btn'
+ }
+ >
+ 로그인
+ </button>
+ </form>
+ <p className="singUp">
+ <span>비밀번호 찾기</span> / <a href="/signup">가입하기</a>
+ </p>
+ </div>
+ </div>
+ );
+ }
}
export default Login; | JavaScript | [공식문서 React로 사고하기](https://ko.reactjs.org/docs/thinking-in-react.html#step-3-identify-the-minimal-but-complete-representation-of-ui-state) 를 보시면 어떤 값들이 state가 되어야하는지에 대해 적혀있습니다.
> 각각 살펴보고 어떤 게 state가 되어야 하는 지 살펴봅시다. 이는 각 데이터에 대해 아래의 세 가지 질문을 통해 결정할 수 있습니다
> 1. 부모로부터 props를 통해 전달됩니까? 그러면 확실히 state가 아닙니다.
> 2. 시간이 지나도 변하지 않나요? 그러면 확실히 state가 아닙니다.
> 3. 컴포넌트 안의 다른 state나 props를 가지고 계산 가능한가요? 그렇다면 state가 아닙니다.
validation state는 위 케이스 중 다른 state로 계산 가능한 값이기에 state로 관리안해도 되는 값입니다.
렌더시에 바로 계산해서 활용하는게 좋아보입니다. |
@@ -1,7 +1,77 @@
-import React from 'react';
+import React, { Component } from 'react';
+import './Login.scss';
-function Login() {
- return <div>Nav bar</div>;
+class Login extends Component {
+ constructor(props) {
+ super(props);
+ this.state = {
+ id: '',
+ pwd: '',
+ };
+ }
+
+ handleInput = event => {
+ const { name, value } = event.target;
+
+ this.setState({
+ [name]: value,
+ });
+ };
+
+ handleSubmit = event => {
+ event.preventDefault();
+ this.handleValidate();
+
+ this.setState({
+ id: '',
+ pwd: '',
+ });
+ };
+
+ render() {
+ const { id, pwd } = this.state;
+ return (
+ <div className="login">
+ <div className="login-container">
+ <h2 className="westagram-logo">westagram</h2>
+ <form className="login-form" onSubmit={this.handleSubmit}>
+ <input
+ type="email"
+ className="login-input"
+ name="id"
+ value={this.state.id}
+ placeholder="전화번호, 사용자 이름 또는 이메일"
+ onChange={this.handleInput}
+ aria-label="이메일"
+ />
+ <input
+ type="password"
+ className="login-input"
+ name="pwd"
+ value={this.state.pwd}
+ placeholder="비밀번호"
+ autoComplete="off"
+ aria-label="비밀번호"
+ onChange={this.handleInput}
+ />
+ <button
+ type="submit"
+ className={
+ id.includes('@') && pwd.length >= 5
+ ? 'login-btn--active'
+ : 'login-btn'
+ }
+ >
+ 로그인
+ </button>
+ </form>
+ <p className="singUp">
+ <span>비밀번호 찾기</span> / <a href="/signup">가입하기</a>
+ </p>
+ </div>
+ </div>
+ );
+ }
}
export default Login; | JavaScript | - snake-case를 이용해서 className 부여하고 계시군요, nesting을 위해서 최상위 태그에 부여하는 클래스네임은 클레스네임의 중복을 피하고, 일반적인 클래스네임과 구분하기 위해서 PascalCase로 작성해주는것도 좋아보이네요
- 이런 부분은 컨벤션적인 부분이기에 팀끼리 합의해서 진행해주시면 되지만 위코드내에서는 컴포넌트 이름과 동일하게 PascalCase를 사용하는것을 권장하고있습니다(권장일 뿐 필수는 아니기에 컨벤션은 팀원끼리 합의해서 적용하시면 됩니다.) |
@@ -1,7 +1,77 @@
-import React from 'react';
+import React, { Component } from 'react';
+import './Login.scss';
-function Login() {
- return <div>Nav bar</div>;
+class Login extends Component {
+ constructor(props) {
+ super(props);
+ this.state = {
+ id: '',
+ pwd: '',
+ };
+ }
+
+ handleInput = event => {
+ const { name, value } = event.target;
+
+ this.setState({
+ [name]: value,
+ });
+ };
+
+ handleSubmit = event => {
+ event.preventDefault();
+ this.handleValidate();
+
+ this.setState({
+ id: '',
+ pwd: '',
+ });
+ };
+
+ render() {
+ const { id, pwd } = this.state;
+ return (
+ <div className="login">
+ <div className="login-container">
+ <h2 className="westagram-logo">westagram</h2>
+ <form className="login-form" onSubmit={this.handleSubmit}>
+ <input
+ type="email"
+ className="login-input"
+ name="id"
+ value={this.state.id}
+ placeholder="전화번호, 사용자 이름 또는 이메일"
+ onChange={this.handleInput}
+ aria-label="이메일"
+ />
+ <input
+ type="password"
+ className="login-input"
+ name="pwd"
+ value={this.state.pwd}
+ placeholder="비밀번호"
+ autoComplete="off"
+ aria-label="비밀번호"
+ onChange={this.handleInput}
+ />
+ <button
+ type="submit"
+ className={
+ id.includes('@') && pwd.length >= 5
+ ? 'login-btn--active'
+ : 'login-btn'
+ }
+ >
+ 로그인
+ </button>
+ </form>
+ <p className="singUp">
+ <span>비밀번호 찾기</span> / <a href="/signup">가입하기</a>
+ </p>
+ </div>
+ </div>
+ );
+ }
}
export default Login; | JavaScript | autoComplete, aria-label 등의 속성까지 세심하게 신경쓰셨네요👍 |
@@ -0,0 +1,78 @@
+.login {
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ height: 100vh;
+ border: 1px solid #bdbdbd;
+ text-align: center;
+ background: rgb(250, 250, 250);
+
+ .login-container {
+ width: 350px;
+ height: 350px;
+ padding: 0 40px;
+ border: 1px solid silver;
+ border-radius: 5px;
+ background: #fff;
+ display: flex;
+ flex-direction: column;
+ justify-content: space-around;
+
+ .westagram-logo {
+ font-size: 45px;
+ font-family: "Lobster",
+ cursive;
+ color: black;
+ }
+
+ .login-form {
+
+ .login-input {
+ width: 100%;
+ height: 38px;
+ font-size: 12px;
+ padding: 0 20px;
+ margin-bottom: 10px;
+ border: 1px solid silver;
+ box-sizing: border-box;
+ border-radius: 5px;
+ background: rgba(238, 238, 238, 0.534);
+ color: #929292;
+ outline: 0;
+ }
+
+ .login-btn {
+ display: block;
+ width: 100%;
+ height: 32px;
+ margin-top: 10px;
+ border-radius: 5px;
+ color: #fff;
+ background: #b2dffc;
+ border: 1px solid #b2dffc;
+ }
+
+ .login-btn--active {
+ width: 100%;
+ height: 32px;
+ margin-top: 10px;
+ border: 1px solid #0095f6;
+ border-radius: 5px;
+ background: #0095f6;
+ color: #fff;
+ }
+ }
+
+ color: #0f5086;
+
+ .singUp {
+ font-size: 12px;
+ color: #0f5086;
+
+ a {
+ color: #0f5086;
+ text-decoration: none;
+ }
+ }
+ }
+}
\ No newline at end of file | Unknown | 이렇게 자주 사용되는 반복되는 속성은 mixin 형태로 만들어서 사용하는것도 좋습니다. |
@@ -0,0 +1,78 @@
+.login {
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ height: 100vh;
+ border: 1px solid #bdbdbd;
+ text-align: center;
+ background: rgb(250, 250, 250);
+
+ .login-container {
+ width: 350px;
+ height: 350px;
+ padding: 0 40px;
+ border: 1px solid silver;
+ border-radius: 5px;
+ background: #fff;
+ display: flex;
+ flex-direction: column;
+ justify-content: space-around;
+
+ .westagram-logo {
+ font-size: 45px;
+ font-family: "Lobster",
+ cursive;
+ color: black;
+ }
+
+ .login-form {
+
+ .login-input {
+ width: 100%;
+ height: 38px;
+ font-size: 12px;
+ padding: 0 20px;
+ margin-bottom: 10px;
+ border: 1px solid silver;
+ box-sizing: border-box;
+ border-radius: 5px;
+ background: rgba(238, 238, 238, 0.534);
+ color: #929292;
+ outline: 0;
+ }
+
+ .login-btn {
+ display: block;
+ width: 100%;
+ height: 32px;
+ margin-top: 10px;
+ border-radius: 5px;
+ color: #fff;
+ background: #b2dffc;
+ border: 1px solid #b2dffc;
+ }
+
+ .login-btn--active {
+ width: 100%;
+ height: 32px;
+ margin-top: 10px;
+ border: 1px solid #0095f6;
+ border-radius: 5px;
+ background: #0095f6;
+ color: #fff;
+ }
+ }
+
+ color: #0f5086;
+
+ .singUp {
+ font-size: 12px;
+ color: #0f5086;
+
+ a {
+ color: #0f5086;
+ text-decoration: none;
+ }
+ }
+ }
+}
\ No newline at end of file | Unknown | css 속성 순서 가이드라인에 맞춰주세요 |
@@ -0,0 +1,78 @@
+.login {
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ height: 100vh;
+ border: 1px solid #bdbdbd;
+ text-align: center;
+ background: rgb(250, 250, 250);
+
+ .login-container {
+ width: 350px;
+ height: 350px;
+ padding: 0 40px;
+ border: 1px solid silver;
+ border-radius: 5px;
+ background: #fff;
+ display: flex;
+ flex-direction: column;
+ justify-content: space-around;
+
+ .westagram-logo {
+ font-size: 45px;
+ font-family: "Lobster",
+ cursive;
+ color: black;
+ }
+
+ .login-form {
+
+ .login-input {
+ width: 100%;
+ height: 38px;
+ font-size: 12px;
+ padding: 0 20px;
+ margin-bottom: 10px;
+ border: 1px solid silver;
+ box-sizing: border-box;
+ border-radius: 5px;
+ background: rgba(238, 238, 238, 0.534);
+ color: #929292;
+ outline: 0;
+ }
+
+ .login-btn {
+ display: block;
+ width: 100%;
+ height: 32px;
+ margin-top: 10px;
+ border-radius: 5px;
+ color: #fff;
+ background: #b2dffc;
+ border: 1px solid #b2dffc;
+ }
+
+ .login-btn--active {
+ width: 100%;
+ height: 32px;
+ margin-top: 10px;
+ border: 1px solid #0095f6;
+ border-radius: 5px;
+ background: #0095f6;
+ color: #fff;
+ }
+ }
+
+ color: #0f5086;
+
+ .singUp {
+ font-size: 12px;
+ color: #0f5086;
+
+ a {
+ color: #0f5086;
+ text-decoration: none;
+ }
+ }
+ }
+}
\ No newline at end of file | Unknown | style을 부여하지 않는 경우에는 굳이 className 부여 및 네스팅 할 필요 없습니다! |
@@ -0,0 +1,78 @@
+.login {
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ height: 100vh;
+ border: 1px solid #bdbdbd;
+ text-align: center;
+ background: rgb(250, 250, 250);
+
+ .login-container {
+ width: 350px;
+ height: 350px;
+ padding: 0 40px;
+ border: 1px solid silver;
+ border-radius: 5px;
+ background: #fff;
+ display: flex;
+ flex-direction: column;
+ justify-content: space-around;
+
+ .westagram-logo {
+ font-size: 45px;
+ font-family: "Lobster",
+ cursive;
+ color: black;
+ }
+
+ .login-form {
+
+ .login-input {
+ width: 100%;
+ height: 38px;
+ font-size: 12px;
+ padding: 0 20px;
+ margin-bottom: 10px;
+ border: 1px solid silver;
+ box-sizing: border-box;
+ border-radius: 5px;
+ background: rgba(238, 238, 238, 0.534);
+ color: #929292;
+ outline: 0;
+ }
+
+ .login-btn {
+ display: block;
+ width: 100%;
+ height: 32px;
+ margin-top: 10px;
+ border-radius: 5px;
+ color: #fff;
+ background: #b2dffc;
+ border: 1px solid #b2dffc;
+ }
+
+ .login-btn--active {
+ width: 100%;
+ height: 32px;
+ margin-top: 10px;
+ border: 1px solid #0095f6;
+ border-radius: 5px;
+ background: #0095f6;
+ color: #fff;
+ }
+ }
+
+ color: #0f5086;
+
+ .singUp {
+ font-size: 12px;
+ color: #0f5086;
+
+ a {
+ color: #0f5086;
+ text-decoration: none;
+ }
+ }
+ }
+}
\ No newline at end of file | Unknown | 여기서 부여하고 있었네요 해당 셀렉터의 스타일은 셀렉터 바로 하위에 적어주세요 이렇게 네스팅이 쭉 있고 그 뒤에 있으면 가독성측면에서 좋지않습니다. |
@@ -0,0 +1,78 @@
+.login {
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ height: 100vh;
+ border: 1px solid #bdbdbd;
+ text-align: center;
+ background: rgb(250, 250, 250);
+
+ .login-container {
+ width: 350px;
+ height: 350px;
+ padding: 0 40px;
+ border: 1px solid silver;
+ border-radius: 5px;
+ background: #fff;
+ display: flex;
+ flex-direction: column;
+ justify-content: space-around;
+
+ .westagram-logo {
+ font-size: 45px;
+ font-family: "Lobster",
+ cursive;
+ color: black;
+ }
+
+ .login-form {
+
+ .login-input {
+ width: 100%;
+ height: 38px;
+ font-size: 12px;
+ padding: 0 20px;
+ margin-bottom: 10px;
+ border: 1px solid silver;
+ box-sizing: border-box;
+ border-radius: 5px;
+ background: rgba(238, 238, 238, 0.534);
+ color: #929292;
+ outline: 0;
+ }
+
+ .login-btn {
+ display: block;
+ width: 100%;
+ height: 32px;
+ margin-top: 10px;
+ border-radius: 5px;
+ color: #fff;
+ background: #b2dffc;
+ border: 1px solid #b2dffc;
+ }
+
+ .login-btn--active {
+ width: 100%;
+ height: 32px;
+ margin-top: 10px;
+ border: 1px solid #0095f6;
+ border-radius: 5px;
+ background: #0095f6;
+ color: #fff;
+ }
+ }
+
+ color: #0f5086;
+
+ .singUp {
+ font-size: 12px;
+ color: #0f5086;
+
+ a {
+ color: #0f5086;
+ text-decoration: none;
+ }
+ }
+ }
+}
\ No newline at end of file | Unknown | scss의 extends 문법 활용하면 좋겠네요 |
@@ -0,0 +1,78 @@
+.login {
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ height: 100vh;
+ border: 1px solid #bdbdbd;
+ text-align: center;
+ background: rgb(250, 250, 250);
+
+ .login-container {
+ width: 350px;
+ height: 350px;
+ padding: 0 40px;
+ border: 1px solid silver;
+ border-radius: 5px;
+ background: #fff;
+ display: flex;
+ flex-direction: column;
+ justify-content: space-around;
+
+ .westagram-logo {
+ font-size: 45px;
+ font-family: "Lobster",
+ cursive;
+ color: black;
+ }
+
+ .login-form {
+
+ .login-input {
+ width: 100%;
+ height: 38px;
+ font-size: 12px;
+ padding: 0 20px;
+ margin-bottom: 10px;
+ border: 1px solid silver;
+ box-sizing: border-box;
+ border-radius: 5px;
+ background: rgba(238, 238, 238, 0.534);
+ color: #929292;
+ outline: 0;
+ }
+
+ .login-btn {
+ display: block;
+ width: 100%;
+ height: 32px;
+ margin-top: 10px;
+ border-radius: 5px;
+ color: #fff;
+ background: #b2dffc;
+ border: 1px solid #b2dffc;
+ }
+
+ .login-btn--active {
+ width: 100%;
+ height: 32px;
+ margin-top: 10px;
+ border: 1px solid #0095f6;
+ border-radius: 5px;
+ background: #0095f6;
+ color: #fff;
+ }
+ }
+
+ color: #0f5086;
+
+ .singUp {
+ font-size: 12px;
+ color: #0f5086;
+
+ a {
+ color: #0f5086;
+ text-decoration: none;
+ }
+ }
+ }
+}
\ No newline at end of file | Unknown | 불필요한 주석은 삭제해주세요 |
@@ -0,0 +1,19 @@
+import React, { Component } from 'react';
+
+class Comment extends Component {
+ render() {
+ const { profile, name, content } = this.props;
+ return (
+ <li className="feeds-comment__reply">
+ <div className="user-feeds__profile--img">
+ <img src={profile} alt="피드사진" />
+ </div>
+ <b className="user-feeds__name--others">{name}</b>
+ <p>{content}</p>
+ <i className="far fa-heart icon"></i>
+ </li>
+ );
+ }
+}
+
+export default Comment; | JavaScript | ```suggestion
{!this.props.profile && (
<img src={this.props.profile} alt="피드사진" />
)
```
- !== 연산자 불필요해보입니다, 빈 문자열은 falsy 값이기에 not 연산자와 조합해서 빈문자열이 아닐때를 표현 가능합니다.
- true일 경우에만 렌더링되면 된다면 삼항연산자말고 && 연산자를 이용해보세요 |
@@ -0,0 +1,19 @@
+import React, { Component } from 'react';
+
+class Comment extends Component {
+ render() {
+ const { profile, name, content } = this.props;
+ return (
+ <li className="feeds-comment__reply">
+ <div className="user-feeds__profile--img">
+ <img src={profile} alt="피드사진" />
+ </div>
+ <b className="user-feeds__name--others">{name}</b>
+ <p>{content}</p>
+ <i className="far fa-heart icon"></i>
+ </li>
+ );
+ }
+}
+
+export default Comment; | JavaScript | props 구조분해할당해서 사용하면 좋아보이네요 |
@@ -0,0 +1,43 @@
+import React, { Component } from 'react';
+import Comment from './Comment/Comment';
+import './CommentList.scss';
+
+class CommentList extends Component {
+ constructor(props) {
+ super(props);
+ this.state = {
+ commentList: [],
+ };
+ }
+ componentDidMount() {
+ fetch('http://localhost:3000/data/commentData_songhyun.json', {
+ method: 'GET',
+ })
+ .then(res => res.json())
+ .then(comments =>
+ this.setState({
+ commentList: comments,
+ })
+ );
+ }
+ render() {
+ const { commentList } = this.state;
+
+ return (
+ <ul className="feeds-comment__list">
+ {commentList.map(comment => {
+ return (
+ <Comment
+ key={comment.id}
+ name={comment.userName}
+ profile={comment.profile}
+ content={comment.content}
+ />
+ );
+ })}
+ </ul>
+ );
+ }
+}
+
+export default CommentList; | JavaScript | data라는 광범위한 변수명보다는 의미가 드러나게 변수명 지어주세요 |
@@ -1,7 +1,246 @@
-import React from 'react';
+import React, { Component } from 'react';
+import CommentList from './CommentList/CommentList';
+import IconList from './IconList/IconList';
+import userImg from '../../../assets/images/IMG_2625.jpg';
+import feedImg from '../../../assets/images/feed.jpg';
+import './Main.scss';
-function Main() {
- return <div>Nav bar</div>;
+class Main extends Component {
+ render() {
+ return (
+ <div className="main-wrapper">
+ {/* nav */}
+ <nav>
+ <a href="#" id="logo">
+ <i className="fab fa-instagram icon"></i>
+ <h2>westagram</h2>
+ </a>
+ {/* search-form */}
+ <form className="search-form">
+ <i className="fas fa-search icon"></i>
+ <input
+ type="text"
+ className="search-form__input"
+ aria-label="검색"
+ placeholder="검색"
+ />
+ </form>
+
+ {/* right icons */}
+ <ul className="right-icons">
+ <li>
+ <a href="#">
+ {/* <span className="ir_pm">explore</span> */}
+ <i className="far fa-compass icon"></i>
+ </a>
+ </li>
+ <li>
+ <a href="#">
+ {/* <span className="ir_pm">heart</span> */}
+ <i className="far fa-heart icon"></i>
+ </a>
+ </li>
+ <li>
+ <a href="#">
+ {/* <span className="ir_pm">profile</span> */}
+ <i className="far fa-user icon"></i>
+ </a>
+ </li>
+ {/* right icons */}
+ </ul>
+ </nav>
+ {/* nav */}
+ <main>
+ {/* feeds */}
+ <div className="feeds">
+ <article className="user-feeds">
+ <div className="user-feeds__profile">
+ <a href="#" className="user-feeds__profile--me">
+ <div className="user-feeds__profile--img">
+ <img src={userImg} alt="피드사진" />
+ </div>
+ <strong className="user-feeds__profile--name">
+ wecode_bootcamp
+ </strong>
+ </a>
+ <a href="#" className="user-feeds__profile--option">
+ <span className="ir_pm">option plus</span>
+ <i className="fas fa-ellipsis-h icon"></i>
+ </a>
+ </div>
+ <div className="feeds-content__img">
+ <img src={feedImg} alt="피드사진" />
+ </div>
+ {/* feeds content */}
+ <div className="feeds__content">
+ <IconList />
+ <div className="feeds__likes">
+ <div className="user-feeds__profile--img">
+ <img src={userImg} alt="피드사진" />
+ </div>
+ <p>
+ <b className="user-feeds__name--others">vi2920va</b>님
+ <b> 외 10명</b>이 좋아합니다.
+ </p>
+ </div>
+ {/* feeds content */}
+ <div className="feeds-comment">
+ <p className="feeds-comment__text">
+ <strong>wecode_bootcamp</strong>
+ <em>위코드에서 인스타그램 클론 코딩하는 중</em>
+ <button>더 보기</button>
+ </p>
+ <CommentList />
+ </div>
+ </div>
+ <form className="add-comment" onSubmit={this.handleClickbtn}>
+ <input
+ type="text"
+ id="add-input"
+ placeholder="댓글 달기..."
+ aria-label="댓글추가"
+ name="conent"
+ />
+ <button type="submit" className="add-btn">
+ 게시
+ </button>
+ </form>
+ </article>
+ </div>
+ {/* feeds */}
+ {/* main-right */}
+ <div className="main-right">
+ {/* main-right my info */}
+ <div className="main-right__myProfile">
+ <h2 className="main-right__myProfile__Img">
+ <i className="profile-img icon"></i>
+ </h2>
+ <div className="main-right__myProfile__info">
+ <span className="main-right__myProfile__info--name">
+ wecode_bootcamp
+ </span>
+ <span className="main-right__myProfile__info--place">
+ Wecode | 위코드
+ </span>
+ </div>
+ </div>
+ {/* main-right my info */}
+ {/* main-right friends story */}
+ <div className="main-right__story">
+ <div className="main-right__story__title">
+ <h2>스토리</h2>
+ <a href="#">모두 보기</a>
+ </div>
+ <ul className="main-right__story__list">
+ <li>
+ <a href="#">
+ <figure>
+ <img src={userImg} alt="user vi2920va" />
+ <figcaption>
+ <strong>_yum_s</strong>
+ <span>16분전</span>
+ </figcaption>
+ </figure>
+ </a>
+ </li>
+ <li>
+ <a>
+ <figure>
+ <img src={userImg} alt="user vi2920va" />
+ <figcaption>
+ <strong>_yum_s</strong>
+ <span>16분전</span>
+ </figcaption>
+ </figure>
+ </a>
+ </li>
+ <li>
+ <a>
+ <figure>
+ <img src={userImg} alt="user vi2920va" />
+ <figcaption>
+ <strong>_yum_s</strong>
+ <span>16분전</span>
+ </figcaption>
+ </figure>
+ </a>
+ </li>
+ <li>
+ <a>
+ <figure>
+ <img src={userImg} alt="user vi2920va" />
+ <figcaption>
+ <strong>_yum_s</strong>
+ <span>16분전</span>
+ </figcaption>
+ </figure>
+ </a>
+ </li>
+ </ul>
+ </div>
+ {/* friend story */}
+ {/* friend for you */}
+ <div className="main-right__forYou">
+ <div className="main-right__forYou__title">
+ <h2>회원님을 위한 추천</h2>
+ <a href="#">모두 보기</a>
+ </div>
+ <ul className="main-right__forYou__list">
+ <li>
+ <a href="#">
+ <figure>
+ <img src={userImg} alt="musinsa standard" />
+ <figcaption>
+ <strong>musina_standard</strong>
+ <em>_ieqnd_a님 외2명이</em>
+ <span>팔로우</span>
+ </figcaption>
+ </figure>
+ </a>
+ </li>
+ <li>
+ <a href="#">
+ <figure>
+ <img src={userImg} alt="yoona" />
+ <figcaption>
+ <strong>yoona_09</strong>
+ <em>_ieqnd_a님 외2명이</em>
+ <span>팔로우</span>
+ </figcaption>
+ </figure>
+ </a>
+ </li>
+ <li>
+ <a href="#">
+ <figure>
+ <img src={userImg} alt="starbucks korea" />
+ <figcaption>
+ <strong>starbucks_korea</strong>
+ <em>_ieqnd_a님 외2명이</em>
+ <span>팔로우</span>
+ </figcaption>
+ </figure>
+ </a>
+ </li>
+ </ul>
+ </div>
+ {/* friend for you */}
+ {/* footer */}
+ <footer>
+ <p>
+ westagram 정보, 지원 홍보 센터·API· <br />
+ 채용정보·개인정보처리방침 약관·
+ <br />
+ 디렉터리·프로필·해시태그 언어
+ </p>
+ <p className="copyright">@ 2019 WESTAGRAM</p>
+ </footer>
+ </div>
+ {/* main-right */}
+ </main>
+ </div>
+ );
+ }
}
export default Main; | JavaScript | 이렇게 반복되는 UI는 Array.map을 활용해서 표현해보세요 정적인 컨텐츠라면 상수데이터와 조합하면 표현 가능해보입니다. |
@@ -1,7 +1,246 @@
-import React from 'react';
+import React, { Component } from 'react';
+import CommentList from './CommentList/CommentList';
+import IconList from './IconList/IconList';
+import userImg from '../../../assets/images/IMG_2625.jpg';
+import feedImg from '../../../assets/images/feed.jpg';
+import './Main.scss';
-function Main() {
- return <div>Nav bar</div>;
+class Main extends Component {
+ render() {
+ return (
+ <div className="main-wrapper">
+ {/* nav */}
+ <nav>
+ <a href="#" id="logo">
+ <i className="fab fa-instagram icon"></i>
+ <h2>westagram</h2>
+ </a>
+ {/* search-form */}
+ <form className="search-form">
+ <i className="fas fa-search icon"></i>
+ <input
+ type="text"
+ className="search-form__input"
+ aria-label="검색"
+ placeholder="검색"
+ />
+ </form>
+
+ {/* right icons */}
+ <ul className="right-icons">
+ <li>
+ <a href="#">
+ {/* <span className="ir_pm">explore</span> */}
+ <i className="far fa-compass icon"></i>
+ </a>
+ </li>
+ <li>
+ <a href="#">
+ {/* <span className="ir_pm">heart</span> */}
+ <i className="far fa-heart icon"></i>
+ </a>
+ </li>
+ <li>
+ <a href="#">
+ {/* <span className="ir_pm">profile</span> */}
+ <i className="far fa-user icon"></i>
+ </a>
+ </li>
+ {/* right icons */}
+ </ul>
+ </nav>
+ {/* nav */}
+ <main>
+ {/* feeds */}
+ <div className="feeds">
+ <article className="user-feeds">
+ <div className="user-feeds__profile">
+ <a href="#" className="user-feeds__profile--me">
+ <div className="user-feeds__profile--img">
+ <img src={userImg} alt="피드사진" />
+ </div>
+ <strong className="user-feeds__profile--name">
+ wecode_bootcamp
+ </strong>
+ </a>
+ <a href="#" className="user-feeds__profile--option">
+ <span className="ir_pm">option plus</span>
+ <i className="fas fa-ellipsis-h icon"></i>
+ </a>
+ </div>
+ <div className="feeds-content__img">
+ <img src={feedImg} alt="피드사진" />
+ </div>
+ {/* feeds content */}
+ <div className="feeds__content">
+ <IconList />
+ <div className="feeds__likes">
+ <div className="user-feeds__profile--img">
+ <img src={userImg} alt="피드사진" />
+ </div>
+ <p>
+ <b className="user-feeds__name--others">vi2920va</b>님
+ <b> 외 10명</b>이 좋아합니다.
+ </p>
+ </div>
+ {/* feeds content */}
+ <div className="feeds-comment">
+ <p className="feeds-comment__text">
+ <strong>wecode_bootcamp</strong>
+ <em>위코드에서 인스타그램 클론 코딩하는 중</em>
+ <button>더 보기</button>
+ </p>
+ <CommentList />
+ </div>
+ </div>
+ <form className="add-comment" onSubmit={this.handleClickbtn}>
+ <input
+ type="text"
+ id="add-input"
+ placeholder="댓글 달기..."
+ aria-label="댓글추가"
+ name="conent"
+ />
+ <button type="submit" className="add-btn">
+ 게시
+ </button>
+ </form>
+ </article>
+ </div>
+ {/* feeds */}
+ {/* main-right */}
+ <div className="main-right">
+ {/* main-right my info */}
+ <div className="main-right__myProfile">
+ <h2 className="main-right__myProfile__Img">
+ <i className="profile-img icon"></i>
+ </h2>
+ <div className="main-right__myProfile__info">
+ <span className="main-right__myProfile__info--name">
+ wecode_bootcamp
+ </span>
+ <span className="main-right__myProfile__info--place">
+ Wecode | 위코드
+ </span>
+ </div>
+ </div>
+ {/* main-right my info */}
+ {/* main-right friends story */}
+ <div className="main-right__story">
+ <div className="main-right__story__title">
+ <h2>스토리</h2>
+ <a href="#">모두 보기</a>
+ </div>
+ <ul className="main-right__story__list">
+ <li>
+ <a href="#">
+ <figure>
+ <img src={userImg} alt="user vi2920va" />
+ <figcaption>
+ <strong>_yum_s</strong>
+ <span>16분전</span>
+ </figcaption>
+ </figure>
+ </a>
+ </li>
+ <li>
+ <a>
+ <figure>
+ <img src={userImg} alt="user vi2920va" />
+ <figcaption>
+ <strong>_yum_s</strong>
+ <span>16분전</span>
+ </figcaption>
+ </figure>
+ </a>
+ </li>
+ <li>
+ <a>
+ <figure>
+ <img src={userImg} alt="user vi2920va" />
+ <figcaption>
+ <strong>_yum_s</strong>
+ <span>16분전</span>
+ </figcaption>
+ </figure>
+ </a>
+ </li>
+ <li>
+ <a>
+ <figure>
+ <img src={userImg} alt="user vi2920va" />
+ <figcaption>
+ <strong>_yum_s</strong>
+ <span>16분전</span>
+ </figcaption>
+ </figure>
+ </a>
+ </li>
+ </ul>
+ </div>
+ {/* friend story */}
+ {/* friend for you */}
+ <div className="main-right__forYou">
+ <div className="main-right__forYou__title">
+ <h2>회원님을 위한 추천</h2>
+ <a href="#">모두 보기</a>
+ </div>
+ <ul className="main-right__forYou__list">
+ <li>
+ <a href="#">
+ <figure>
+ <img src={userImg} alt="musinsa standard" />
+ <figcaption>
+ <strong>musina_standard</strong>
+ <em>_ieqnd_a님 외2명이</em>
+ <span>팔로우</span>
+ </figcaption>
+ </figure>
+ </a>
+ </li>
+ <li>
+ <a href="#">
+ <figure>
+ <img src={userImg} alt="yoona" />
+ <figcaption>
+ <strong>yoona_09</strong>
+ <em>_ieqnd_a님 외2명이</em>
+ <span>팔로우</span>
+ </figcaption>
+ </figure>
+ </a>
+ </li>
+ <li>
+ <a href="#">
+ <figure>
+ <img src={userImg} alt="starbucks korea" />
+ <figcaption>
+ <strong>starbucks_korea</strong>
+ <em>_ieqnd_a님 외2명이</em>
+ <span>팔로우</span>
+ </figcaption>
+ </figure>
+ </a>
+ </li>
+ </ul>
+ </div>
+ {/* friend for you */}
+ {/* footer */}
+ <footer>
+ <p>
+ westagram 정보, 지원 홍보 센터·API· <br />
+ 채용정보·개인정보처리방침 약관·
+ <br />
+ 디렉터리·프로필·해시태그 언어
+ </p>
+ <p className="copyright">@ 2019 WESTAGRAM</p>
+ </footer>
+ </div>
+ {/* main-right */}
+ </main>
+ </div>
+ );
+ }
}
export default Main; | JavaScript | 이 파일에서 반복되는 UI 많이 보이는데 다 한번 Array.map을 이용해서 표현해보세요 |
@@ -1,7 +1,77 @@
-import React from 'react';
+import React, { Component } from 'react';
+import './Login.scss';
-function Login() {
- return <div>Nav bar</div>;
+class Login extends Component {
+ constructor(props) {
+ super(props);
+ this.state = {
+ id: '',
+ pwd: '',
+ };
+ }
+
+ handleInput = event => {
+ const { name, value } = event.target;
+
+ this.setState({
+ [name]: value,
+ });
+ };
+
+ handleSubmit = event => {
+ event.preventDefault();
+ this.handleValidate();
+
+ this.setState({
+ id: '',
+ pwd: '',
+ });
+ };
+
+ render() {
+ const { id, pwd } = this.state;
+ return (
+ <div className="login">
+ <div className="login-container">
+ <h2 className="westagram-logo">westagram</h2>
+ <form className="login-form" onSubmit={this.handleSubmit}>
+ <input
+ type="email"
+ className="login-input"
+ name="id"
+ value={this.state.id}
+ placeholder="전화번호, 사용자 이름 또는 이메일"
+ onChange={this.handleInput}
+ aria-label="이메일"
+ />
+ <input
+ type="password"
+ className="login-input"
+ name="pwd"
+ value={this.state.pwd}
+ placeholder="비밀번호"
+ autoComplete="off"
+ aria-label="비밀번호"
+ onChange={this.handleInput}
+ />
+ <button
+ type="submit"
+ className={
+ id.includes('@') && pwd.length >= 5
+ ? 'login-btn--active'
+ : 'login-btn'
+ }
+ >
+ 로그인
+ </button>
+ </form>
+ <p className="singUp">
+ <span>비밀번호 찾기</span> / <a href="/signup">가입하기</a>
+ </p>
+ </div>
+ </div>
+ );
+ }
}
export default Login; | JavaScript | 네 코드 리뷰 적용하겠습니다. |
@@ -1,7 +1,77 @@
-import React from 'react';
+import React, { Component } from 'react';
+import './Login.scss';
-function Login() {
- return <div>Nav bar</div>;
+class Login extends Component {
+ constructor(props) {
+ super(props);
+ this.state = {
+ id: '',
+ pwd: '',
+ };
+ }
+
+ handleInput = event => {
+ const { name, value } = event.target;
+
+ this.setState({
+ [name]: value,
+ });
+ };
+
+ handleSubmit = event => {
+ event.preventDefault();
+ this.handleValidate();
+
+ this.setState({
+ id: '',
+ pwd: '',
+ });
+ };
+
+ render() {
+ const { id, pwd } = this.state;
+ return (
+ <div className="login">
+ <div className="login-container">
+ <h2 className="westagram-logo">westagram</h2>
+ <form className="login-form" onSubmit={this.handleSubmit}>
+ <input
+ type="email"
+ className="login-input"
+ name="id"
+ value={this.state.id}
+ placeholder="전화번호, 사용자 이름 또는 이메일"
+ onChange={this.handleInput}
+ aria-label="이메일"
+ />
+ <input
+ type="password"
+ className="login-input"
+ name="pwd"
+ value={this.state.pwd}
+ placeholder="비밀번호"
+ autoComplete="off"
+ aria-label="비밀번호"
+ onChange={this.handleInput}
+ />
+ <button
+ type="submit"
+ className={
+ id.includes('@') && pwd.length >= 5
+ ? 'login-btn--active'
+ : 'login-btn'
+ }
+ >
+ 로그인
+ </button>
+ </form>
+ <p className="singUp">
+ <span>비밀번호 찾기</span> / <a href="/signup">가입하기</a>
+ </p>
+ </div>
+ </div>
+ );
+ }
}
export default Login; | JavaScript | 감사합니다 ㅎㅎ |
@@ -0,0 +1,22 @@
+package common;
+
+import domain.gameresult.GameResult;
+import domain.gameresult.GameResults;
+import domain.player.Player;
+import domain.player.Players;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public class PlayerGameResult {
+ public static Map<String, String> match(Players players, GameResults gameResults) {
+ Map<String, String> result = new HashMap<>();
+ for (Player player : players.getPlayers()) {
+ String gameResultName = gameResults.getGameResults().stream()
+ .filter(gameResult -> gameResult.getPosition().equals(player.getPosition()))
+ .map(GameResult::getName).findFirst().get();
+ result.put(player.getName(), gameResultName);
+ }
+ return result;
+ }
+} | Java | 이 클래스가 꼭 필요할까요? common 패키지에 위치한 이유와 각 책임을 다른 클래스들로 위임할 수 없을지 고민해보면 좋을 것 같습니다. |
@@ -0,0 +1,22 @@
+package common;
+
+import domain.gameresult.GameResult;
+import domain.gameresult.GameResults;
+import domain.player.Player;
+import domain.player.Players;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public class PlayerGameResult {
+ public static Map<String, String> match(Players players, GameResults gameResults) {
+ Map<String, String> result = new HashMap<>();
+ for (Player player : players.getPlayers()) {
+ String gameResultName = gameResults.getGameResults().stream()
+ .filter(gameResult -> gameResult.getPosition().equals(player.getPosition()))
+ .map(GameResult::getName).findFirst().get();
+ result.put(player.getName(), gameResultName);
+ }
+ return result;
+ }
+} | Java | command + ,
java code style
method chaining multi line
부분에 체크하고 정렬하시면 가독성 좋게 정렬됩니다 ~ 추천드려요 |
@@ -0,0 +1,22 @@
+package common;
+
+import domain.gameresult.GameResult;
+import domain.gameresult.GameResults;
+import domain.player.Player;
+import domain.player.Players;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public class PlayerGameResult {
+ public static Map<String, String> match(Players players, GameResults gameResults) {
+ Map<String, String> result = new HashMap<>();
+ for (Player player : players.getPlayers()) {
+ String gameResultName = gameResults.getGameResults().stream()
+ .filter(gameResult -> gameResult.getPosition().equals(player.getPosition()))
+ .map(GameResult::getName).findFirst().get();
+ result.put(player.getName(), gameResultName);
+ }
+ return result;
+ }
+} | Java | get 으로 가져와서 구현하는 것보다 Tell don't ask 원칙을 적용해보면 어떨까요? |
@@ -0,0 +1,106 @@
+package controller;
+
+import common.PlayerGameResult;
+import domain.gameresult.GameResultFactory;
+import domain.gameresult.GameResultName;
+import domain.gameresult.GameResults;
+import domain.ladder.Height;
+import domain.ladder.Ladder;
+import domain.ladder.LadderGenerator;
+import domain.player.Name;
+import domain.player.Players;
+import domain.player.PlayersFactory;
+import exception.HeightValueException;
+import exception.NameFormatException;
+import view.InputView;
+import view.OutputView;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+public class Game {
+ private InputView inputView;
+ private OutputView outputView;
+
+ public Game() {
+ inputView = new InputView();
+ outputView = new OutputView();
+ }
+
+ public void play() {
+ Players players = PlayersFactory.from(inputPlayer());
+ List<GameResultName> gameResultNames = inputGameResultNames();
+ Height ladderHeight = new Height(inputHeight());
+ GameResults gameResults = GameResultFactory.from(gameResultNames, ladderHeight.getHeight());
+
+ Ladder ladder = LadderGenerator.generate(ladderHeight.getHeight(), players.size());
+ players.moveAll(ladder.getLines());
+
+ Map<String, String> matchedGameResult = PlayerGameResult.match(players, gameResults);
+
+ outputView.printPlayers(players.toPlayerNames());
+ for (int i = 0; i < ladderHeight.getHeight(); i++) {
+ outputView.printOneLine(ladder.getLines().get(i).toBoolean());
+ }
+ outputView.printGameResultNames(gameResults.toGameResultNames());
+
+ printMatchedGameResult(players, matchedGameResult);
+ }
+
+ private void printMatchedGameResult(Players players, Map<String, String> matchedGameResult) {
+ String playerName = inputPlayerName();
+ if (players.isContain(playerName)) {
+ outputView.printMatchedGameResult(matchedGameResult, playerName);
+ printMatchedGameResult(players, matchedGameResult);
+ }
+ if (playerName.equals("all")) {
+ outputView.printMatchedGameResults(matchedGameResult);
+ }
+ }
+
+ public List<Name> inputPlayer() {
+ List<Name> playerNames = new ArrayList<>();
+ try {
+ playerNames = inputView.inputPlayer().stream().map(playerName -> new Name(playerName)).collect(Collectors.toList());
+ } catch (NameFormatException nameFormatException) {
+ System.out.println(nameFormatException.getMessage());
+ inputPlayer();
+ }
+ return playerNames;
+ }
+
+ public List<GameResultName> inputGameResultNames() {
+ List<GameResultName> gameResultNames = new ArrayList<>();
+ try {
+ gameResultNames = inputView.inputGameResult().stream().map(gameResultName -> new GameResultName(gameResultName)).collect(Collectors.toList());
+ } catch (NameFormatException nameFormatException) {
+ System.out.println(nameFormatException.getMessage());
+ inputGameResultNames();
+ }
+ return gameResultNames;
+ }
+
+ public int inputHeight() {
+ int height = 0;
+ try {
+ height = inputView.inputLadderHeight();
+ } catch (HeightValueException heightValueException) {
+ System.out.println(heightValueException.getMessage());
+ inputHeight();
+ }
+ return height;
+ }
+
+ public String inputPlayerName() {
+ String playerName = "";
+ try {
+ playerName = inputView.inputPlayerName();
+ } catch (NameFormatException nameFormatException) {
+ System.out.println(nameFormatException.getMessage());
+ inputPlayerName();
+ }
+ return playerName;
+ }
+}
\ No newline at end of file | Java | 상태값이 존재하지 않도록 구현해서 static 하게 사용해보면 어떨까요 |
@@ -0,0 +1,106 @@
+package controller;
+
+import common.PlayerGameResult;
+import domain.gameresult.GameResultFactory;
+import domain.gameresult.GameResultName;
+import domain.gameresult.GameResults;
+import domain.ladder.Height;
+import domain.ladder.Ladder;
+import domain.ladder.LadderGenerator;
+import domain.player.Name;
+import domain.player.Players;
+import domain.player.PlayersFactory;
+import exception.HeightValueException;
+import exception.NameFormatException;
+import view.InputView;
+import view.OutputView;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+public class Game {
+ private InputView inputView;
+ private OutputView outputView;
+
+ public Game() {
+ inputView = new InputView();
+ outputView = new OutputView();
+ }
+
+ public void play() {
+ Players players = PlayersFactory.from(inputPlayer());
+ List<GameResultName> gameResultNames = inputGameResultNames();
+ Height ladderHeight = new Height(inputHeight());
+ GameResults gameResults = GameResultFactory.from(gameResultNames, ladderHeight.getHeight());
+
+ Ladder ladder = LadderGenerator.generate(ladderHeight.getHeight(), players.size());
+ players.moveAll(ladder.getLines());
+
+ Map<String, String> matchedGameResult = PlayerGameResult.match(players, gameResults);
+
+ outputView.printPlayers(players.toPlayerNames());
+ for (int i = 0; i < ladderHeight.getHeight(); i++) {
+ outputView.printOneLine(ladder.getLines().get(i).toBoolean());
+ }
+ outputView.printGameResultNames(gameResults.toGameResultNames());
+
+ printMatchedGameResult(players, matchedGameResult);
+ }
+
+ private void printMatchedGameResult(Players players, Map<String, String> matchedGameResult) {
+ String playerName = inputPlayerName();
+ if (players.isContain(playerName)) {
+ outputView.printMatchedGameResult(matchedGameResult, playerName);
+ printMatchedGameResult(players, matchedGameResult);
+ }
+ if (playerName.equals("all")) {
+ outputView.printMatchedGameResults(matchedGameResult);
+ }
+ }
+
+ public List<Name> inputPlayer() {
+ List<Name> playerNames = new ArrayList<>();
+ try {
+ playerNames = inputView.inputPlayer().stream().map(playerName -> new Name(playerName)).collect(Collectors.toList());
+ } catch (NameFormatException nameFormatException) {
+ System.out.println(nameFormatException.getMessage());
+ inputPlayer();
+ }
+ return playerNames;
+ }
+
+ public List<GameResultName> inputGameResultNames() {
+ List<GameResultName> gameResultNames = new ArrayList<>();
+ try {
+ gameResultNames = inputView.inputGameResult().stream().map(gameResultName -> new GameResultName(gameResultName)).collect(Collectors.toList());
+ } catch (NameFormatException nameFormatException) {
+ System.out.println(nameFormatException.getMessage());
+ inputGameResultNames();
+ }
+ return gameResultNames;
+ }
+
+ public int inputHeight() {
+ int height = 0;
+ try {
+ height = inputView.inputLadderHeight();
+ } catch (HeightValueException heightValueException) {
+ System.out.println(heightValueException.getMessage());
+ inputHeight();
+ }
+ return height;
+ }
+
+ public String inputPlayerName() {
+ String playerName = "";
+ try {
+ playerName = inputView.inputPlayerName();
+ } catch (NameFormatException nameFormatException) {
+ System.out.println(nameFormatException.getMessage());
+ inputPlayerName();
+ }
+ return playerName;
+ }
+}
\ No newline at end of file | Java | Players 가 아닌 Factory 클래스를 도입했을 때 어떤 장점이 있을까요? |
@@ -0,0 +1,106 @@
+package controller;
+
+import common.PlayerGameResult;
+import domain.gameresult.GameResultFactory;
+import domain.gameresult.GameResultName;
+import domain.gameresult.GameResults;
+import domain.ladder.Height;
+import domain.ladder.Ladder;
+import domain.ladder.LadderGenerator;
+import domain.player.Name;
+import domain.player.Players;
+import domain.player.PlayersFactory;
+import exception.HeightValueException;
+import exception.NameFormatException;
+import view.InputView;
+import view.OutputView;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+public class Game {
+ private InputView inputView;
+ private OutputView outputView;
+
+ public Game() {
+ inputView = new InputView();
+ outputView = new OutputView();
+ }
+
+ public void play() {
+ Players players = PlayersFactory.from(inputPlayer());
+ List<GameResultName> gameResultNames = inputGameResultNames();
+ Height ladderHeight = new Height(inputHeight());
+ GameResults gameResults = GameResultFactory.from(gameResultNames, ladderHeight.getHeight());
+
+ Ladder ladder = LadderGenerator.generate(ladderHeight.getHeight(), players.size());
+ players.moveAll(ladder.getLines());
+
+ Map<String, String> matchedGameResult = PlayerGameResult.match(players, gameResults);
+
+ outputView.printPlayers(players.toPlayerNames());
+ for (int i = 0; i < ladderHeight.getHeight(); i++) {
+ outputView.printOneLine(ladder.getLines().get(i).toBoolean());
+ }
+ outputView.printGameResultNames(gameResults.toGameResultNames());
+
+ printMatchedGameResult(players, matchedGameResult);
+ }
+
+ private void printMatchedGameResult(Players players, Map<String, String> matchedGameResult) {
+ String playerName = inputPlayerName();
+ if (players.isContain(playerName)) {
+ outputView.printMatchedGameResult(matchedGameResult, playerName);
+ printMatchedGameResult(players, matchedGameResult);
+ }
+ if (playerName.equals("all")) {
+ outputView.printMatchedGameResults(matchedGameResult);
+ }
+ }
+
+ public List<Name> inputPlayer() {
+ List<Name> playerNames = new ArrayList<>();
+ try {
+ playerNames = inputView.inputPlayer().stream().map(playerName -> new Name(playerName)).collect(Collectors.toList());
+ } catch (NameFormatException nameFormatException) {
+ System.out.println(nameFormatException.getMessage());
+ inputPlayer();
+ }
+ return playerNames;
+ }
+
+ public List<GameResultName> inputGameResultNames() {
+ List<GameResultName> gameResultNames = new ArrayList<>();
+ try {
+ gameResultNames = inputView.inputGameResult().stream().map(gameResultName -> new GameResultName(gameResultName)).collect(Collectors.toList());
+ } catch (NameFormatException nameFormatException) {
+ System.out.println(nameFormatException.getMessage());
+ inputGameResultNames();
+ }
+ return gameResultNames;
+ }
+
+ public int inputHeight() {
+ int height = 0;
+ try {
+ height = inputView.inputLadderHeight();
+ } catch (HeightValueException heightValueException) {
+ System.out.println(heightValueException.getMessage());
+ inputHeight();
+ }
+ return height;
+ }
+
+ public String inputPlayerName() {
+ String playerName = "";
+ try {
+ playerName = inputView.inputPlayerName();
+ } catch (NameFormatException nameFormatException) {
+ System.out.println(nameFormatException.getMessage());
+ inputPlayerName();
+ }
+ return playerName;
+ }
+}
\ No newline at end of file | Java | controller 에서 input 을 받는게 아니므로 메서드명을 바꿔보면 어떨까요?
심플하게 getGameResultNames() 는 어떨까요 |
@@ -0,0 +1,106 @@
+package controller;
+
+import common.PlayerGameResult;
+import domain.gameresult.GameResultFactory;
+import domain.gameresult.GameResultName;
+import domain.gameresult.GameResults;
+import domain.ladder.Height;
+import domain.ladder.Ladder;
+import domain.ladder.LadderGenerator;
+import domain.player.Name;
+import domain.player.Players;
+import domain.player.PlayersFactory;
+import exception.HeightValueException;
+import exception.NameFormatException;
+import view.InputView;
+import view.OutputView;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+public class Game {
+ private InputView inputView;
+ private OutputView outputView;
+
+ public Game() {
+ inputView = new InputView();
+ outputView = new OutputView();
+ }
+
+ public void play() {
+ Players players = PlayersFactory.from(inputPlayer());
+ List<GameResultName> gameResultNames = inputGameResultNames();
+ Height ladderHeight = new Height(inputHeight());
+ GameResults gameResults = GameResultFactory.from(gameResultNames, ladderHeight.getHeight());
+
+ Ladder ladder = LadderGenerator.generate(ladderHeight.getHeight(), players.size());
+ players.moveAll(ladder.getLines());
+
+ Map<String, String> matchedGameResult = PlayerGameResult.match(players, gameResults);
+
+ outputView.printPlayers(players.toPlayerNames());
+ for (int i = 0; i < ladderHeight.getHeight(); i++) {
+ outputView.printOneLine(ladder.getLines().get(i).toBoolean());
+ }
+ outputView.printGameResultNames(gameResults.toGameResultNames());
+
+ printMatchedGameResult(players, matchedGameResult);
+ }
+
+ private void printMatchedGameResult(Players players, Map<String, String> matchedGameResult) {
+ String playerName = inputPlayerName();
+ if (players.isContain(playerName)) {
+ outputView.printMatchedGameResult(matchedGameResult, playerName);
+ printMatchedGameResult(players, matchedGameResult);
+ }
+ if (playerName.equals("all")) {
+ outputView.printMatchedGameResults(matchedGameResult);
+ }
+ }
+
+ public List<Name> inputPlayer() {
+ List<Name> playerNames = new ArrayList<>();
+ try {
+ playerNames = inputView.inputPlayer().stream().map(playerName -> new Name(playerName)).collect(Collectors.toList());
+ } catch (NameFormatException nameFormatException) {
+ System.out.println(nameFormatException.getMessage());
+ inputPlayer();
+ }
+ return playerNames;
+ }
+
+ public List<GameResultName> inputGameResultNames() {
+ List<GameResultName> gameResultNames = new ArrayList<>();
+ try {
+ gameResultNames = inputView.inputGameResult().stream().map(gameResultName -> new GameResultName(gameResultName)).collect(Collectors.toList());
+ } catch (NameFormatException nameFormatException) {
+ System.out.println(nameFormatException.getMessage());
+ inputGameResultNames();
+ }
+ return gameResultNames;
+ }
+
+ public int inputHeight() {
+ int height = 0;
+ try {
+ height = inputView.inputLadderHeight();
+ } catch (HeightValueException heightValueException) {
+ System.out.println(heightValueException.getMessage());
+ inputHeight();
+ }
+ return height;
+ }
+
+ public String inputPlayerName() {
+ String playerName = "";
+ try {
+ playerName = inputView.inputPlayerName();
+ } catch (NameFormatException nameFormatException) {
+ System.out.println(nameFormatException.getMessage());
+ inputPlayerName();
+ }
+ return playerName;
+ }
+}
\ No newline at end of file | Java | null 로 할당하는 것과 ArrayList 로 할당하는 것 중 어느게 더 효율적일까요 |
@@ -0,0 +1,106 @@
+package controller;
+
+import common.PlayerGameResult;
+import domain.gameresult.GameResultFactory;
+import domain.gameresult.GameResultName;
+import domain.gameresult.GameResults;
+import domain.ladder.Height;
+import domain.ladder.Ladder;
+import domain.ladder.LadderGenerator;
+import domain.player.Name;
+import domain.player.Players;
+import domain.player.PlayersFactory;
+import exception.HeightValueException;
+import exception.NameFormatException;
+import view.InputView;
+import view.OutputView;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+public class Game {
+ private InputView inputView;
+ private OutputView outputView;
+
+ public Game() {
+ inputView = new InputView();
+ outputView = new OutputView();
+ }
+
+ public void play() {
+ Players players = PlayersFactory.from(inputPlayer());
+ List<GameResultName> gameResultNames = inputGameResultNames();
+ Height ladderHeight = new Height(inputHeight());
+ GameResults gameResults = GameResultFactory.from(gameResultNames, ladderHeight.getHeight());
+
+ Ladder ladder = LadderGenerator.generate(ladderHeight.getHeight(), players.size());
+ players.moveAll(ladder.getLines());
+
+ Map<String, String> matchedGameResult = PlayerGameResult.match(players, gameResults);
+
+ outputView.printPlayers(players.toPlayerNames());
+ for (int i = 0; i < ladderHeight.getHeight(); i++) {
+ outputView.printOneLine(ladder.getLines().get(i).toBoolean());
+ }
+ outputView.printGameResultNames(gameResults.toGameResultNames());
+
+ printMatchedGameResult(players, matchedGameResult);
+ }
+
+ private void printMatchedGameResult(Players players, Map<String, String> matchedGameResult) {
+ String playerName = inputPlayerName();
+ if (players.isContain(playerName)) {
+ outputView.printMatchedGameResult(matchedGameResult, playerName);
+ printMatchedGameResult(players, matchedGameResult);
+ }
+ if (playerName.equals("all")) {
+ outputView.printMatchedGameResults(matchedGameResult);
+ }
+ }
+
+ public List<Name> inputPlayer() {
+ List<Name> playerNames = new ArrayList<>();
+ try {
+ playerNames = inputView.inputPlayer().stream().map(playerName -> new Name(playerName)).collect(Collectors.toList());
+ } catch (NameFormatException nameFormatException) {
+ System.out.println(nameFormatException.getMessage());
+ inputPlayer();
+ }
+ return playerNames;
+ }
+
+ public List<GameResultName> inputGameResultNames() {
+ List<GameResultName> gameResultNames = new ArrayList<>();
+ try {
+ gameResultNames = inputView.inputGameResult().stream().map(gameResultName -> new GameResultName(gameResultName)).collect(Collectors.toList());
+ } catch (NameFormatException nameFormatException) {
+ System.out.println(nameFormatException.getMessage());
+ inputGameResultNames();
+ }
+ return gameResultNames;
+ }
+
+ public int inputHeight() {
+ int height = 0;
+ try {
+ height = inputView.inputLadderHeight();
+ } catch (HeightValueException heightValueException) {
+ System.out.println(heightValueException.getMessage());
+ inputHeight();
+ }
+ return height;
+ }
+
+ public String inputPlayerName() {
+ String playerName = "";
+ try {
+ playerName = inputView.inputPlayerName();
+ } catch (NameFormatException nameFormatException) {
+ System.out.println(nameFormatException.getMessage());
+ inputPlayerName();
+ }
+ return playerName;
+ }
+}
\ No newline at end of file | Java | Ladder 의 생성자를 통해 생성하지 않고 Generator 를 통해 생성하면 어떤 장점이 있을까요 |
@@ -0,0 +1,46 @@
+package domain.player;
+
+import domain.line.Line;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.stream.Collectors;
+
+public class Players {
+
+ private List<Player> players;
+
+ public Players(List<Player> players) {
+ this.players = new ArrayList<>(players);
+ }
+
+ public List<Player> getPlayers() {
+ return Collections.unmodifiableList(players);
+ }
+
+ public List<String> toPlayerNames() {
+ return players.stream()
+ .map(player -> player.getName())
+ .collect(Collectors.toList());
+ }
+
+ public int size() {
+ return players.size();
+ }
+
+ public void moveAll(List<Line> lines) {
+ lines.forEach(this::moveOneLine);
+ }
+
+ public void moveOneLine(Line line) {
+ players.forEach(player -> player.move(line.findCurrentPointDirection(player.getPosition().getX())));
+ }
+
+ public boolean isContain(String playerName) {
+ if (!toPlayerNames().contains(playerName)) {
+ return false;
+ }
+ return true;
+ }
+} | Java | getPlayerNames 는 어떨까요 |
@@ -0,0 +1,46 @@
+package domain.player;
+
+import domain.line.Line;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.stream.Collectors;
+
+public class Players {
+
+ private List<Player> players;
+
+ public Players(List<Player> players) {
+ this.players = new ArrayList<>(players);
+ }
+
+ public List<Player> getPlayers() {
+ return Collections.unmodifiableList(players);
+ }
+
+ public List<String> toPlayerNames() {
+ return players.stream()
+ .map(player -> player.getName())
+ .collect(Collectors.toList());
+ }
+
+ public int size() {
+ return players.size();
+ }
+
+ public void moveAll(List<Line> lines) {
+ lines.forEach(this::moveOneLine);
+ }
+
+ public void moveOneLine(Line line) {
+ players.forEach(player -> player.move(line.findCurrentPointDirection(player.getPosition().getX())));
+ }
+
+ public boolean isContain(String playerName) {
+ if (!toPlayerNames().contains(playerName)) {
+ return false;
+ }
+ return true;
+ }
+} | Java | player.getPositionX(); 로 디미터법칙을 지켜보면 어떨까요 |
@@ -0,0 +1,32 @@
+package domain.line;
+
+import domain.point.Direction;
+import domain.point.Point;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.stream.Collectors;
+
+public class Line {
+ private List<Point> points;
+
+ public Line(List<Point> points) {
+ this.points = new ArrayList<>(points);
+ }
+
+ public List<Point> getPoints() {
+ return Collections.unmodifiableList(points);
+ }
+
+ public List<Boolean> toBoolean() {
+ return points.stream()
+ .limit(points.size() - 1)
+ .map(point -> point.isRight())
+ .collect(Collectors.toList());
+ }
+
+ public Direction findCurrentPointDirection(int x) {
+ return points.get(x).getDirection();
+ }
+} | Java | getDirectionFlags() 는 어떤가요? |
@@ -0,0 +1,28 @@
+package domain.gameresult;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.stream.Collectors;
+
+public class GameResults {
+ private List<GameResult> gameResults;
+
+ public GameResults(List<GameResult> gameResults) {
+ this.gameResults = new ArrayList<>(gameResults);
+ }
+
+ public List<GameResult> getGameResults() {
+ return Collections.unmodifiableList(gameResults);
+ }
+
+ public List<String> toGameResultNames() {
+ return gameResults.stream()
+ .map(gameResult -> gameResult.getName())
+ .collect(Collectors.toList());
+ }
+
+ public int size() {
+ return gameResults.size();
+ }
+} | Java | 객체의 상태를 변환하는게 아니고 반환하는 것이므로 get 이라는 동사어가 어울릴 것 같습니다 |
@@ -0,0 +1,106 @@
+package controller;
+
+import common.PlayerGameResult;
+import domain.gameresult.GameResultFactory;
+import domain.gameresult.GameResultName;
+import domain.gameresult.GameResults;
+import domain.ladder.Height;
+import domain.ladder.Ladder;
+import domain.ladder.LadderGenerator;
+import domain.player.Name;
+import domain.player.Players;
+import domain.player.PlayersFactory;
+import exception.HeightValueException;
+import exception.NameFormatException;
+import view.InputView;
+import view.OutputView;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+public class Game {
+ private InputView inputView;
+ private OutputView outputView;
+
+ public Game() {
+ inputView = new InputView();
+ outputView = new OutputView();
+ }
+
+ public void play() {
+ Players players = PlayersFactory.from(inputPlayer());
+ List<GameResultName> gameResultNames = inputGameResultNames();
+ Height ladderHeight = new Height(inputHeight());
+ GameResults gameResults = GameResultFactory.from(gameResultNames, ladderHeight.getHeight());
+
+ Ladder ladder = LadderGenerator.generate(ladderHeight.getHeight(), players.size());
+ players.moveAll(ladder.getLines());
+
+ Map<String, String> matchedGameResult = PlayerGameResult.match(players, gameResults);
+
+ outputView.printPlayers(players.toPlayerNames());
+ for (int i = 0; i < ladderHeight.getHeight(); i++) {
+ outputView.printOneLine(ladder.getLines().get(i).toBoolean());
+ }
+ outputView.printGameResultNames(gameResults.toGameResultNames());
+
+ printMatchedGameResult(players, matchedGameResult);
+ }
+
+ private void printMatchedGameResult(Players players, Map<String, String> matchedGameResult) {
+ String playerName = inputPlayerName();
+ if (players.isContain(playerName)) {
+ outputView.printMatchedGameResult(matchedGameResult, playerName);
+ printMatchedGameResult(players, matchedGameResult);
+ }
+ if (playerName.equals("all")) {
+ outputView.printMatchedGameResults(matchedGameResult);
+ }
+ }
+
+ public List<Name> inputPlayer() {
+ List<Name> playerNames = new ArrayList<>();
+ try {
+ playerNames = inputView.inputPlayer().stream().map(playerName -> new Name(playerName)).collect(Collectors.toList());
+ } catch (NameFormatException nameFormatException) {
+ System.out.println(nameFormatException.getMessage());
+ inputPlayer();
+ }
+ return playerNames;
+ }
+
+ public List<GameResultName> inputGameResultNames() {
+ List<GameResultName> gameResultNames = new ArrayList<>();
+ try {
+ gameResultNames = inputView.inputGameResult().stream().map(gameResultName -> new GameResultName(gameResultName)).collect(Collectors.toList());
+ } catch (NameFormatException nameFormatException) {
+ System.out.println(nameFormatException.getMessage());
+ inputGameResultNames();
+ }
+ return gameResultNames;
+ }
+
+ public int inputHeight() {
+ int height = 0;
+ try {
+ height = inputView.inputLadderHeight();
+ } catch (HeightValueException heightValueException) {
+ System.out.println(heightValueException.getMessage());
+ inputHeight();
+ }
+ return height;
+ }
+
+ public String inputPlayerName() {
+ String playerName = "";
+ try {
+ playerName = inputView.inputPlayerName();
+ } catch (NameFormatException nameFormatException) {
+ System.out.println(nameFormatException.getMessage());
+ inputPlayerName();
+ }
+ return playerName;
+ }
+}
\ No newline at end of file | Java | Collection 프레임워크 네이밍을 참고해보면 players.contains(playerName) 이 더 자연스럽지 않을까요~? |
@@ -0,0 +1,32 @@
+package domain.line;
+
+import domain.point.Direction;
+import domain.point.Point;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.stream.Collectors;
+
+public class Line {
+ private List<Point> points;
+
+ public Line(List<Point> points) {
+ this.points = new ArrayList<>(points);
+ }
+
+ public List<Point> getPoints() {
+ return Collections.unmodifiableList(points);
+ }
+
+ public List<Boolean> toBoolean() {
+ return points.stream()
+ .limit(points.size() - 1)
+ .map(point -> point.isRight())
+ .collect(Collectors.toList());
+ }
+
+ public Direction findCurrentPointDirection(int x) {
+ return points.get(x).getDirection();
+ }
+} | Java | this.points = points 로 하면 어떻게 될까요? |
@@ -0,0 +1,32 @@
+package domain.line;
+
+import domain.point.Direction;
+import domain.point.Point;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.stream.Collectors;
+
+public class Line {
+ private List<Point> points;
+
+ public Line(List<Point> points) {
+ this.points = new ArrayList<>(points);
+ }
+
+ public List<Point> getPoints() {
+ return Collections.unmodifiableList(points);
+ }
+
+ public List<Boolean> toBoolean() {
+ return points.stream()
+ .limit(points.size() - 1)
+ .map(point -> point.isRight())
+ .collect(Collectors.toList());
+ }
+
+ public Direction findCurrentPointDirection(int x) {
+ return points.get(x).getDirection();
+ }
+} | Java | unmodifiable 로 한번 감싼 이유가 있으실까요? |
@@ -0,0 +1,32 @@
+package domain.line;
+
+import domain.point.Direction;
+import domain.point.Point;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.stream.Collectors;
+
+public class Line {
+ private List<Point> points;
+
+ public Line(List<Point> points) {
+ this.points = new ArrayList<>(points);
+ }
+
+ public List<Point> getPoints() {
+ return Collections.unmodifiableList(points);
+ }
+
+ public List<Boolean> toBoolean() {
+ return points.stream()
+ .limit(points.size() - 1)
+ .map(point -> point.isRight())
+ .collect(Collectors.toList());
+ }
+
+ public Direction findCurrentPointDirection(int x) {
+ return points.get(x).getDirection();
+ }
+} | Java | array out of index 에러는 걱정하지 않아도 되는건가요? |
@@ -0,0 +1,32 @@
+package domain.line;
+
+import domain.point.Direction;
+import domain.point.Point;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.stream.Collectors;
+
+public class Line {
+ private List<Point> points;
+
+ public Line(List<Point> points) {
+ this.points = new ArrayList<>(points);
+ }
+
+ public List<Point> getPoints() {
+ return Collections.unmodifiableList(points);
+ }
+
+ public List<Boolean> toBoolean() {
+ return points.stream()
+ .limit(points.size() - 1)
+ .map(point -> point.isRight())
+ .collect(Collectors.toList());
+ }
+
+ public Direction findCurrentPointDirection(int x) {
+ return points.get(x).getDirection();
+ }
+} | Java | find 와 get 메서드 네이밍의 차이가 무엇일까요? |
@@ -0,0 +1,32 @@
+package domain.line;
+
+import domain.point.Direction;
+import domain.point.Point;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.stream.Collectors;
+
+public class Line {
+ private List<Point> points;
+
+ public Line(List<Point> points) {
+ this.points = new ArrayList<>(points);
+ }
+
+ public List<Point> getPoints() {
+ return Collections.unmodifiableList(points);
+ }
+
+ public List<Boolean> toBoolean() {
+ return points.stream()
+ .limit(points.size() - 1)
+ .map(point -> point.isRight())
+ .collect(Collectors.toList());
+ }
+
+ public Direction findCurrentPointDirection(int x) {
+ return points.get(x).getDirection();
+ }
+} | Java | points 를 Line 으로 추상화하신 것 같은데 getPoints() 가 필요한 케이스가 있을까요? |
@@ -0,0 +1,21 @@
+package domain.gameresult;
+
+import domain.player.Position;
+
+public class GameResult {
+ private GameResultName name;
+ private Position position;
+
+ public GameResult(GameResultName name, Position position) {
+ this.name = name;
+ this.position = position;
+ }
+
+ public String getName() {
+ return name.getName();
+ }
+
+ public Position getPosition() {
+ return position;
+ }
+} | Java | 생성자와 getter 뿐인데 이건 DTO 역할인가요? |
@@ -0,0 +1,17 @@
+package domain.gameresult;
+
+import domain.player.Position;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class GameResultFactory {
+
+ public static GameResults from(List<GameResultName> gameResultNames, int positionY) {
+ List<GameResult> gameResults = new ArrayList<>();
+ for (int i = 0; i < gameResultNames.size(); i++) {
+ gameResults.add(new GameResult(gameResultNames.get(i), new Position(i, positionY)));
+ }
+ return new GameResults(gameResults);
+ }
+}
\ No newline at end of file | Java | 생성을 Factory 로 모두 위임한 이유가 궁금합니다.
Factory 없이 도메인 클래스의 정적 팩토리 메서드를 통해 생성하면 어떤 안 좋은 점이 있을까요?
그리고 GameResultsFactory 가 아닐까요? |
@@ -0,0 +1,21 @@
+package domain.ladder;
+
+public class Height {
+ private static final String INPUT_POSITIVE_MESSAGE = "[ERROR] 높이는 0 초과를 입력합니다.";
+ private int height;
+
+ public Height(int height) {
+ validatePositive(height);
+ this.height = height;
+ }
+
+ public void validatePositive(int height) {
+ if (height <= 0) {
+ throw new IllegalArgumentException(INPUT_POSITIVE_MESSAGE);
+ }
+ }
+
+ public int getHeight() {
+ return height;
+ }
+} | Java | private 이어야 하지 않을까요~? |
@@ -0,0 +1,18 @@
+package domain.ladder;
+
+import domain.line.Line;
+import domain.line.LineGenerator;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class LadderGenerator {
+
+ public static Ladder generate(int ladderHeight, int playerCount) {
+ List<Line> lines = new ArrayList<>();
+ for (int i = 0; i < ladderHeight; i++) {
+ lines.add(LineGenerator.generate(playerCount));
+ }
+ return new Ladder(lines);
+ }
+} | Java | Ladder 로 위임하면 어떨까요 |
@@ -0,0 +1,49 @@
+package domain.line;
+
+import domain.point.Point;
+import domain.point.RandomPointGenerator;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class LineGenerator {
+
+ public static Line generate(int playerCount) {
+ List<Point> points = new ArrayList<>();
+ if (playerCount == 1) {
+ return new Line(generateSingleVerticalLine(points));
+ }
+
+ return new Line(generateMultiVerticalLine(points, playerCount));
+ }
+
+ private static Point generateOnlyFirstExist() {
+ return Point.onlyFirstExist();
+ }
+
+ private static Point generateFirstPoint() {
+ return Point.first(RandomPointGenerator.generate());
+ }
+
+ private static Point generateMiddlePoint(Point prePoint) {
+ return Point.next(prePoint, RandomPointGenerator.generate());
+ }
+
+ private static Point generateLastPoint(Point prePoint) {
+ return Point.last(prePoint);
+ }
+
+ private static List<Point> generateSingleVerticalLine(List<Point> points) {
+ points.add(generateOnlyFirstExist());
+ return points;
+ }
+
+ private static List<Point> generateMultiVerticalLine(List<Point> points, int playerCount) {
+ points.add(generateFirstPoint());
+ for (int i = 0; i < playerCount - 2; i++) {
+ points.add(generateMiddlePoint(points.get(i)));
+ }
+ points.add(generateLastPoint(points.get(points.size() - 1)));
+ return points;
+ }
+} | Java | Line 뿐만 아니라 Point, List<Point> 타입까지 생성하고 있는데
각자 위임될만한 도메인 클래스가 있지 않을까요? 한번 고민해보면 좋을 것 같습니다. |
@@ -0,0 +1,35 @@
+package domain.player;
+
+import domain.point.Direction;
+
+public class Player {
+ private Name name;
+ private Position position;
+
+ public Player(Name name, Position position) {
+ this.name = name;
+ this.position = position;
+ }
+
+ public void move(Direction direction) {
+ if (direction == Direction.LEFT) {
+ position.moveLeft();
+ position.moveDown();
+ }
+ if (direction == Direction.RIGHT) {
+ position.moveRight();
+ position.moveDown();
+ }
+ if (direction == Direction.DOWN) {
+ position.moveDown();
+ }
+ }
+
+ public String getName() {
+ return name.getName();
+ }
+
+ public Position getPosition() {
+ return position;
+ }
+}
\ No newline at end of file | Java | 인터페이스를 활용해서 if 문을 없앨 수 있지 않을까요? |
@@ -0,0 +1,46 @@
+package domain.player;
+
+import domain.line.Line;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.stream.Collectors;
+
+public class Players {
+
+ private List<Player> players;
+
+ public Players(List<Player> players) {
+ this.players = new ArrayList<>(players);
+ }
+
+ public List<Player> getPlayers() {
+ return Collections.unmodifiableList(players);
+ }
+
+ public List<String> toPlayerNames() {
+ return players.stream()
+ .map(player -> player.getName())
+ .collect(Collectors.toList());
+ }
+
+ public int size() {
+ return players.size();
+ }
+
+ public void moveAll(List<Line> lines) {
+ lines.forEach(this::moveOneLine);
+ }
+
+ public void moveOneLine(Line line) {
+ players.forEach(player -> player.move(line.findCurrentPointDirection(player.getPosition().getX())));
+ }
+
+ public boolean isContain(String playerName) {
+ if (!toPlayerNames().contains(playerName)) {
+ return false;
+ }
+ return true;
+ }
+} | Java | 이 메서드는 어디서 사용되는건가요~? |
@@ -0,0 +1,54 @@
+package domain.player;
+
+import java.util.Objects;
+
+public class Position {
+ private static final String NEGATIVE_ERROR_MESSAGE = "[ERROR] Position의 x, y 값은 양수입니다.";
+ private int x;
+ private int y;
+
+ public Position(int x, int y) {
+ validateNegative(x, y);
+ this.x = x;
+ this.y = y;
+ }
+
+ public void validateNegative(int x, int y) {
+ if (x < 0 || y < 0) {
+ throw new IllegalArgumentException(NEGATIVE_ERROR_MESSAGE);
+ }
+ }
+
+ public void moveLeft() {
+ x--;
+ }
+
+ public void moveRight() {
+ x++;
+ }
+
+ public void moveDown() {
+ y++;
+ }
+
+ public int getX() {
+ return x;
+ }
+
+ public int getY() {
+ return y;
+ }
+
+ @Override
+ public boolean equals(Object o) {
+ if (this == o) return true;
+ if (o == null || getClass() != o.getClass()) return false;
+ Position position = (Position) o;
+ return getX() == position.getX() && getY() == position.getY();
+ }
+
+ @Override
+ public int hashCode() {
+ return Objects.hash(getX(), getY());
+ }
+} | Java | equals 와 hashcode 를 재정의한 이유를 설명해주시면 좋을 것 같아요~ |
@@ -0,0 +1,65 @@
+package domain.point;
+
+public class Point {
+ private static final String CONTINUOUS_CONNECTION_BRIDGE_ERROR_MESSAGE = "[ERROR] 다리는 연속되어 존재할 수 없습니다.";
+
+ private boolean left;
+ private boolean right;
+ private Direction direction;
+
+ public Point(boolean left, boolean right) {
+ validateContinuousConnectionBridge(left, right);
+ this.left = left;
+ this.right = right;
+ this.direction = checkConnection();
+ }
+
+ public static Point onlyFirstExist() {
+ return new Point(false, false);
+ }
+
+ public static Point first(boolean right) {
+ return new Point(false, right);
+ }
+
+ public static Point next(Point prePoint, boolean right) {
+ if (prePoint.right) {
+ return new Point(prePoint.right, false);
+ }
+ return new Point(false, right);
+ }
+
+ public static Point last(Point prePoint) {
+ return new Point(prePoint.right, false);
+ }
+
+ private void validateContinuousConnectionBridge(boolean left, boolean right) {
+ if (left && right) {
+ throw new IllegalArgumentException(CONTINUOUS_CONNECTION_BRIDGE_ERROR_MESSAGE);
+ }
+ }
+
+ public Direction checkConnection() {
+ if (left & !right) {
+ return Direction.LEFT;
+ }
+ if (right & !left) {
+ return Direction.RIGHT;
+ }
+ return Direction.DOWN;
+ }
+
+ public boolean isRight() {
+ return right;
+ }
+
+ public boolean isLeft() {
+ return left;
+ }
+
+ public Direction getDirection() {
+ return direction;
+ }
+
+
+} | Java | check 라는 메서드는 Direction 을 반환하기에 적절하지 않은 메서드명인 것 같습니다.
getConnectedDirection() 은 어떨까요 |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.