Delete games

CodeURJC-DAW-2022-23 · Feb 21, 2023 · f6358ea · f6358ea
1 parent a910afa
commit f6358ea
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 7 deletions.
diff --git a/backend/src/main/java/app/controller/AddGameController.java b/backend/src/main/java/app/controller/AddGameController.java
@@ -5,6 +5,7 @@
 import java.security.Principal;
 import java.sql.SQLException;
 import java.util.List;
+import java.util.Optional;
 import java.util.stream.Collectors;
 
 import javax.servlet.http.HttpServletRequest;
@@ -77,8 +78,10 @@ public String editGame(Model model, @PathVariable long id) {
 
 	@GetMapping("/deleteGame/{id}")
 	public String deleteGame(Model model, @PathVariable long id) {
-		gameService.deleteById(id);
-		return "controlPanel";
+		Game game = gameService.findById(id).orElseThrow();
+		game.setDeleted(true);
+		gameService.save(game);
+		return "redirect:/controlPanel";
 	}
 
 	@PostMapping("/editGame/{id}")

diff --git a/backend/src/main/java/app/model/Game.java b/backend/src/main/java/app/model/Game.java
@@ -37,6 +37,7 @@ public class Game {
 	private String network;
 	private String hardDrive;
 	private String soundCard;
+	private boolean deleted = false;
 
 	private int totalRating = 0;
 
@@ -58,6 +59,7 @@ public class Game {
 
 	@OneToMany(mappedBy = "game", cascade = CascadeType.ALL, orphanRemoval = true)
 	private List<Review> reviews = new ArrayList<>();
+
 
 	public Game() {
 
@@ -94,6 +96,10 @@ public Game(String category, String name, float price, String os, String process
 		this.soundCard = soundCard;
 	}
 
+	public void setDeleted(boolean deleted){
+		this.deleted = deleted;
+	}
+
 
 	public Long getId() {
 		return this.id;

diff --git a/backend/src/main/java/app/repository/GameRepository.java b/backend/src/main/java/app/repository/GameRepository.java
@@ -9,23 +9,25 @@
 import app.model.Game;
 
 public interface GameRepository extends JpaRepository<Game, Long> {
+
+    @Query("SELECT g FROM Game g WHERE g.category = :category AND g.deleted = false")
     List<Game> findByCategory(String category);
 
-    @Query("SELECT g FROM Game g WHERE LOWER(g.name) LIKE %:name% AND g.category = :category")
+    @Query("SELECT g FROM Game g WHERE LOWER(g.name) LIKE %:name% AND g.category = :category AND g.deleted = false")
     List<Game> findByCategoryAndName(String name, String category, Pageable pageable);
 
-    @Query("SELECT g FROM Game g WHERE LOWER(g.name) LIKE %:name%")
+    @Query("SELECT g FROM Game g WHERE LOWER(g.name) LIKE %:name% AND g.deleted = false")
     List<Game> findByName(String name, Pageable pageable);
 
-    @Query("SELECT COUNT(g) FROM Game g WHERE LOWER(g.name) LIKE %:name% AND g.category = :category")
+    @Query("SELECT COUNT(g) FROM Game g WHERE LOWER(g.name) LIKE %:name% AND g.category = :category AND g.deleted = false")
     int countByCategoryAndName(String name, String category);
 
-    @Query("SELECT COUNT(g) FROM Game g WHERE LOWER(g.name) LIKE %:name%")
+    @Query("SELECT COUNT(g) FROM Game g WHERE LOWER(g.name) LIKE %:name% AND g.deleted = false")
     int countByName(String name);
 
     int countById(long id);
 
-    @Query("SELECT g FROM Game g")
+    @Query("SELECT g FROM Game g WHERE g.deleted = false")
     List<Game> findGames(Pageable pageable);
 }
 

diff --git a/backend/src/main/resources/templates/product-info.html b/backend/src/main/resources/templates/product-info.html
@@ -90,7 +90,14 @@ <h1>{{name}}</h1>
               </a></div>
             {{/admin}}
             <br>
+            {{^deleted}}
             <h2><span class="label label-default">${{price}}</span></h2>
+            {{/deleted}}
+            {{#deleted}}
+            <div class="alert" role="alert">
+              <strong>This game is no longer available</strong>
+            </div>
+            {{/deleted}}
             {{#logged}}
             {{^inCart}}
             {{^isBought}}

diff --git a/backend/target/classes/templates/product-info.html b/backend/target/classes/templates/product-info.html
@@ -90,7 +90,14 @@ <h1>{{name}}</h1>
               </a></div>
             {{/admin}}
             <br>
+            {{^deleted}}
             <h2><span class="label label-default">${{price}}</span></h2>
+            {{/deleted}}
+            {{#deleted}}
+            <div class="alert" role="alert">
+              <strong>This game is no longer available</strong>
+            </div>
+            {{/deleted}}
             {{#logged}}
             {{^inCart}}
             {{^isBought}}