From 16b45bc4f64008f51d4e5fa42eeedc4f0959ef8f Mon Sep 17 00:00:00 2001
From: Rickory2021 <42385877+Rickory2021@users.noreply.github.com>
Date: Thu, 3 Apr 2025 19:09:32 -0400
Subject: [PATCH] Fixed Matrix Image and Carver Matrix Service

Added Delete Cascade
Added missing Bracket
Added missing return
---
 .../com/fmc/starterApp/models/entity/MatrixImage.java     | 1 +
 .../com/fmc/starterApp/services/CarverMatrixService.java  | 8 +++-----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/backend/src/main/java/com/fmc/starterApp/models/entity/MatrixImage.java b/backend/src/main/java/com/fmc/starterApp/models/entity/MatrixImage.java
index e6071eb..4de882d 100644
--- a/backend/src/main/java/com/fmc/starterApp/models/entity/MatrixImage.java
+++ b/backend/src/main/java/com/fmc/starterApp/models/entity/MatrixImage.java
@@ -61,6 +61,7 @@ public class MatrixImage {
 
     @ManyToOne
     @JoinColumn(name = "item_id", nullable = false)
+    @OnDelete(action = OnDeleteAction.CASCADE)
     private CarverItem carverItem;
 
     /**
diff --git a/backend/src/main/java/com/fmc/starterApp/services/CarverMatrixService.java b/backend/src/main/java/com/fmc/starterApp/services/CarverMatrixService.java
index 53ad01a..c377dc9 100644
--- a/backend/src/main/java/com/fmc/starterApp/services/CarverMatrixService.java
+++ b/backend/src/main/java/com/fmc/starterApp/services/CarverMatrixService.java
@@ -1,5 +1,6 @@
 package com.fmc.starterApp.services;
 
+import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
@@ -8,7 +9,6 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Random;
-import java.io.IOException;
 import java.util.Set;
 import java.util.stream.Collectors;
 
@@ -25,9 +25,6 @@
 import com.fmc.starterApp.repositories.MatrixImageRepository;
 import com.fmc.starterApp.repositories.User2Repository;
 
-import com.fmc.starterApp.repositories.CarverItemRepository;
-import com.fmc.starterApp.services.ImageService;
-
 import lombok.AllArgsConstructor;
 
 /**
@@ -145,6 +142,7 @@ public CarverMatrix getMatrixById(Long matrixId) {
           }else{
              throw new IllegalArgumentException("CarverMatrix must not be null");
           }
+          return matrix;
         } catch (Exception e) {
             throw new RuntimeException("Failed to retrieve CarverMatrix with ID: " + matrixId, e);
         }
@@ -511,5 +509,5 @@ public void deleteCarverMatrix(Long matrixId) {
         CarverMatrix matrix = carverMatrixRepository.findById(matrixId)
             .orElseThrow(() -> new IllegalArgumentException("CarverMatrix not found with ID: " + matrixId));
         carverMatrixRepository.delete(matrix);
-    
+    }   
 }