feat : Shop 등록 & 조회

.gitignore

@@ -36,4 +36,5 @@ out/
 ### VS Code ###
 .vscode/
 application.yaml
-.DS_Store
+.DS_Store
+src/main/generated/**

build.gradle

@@ -62,9 +62,30 @@ dependencies {
 
     implementation group: 'org.json', name: 'json', version: '20231013'
 
+    //Query Dsl
+    implementation 'com.querydsl:querydsl-jpa:5.0.0:jakarta'
 
+    annotationProcessor "com.querydsl:querydsl-apt:${dependencyManagement.importedProperties['querydsl.version']}:jakarta"
+    annotationProcessor "jakarta.annotation:jakarta.annotation-api"
+    annotationProcessor "jakarta.persistence:jakarta.persistence-api"
 }
 
+//Query Dsl
+def querydslDir = "src/main/generated"
+
+sourceSets {
+    main.java.srcDirs += [querydslDir]
+}
+
+tasks.withType(JavaCompile) {
+    options.getGeneratedSourceOutputDirectory().set(file(querydslDir))
+}
+
+clean.doLast {
+    file(querydslDir).deleteDir()
+}
+//Query Dsl
+
 tasks.named('test') {
     useJUnitPlatform()
 }

src/main/java/com/prgrms/catchtable/notification/service/NotificationService.java

@@ -29,13 +29,12 @@
 @Slf4j
 public class NotificationService {
 
-    @Value("${slack.token}")
-    private String slackToken;
-
     private final NotificationMemberRepository notificationMemberRepository;
     private final NotificationOwnerRepository notificationOwnerRepository;
     private final MemberRepository memberRepository; // 추후 삭제 예정
     private final OwnerRepository ownerRepository; // 추후 삭제 예정
+    @Value("${slack.token}")
+    private String slackToken;
     private JSONObject jsonObject;
 
     public void sendMessageAndSave(Member member, NotificationContent content) {

src/main/java/com/prgrms/catchtable/reservation/domain/ReservationTime.java

@@ -49,6 +49,7 @@ public ReservationTime(LocalDateTime time) {
 
     public void insertShop(Shop shop) {
         this.shop = shop;
+        shop.getReservationTimeList().add(this);
     }
 
     public void setOccupiedTrue() {

src/main/java/com/prgrms/catchtable/shop/controller/MemberShopController.java

@@ -0,0 +1,39 @@
+package com.prgrms.catchtable.shop.controller;
+
+import com.prgrms.catchtable.shop.dto.request.ShopSearchCondition;
+import com.prgrms.catchtable.shop.dto.response.GetAllShopResponse;
+import com.prgrms.catchtable.shop.dto.response.GetShopResponse;
+import com.prgrms.catchtable.shop.service.MemberShopService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("/shops")
+public class MemberShopController {
+
+    private final MemberShopService memberShopService;
+
+    @GetMapping
+    public ResponseEntity<GetAllShopResponse> getAll() {
+        return ResponseEntity.ok(memberShopService.getAll());
+    }
+
+    @GetMapping("/{shopId}")
+    public ResponseEntity<GetShopResponse> getById(@PathVariable("shopId") Long id) {
+        return ResponseEntity.ok(memberShopService.getById(id));
+    }
+
+    @GetMapping("/search")
+    public ResponseEntity<GetAllShopResponse> getBySearch(
+        @ModelAttribute ShopSearchCondition condition) {
+        return ResponseEntity.ok(memberShopService.getBySearch(condition));
+    }
+
+
+}

src/main/java/com/prgrms/catchtable/shop/controller/OwnerShopController.java

@@ -0,0 +1,32 @@
+package com.prgrms.catchtable.shop.controller;
+
+import com.prgrms.catchtable.common.login.LogIn;
+import com.prgrms.catchtable.owner.domain.Owner;
+import com.prgrms.catchtable.shop.dto.request.RegistShopRequest;
+import com.prgrms.catchtable.shop.dto.response.RegistShopResponse;
+import com.prgrms.catchtable.shop.service.OwnerShopService;
+import jakarta.validation.Valid;
+import lombok.RequiredArgsConstructor;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("/owners")
+public class OwnerShopController {
+
+    private final OwnerShopService shopService;
+
+    @PostMapping("/shops")
+    public ResponseEntity<RegistShopResponse> registShop(
+        @Valid @RequestBody RegistShopRequest request, @LogIn
+    Owner owner) {
+        RegistShopResponse registShopResponse = shopService.registShop(request, owner);
+        return ResponseEntity.status(HttpStatus.CREATED).body(registShopResponse);
+    }
+
+}

src/main/java/com/prgrms/catchtable/shop/domain/Category.java

@@ -1,5 +1,8 @@
 package com.prgrms.catchtable.shop.domain;
 
+import com.prgrms.catchtable.common.exception.ErrorCode;
+import com.prgrms.catchtable.common.exception.custom.BadRequestCustomException;
+import java.util.Arrays;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 
@@ -11,6 +14,16 @@ public enum Category {
     CHINESE_FOOD("중식"),
     WESTERN_FOOD("양식");
 
-    private final String description;
+    private final String type;
 
+    public static Category of(String input) {
+        return Arrays.stream(values())
+            .filter(category -> category.isEqual(input))
+            .findAny()
+            .orElseThrow(() -> new BadRequestCustomException(ErrorCode.INVALID_INPUT_TYPE));
+    }
+
+    private boolean isEqual(String input) {
+        return type.equals(input);
+    }
 }

src/main/java/com/prgrms/catchtable/shop/domain/Shop.java

@@ -7,17 +7,22 @@
 
 import com.prgrms.catchtable.common.BaseEntity;
 import com.prgrms.catchtable.common.exception.custom.BadRequestCustomException;
+import com.prgrms.catchtable.reservation.domain.ReservationTime;
 import jakarta.persistence.Column;
 import jakarta.persistence.Embedded;
 import jakarta.persistence.Entity;
 import jakarta.persistence.Enumerated;
 import jakarta.persistence.GeneratedValue;
 import jakarta.persistence.Id;
+import jakarta.persistence.OneToMany;
 import java.math.BigDecimal;
 import java.time.LocalTime;
+import java.util.ArrayList;
+import java.util.List;
 import lombok.Builder;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
+import org.hibernate.annotations.BatchSize;
 
 @Getter
 @NoArgsConstructor(access = PROTECTED)
@@ -51,6 +56,9 @@ public class Shop extends BaseEntity {
     @Column(name = "closing_time")
     private LocalTime closingTime;
 
+    @BatchSize(size = 30)
+    @OneToMany(mappedBy = "shop")
+    private List<ReservationTime> reservationTimeList = new ArrayList<>();
 
     @Builder
     public Shop(String name, BigDecimal rating, Category category, Address address, int capacity,

src/main/java/com/prgrms/catchtable/shop/dto/ShopMapper.java

@@ -0,0 +1,63 @@
+package com.prgrms.catchtable.shop.dto;
+
+import com.prgrms.catchtable.shop.domain.Address;
+import com.prgrms.catchtable.shop.domain.Category;
+import com.prgrms.catchtable.shop.domain.Shop;
+import com.prgrms.catchtable.shop.dto.request.RegistShopRequest;
+import com.prgrms.catchtable.shop.dto.response.GetAllShopResponse;
+import com.prgrms.catchtable.shop.dto.response.GetShopResponse;
+import com.prgrms.catchtable.shop.dto.response.RegistShopResponse;
+import java.util.List;
+
+public class ShopMapper {
+
+    public static Shop toEntity(RegistShopRequest registShopRequest) {
+
+        return Shop.builder()
+            .name(registShopRequest.name())
+            .rating(registShopRequest.rating())
+            .category(Category.of(registShopRequest.category()))
+            .address(Address.builder()
+                .city(registShopRequest.city())
+                .district(registShopRequest.district())
+                .build())
+            .capacity(registShopRequest.capacity())
+            .openingTime(registShopRequest.openingTime())
+            .closingTime(registShopRequest.closingTime())
+            .build();
+    }
+
+    public static RegistShopResponse toRegistShopResponse(Shop shop) {
+        return RegistShopResponse.builder()
+            .name(shop.getName())
+            .rating(shop.getRating())
+            .category(shop.getCategory().getType())
+            .city(shop.getAddress().getCity())
+            .district(shop.getAddress().getDistrict())
+            .capacity(shop.getCapacity())
+            .openingTime(shop.getOpeningTime())
+            .closingTime(shop.getClosingTime())
+            .build();
+    }
+
+    public static GetAllShopResponse toGetAllShopResponse(List<Shop> shops) {
+        return new GetAllShopResponse(shops.stream()
+            .map(ShopMapper::toGetShopResponse)
+            .toList());
+    }
+
+    public static GetShopResponse toGetShopResponse(Shop shop) {
+        return GetShopResponse.builder()
+            .id(shop.getId())
+            .name(shop.getName())
+            .rating(shop.getRating())
+            .category(shop.getCategory().getType())
+            .city(shop.getAddress().getCity())
+            .district(shop.getAddress().getDistrict())
+            .capacity(shop.getCapacity())
+            .openingTime(shop.getOpeningTime())
+            .closingTime(shop.getClosingTime())
+            .build();
+    }
+
+}

src/main/java/com/prgrms/catchtable/shop/dto/request/RegistShopRequest.java

@@ -0,0 +1,28 @@
+package com.prgrms.catchtable.shop.dto.request;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import jakarta.validation.constraints.Max;
+import jakarta.validation.constraints.Min;
+import java.math.BigDecimal;
+import java.time.LocalTime;
+import lombok.Builder;
+
+@Builder
+public record RegistShopRequest(
+
+    String name,
+    @Min(0)
+    @Max(5)
+    BigDecimal rating,
+    String category,
+    String city,
+    String district,
+    int capacity,
+    @JsonFormat(pattern = "kk:mm:ss")
+    LocalTime openingTime,
+    @JsonFormat(pattern = "kk:mm:ss")
+    LocalTime closingTime
+
+) {
+
+}

src/main/java/com/prgrms/catchtable/shop/dto/request/ShopSearchCondition.java

@@ -0,0 +1,9 @@
+package com.prgrms.catchtable.shop.dto.request;
+
+public record ShopSearchCondition(
+    String name,
+    String category,
+    String city
+) {
+
+}

src/main/java/com/prgrms/catchtable/shop/dto/response/GetAllShopResponse.java

@@ -0,0 +1,9 @@
+package com.prgrms.catchtable.shop.dto.response;
+
+import java.util.List;
+
+public record GetAllShopResponse(
+    List<GetShopResponse> shopResponses
+) {
+
+}

src/main/java/com/prgrms/catchtable/shop/dto/response/GetShopResponse.java

@@ -0,0 +1,22 @@
+package com.prgrms.catchtable.shop.dto.response;
+
+import java.math.BigDecimal;
+import java.time.LocalTime;
+import lombok.Builder;
+
+@Builder
+public record GetShopResponse(
+
+    Long id,
+    String name,
+    BigDecimal rating,
+    String category,
+    String city,
+    String district,
+    int capacity,
+    LocalTime openingTime,
+    LocalTime closingTime
+
+) {
+
+}

src/main/java/com/prgrms/catchtable/shop/dto/response/RegistShopResponse.java

@@ -0,0 +1,23 @@
+package com.prgrms.catchtable.shop.dto.response;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import java.math.BigDecimal;
+import java.time.LocalTime;
+import lombok.Builder;
+
+@Builder
+public record RegistShopResponse(
+
+    String name,
+    BigDecimal rating,
+    String category,
+    String city,
+    String district,
+    int capacity,
+    @JsonFormat(pattern = "kk:mm:ss")
+    LocalTime openingTime,
+    @JsonFormat(pattern = "kk:mm:ss")
+    LocalTime closingTime
+) {
+
+}

src/main/java/com/prgrms/catchtable/shop/repository/ShopRepository.java

@@ -1,8 +1,12 @@
 package com.prgrms.catchtable.shop.repository;
 
 import com.prgrms.catchtable.shop.domain.Shop;
+import java.util.Optional;
+import org.springframework.data.jpa.repository.EntityGraph;
 import org.springframework.data.jpa.repository.JpaRepository;
 
-public interface ShopRepository extends JpaRepository<Shop, Long> {
+public interface ShopRepository extends JpaRepository<Shop, Long>, ShopRepositoryCustom {
 
+    @EntityGraph(attributePaths = "reservationTimeList")
+    Optional<Shop> findShopById(Long id);
 }

src/main/java/com/prgrms/catchtable/shop/repository/ShopRepositoryCustom.java

@@ -0,0 +1,11 @@
+package com.prgrms.catchtable.shop.repository;
+
+import com.prgrms.catchtable.shop.domain.Shop;
+import com.prgrms.catchtable.shop.dto.request.ShopSearchCondition;
+import java.util.List;
+
+public interface ShopRepositoryCustom {
+
+    List<Shop> findSearch(ShopSearchCondition condition);
+
+}