Merge pull request #96 from folded-ear/calendar-do-not-recog

don't include leading ! on plan calendar items
folded-ear · Aug 19, 2024 · 635ccf4 · 635ccf4
2 parents 505992d + 53c3d03
commit 635ccf4
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 7 deletions.
diff --git a/src/main/java/com/brennaswitzer/cookbook/domain/PlanItem.java b/src/main/java/com/brennaswitzer/cookbook/domain/PlanItem.java
@@ -256,6 +256,10 @@ public void setParent(PlanItem parent) {
         this.parent = parent;
     }
 
+    public boolean isRecognitionDisallowed() {
+        return getName().startsWith("!");
+    }
+
     public void moveToTrash() {
         this.trashBin = getPlan();
         this.trashBin.getTrashBinItems().add(this);

diff --git a/src/main/java/com/brennaswitzer/cookbook/services/PlanCalendar.java b/src/main/java/com/brennaswitzer/cookbook/services/PlanCalendar.java
@@ -100,7 +100,11 @@ private Summary getEventSummary(PlanItem item) {
             case COMPLETED -> sb.append("✔ ");
             case DELETED -> sb.append("✘ ");
         }
-        sb.append(item.getName());
+        if (item.isRecognitionDisallowed()) {
+            sb.append(item.getName().substring(1));
+        } else {
+            sb.append(item.getName());
+        }
         PlanBucket bucket = item.getBucket();
         if (bucket.isNamed()) {
             sb.append(" - ")

diff --git a/src/main/java/com/brennaswitzer/cookbook/services/PlanService.java b/src/main/java/com/brennaswitzer/cookbook/services/PlanService.java
@@ -301,7 +301,7 @@ public PlanItem createItem(Long parentId, Long afterId, String name) {
         PlanItem parent = getPlanItemById(parentId, AccessLevel.CHANGE);
         PlanItem after = afterId == null ? null : getPlanItemById(afterId, AccessLevel.VIEW);
         PlanItem item = itemRepo.save(new PlanItem(name).of(parent, after));
-        if (!isRecognitionDisallowed(item)) {
+        if (!item.isRecognitionDisallowed()) {
             itemService.autoRecognize(item);
         }
         if (item.getId() == null) itemRepo.flush();
@@ -382,18 +382,14 @@ public PlanMessage deleteBucketForMessage(Long planId, Long id) {
     public PlanItem renameItem(Long id, String name) {
         PlanItem item = getPlanItemById(id, AccessLevel.CHANGE);
         item.setName(name);
-        if (isRecognitionDisallowed(item)) {
+        if (item.isRecognitionDisallowed()) {
             itemService.clearAutoRecognition(item);
         } else if (!item.hasIngredient() || !(Hibernate.unproxy(item.getIngredient()) instanceof Recipe)) {
             itemService.updateAutoRecognition(item);
         }
         return item;
     }
 
-    private boolean isRecognitionDisallowed(PlanItem item) {
-        return item.getName().startsWith("!");
-    }
-
     public PlanMessage renameItemForMessage(Long id, String name) {
         return buildUpdateMessage(renameItem(id, name));
     }