Merge branch 'develop' into backend/feature/175-get-comments-endpoint

# Conflicts:
#	backend/src/main/java/com/group1/cuisines/controllers/RecipeController.java
#	backend/src/main/java/com/group1/cuisines/services/RecipeService.java

Author: boraykasap

.github/workflows/backend_deploy_staging.yml

@@ -0,0 +1,36 @@
+name: backend-staging-workflow
+
+on:
+  workflow_run:
+    workflows: ["backend-test"]
+    types:
+      - completed
+  push:
+    branches:
+      - staging
+    paths:
+      - 'backend/**'
+      - compose.yml
+
+jobs:
+  deploy:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+      
+      - name: Authorize to with doctl
+        run: echo ${{ secrets.DIGITALOCEAN_ACCESS_TOKEN }} | doctl auth init --context github-actions
+
+      - name: Login to Docker registry
+        run: doctl registry login --context github-actions
+
+      - name: Build Docker image
+        run: docker compose build
+
+      - name: Tag Docker image
+        run: docker tag bounswe2024group1-backend:latest registry.digitalocean.com/semantic-browse/backend-staging:latest
+
+      - name: Push Docker image
+        run: docker push registry.digitalocean.com/semantic-browse/backend-staging:latest
+

.github/workflows/backend_test.yml

@@ -0,0 +1,32 @@
+name: backend-test
+
+on:
+  push:
+    paths:
+      - 'backend/**'
+      - compose.yml
+      - dev.yml
+      - '.github/workflows/backend_test.yml'
+
+  pull_request:
+    branches:
+      - main
+      - staging
+      - develop
+
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    env:
+      working-directory:
+        backend
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+            
+      - name: Test with Maven
+        run: docker compose -f dev.yml run --rm backend mvn test
+
+
+            

backend/src/main/java/com/group1/cuisines/controllers/RecipeController.java

@@ -3,6 +3,7 @@
 import com.group1.cuisines.dto.RatingDto;
 import com.group1.cuisines.dto.RecipeDetailDto;
 import com.group1.cuisines.entities.Comment;
+import com.group1.cuisines.entities.User;
 import com.group1.cuisines.services.RecipeService;
 import org.springframework.http.HttpStatus;
 import org.springframework.security.core.Authentication;
@@ -13,6 +14,8 @@
 import org.springframework.security.access.prepost.PreAuthorize;
 import java.util.List;
 
+import java.util.List;
+
 @RestController
 @RequestMapping("/api/v1")
 public class RecipeController {
@@ -69,6 +72,34 @@ public ResponseEntity<?> rateRecipe(@PathVariable Integer recipeId, @RequestBody
         }
     }
 
+    @PostMapping("/recipes/{recipeId}/bookmarks")
+    public ResponseEntity<?> bookmarkRecipe(@PathVariable Integer recipeId) {
+        Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
+        if (authentication == null || authentication.getPrincipal().equals("anonymousUser")) {
+            return ResponseEntity.status(HttpStatus.UNAUTHORIZED).body("Authentication required.");
+        }
+
+        String username = authentication.getName(); // Assuming the username can be obtained like this
+        boolean success = recipeService.bookmarkRecipe(recipeId, username);
+
+        if (success) {
+            return ResponseEntity.ok().body("Recipe bookmarked successfully");
+        } else {
+            return ResponseEntity.badRequest().body("Failed to bookmark recipe");
+        }
+    }
+
+    @GetMapping("/recipes/{recipeId}/bookmarks")
+    public ResponseEntity<?> getBookmarks(@PathVariable Integer recipeId) {
+        Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
+        if (authentication == null || authentication.getPrincipal().equals("anonymousUser")) {
+            return ResponseEntity.status(HttpStatus.UNAUTHORIZED).body("Authentication required.");
+        }
+
+        List<User> whoBookmarked = recipeService.getWhoBookmarked(recipeId);
+        return ResponseEntity.ok().body(whoBookmarked);
+    }
+
     @GetMapping("/recipes/{recipeId}/comments")
     public ResponseEntity<?> getComments(@PathVariable Integer recipeId) {
 

backend/src/main/java/com/group1/cuisines/repositories/BookmarkRepository.java

@@ -4,8 +4,15 @@
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
 
+import java.util.List;
+import java.util.Optional;
+
 @Repository
 public interface BookmarkRepository extends JpaRepository<Bookmark,Integer> {
+    List<Bookmark> findByUserId(Integer userId);
+    List<Bookmark> findByRecipeId(Integer recipeId);
+    Optional<Bookmark> findByUserIdAndRecipeId(Integer userId, Integer recipeId);
+
 }
 
 

backend/src/main/java/com/group1/cuisines/services/RecipeService.java

@@ -27,6 +27,8 @@ public class RecipeService {
     private UserRepository userRepository;
     @Autowired
     private RatingRepository ratingRepository;
+    @Autowired
+    private BookmarkRepository bookmarkRepository;
 
     @Autowired
     private CommentRepository commentRepository;
@@ -120,11 +122,34 @@ public boolean rateRecipe(Integer recipeId, String username, Integer ratingValue
         return false;
     }
 
+    public boolean bookmarkRecipe(Integer recipeId, String username) {
+        User user = userRepository.findByUsername(username).orElse(null);
+        if (user == null){
+            return false;
+        }
+        Recipe recipe = recipeRepository.findById(recipeId).orElse(null);
+        if (recipe == null){
+            return false;
+        }
+        if (bookmarkRepository.findByUserIdAndRecipeId(user.getId(), recipeId).isPresent()){
+            return false;
+        }
 
-    public List<Comment> getCommentsByRecipeId(Integer recipeId) {
-        return commentRepository.findByRecipeId(recipeId);
+        Bookmark bookmark = Bookmark.builder()
+                .user(user)
+                .recipe(recipe)
+                .build();
+        bookmarkRepository.save(bookmark);
+
+        return true;
     }
 
+    public List<User> getWhoBookmarked(Integer recipeId) {
+        return bookmarkRepository.findByRecipeId(recipeId).stream().map(Bookmark::getUser).toList();
+    }
 
+    public List<Comment> getCommentsByRecipeId(Integer recipeId) {
+        return commentRepository.findByRecipeId(recipeId);
+    }
 
 }