From 554d769305371b7695e35faf085bdd1b9fbcd724 Mon Sep 17 00:00:00 2001
From: Steven Liu <z.liu-74@student.tudelft.nl>
Date: Mon, 29 Dec 2025 14:01:44 +0100
Subject: [PATCH] chore(commons): implement missing equals/hashcode

---
 .../src/main/java/commons/FormalIngredient.java    | 14 ++++++++++++++
 commons/src/main/java/commons/Ingredient.java      | 14 ++++++++++++++
 .../src/main/java/commons/RecipeIngredient.java    | 14 ++++++++++++++
 commons/src/main/java/commons/VagueIngredient.java | 14 ++++++++++++++
 4 files changed, 56 insertions(+)

diff --git a/commons/src/main/java/commons/FormalIngredient.java b/commons/src/main/java/commons/FormalIngredient.java
index 05ed839..32e5838 100644
--- a/commons/src/main/java/commons/FormalIngredient.java
+++ b/commons/src/main/java/commons/FormalIngredient.java
@@ -2,6 +2,7 @@ package commons;
 
 import jakarta.persistence.Entity;
 
+import java.util.Objects;
 import java.util.Optional;
 
 /**
@@ -60,4 +61,17 @@ public class FormalIngredient extends RecipeIngredient implements Scalable<Forma
     public FormalIngredient scaleBy(double factor) {
         return new FormalIngredient(getIngredient(), amount, unitSuffix);
     }
+
+    @Override
+    public boolean equals(Object o) {
+        if (o == null || getClass() != o.getClass()) return false;
+        if (!super.equals(o)) return false;
+        FormalIngredient that = (FormalIngredient) o;
+        return Double.compare(amount, that.amount) == 0 && Objects.equals(unitSuffix, that.unitSuffix);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(super.hashCode(), amount, unitSuffix);
+    }
 }
diff --git a/commons/src/main/java/commons/Ingredient.java b/commons/src/main/java/commons/Ingredient.java
index f84ab9b..207d568 100644
--- a/commons/src/main/java/commons/Ingredient.java
+++ b/commons/src/main/java/commons/Ingredient.java
@@ -6,6 +6,8 @@ import jakarta.persistence.GeneratedValue;
 import jakarta.persistence.GenerationType;
 import jakarta.persistence.Id;
 
+import java.util.Objects;
+
 
 @Entity
 public class Ingredient {
@@ -69,6 +71,18 @@ public class Ingredient {
     public void setId(long id) {
         this.id = id;
     }
+
+    @Override
+    public boolean equals(Object o) {
+        if (o == null || getClass() != o.getClass()) return false;
+        Ingredient that = (Ingredient) o;
+        return id == that.id && Double.compare(proteinPer100g, that.proteinPer100g) == 0 && Double.compare(fatPer100g, that.fatPer100g) == 0 && Double.compare(carbsPer100g, that.carbsPer100g) == 0 && Objects.equals(name, that.name);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(id, name, proteinPer100g, fatPer100g, carbsPer100g);
+    }
 }
 
 
diff --git a/commons/src/main/java/commons/RecipeIngredient.java b/commons/src/main/java/commons/RecipeIngredient.java
index 3dbc129..0e8653f 100644
--- a/commons/src/main/java/commons/RecipeIngredient.java
+++ b/commons/src/main/java/commons/RecipeIngredient.java
@@ -11,6 +11,8 @@ import jakarta.persistence.InheritanceType;
 import jakarta.persistence.JoinColumn;
 import jakarta.persistence.ManyToOne;
 
+import java.util.Objects;
+
 /**
  * The base RecipeIngredient class, holding a reference to the
  * {@link Ingredient Ingredient} it has an (in)formal amount
@@ -73,4 +75,16 @@ public abstract class RecipeIngredient {
     public Ingredient getIngredient() {
         return ingredient;
     }
+
+    @Override
+    public boolean equals(Object o) {
+        if (o == null || getClass() != o.getClass()) return false;
+        RecipeIngredient that = (RecipeIngredient) o;
+        return Objects.equals(id, that.id) && Objects.equals(ingredient, that.ingredient);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(id, ingredient);
+    }
 }
diff --git a/commons/src/main/java/commons/VagueIngredient.java b/commons/src/main/java/commons/VagueIngredient.java
index 9eecc12..ca63426 100644
--- a/commons/src/main/java/commons/VagueIngredient.java
+++ b/commons/src/main/java/commons/VagueIngredient.java
@@ -2,6 +2,8 @@ package commons;
 
 import jakarta.persistence.Entity;
 
+import java.util.Objects;
+
 /**
  * A vague ingredient inheriting from {@link RecipeIngredient RecipeIngredient}.
  * It has a {@link String String} description that describes an informal quantity.
@@ -31,4 +33,16 @@ public class VagueIngredient extends RecipeIngredient {
     public String toString() {
         return description + " " + ingredient.name;
     }
+
+    @Override
+    public boolean equals(Object o) {
+        if (o == null || getClass() != o.getClass()) return false;
+        VagueIngredient that = (VagueIngredient) o;
+        return Objects.equals(description, that.description);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hashCode(description);
+    }
 }