Merge pull request #102 from COS301-SE-2023/franko-EndToEnd

Franko end to end

backend/gradlew

@@ -237,4 +237,4 @@ eval "set -- $(
         tr '\n' ' '
     )" '"$@"'
 
-exec "$JAVACMD" "$@"
+exec "$JAVACMD" "$@"

backend/src/main/java/fellowship/mealmaestro/controllers/SettingsController.java

@@ -0,0 +1,41 @@
+package fellowship.mealmaestro.controllers;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestHeader;
+import org.springframework.web.bind.annotation.RestController;
+
+import fellowship.mealmaestro.models.SettingsModel;
+import fellowship.mealmaestro.services.SettingsService;
+import jakarta.validation.Valid;
+
+@RestController
+public class SettingsController {
+
+     @Autowired
+    private SettingsService settingsService;
+
+
+    @PostMapping("/getSettings")
+    public ResponseEntity<SettingsModel> getSettings(@RequestHeader("Authorization") String token){
+        if (token == null || token.isEmpty()) {
+            return ResponseEntity.badRequest().build();
+        }
+        String authToken = token.substring(7);
+        return ResponseEntity.ok(settingsService.getSettings(authToken));
+    }
+
+    @PostMapping("/updateSettings")
+    public ResponseEntity<Void> updateSettings(@Valid @RequestBody SettingsModel request, @RequestHeader("Authorization") String token){
+        if (token == null || token.isEmpty()) {
+            return ResponseEntity.badRequest().build();
+        }
+        String authToken = token.substring(7);
+        request.setUserBMI(request.getUserHeight(), request.getUserWeight());
+        settingsService.updateSettings(request, authToken);
+        return ResponseEntity.ok().build();
+    }
+
+}

backend/src/main/java/fellowship/mealmaestro/models/SettingsModel.java

