From bcd03fc7cebcdd244c4c248517a51021b897cde5 Mon Sep 17 00:00:00 2001
From: Gustavo Henrique Santos Souza de Miranda <gustavohssmiranda@gmail.com>
Date: Mon, 8 Dec 2025 00:22:42 -0300
Subject: [PATCH 1/3] Fix broken removeGenre implementation in Album entity

---
 src/main/java/com/mediamanager/model/Album.java | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/mediamanager/model/Album.java b/src/main/java/com/mediamanager/model/Album.java
index e3419b4..684bc6c 100644
--- a/src/main/java/com/mediamanager/model/Album.java
+++ b/src/main/java/com/mediamanager/model/Album.java
@@ -98,9 +98,11 @@ public class Album {
     }
 
     public void removeGenre(Genre genre) {
-        ag.getGenre() != null && 
-            ag.getGenre().getId() != null && 
-            ag.getGenre().getId().equals(genre.getId())
+        albumGenres.removeIf(ag ->
+                ag.getGenre() != null &&
+                        ag.getGenre().getId() != null &&
+                        ag.getGenre().getId().equals(genre.getId())
+        );
     }
 
     // Método conveniente para pegar só os gêneros

From 09d20efba63c7d5e0c6ca40e129bcaa9af74f685 Mon Sep 17 00:00:00 2001
From: Gustavo Henrique Santos Souza de Miranda <gustavohssmiranda@gmail.com>
Date: Mon, 8 Dec 2025 00:33:23 -0300
Subject: [PATCH 2/3] Fix broken removeGenre to avoid possible null-pointer

---
 src/main/java/com/mediamanager/model/Album.java | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/main/java/com/mediamanager/model/Album.java b/src/main/java/com/mediamanager/model/Album.java
index 684bc6c..f2d7765 100644
--- a/src/main/java/com/mediamanager/model/Album.java
+++ b/src/main/java/com/mediamanager/model/Album.java
@@ -98,6 +98,9 @@ public class Album {
     }
 
     public void removeGenre(Genre genre) {
+        if (genre != null) {
+            return;
+        }
         albumGenres.removeIf(ag ->
                 ag.getGenre() != null &&
                         ag.getGenre().getId() != null &&

From 8119530befbce76a3972801e846bac0070960fb5 Mon Sep 17 00:00:00 2001
From: Gustavo Henrique Santos Souza de Miranda <gustavohssmiranda@gmail.com>
Date: Mon, 8 Dec 2025 00:37:05 -0300
Subject: [PATCH 3/3] Fix broken removeGenre to correct logic for the
 null-pointer exception

---
 src/main/java/com/mediamanager/model/Album.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/com/mediamanager/model/Album.java b/src/main/java/com/mediamanager/model/Album.java
index f2d7765..ca4bab5 100644
--- a/src/main/java/com/mediamanager/model/Album.java
+++ b/src/main/java/com/mediamanager/model/Album.java
@@ -98,7 +98,7 @@ public class Album {
     }
 
     public void removeGenre(Genre genre) {
-        if (genre != null) {
+        if (genre == null) {
             return;
         }
         albumGenres.removeIf(ag ->