Merge pull request #33 from CSC207-2022F-UofT/Final-Merge

Final merge

Author: ShaanPurewal

.gitignore

@@ -81,8 +81,6 @@ fabric.properties
 **/build/
 !src/**/build/
 
-## Mongo-Related
-src/main/resources/application.properties
 
 # Ignore Gradle GUI config
 gradle-app.setting

src/main/java/com/backend/controller/AccountController.java

@@ -1,12 +1,24 @@
 package com.backend.controller;
 
 import com.backend.entities.IDs.SessionID;
-import com.backend.usecases.AccountManager;
+import com.backend.usecases.facades.AccountSystemFacade;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 
 @RestController
 public class AccountController {
+    private final AccountSystemFacade accountSystemFacade;
+
+    /**
+     * Spring Boot Dependency Injection of the accountSystemFacade
+     * @param accountSystemFacade the dependency to be injected
+     */
+    @Autowired
+    public AccountController(AccountSystemFacade accountSystemFacade) {
+        this.accountSystemFacade = accountSystemFacade;
+    }
+
     /**
      * Post request to log in with the given credentials
      * @param username of type String, username to reference associated account
@@ -16,7 +28,7 @@ public class AccountController {
     @PostMapping("/login" )
     public ResponseEntity<Object> loginAccount(@RequestParam String username, String password){
         // Run AccountManager service
-        return AccountManager.loginAccount(username, password);
+        return this.accountSystemFacade.loginAccount(username, password);
     }
 
     /**
@@ -27,7 +39,7 @@ public ResponseEntity<Object> loginAccount(@RequestParam String username, String
     @PostMapping("/logout" )
     public ResponseEntity<Object> logoutAccount(@RequestParam String sessionID){
         // Run AccountManager service
-        return AccountManager.logoutAccount(new SessionID(sessionID));
+        return this.accountSystemFacade.logoutAccount(new SessionID(sessionID));
     }
 
     /**
@@ -39,7 +51,7 @@ public ResponseEntity<Object> logoutAccount(@RequestParam String sessionID){
     @PostMapping("/register" )
     public ResponseEntity<Object> registerAccount(@RequestParam String username, String password){
         // Run AccountManager service
-        return AccountManager.registerAccount(username, password);
+        return this.accountSystemFacade.registerAccount(username, password);
     }
 
     /**
@@ -50,7 +62,31 @@ public ResponseEntity<Object> registerAccount(@RequestParam String username, Str
     @DeleteMapping("/delete" )
     public ResponseEntity<Object> deleteAccount(@RequestParam String sessionID){
         // Run AccountManager service
-        return AccountManager.deleteAccount(new SessionID(sessionID));
+        return this.accountSystemFacade.deleteAccount(new SessionID(sessionID));
+    }
+
+    /**
+     * Patch request to update the account associated with the given parameter
+     * @param sessionID of type String, sessionID to reference the account to be deleted
+     * @param newUsername of type String, newUsername to change the account credential to
+     * @return a response entity detailing successful completion or any associated error
+     */
+    @PatchMapping("/updateUsername" )
+    public ResponseEntity<Object> updateAccountUsername(@RequestParam String sessionID, String newUsername){
+        // Run AccountManager service
+        return this.accountSystemFacade.updateUsername(new SessionID(sessionID), newUsername);
+    }
+
+    /**
+     * Patch request to update the account associated with the given parameter
+     * @param sessionID of type String, sessionID to reference the account to be deleted
+     * @param newPassword of type String, newPassword to change the account credential to
+     * @return a response entity detailing successful completion or any associated error
+     */
+    @PatchMapping("/updatePassword" )
+    public ResponseEntity<Object> updateAccountPassword(@RequestParam String sessionID, String newPassword){
+        // Run AccountManager service
+        return this.accountSystemFacade.updatePassword(new SessionID(sessionID), newPassword);
     }
 
     /**
@@ -61,6 +97,6 @@ public ResponseEntity<Object> deleteAccount(@RequestParam String sessionID){
     @GetMapping("/account" )
     public ResponseEntity<Object> getAccount(@RequestParam String sessionID) {
         // Run AccountManager service
-        return AccountManager.getAccountInfo(new SessionID(sessionID));
+        return this.accountSystemFacade.getAccountInfo(new SessionID(sessionID));
     }
 }

src/main/java/com/backend/controller/FeedController.java

@@ -0,0 +1,33 @@
+package com.backend.controller;
+
+import com.backend.usecases.facades.FeedSystemFacade;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+public class FeedController {
+    private final FeedSystemFacade feedSystemFacade;
+
+    /**
+     * Spring Boot Dependency Injection of the accountSystemFacade
+     * @param feedSystemFacade the dependency to be injected
+     */
+    @Autowired
+    public FeedController(FeedSystemFacade feedSystemFacade) {
+        this.feedSystemFacade = feedSystemFacade;
+    }
+
+    /**
+     * Get a list of feed data representing information regarding recent posts made by friends
+     * @param sessionID of type String, password to reference associated account
+     * @return a response entity detailing successful completion (with a newly generated SessionID) or any associated error
+     */
+    @GetMapping("/feed" )
+    public ResponseEntity<Object> getFeed(@RequestParam String sessionID){
+        // Run AccountManager service
+        return this.feedSystemFacade.getFeed(sessionID);
+    }
+}

