Merge pull request #4 from Skhuthon/yong

Yong

Author: zzdh8

src/main/java/org/skhuton/skhudebug/bughunt/repository/BughuntRepository.java

@@ -1,11 +1,14 @@
 package org.skhuton.skhudebug.bughunt.repository;
 
 import org.skhuton.skhudebug.bughunt.domain.Bughunt;
+import org.skhuton.skhudebug.member.domain.User;
 import org.springframework.data.jpa.repository.JpaRepository;
 
 import java.math.BigDecimal;
 import java.util.List;
 
 public interface BughuntRepository extends JpaRepository<Bughunt, Long> {
     List<Bughunt> findByLatitudeBetweenAndLongitudeBetween(BigDecimal minLat, BigDecimal maxLat, BigDecimal minLng, BigDecimal maxLng);
+
+    Bughunt findByUser(User user);
 }

src/main/java/org/skhuton/skhudebug/bughunt/service/BughuntService.java

@@ -8,6 +8,8 @@
 import org.skhuton.skhudebug.bughunt.repository.BughuntRepository;
 import org.skhuton.skhudebug.exception.ErrorCode;
 import org.skhuton.skhudebug.exception.model.NotFoundException;
+import org.skhuton.skhudebug.match.domain.HuntReqManagement;
+import org.skhuton.skhudebug.match.repository.HuntMatchRepository;
 import org.skhuton.skhudebug.member.domain.User;
 import org.skhuton.skhudebug.member.repository.UserRepository;
 import org.springframework.stereotype.Service;
