Add tag assignments. Centralize model updates.

io7m-com · Sep 10, 2024 · ca16bb0 · ca16bb0
1 parent 36fb543
commit ca16bb0
Show file tree

Hide file tree

Showing 11 changed files with 846 additions and 92 deletions.
diff --git a/com.io7m.laurel.filemodel/src/main/java/com/io7m/laurel/filemodel/LFileModelType.java b/com.io7m.laurel.filemodel/src/main/java/com/io7m/laurel/filemodel/LFileModelType.java
@@ -18,6 +18,7 @@
 package com.io7m.laurel.filemodel;
 
 import com.io7m.jattribute.core.AttributeReadableType;
+import com.io7m.laurel.filemodel.internal.LCategoryAndTags;
 import com.io7m.laurel.model.LCategory;
 import com.io7m.laurel.model.LException;
 import com.io7m.laurel.model.LImage;
@@ -28,6 +29,7 @@
 import java.util.List;
 import java.util.Optional;
 import java.util.Set;
+import java.util.SortedMap;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.Flow;
 
@@ -115,6 +117,28 @@ CompletableFuture<?> imageAdd(
   CompletableFuture<?> imageSelect(
     Optional<String> name);
 
+  /**
+   * Assign the given tags to the given categories.
+   *
+   * @param categories The categories/tags
+   *
+   * @return The operation in progress
+   */
+
+  CompletableFuture<?> categoryTagsAssign(
+    List<LCategoryAndTags> categories);
+
+  /**
+   * Unassign the given tags from the given categories.
+   *
+   * @param categories The categories/tags
+   *
+   * @return The operation in progress
+   */
+
+  CompletableFuture<?> categoryTagsUnassign(
+    List<LCategoryAndTags> categories);
+
   @Override
   void close()
     throws LException;
@@ -191,4 +215,10 @@ void close()
    */
 
   AttributeReadableType<List<LCategory>> categoryList();
+
+  /**
+   * @return The tags for every available category
+   */
+
+  AttributeReadableType<SortedMap<LCategory, List<LTag>>> categoryTags();
 }
diff --git a/...rel.filemodel/src/main/java/com/io7m/laurel/filemodel/internal/LCommandCategoriesAdd.java b/...rel.filemodel/src/main/java/com/io7m/laurel/filemodel/internal/LCommandCategoriesAdd.java
@@ -93,20 +93,6 @@ private static LCommandCategoriesAdd fromProperties(
     return c;
   }
 
-  private static List<LCategory> listCategories(
-    final LDatabaseTransactionType transaction)
-  {
-    final var context =
-      transaction.get(DSLContext.class);
-
-    return context.select(CATEGORIES.CATEGORY_TEXT)
-      .from(CATEGORIES)
-      .orderBy(CATEGORIES.CATEGORY_TEXT.asc())
-      .stream()
-      .map(r -> new LCategory(r.get(CATEGORIES.CATEGORY_TEXT)))
-      .toList();
-  }
-
   @Override
   protected LCommandUndoable onExecute(
     final LFileModel model,
@@ -148,7 +134,7 @@ protected LCommandUndoable onExecute(
       );
     }
 
-    model.setCategoriesAll(listCategories(transaction));
+    LCommandModelUpdates.updateTagsAndCategories(context, model);
     model.eventWithoutProgress("Added %d categories.", this.savedData.size());
 
     if (!this.savedData.isEmpty()) {
@@ -180,7 +166,7 @@ protected void onUndo(
         .execute();
     }
 
-    model.setCategoriesAll(listCategories(transaction));
+    LCommandModelUpdates.updateTagsAndCategories(context, model);
     model.eventWithoutProgress("Removed %d categories.", Integer.valueOf(max));
   }
 
@@ -210,7 +196,7 @@ protected void onRedo(
         .execute();
     }
 