src/main/java/com/backend/controller/FriendController.java

@@ -0,0 +1,33 @@
+package com.backend.controller;
+
+
+import com.backend.usecases.facades.FriendSystemFacade;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.*;
+
+@RestController
+public class FriendController {
+
+    private final FriendSystemFacade friendSystemFacade;
+
+    @Autowired
+    public FriendController(FriendSystemFacade friendSystemFacade) {
+        this.friendSystemFacade = friendSystemFacade;
+    }
+
+    @GetMapping("/friends/getFriends")
+    public ResponseEntity<Object> getFriends(@RequestParam String sessionID) {
+        return this.friendSystemFacade.getUserFriends(sessionID);
+    }
+
+    @DeleteMapping("/friends/deleteFriend")
+    public ResponseEntity<Object> deleteFriend(@RequestParam String friendUserName, @RequestParam String sessionID) {
+        return this.friendSystemFacade.deleteFriend(friendUserName, sessionID);
+    }
+
+    @DeleteMapping("/friends/deleteAllCorrelatedFriends")
+    public ResponseEntity<Object> deleteAllCorrelatedFriends(@RequestParam String sessionID) {
+        return this.friendSystemFacade.deleteAllCorrelatedFriends(sessionID);
+    }
+}

src/main/java/com/backend/controller/InvitationController.java

@@ -0,0 +1,68 @@
+package com.backend.controller;
+
+import com.backend.usecases.facades.FriendSystemFacade;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.*;
+
+@RestController
+public class InvitationController {
+
+    private final FriendSystemFacade friendSystemFacade;
+
+    @Autowired
+    public InvitationController(FriendSystemFacade friendSystemFacade) {
+        this.friendSystemFacade = friendSystemFacade;
+    }
+
+    // create a get request to get invitations for a specific user
+    @GetMapping("/friends/getInviteAsReceiver")
+    public ResponseEntity<Object> getInvitationsAsReceiver(@RequestParam String sessionID) {
+        // get sessionID from request
+        // call getInvitations method from InvitationsManager
+        // return response
+        return this.friendSystemFacade.getInvitations(sessionID, true);
+    }
+
+    @GetMapping("/friends/getInviteAsSender")
+    public ResponseEntity<Object> getInvitationsAsSender(@RequestParam String sessionID) {
+        // get sessionID from request
+        // call getInvitations method from InvitationsManager
+        // return response
+        return this.friendSystemFacade.getInvitations(sessionID, false);
+    }
+
+    // create a post request to send an invitation
+    @PostMapping("/friends/sendInvite")
+    public ResponseEntity<Object> sendInvitation(@RequestParam String receiverUsername, String sessionID) {
+        // create invitation
+        // save invitation to the database
+        return this.friendSystemFacade.sendInvitation(receiverUsername, sessionID);
+    }
+
+    @DeleteMapping("/friends/withdrawInvite")
+    public ResponseEntity<Object> withdrawInvitation(@RequestParam String receiverUsername, String sessionID) {
+        return this.friendSystemFacade.withdrawInvitation(receiverUsername, sessionID);
+    }
+
+    // create a post request to accept an invitation
+    @PostMapping("/friends/acceptInvite")
+    public ResponseEntity<Object> acceptInvitation(@RequestParam String receiverUsername, String sessionID) {
+        return this.friendSystemFacade.handleInvitation(receiverUsername, sessionID, true);
+    }
+
+
+    // create a post request to decline an invitation
+    @DeleteMapping("/friends/declineInvite")
+    public ResponseEntity<Object> declineInvitation(@RequestParam String receiverUsername, @RequestParam String sessionID) {
+        // check if invitation exists
+        // delete invitation from the database
+        return this.friendSystemFacade.handleInvitation(receiverUsername, sessionID, false);
+    }
+
+    @DeleteMapping("/friends/deleteAllCorrelatedInvitations")
+    public ResponseEntity<Object> deleteAllCorrelatedInvitations(@RequestParam String sessionID) {
+
+        return this.friendSystemFacade.deleteAllCorrelatedInvitations(sessionID);
+    }
+}

src/main/java/com/backend/controller/PetController.java

@@ -1,108 +1,42 @@
 package com.backend.controller;
 
