Merge pull request #25 from TravelMate-KU/feat/matching

Feat: 봉사자 - requests 요청 수락 API 구현

.gitignore

@@ -1,4 +1,5 @@
 .gradle
 build/
+.idea
 
 .DS_Store

src/main/java/konkuk/travelmate/controller/RequestController.java

@@ -7,6 +7,8 @@
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.format.annotation.DateTimeFormat;
+import org.springframework.security.core.annotation.AuthenticationPrincipal;
+import org.springframework.security.oauth2.core.user.OAuth2User;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.*;
@@ -17,6 +19,7 @@
 import java.time.LocalTime;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Objects;
 
 @Slf4j
 @Controller
@@ -71,6 +74,22 @@ public String showRequests(@RequestParam(value = "walk", required = false) Integ
         return "volunteer_matching";
     }
 
+    /**
+     * 봉사자 -> 장애인 요청 수락
+     * 매칭 생성
+     */
+    @PostMapping("/requests/{requestId}/matchings")
+    public String acceptDisabledRequest(@PathVariable Long requestId, @AuthenticationPrincipal OAuth2User user) {
+
+        log.info("[RequestController.acceptDisabledRequest]");
+
+        String email = Objects.requireNonNull(user.getAttribute("email")).toString();
+
+        requestService.acceptDisabledRequest(requestId, email);
+
+        return "redirect:/matchings";
+    }
+
     private boolean isSearchButtonClicked(Integer walk, Integer see, Integer talk, Integer listen, Integer iq, Integer depression, Integer bipolarDisorder) {
         return walk != null && see != null && talk != null && listen != null && iq != null && depression != null && bipolarDisorder != null;
     }

src/main/java/konkuk/travelmate/controller/UserController.java

@@ -43,7 +43,7 @@ public String gateway(@AuthenticationPrincipal OAuth2User oauth) {
         } else if (user.get().getRole() == Role.DISABLED) {
             return "redirect:disable";
         } else if (user.get().getRole() == Role.VOLUNTEER) {
-            return "redirect:volunteer";
+            return "redirect:/requests";
         }
         return "/error";
     }

src/main/java/konkuk/travelmate/domain/Matching.java

@@ -9,7 +9,6 @@
 @NoArgsConstructor
 public class Matching {
 
-
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     @Column(name = "m_id")
@@ -24,4 +23,10 @@ public class Matching {
     @ManyToOne(fetch = FetchType.LAZY)
     @JoinColumn(name = "r_id")
     private Request request;
+
+    public Matching(Integer rating, User volunteer, Request request) {
+        this.rating = rating;
+        this.volunteer = volunteer;
+        this.request = request;
+    }
 }