Merge pull request #144 from COS301-SE-2023/hotfix/v0.1.0

Hotfix/v0.1.0 to Main

Author: PaulPilane

.github/workflows/ci-dev.yml

@@ -2,9 +2,9 @@ name: Development CI
 
 on:
   push:
-    branches: [ feat/* ]
+    branches: [ feat/*, hotfix/* ]
   pull_request:
-    branches: [ dev, feat/* ]
+    branches: [ dev, feat/*, hotfix/* ]
   workflow_call:
 
 permissions:
@@ -46,7 +46,7 @@ jobs:
       run: npx nx run app:lint
 
     - name: Test Workspace
-      run: npm run test:app:ci
+      run: npm run test:workspace:ci
 
     - name: Upload Coverage Report
       uses: codecov/codecov-action@v3
@@ -55,6 +55,9 @@ jobs:
       with:
         files: coverage/lcov.info  
 
+    - name: e2e Test App
+      run: npm run e2e:app:ci
+      
     - name: Build App
       run: npm run build:app:dev
 

.github/workflows/ci-prod.yml

@@ -44,14 +44,17 @@ jobs:
       run: npx nx run app:lint
 
     - name: Test Workspace
-      run: npm run test:app:ci
+      run: npm run test:workspace:ci
 
     - name: Upload Coverage Report
       uses: codecov/codecov-action@v3
       env: 
         CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}
       with:
         files: coverage/lcov.info  
+
+    - name: e2e Test App
+      run: npm run e2e:app:prod
 
     - name: Build App
       run: npm run build:app:prod

apps/api/src/main/java/com/fridgetoplate/api/IngredientController.java

@@ -8,7 +8,6 @@
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.CrossOrigin;
-import org.springframework.web.bind.annotation.CrossOrigin;
 import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
@@ -23,7 +22,7 @@
 import com.fridgetoplate.repository.IngredientRepository;
 
 @RestController
-@CrossOrigin(origins = "*", allowedHeaders = "", methods = { RequestMethod.GET, RequestMethod.POST, RequestMethod.PUT, RequestMethod.DELETE })
+@CrossOrigin(origins = "*", allowedHeaders = "*", methods = { RequestMethod.GET, RequestMethod.POST, RequestMethod.PUT, RequestMethod.DELETE })
 @RequestMapping("/ingredients")
 public class IngredientController {
     @Autowired

apps/api/src/main/java/com/fridgetoplate/api/PreferenceController.java

@@ -4,7 +4,6 @@
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.CrossOrigin;
-import org.springframework.web.bind.annotation.CrossOrigin;
 import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
@@ -13,14 +12,13 @@
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RestController;
 
 import com.fridgetoplate.model.Preference;
 import com.fridgetoplate.repository.PreferenceRepository;
 
 @RestController
-@CrossOrigin(origins = "*", allowedHeaders = "", methods = { RequestMethod.GET, RequestMethod.POST, RequestMethod.PUT, RequestMethod.DELETE })
+@CrossOrigin(origins = "*", allowedHeaders = "*", methods = { RequestMethod.GET, RequestMethod.POST, RequestMethod.PUT, RequestMethod.DELETE })
 @RequestMapping("/preferences")
 public class PreferenceController {
     @Autowired

apps/api/src/main/java/com/fridgetoplate/api/ProfileController.java

@@ -9,8 +9,7 @@
 import com.fridgetoplate.repository.ProfileRepository;
 
 @RestController
-@CrossOrigin(origins = "*", allowedHeaders = "", methods = { RequestMethod.GET, RequestMethod.POST, RequestMethod.PUT, RequestMethod.DELETE })
-@CrossOrigin(origins = "*", allowedHeaders = "", methods = { RequestMethod.GET, RequestMethod.POST, RequestMethod.PUT, RequestMethod.DELETE })
+@CrossOrigin(origins = "*", allowedHeaders = "*", methods = { RequestMethod.GET, RequestMethod.POST, RequestMethod.PUT, RequestMethod.DELETE })
 @RequestMapping("/profiles")
 
 public class ProfileController {

apps/api/src/main/java/com/fridgetoplate/api/RecipeController.java

@@ -7,7 +7,7 @@
 import com.fridgetoplate.model.Recipe;
 
 @RestController
-@CrossOrigin(origins = "*", allowedHeaders = "", methods = { RequestMethod.GET, RequestMethod.POST, RequestMethod.PUT, RequestMethod.DELETE })
+@CrossOrigin(origins = "*", allowedHeaders = "*", methods = { RequestMethod.GET, RequestMethod.POST, RequestMethod.PUT, RequestMethod.DELETE })
 @RequestMapping("/recipes")
 public class RecipeController {
 

apps/api/src/main/java/com/fridgetoplate/api/RecommendController.java

@@ -7,7 +7,7 @@
 import com.fridgetoplate.model.Recipe;
 
 @RestController
-@CrossOrigin(origins = "*", allowedHeaders = "", methods = { RequestMethod.GET, RequestMethod.POST, RequestMethod.PUT,
+@CrossOrigin(origins = "*", allowedHeaders = "*", methods = { RequestMethod.GET, RequestMethod.POST, RequestMethod.PUT,
         RequestMethod.DELETE })
 @RequestMapping("/recommend")
 

apps/api/src/main/java/com/fridgetoplate/model/Recipe.java

@@ -8,7 +8,6 @@
 import com.fridgetoplate.utils.StringArrayConverter;
 import com.fridgetoplate.utils.IngredientArrayConverter;
 import com.fridgetoplate.utils.RecipeStepArrayConverter;
-import com.fridgetoplate.utils.RecipeStepArrayConverter;
 
 import lombok.Data;
 

apps/api/src/main/java/com/fridgetoplate/model/RecipeStep.java

@@ -4,8 +4,8 @@
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 public class RecipeStep {
-    @JsonProperty("instructionHead")
-    private String instructionHead;
+    @JsonProperty("instructionHeading")
+    private String instructionHeading = "N/A";
 
     @JsonProperty("instructionBody")
     private String instructionBody;

apps/api/src/main/java/com/fridgetoplate/repository/IngredientRepository.java

@@ -1,5 +1,4 @@
 package com.fridgetoplate.repository;
-import java.util.Arrays;
 import java.util.List;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Repository;