Add equals and hashcode overrides

startreedata · Jan 16, 2025 · d1895d4 · d1895d4
1 parent 9f3463c
commit d1895d4
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 4 deletions.
diff --git a/...deye-server/src/main/java/ai/startree/thirdeye/service/NamespaceConfigurationService.java b/...deye-server/src/main/java/ai/startree/thirdeye/service/NamespaceConfigurationService.java
@@ -83,10 +83,7 @@ protected void validateUpdate(NamespaceConfigurationApi existing,
       NamespaceConfigurationApi updated) {
     if (!Objects.equals(existing.getId(), updated.getId()) ||
         !Objects.equals(existing.getAuth().getNamespace(), updated.getAuth().getNamespace()) ||
-        !Objects.equals(existing.getQuotasConfiguration().getTaskQuotasConfiguration().getMaximumDetectionTasksPerMonth(),
-            updated.getQuotasConfiguration().getTaskQuotasConfiguration().getMaximumNotificationTasksPerMonth()) ||
-        !Objects.equals(existing.getQuotasConfiguration().getTaskQuotasConfiguration().getMaximumNotificationTasksPerMonth(),
-            updated.getQuotasConfiguration().getTaskQuotasConfiguration().getMaximumNotificationTasksPerMonth())) {
+        !Objects.equals(existing.getQuotasConfiguration(), updated.getQuotasConfiguration())) {
       throw badRequest(
           ThirdEyeStatus.ERR_NAMESPACE_CONFIGURATION_VALIDATION_FAILED,
           existing.namespace(),

diff --git a/thirdeye-spi/src/main/java/ai/startree/thirdeye/spi/api/TaskQuotasConfigurationApi.java b/thirdeye-spi/src/main/java/ai/startree/thirdeye/spi/api/TaskQuotasConfigurationApi.java
@@ -13,6 +13,8 @@
  */
 package ai.startree.thirdeye.spi.api;
 
+import java.util.Objects;
+
 public class TaskQuotasConfigurationApi {
 
   private Long maximumDetectionTasksPerMonth;
@@ -37,4 +39,23 @@ public TaskQuotasConfigurationApi setMaximumNotificationTasksPerMonth(
     this.maximumNotificationTasksPerMonth = maximumNotificationTasksPerMonth;
     return this;
   }
+
+  @Override
+  public boolean equals(final Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    final TaskQuotasConfigurationApi that = (TaskQuotasConfigurationApi) o;
+    return Objects.equals(maximumDetectionTasksPerMonth, that.maximumDetectionTasksPerMonth)
+        && Objects.equals(maximumNotificationTasksPerMonth,
+        that.maximumNotificationTasksPerMonth);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(maximumDetectionTasksPerMonth, maximumNotificationTasksPerMonth);
+  }
 }