@@ -24,9 +26,10 @@
 public class BughuntService {
     private final BughuntRepository bughuntRepository;
     private final UserRepository userRepository;
+    private final HuntMatchRepository huntMatchRepository;
 
     @Transactional
-    public Bughunt save(BughuntSaveReqDto bughuntSaveReqDto) {
+    public void save(BughuntSaveReqDto bughuntSaveReqDto) {
         User user = userRepository.findByLoginId(bughuntSaveReqDto.loginId()).orElseThrow(
                 ()-> new NotFoundException(
                         ErrorCode.USER_NOT_FOUND,
@@ -42,7 +45,17 @@ public Bughunt save(BughuntSaveReqDto bughuntSaveReqDto) {
                 .radius(bughuntSaveReqDto.radius())
                 .build();
         bughunt.setCreatedAt(LocalDateTime.now());
-        return bughuntRepository.save(bughunt);
+        bughuntRepository.save(bughunt);
+
+        //요청 아이디 값 가져와서 저장하기.
+        Bughunt getvalue = bughuntRepository.findByUser(user);
+        HuntReqManagement huntReqManagement = HuntReqManagement.builder()
+                .requestId(getvalue.getId())
+                .senderId(user.getLoginId())
+                .senderId(null)
+                .complete(false)
+                .build();
+        huntMatchRepository.save(huntReqManagement);
     }
     public BughuntListResDto findAll(){
         List<Bughunt> bughunts = bughuntRepository.findAll();

src/main/java/org/skhuton/skhudebug/exception/SuccessCode.java

@@ -16,7 +16,8 @@ public enum SuccessCode {
     /*200 OK*/
     RANKING_GET_SUCCESS(HttpStatus.OK, "랭킹 조회 성공"),
     GET_SUCCESS(HttpStatus.OK, "조회 완료"),
-    BUGHUNT_RADIUS_GET_SUCCESS(HttpStatus.OK, "조회 완료")
+    BUGHUNT_RADIUS_GET_SUCCESS(HttpStatus.OK, "조회 완료"),
+    BUGHUNT_REQUEST_ACCEPT(HttpStatus.OK, "헌터 구인 요청 수락 완료"),
     ;
 
     private final HttpStatus httpStatus;

src/main/java/org/skhuton/skhudebug/match/controller/BughuntMatchController.java

@@ -0,0 +1,33 @@
+package org.skhuton.skhudebug.match.controller;
+
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.Parameters;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import lombok.RequiredArgsConstructor;
+import org.skhuton.skhudebug.common.dto.BaseResponse;
+import org.skhuton.skhudebug.exception.SuccessCode;
+import org.skhuton.skhudebug.match.dto.MatchReqDto;
+import org.skhuton.skhudebug.match.service.MatchService;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequiredArgsConstructor
+@Tag(name = "Bughunt Match API", description = "헌트 요청의 수락과 업무의 완료를 담당하는 API")
+public class BughuntMatchController {
+    private final MatchService matchService;
+
+    @Operation(summary = "헌트 요청 수락", description = "헌트 요청을 수락하는 API")
+    @Parameters({
+            @Parameter(name = "senderId", description = "호출하는 사용자 아이디", required = true),
+            @Parameter(name = "requestId", description = "헌트 요청 건 고유의 아이디", required = true),
+            @Parameter(name = "receiveId", description = "호출받는 사용자의 아이디", required = true)
+    })
+    @PostMapping("/bughunt-matching")
+    public BaseResponse<String> bughuntMatching(@RequestBody MatchReqDto matchReqDto) {
+        matchService.acceptByHunter(matchReqDto);
+        return BaseResponse.success(SuccessCode.BUGHUNT_REQUEST_ACCEPT);
+    }
+}

src/main/java/org/skhuton/skhudebug/match/domain/HuntReqManagement.java

@@ -0,0 +1,33 @@
+package org.skhuton.skhudebug.match.domain;
+
+import jakarta.persistence.*;
+import lombok.*;
+
+@Entity
+@Setter
+@Getter
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class HuntReqManagement {
+
+    /**
+     * 요청 관리 엔티티
+     */
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @Column(name = "hunt_match_id")
+    private Long id;
+
+    @Column(name = "request_id", nullable = false)
+    private Long requestId;
+
+    @Column(name = "sender_id", nullable = false)
+    private String senderId;
+
+    @Column(name = "receive_id", nullable = false)
+    private String receiveId;
+
+    @Column(name = "complete", nullable = false)
+    private boolean complete;
+}

src/main/java/org/skhuton/skhudebug/match/dto/MatchReqDto.java

@@ -0,0 +1,18 @@
+package org.skhuton.skhudebug.match.dto;
+
+import lombok.Builder;
+
+public record MatchReqDto(
+        String senderId,
+        String receiveId,
+        Long requestId
+) {
+    @Builder
+    public static MatchReqDto from(String senderId, String receiveId, Long requestId) {
+        return MatchReqDto.builder()
+                .senderId(senderId)
+                .receiveId(receiveId)
+                .requestId(requestId)
+                .build();
+    }
+}

src/main/java/org/skhuton/skhudebug/match/repository/HuntMatchRepository.java

@@ -0,0 +1,10 @@
+package org.skhuton.skhudebug.match.repository;
+
+import org.skhuton.skhudebug.match.domain.HuntReqManagement;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface HuntMatchRepository extends JpaRepository<HuntReqManagement, Long> {
+    HuntReqManagement findBySenderId(String senderId);
+}

src/main/java/org/skhuton/skhudebug/match/service/MatchService.java

@@ -0,0 +1,29 @@
+package org.skhuton.skhudebug.match.service;
+
+import lombok.RequiredArgsConstructor;
+import org.skhuton.skhudebug.match.domain.HuntReqManagement;
+import org.skhuton.skhudebug.match.dto.MatchReqDto;
+import org.skhuton.skhudebug.match.repository.HuntMatchRepository;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+@Service
+@RequiredArgsConstructor
+public class MatchService {
+    private final HuntMatchRepository huntMatchRepository;
+    /**
+     * 호출 수락
+     *
+     * 1. 수락 버튼 클릭
+     * 2. 벌레에 대한 정보와 호출한 유저, 수락한 유저의 아이디를 담은 요청 데이터 전송
+     * 3. 요청 관리 테이블에서 수락 컬럼을 true로 변경
+     *
+     * 요청관리테이블의 특정 컬럼들이 true가 될 때까지 벌레 잡은 상태로 취급하지 않음.
+     */
+    @Transactional
+    public void acceptByHunter(MatchReqDto matchReqDto) {
+        HuntReqManagement huntReqManagement = huntMatchRepository.findBySenderId(matchReqDto.senderId());
+        huntReqManagement.setReceiveId(matchReqDto.receiveId());
+        huntMatchRepository.save(huntReqManagement);
+    }
+}