Merge tag 'tags/v6.3'

1 files changed, 15 insertions, 0 deletions

diff --git a/src/main/java/org/traccar/model/User.java b/src/main/java/org/traccar/model/User.java
index 9b8ee3e53..7cf8c25a6 100644
--- a/src/main/java/org/traccar/model/User.java
+++ b/src/main/java/org/traccar/model/User.java
@@ -17,11 +17,13 @@ package org.traccar.model;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 
+import org.apache.commons.lang3.builder.EqualsBuilder;
 import org.traccar.storage.QueryIgnore;
 import org.traccar.helper.Hashing;
 import org.traccar.storage.StorageName;
 
 import java.util.Date;
+import java.util.HashMap;
 
 @StorageName("tc_users")
 public class User extends ExtendedModel implements UserRestrictions, Disableable {
@@ -305,4 +307,17 @@ public class User extends ExtendedModel implements UserRestrictions, Disableable
         return Hashing.validatePassword(password, hashedPassword, salt);
     }
 
+    public boolean compare(User other, String... exclusions) {
+        if (!EqualsBuilder.reflectionEquals(this, other, "attributes", "hashedPassword", "salt")) {
+            return false;
+        }
+        var thisAttributes = new HashMap<>(getAttributes());
+        var otherAttributes = new HashMap<>(other.getAttributes());
+        for (String exclusion : exclusions) {
+            thisAttributes.remove(exclusion);
+            otherAttributes.remove(exclusion);
+        }
+        return thisAttributes.equals(otherAttributes);
+    }
+
 }