-import com.backend.entities.Pet;
-import com.backend.entities.ShopItem;
-import com.backend.error.handlers.LogHandler;
-import com.backend.repositories.PetRepo;
-import com.backend.usecases.ShopManager;
-import org.springframework.http.HttpStatus;
+import com.backend.entities.IDs.SessionID;
+import com.backend.usecases.facades.PetSystemFacade;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.util.ArrayList;
-import java.util.Optional;
 
 @RestController
 public class PetController {
-    /**
-     * Get request to getPet with the sessionID from the database
-     * @param sessionID string that represents the current session and verifies the action
-     */
-    @GetMapping("/pet")
-    public ResponseEntity<Object> pets(@RequestParam String sessionID){
-        Optional<Pet> pet = ShopManager.getPet(sessionID);
 
-        if (pet.isPresent()){
-            return new ResponseEntity<>(pet, HttpStatus.OK);
-        }
-        return LogHandler.logError(new Exception("curAccount is null"), HttpStatus.BAD_REQUEST);
-    }
-
-    /**
-     * Post request to addPet with the petID from the database
-     * @param id string that represents the current session and verifies the action
-     */
-    @PostMapping("/addPet")
-    public ResponseEntity<Object> addPet(@RequestParam String id){
-        Pet pet = ShopManager.addPet(id);
+    private final PetSystemFacade petSystemFacade;
 
-        return new ResponseEntity<>(pet, HttpStatus.OK);
+    @Autowired
+    public PetController(PetSystemFacade petSystemFacade){
+        this.petSystemFacade = petSystemFacade;
     }
 
     /**
-     * Post request to replace the current pet with the same pet with an updated outfit from the database
-     * @param sessionID string that represents the current session and verifies the action
-     * @param newOutfit ArrayList of ShopItems that will be for the updated outfit
-     */
-    @PostMapping("/updatePetOutfit")
-    public ResponseEntity<Object> updatePetOutfit(@RequestParam String sessionID, ArrayList<ShopItem> newOutfit){
-        boolean successful = ShopManager.updateCurrentOutfit(sessionID, newOutfit);
-
-        if (successful){
-            return new ResponseEntity<>("Pet outfit successfully updated", HttpStatus.OK);
-        }
-
-        return LogHandler.logError(new Exception("outfit failed to update"), HttpStatus.BAD_REQUEST);
-    }
-
-    /**
-     * Get request to get Pet Balance with the sessionID from the database
-     * @param sessionID string that represents the current session and verifies the action
-     */
-    @GetMapping("/petBalance")
-    public ResponseEntity<Object> getBalance(@RequestParam String sessionID){
-        Optional<Double> balance = ShopManager.getBalance(sessionID);
-
-        if (balance.isPresent()){
-            return new ResponseEntity<>(balance, HttpStatus.OK);
-        }
-
-        return LogHandler.logError(new Exception("Get balance failed"), HttpStatus.BAD_REQUEST);
-    }
-
-    /**
-     * Post request to add balance to a pet with the sessionID in the database
+     * Get request to getPet with the sessionID from the database
      * @param sessionID string that represents the current session and verifies the action
-     * @param balance double that represent amount that will be added
      */
-    @PostMapping("/addPetBalance")
-    public ResponseEntity<Object> addPetBalance(@RequestParam String sessionID, Double balance){
-        boolean successful = ShopManager.addBalance(sessionID, balance);
-        if (successful){
-            return new ResponseEntity<>("Balance added", HttpStatus.OK);
-        }
-
-        return LogHandler.logError(new Exception("Add balance failed"), HttpStatus.BAD_REQUEST);
+    @GetMapping("/pet")
+    public ResponseEntity<Object> getPet(@RequestParam SessionID sessionID){
+        return this.petSystemFacade.getPet(sessionID);
     }
 
     /**
-     * Post request to have the pet own the item and reduce the balance accordingly to the cost of the item from the database
+     * Post request to replace the current pet with the same pet with an updated outfit from the database
      * @param sessionID string that represents the current session and verifies the action
-     * @param itemId string that represents the item to be purchased
+     * @param itemID ItemID that corrosponds with the shop item
      */
-    @PostMapping("/purchaseItems")
-    public ResponseEntity<Object> purchaseItem(@RequestParam String sessionID, String itemId){
-        boolean successful = ShopManager.purchaseItem(itemId, sessionID);
-
-        if (successful){
-            return new ResponseEntity<>("Item purchased", HttpStatus.OK);
-        }
-
-        return LogHandler.logError(new Exception("Purchase item failed"), HttpStatus.BAD_REQUEST);
-
+    @PostMapping("/updatePetOutfit")
+    public ResponseEntity<Object> updatePetOutfit(@RequestParam SessionID sessionID, String itemID){
+        return this.petSystemFacade.updateCurrentOutfit(sessionID, itemID);
     }