Attempt to fix duplicate key issue in UpdateWebPermissionsPatch

Affects issues: - #3543
plan-player-analytics · Mar 30, 2024 · 49269d3 · 49269d3
1 parent 95a20b5
commit 49269d3
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 1 deletion.
diff --git a/Plan/common/src/main/java/com/djrapitops/plan/exceptions/database/DBOpException.java b/Plan/common/src/main/java/com/djrapitops/plan/exceptions/database/DBOpException.java
@@ -30,6 +30,7 @@
 public class DBOpException extends IllegalStateException implements ExceptionWithContext {
 
     public static final String CONSTRAINT_VIOLATION = "Constraint Violation";
+    public static final String DUPLICATE_KEY = "Duplicate key";
     private final ErrorContext context;
 
     public DBOpException(String message) {
@@ -77,7 +78,7 @@ public static DBOpException forCause(String sql, SQLException e) {
             case 1022:
             case 23001:
             case 23505:
-                context.related("Duplicate key")
+                context.related(DUPLICATE_KEY)
                         .whatToDo("Report this, duplicate key exists in SQL.");
                 break;
             // Constraint violation
@@ -165,4 +166,9 @@ public boolean isUserIdConstraintViolation() {
                 && getCause() != null
                 && getCause().getMessage().contains("user_id");
     }
+
+    public boolean isDuplicateKeyViolation() {
+        return context != null
+                && context.getRelated().contains(DBOpException.CONSTRAINT_VIOLATION);
+    }
 }
diff --git a/.../com/djrapitops/plan/storage/database/transactions/patches/UpdateWebPermissionsPatch.java b/.../com/djrapitops/plan/storage/database/transactions/patches/UpdateWebPermissionsPatch.java
@@ -17,6 +17,7 @@
 package com.djrapitops.plan.storage.database.transactions.patches;
 
 import com.djrapitops.plan.delivery.domain.auth.WebPermission;
+import com.djrapitops.plan.exceptions.database.DBOpException;
 import com.djrapitops.plan.storage.database.queries.objects.WebUserQueries;
 import com.djrapitops.plan.storage.database.sql.tables.webuser.WebPermissionTable;
 import com.djrapitops.plan.storage.database.transactions.ExecBatchStatement;
@@ -55,6 +56,18 @@ public boolean hasBeenApplied() {
 
     @Override
     protected void applyPatch() {
+        try {
+            storeMissing();
+        } catch (DBOpException failed) {
+            if (failed.isDuplicateKeyViolation()) {
+                retry(failed);
+            } else {
+                throw failed;
+            }
+        }
+    }
+
+    private void storeMissing() {
         execute(new ExecBatchStatement(WebPermissionTable.INSERT_STATEMENT) {
             @Override
             public void prepare(PreparedStatement statement) throws SQLException {
@@ -65,4 +78,14 @@ public void prepare(PreparedStatement statement) throws SQLException {
             }
         });
     }
+
+    private void retry(DBOpException failed) {
+        try {
+            if (hasBeenApplied()) return;
+            storeMissing();
+        } catch (DBOpException anotherFail) {
+            anotherFail.addSuppressed(failed);
+            throw anotherFail;
+        }
+    }
 }