[농장] 카테고리 생성 및 누락 칼럼 추가 (#187)

* feat: 농장 누락 칼럼 추가
- 작물 유형
- 전화번호
#148

* feat: 농장 카테고리 조회
#148

* feat: 농장 카테고리 조회 API 작업
#148

* feat: 농장 카테고리 넘기도록 수정
#148

* feat: 카테고리 추가
#148

Author: stopmin

src/main/java/poomasi/domain/auth/config/SecurityConfig.java

@@ -80,12 +80,11 @@ public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Excepti
 
         // 기본 경로 및 테스트 경로
         http.authorizeHttpRequests((authorize) -> authorize
-                .requestMatchers(HttpMethod.POST, "/api/farm/**").permitAll()
                 .requestMatchers(HttpMethod.GET, "/api/product/**").permitAll()
                 .requestMatchers(HttpMethod.GET, "/api/review/**").permitAll()
                 .requestMatchers(HttpMethod.GET, "/health").permitAll()
                 .requestMatchers(HttpMethod.GET, "/api/image/**").permitAll()
-                .requestMatchers("/api/member/sign-up", "/api/login", "api/reissue", "api/payment/**", "api/order/**", "api/reservation/**", "/api/v1/farmer/reservations").permitAll()
+                .requestMatchers("/api/farm/**", "/api/member/sign-up", "/api/login", "api/reissue", "api/payment/**", "api/order/**", "api/reservation/**", "/api/v1/farmer/reservations").permitAll()
                 .requestMatchers("/api/need-auth/**").authenticated()
                 .anyRequest().
                 authenticated()

src/main/java/poomasi/domain/farm/_category/controller/FarmCategoryController.java

@@ -0,0 +1,27 @@
+package poomasi.domain.farm._category.controller;
+
+import lombok.RequiredArgsConstructor;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import poomasi.domain.farm._category.dto.response.FarmCategoryResponse;
+import poomasi.domain.farm._category.service.FarmCategoryService;
+
+import java.util.List;
+
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("/api/farm/category")
+public class FarmCategoryController {
+    private final FarmCategoryService farmCategoryService;
+
+    @GetMapping
+    public ResponseEntity<List<FarmCategoryResponse>> getFarmCategories() {
+        return ResponseEntity.ok(
+                farmCategoryService.getFarmCategories().stream()
+                        .map(FarmCategoryResponse::toResponse)
+                        .toList()
+        );
+    }
+}

src/main/java/poomasi/domain/farm/_category/domain/FarmCategory.java

@@ -0,0 +1,22 @@
+package poomasi.domain.farm._category.domain;
+
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import lombok.Getter;
+import org.hibernate.annotations.Comment;
+
+@Entity
+@Getter
+public class FarmCategory {
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Long id;
+
+    @Comment("농장 카테고리 이름")
+    private String name;
+
+    @Comment("농장 카테고리 이미지 URL")
+    private String imageUrl;
+}

src/main/java/poomasi/domain/farm/_category/dto/response/FarmCategoryResponse.java

@@ -0,0 +1,19 @@
+package poomasi.domain.farm._category.dto.response;
+
+import lombok.Builder;
+import poomasi.domain.farm._category.domain.FarmCategory;
+
+@Builder
+public record FarmCategoryResponse(
+        Long id,
+        String name,
+        String imageUrl
+) {
+    public static FarmCategoryResponse toResponse(FarmCategory farmCategory) {
+        return FarmCategoryResponse.builder()
+                .id(farmCategory.getId())
+                .name(farmCategory.getName())
+                .imageUrl(farmCategory.getImageUrl())
+                .build();
+    }
+}

src/main/java/poomasi/domain/farm/_category/repository/FarmCategoryRepository.java

@@ -0,0 +1,9 @@
+package poomasi.domain.farm._category.repository;
+
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.stereotype.Repository;
+import poomasi.domain.farm._category.domain.FarmCategory;
+
+@Repository
+public interface FarmCategoryRepository extends JpaRepository<FarmCategory, Long> {
+}

src/main/java/poomasi/domain/farm/_category/service/FarmCategoryService.java

@@ -0,0 +1,18 @@
+package poomasi.domain.farm._category.service;
+
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+import poomasi.domain.farm._category.domain.FarmCategory;
+import poomasi.domain.farm._category.repository.FarmCategoryRepository;
+
+import java.util.List;
+
+@Service
+@RequiredArgsConstructor
+public class FarmCategoryService {
+    private final FarmCategoryRepository farmCategoryRepository;
+
+    public List<FarmCategory> getFarmCategories() {
+        return farmCategoryRepository.findAll();
+    }
+}

src/main/java/poomasi/domain/farm/dto/FarmRegisterRequest.java

@@ -13,7 +13,7 @@ public record FarmRegisterRequest(
         int experiencePrice,
         Integer maxCapacity,
         Integer maxReservation,
-        String businessNumber
+        Long categoryId
 ) {
     public Farm toEntity(Long memberId) {
         return Farm.builder()
@@ -27,7 +27,8 @@ public Farm toEntity(Long memberId) {
                 .experiencePrice(experiencePrice)
                 .maxCapacity(maxCapacity)
                 .maxReservation(maxReservation)
-                .businessNumber(businessNumber)
+                .categoryId(categoryId)
+                .phoneNumber(phoneNumber)
                 .build();
     }
 }

src/main/java/poomasi/domain/farm/entity/Farm.java

@@ -13,9 +13,11 @@
 import jakarta.persistence.OneToMany;
 import jakarta.persistence.OneToOne;
 import jakarta.persistence.Table;
+
 import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.List;
+
 import lombok.AccessLevel;
 import lombok.Builder;
 import lombok.Getter;
@@ -25,6 +27,9 @@
 import org.hibernate.annotations.SQLDelete;
 import org.hibernate.annotations.UpdateTimestamp;
 import poomasi.domain.farm.dto.FarmUpdateRequest;
+
+import java.time.LocalDateTime;
+
 import poomasi.domain.order.entity._farm.OrderedFarm;
 import poomasi.domain.review.entity.Review;
 
@@ -34,7 +39,6 @@
 @NoArgsConstructor(access = AccessLevel.PROTECTED)
 @SQLDelete(sql = "UPDATE farm SET deleted_at=current_timestamp WHERE id = ?")
 public class Farm {
-
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     private Long id;
@@ -67,6 +71,10 @@ public class Farm {
     @Enumerated(EnumType.STRING)
     private FarmStatus status = FarmStatus.OPEN;
 
+    @Comment("카테고리 ID")
+    @Column(name = "category_id")
+    private Long categoryId;
+
     @Comment("체험 비용")
     private int experiencePrice;
 
@@ -87,6 +95,9 @@ public class Farm {
     @UpdateTimestamp
     private LocalDateTime updatedAt = LocalDateTime.now();
 
+    @Column(name = "phone_number")
+    private String phoneNumber;
+
     @OneToMany(cascade = CascadeType.REMOVE, orphanRemoval = true)
     @JoinColumn(name = "entityId")
     private List<Review> reviewList = new ArrayList<>();
@@ -98,10 +109,7 @@ public class Farm {
     private double averageRating;
 
     @Builder
-    public Farm(Long id, String name, Long ownerId, String address, String addressDetail,
-            Double latitude, Double longitude, String description, int experiencePrice,
-            Integer maxCapacity, Integer maxReservation, String businessNumber,
-            LocalDateTime deletedAt) {
+    public Farm(Long id, String name, Long ownerId, String address, String addressDetail, Double latitude, Double longitude, String description, int experiencePrice, Integer maxCapacity, Integer maxReservation, String businessNumber, LocalDateTime deletedAt, Long categoryId, String phoneNumber) {
         this.id = id;
         this.name = name;
         this.ownerId = ownerId;
@@ -115,6 +123,8 @@ public Farm(Long id, String name, Long ownerId, String address, String addressDe
         this.maxReservation = maxReservation;
         this.businessNumber = businessNumber;
         this.deletedAt = deletedAt;
+        this.categoryId = categoryId;
+        this.phoneNumber = phoneNumber;
         averageRating = 0.0f;
     }
 

src/main/java/poomasi/global/common/ProduceType.java

@@ -0,0 +1,5 @@
+package poomasi.global.common;
+
+public enum ProduceType {
+    FRUIT, VEGETABLE
+}

src/test/java/poomasi/domain/farm/service/FarmFarmerServiceTest.java

@@ -14,6 +14,7 @@
 import poomasi.domain.member.entity.Member;
 import poomasi.global.error.BusinessError;
 import poomasi.global.error.BusinessException;
+import poomasi.payment.entity.ItemType;
 
 import java.util.Optional;
 
@@ -48,7 +49,7 @@ void should_throwException_when_farmAlreadyExists() {
 
             given(farmRepository.getFarmByOwnerIdAndDeletedAtIsNull(member.getId())).willReturn(Optional.of(existingFarm));
 
-            FarmRegisterRequest request = new FarmRegisterRequest("New Farm", "Address", "Detail", 1.0, 1.0, "010-1234-5678", "Description", 10000, 10, 5, "1234-1234");
+            FarmRegisterRequest request = new FarmRegisterRequest("New Farm", "Address", "Detail", 1.0, 1.0, "010-1234-5678", "Description", 10000, 10, 5, 1L);
 
             // when & then
             assertThatThrownBy(() -> farmFarmerService.registerFarm(member, request))