@@ -0,0 +1,221 @@
+package fellowship.mealmaestro.models;
+
+import java.util.List;
+
+
+import java.util.Map;
+
+public class SettingsModel{
+
+    private String goal; 
+    private String shoppingInterval;
+    private List<String> foodPreferences;
+    private int calorieAmount;
+    private String budgetRange;
+    private Map<String, Integer> macroRatio;
+
+    private List<String> allergies;
+    private String cookingTime;
+    private int userHeight; // consider moving to account
+    private int userWeight; // consider moving to account
+    private int userBMI;
+
+    private boolean BMISet = false;
+    private boolean cookingTimeSet = false;
+    private boolean allergiesSet = false;
+    private boolean macroSet = false;
+    private boolean budgetSet = false;
+    private boolean calorieSet = false;
+    private boolean foodPreferenceSet = false;
+    private boolean shoppingIntervalSet = false;
+
+    public SettingsModel() {
+        // Empty constructor with all booleans set to false by default
+    }
+
+    public SettingsModel(String goal, String shoppingInterval, List<String> foodPreferences, int calorieAmount,
+                         String budgetRange, Map<String, Integer> macroRatio, List<String> allergies, String cookingTime,
+                         int userHeight, int userWeight, int userBMI, boolean BMISet, boolean cookingTimeSet,
+                         boolean allergiesSet, boolean macroSet, boolean budgetSet, boolean calorieSet,
+                         boolean foodPreferenceSet, boolean shoppingIntervalSet) {
+        this.goal = goal;
+        this.shoppingInterval = shoppingInterval;
+        this.foodPreferences = foodPreferences;
+        this.calorieAmount = calorieAmount;
+        this.budgetRange = budgetRange;
+        this.macroRatio =  macroRatio;
+
+        this.allergies = allergies;
+        this.cookingTime = cookingTime;
+        this.userHeight = userHeight;
+        this.userWeight = userWeight;
+        this.userBMI = userBMI;
+        this.BMISet = BMISet;
+        this.cookingTimeSet = cookingTimeSet;
+        this.allergiesSet = allergiesSet;
+        this.macroSet = macroSet;
+        this.budgetSet = budgetSet;
+        this.calorieSet = calorieSet;
+        this.foodPreferenceSet = foodPreferenceSet;
+        this.shoppingIntervalSet = shoppingIntervalSet;
+    }
+
+    public String getGoal() {
+        return goal;
+    }
+
+    public void setGoal(String goal) {
+        this.goal = goal;
+    }
+
+    public String getShoppingInterval() {
+        return shoppingInterval;
+    }
+
+    public void setShoppingInterval(String shoppingInterval) {
+        this.shoppingInterval = shoppingInterval;
+    }
+
+    public List<String> getFoodPreferences() {
+        return foodPreferences;
+    }
+
+    public void setFoodPreferences(List<String> foodPreferences) {
+        this.foodPreferences = foodPreferences;
+    }
+
+    public int getCalorieAmount() {
+
+        return calorieAmount;
+    }
+
+    public void setCalorieAmount(int calorieAmount) {
+        this.calorieAmount = calorieAmount;
+    }
+
+    public String getBudgetRange() {
+        return budgetRange;
+    }
+
+    public void setBudgetRange(String budgetRange) {
+        this.budgetRange = budgetRange;
+    }
+
+    public Map<String, Integer> getMacroRatio() {
+        return macroRatio;
+    }
+
+    public void setMacroRatio(Map<String, Integer> macroRatio) {
+        this.macroRatio = macroRatio;
+    }
+
+    public List<String> getAllergies() {
+        return allergies;
+    }
+
+    public void setAllergies(List<String> allergies) {
+        this.allergies = allergies;
+    }
+
+    public String getCookingTime() {
+        return cookingTime;
+    }
+
+    public void setCookingTime(String cookingTime) {
+        this.cookingTime = cookingTime;
+    }
+
+    public int getUserHeight() {
+        return userHeight;
+    }
+
+    public void setUserHeight(int userHeight) {
+        this.userHeight = userHeight;
+    }
+
+    public int getUserWeight() {
+        return userWeight;
+    }
+
+    public void setUserWeight(int userWeight) {
+        this.userWeight = userWeight;
+    }
+
+    public int getUserBMI() {
+        return userBMI;
+    }
+
+    public void setUserBMI(int userHeight, int userWeight) {
+        this.userBMI = userHeight/userWeight;
+    }
+
+    public void setUserBMI(int userBMI) {
+        this.userBMI = userBMI;
+    }
+
+    public boolean isBMISet() {
+        return BMISet;
+    }
+
+    public void setBMISet(boolean BMISet) {
+        this.BMISet = BMISet;
+    }
+
+    public boolean isCookingTimeSet() {
+        return cookingTimeSet;
+    }
+
+    public void setCookingTimeSet(boolean cookingTimeSet) {
+        this.cookingTimeSet = cookingTimeSet;
+    }
+
+    public boolean isAllergiesSet() {
+        return allergiesSet;
+    }
+
+    public void setAllergiesSet(boolean allergiesSet) {
+        this.allergiesSet = allergiesSet;
+    }
+
+    public boolean isMacroSet() {
+        return macroSet;
+    }
+
+    public void setMacroSet(boolean macroSet) {
+        this.macroSet = macroSet;
+    }
+
+    public boolean isBudgetSet() {
+        return budgetSet;
+    }
+
+    public void setBudgetSet(boolean budgetSet) {
+        this.budgetSet = budgetSet;
+    }
+
+    public boolean isCalorieSet() {
+        return calorieSet;
+    }
+
+    public void setCalorieSet(boolean calorieSet) {
+        this.calorieSet = calorieSet;
+    }
+
+    public boolean isFoodPreferenceSet() {
+        return foodPreferenceSet;
+    }
+
+    public void setFoodPreferenceSet(boolean foodPreferenceSet) {
+        this.foodPreferenceSet = foodPreferenceSet;
+    }
+
+    public boolean isShoppingIntervalSet() {
+        return shoppingIntervalSet;
+    }
+
+    public void setShoppingIntervalSet(boolean shoppingIntervalSet) {
+        this.shoppingIntervalSet = shoppingIntervalSet;
+    }
+
+
+}