-    model.setCategoriesAll(listCategories(transaction));
+    LCommandModelUpdates.updateTagsAndCategories(context, model);
     model.eventWithoutProgress("Added %d categories.", Integer.valueOf(max));
   }
 

diff --git a/...model/src/main/java/com/io7m/laurel/filemodel/internal/LCommandCategoriesSetRequired.java b/...model/src/main/java/com/io7m/laurel/filemodel/internal/LCommandCategoriesSetRequired.java
@@ -139,7 +139,7 @@ protected LCommandUndoable onExecute(
     }
 
     model.eventWithoutProgress("Updated %d categories.", this.savedData.size());
-    model.setCategoriesRequired(listRequired(transaction));
+    LCommandModelUpdates.updateTagsAndCategories(context, model);
 
     if (!this.savedData.isEmpty()) {
       return LCommandUndoable.COMMAND_UNDOABLE;
@@ -172,7 +172,7 @@ protected void onUndo(
     }
 
     model.eventWithoutProgress("Updated %d categories.", Integer.valueOf(max));
-    model.setCategoriesRequired(listRequired(transaction));
+    LCommandModelUpdates.updateTagsAndCategories(context, model);
   }
 
   @Override
@@ -199,22 +199,7 @@ protected void onRedo(
     }
 
     model.eventWithoutProgress("Updated %d categories.", Integer.valueOf(max));
-    model.setCategoriesRequired(listRequired(transaction));
-  }
-
-  private static List<LCategory> listRequired(
-    final LDatabaseTransactionType transaction)
-  {
-    final var context =
-      transaction.get(DSLContext.class);
-
-    return context.select(CATEGORIES.CATEGORY_TEXT)
-      .from(CATEGORIES)
-      .where(CATEGORIES.CATEGORY_REQUIRED.eq(1L))
-      .orderBy(CATEGORIES.CATEGORY_TEXT.asc())
-      .stream()
-      .map(r -> new LCategory(r.get(CATEGORIES.CATEGORY_TEXT)))
-      .toList();
+    LCommandModelUpdates.updateTagsAndCategories(context, model);
   }
 
   @Override

diff --git a/...del/src/main/java/com/io7m/laurel/filemodel/internal/LCommandCategoriesUnsetRequired.java b/...del/src/main/java/com/io7m/laurel/filemodel/internal/LCommandCategoriesUnsetRequired.java
@@ -139,8 +139,7 @@ protected LCommandUndoable onExecute(
     }
 
     model.eventWithoutProgress("Updated %d categories.", this.savedData.size());
-    model.setCategoriesRequired(listRequired(transaction));
-
+    LCommandModelUpdates.updateTagsAndCategories(context, model);
 
     if (!this.savedData.isEmpty()) {
       return LCommandUndoable.COMMAND_UNDOABLE;
@@ -173,8 +172,7 @@ protected void onUndo(
     }
 
     model.eventWithoutProgress("Updated %d categories.", Integer.valueOf(max));
-    model.setCategoriesRequired(listRequired(transaction));
-
+    LCommandModelUpdates.updateTagsAndCategories(context, model);
   }
 
   @Override
@@ -201,22 +199,7 @@ protected void onRedo(
     }
 
     model.eventWithoutProgress("Updated %d categories.", Integer.valueOf(max));
-    model.setCategoriesRequired(listRequired(transaction));
-  }
-
-  private static List<LCategory> listRequired(
-    final LDatabaseTransactionType transaction)
-  {
-    final var context =
-      transaction.get(DSLContext.class);
-
-    return context.select(CATEGORIES.CATEGORY_TEXT)
-      .from(CATEGORIES)
-      .where(CATEGORIES.CATEGORY_REQUIRED.eq(1L))
-      .orderBy(CATEGORIES.CATEGORY_TEXT.asc())
-      .stream()
-      .map(r -> new LCategory(r.get(CATEGORIES.CATEGORY_TEXT)))
-      .toList();
+    LCommandModelUpdates.updateTagsAndCategories(context, model);
   }
 
   @Override