feat: implement MatchingController

Author: stark-cybertech

server/matching/src/main/java/meet_at_mensa/matching/controller/MatchingController.java

@@ -1,10 +1,14 @@
 package meet_at_mensa.matching.controller;
 
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.RestController;
 
 import jakarta.validation.Valid;
+import meet_at_mensa.matching.exception.MatchNotFoundException;
+import meet_at_mensa.matching.exception.RequestNotFoundException;
+import meet_at_mensa.matching.exception.RequestOverlapException;
 import meet_at_mensa.matching.service.MatchRequestService;
 import meet_at_mensa.matching.service.MatchService;
 import meet_at_mensa.matching.service.MatchingService;
@@ -29,24 +33,89 @@ public class MatchingController implements MatchingApi {
     // DELETE @ api/v2/matching/request/{requestID}
     @Override
     public ResponseEntity<Void> deleteApiV2MatchingRequestRequestId(UUID requestId) {
-        // TODO: Implement deletion logic using requestId
-        return ResponseEntity.ok().build();
+
+        // 200
+        try {
+
+            // attempt to remove request
+            requestService.removeRequest(requestId);
+
+            // if ok, return 200
+            return ResponseEntity.ok().build();
+
+
+        // 404
+        } catch (RequestNotFoundException e) {
+            
+            // if request not found return 404
+            return ResponseEntity.notFound().build();
+
+        // 500
+        } catch (Exception e) {
+
+            // if some other exception occurs
+            return ResponseEntity.internalServerError().build();
+
+        }
     }
 
     // GET @ api/v2/matching/matches/{userID}
     @Override
     public ResponseEntity<MatchCollection> getApiV2MatchingMatchesUserID(UUID userId) {
-        // TODO: Fetch matches for userId
-        MatchCollection collection = new MatchCollection();
-        return ResponseEntity.ok(collection);
+
+
+        // 200
+        try {
+            
+            // attempt to get matches
+            MatchCollection matches = matchService.getMatches(userId);
+
+            // return 200 with MatchCollection if found
+            return ResponseEntity.ok(matches);
+
+        // 404
+        } catch (MatchNotFoundException e) {
+            
+            // return 404 if no matches are found
+            return ResponseEntity.notFound().build();
+
+        // 500
+        } catch (Exception e) {
+
+            // return 500 if another exception occurs
+            return ResponseEntity.internalServerError().build();
+
+        }
+
     }
 
     // GET @ api/v2/matching/requests/{userID}
     @Override
     public ResponseEntity<MatchRequestCollection> getApiV2MatchingRequestsUserID(UUID userId) {
-        // TODO: Fetch match requests for userId
-        MatchRequestCollection collection = new MatchRequestCollection();
-        return ResponseEntity.ok(collection);
+
+        // 200
+        try {
+            
+            // attempt to get MatchRequests
+            MatchRequestCollection requests = requestService.getUserRequests(userId);
+
+            // return 200 with MatchRequestCollection if found
+            return ResponseEntity.ok(requests);
+
+        // 404
+        } catch (RequestNotFoundException e) {
+            
+            // return 404 if no MatchRequests are found
+            return ResponseEntity.notFound().build();
+
+        // 500
+        } catch (Exception e) {
+
+            // return 500 if another exception occurs
+            return ResponseEntity.internalServerError().build();
+
+        }
+
     }
 
     // GET @ api/v2/matching/rsvp/{matchID}/accept
@@ -65,19 +134,58 @@ public ResponseEntity<Void> getApiV2MatchingRsvpMatchIdReject(UUID matchId) {
 
     // POST @ api/v2/matching/request/submit
     @Override
-    public ResponseEntity<Void> postApiV2MatchingRequestSubmit(@Valid MatchRequestNew matchRequestNew) {
-        // TODO: Handle new match request submission
-        return ResponseEntity.ok().build();
+    public ResponseEntity<MatchRequest> postApiV2MatchingRequestSubmit(@Valid MatchRequestNew matchRequestNew) {
+
+        // 200
+        try {
+            
+            // attempt to register a new matchRequset
+            MatchRequest request = requestService.registerRequests(matchRequestNew);
+
+            // return 200 if successful
+            return ResponseEntity.ok(request);
+
+        // 409
+        } catch (RequestOverlapException e) {
+            
+            // return 409 if user already has a request on that day
+            return ResponseEntity.status(HttpStatus.CONFLICT).build();
+
+        // 500
+        } catch (Exception e) {
+
+            // return 500 if another exception occurs
+            return ResponseEntity.internalServerError().build();
+
+        }
     }
 
     // PUT @ api/v2/matching/request/{requestID}
     @Override
-    public ResponseEntity<MatchRequest> putApiV2MatchingRequestRequestId(
-            UUID requestId,
-            @Valid MatchRequestUpdate matchRequestUpdate) {
-        // TODO: Handle updating match request
-        MatchRequest updated = new MatchRequest(); // Fill with updated data
-        return ResponseEntity.ok(updated);
+    public ResponseEntity<MatchRequest> putApiV2MatchingRequestRequestId(UUID requestId, @Valid MatchRequestUpdate matchRequestUpdate) {
+                
+        // 200
+        try {
+
+            // attempt to update match request
+            MatchRequest request = requestService.updateRequest(requestId, matchRequestUpdate);
+            
+            // return 200 with MatchRequestCollection if found
+            return ResponseEntity.ok(request);
+
+        // 404
+        } catch (RequestNotFoundException e) {
+            
+            // return 404 if no MatchRequests are found
+            return ResponseEntity.notFound().build();
+
+        // 500
+        } catch (Exception e) {
+
+            // return 500 if another exception occurs
+            return ResponseEntity.internalServerError().build();
+
+        }
     }
 
 }

server/user/src/main/java/meet_at_mensa/user/controller/UserController.java

@@ -94,7 +94,7 @@ public ResponseEntity<User> postApiV2UserRegister(UserNew userNew) {
             // attempt to register a new user
             User newUser = userService.registerUser(userNew);
 
-            return ResponseEntity.status(201).body(newUser);
+            return ResponseEntity.ok(newUser);
 
         // 500
         } catch (Exception e) {