Fix Bug Not Delete ReminderTask despite Cleared Event. fixes #282 @2h …

…#286
mizo0203 · Jan 21, 2018 · c67a1f0 · c67a1f0
1 parent 1c19c08
commit c67a1f0
Show file tree

Hide file tree

Showing 3 changed files with 45 additions and 21 deletions.
diff --git a/src/main/java/com/mizo0203/lilywhite/repo/PushQueueRepository.java b/src/main/java/com/mizo0203/lilywhite/repo/PushQueueRepository.java
@@ -21,12 +21,30 @@ public void destroy() {
     // NOP
   }
 
-  protected void enqueueReminderTask(String source_id, long etaMillis, String message) {
+  /**
+   * リマインダータスクを追加する
+   *
+   * @param source_id
+   *     送信先のID。Webhookイベントオブジェクトで返される、userId、groupId、またはroomIdの値を使用します。LINEアプリに表示されるLINE
+   *     IDは使用しないでください。
+   * @param etaMillis Sets the approximate absolute time to execute. (i.e. etaMillis is comparable
+   *     with {@link System#currentTimeMillis()}).
+   * @param message メッセージのテキスト。最大文字数：2000
+   * @return タスク名 - App Engine によってタスクに一意の名前が割り当てられます
+   */
+  protected String enqueueReminderTask(String source_id, long etaMillis, String message) {
     LOG.info("enqueueReminderTask");
-    mQueue.add(
-        TaskOptions.Builder.withUrl("/push_task/reminder_task")
-            .param(ReminderTaskServlet.PARAM_NAME_SOURCE_ID, source_id)
-            .param(ReminderTaskServlet.PARAM_NAME_MESSAGE, message)
-            .etaMillis(etaMillis));
+    return mQueue
+        .add(
+            TaskOptions.Builder.withUrl("/push_task/reminder_task")
+                .param(ReminderTaskServlet.PARAM_NAME_SOURCE_ID, source_id)
+                .param(ReminderTaskServlet.PARAM_NAME_MESSAGE, message)
+                .etaMillis(etaMillis))
+        .getName();
+  }
+
+  public void deleteReminderTask(String taskName) {
+    // Delete an individual task...
+    mQueue.deleteTask(taskName);
   }
 }
diff --git a/src/main/java/com/mizo0203/lilywhite/repo/Repository.java b/src/main/java/com/mizo0203/lilywhite/repo/Repository.java
@@ -45,19 +45,20 @@ public void setReminderMessage(String sourceId, String reminderMessage) {
   }
 
   public void clearEvent(String sourceId) {
-    mOfyRepository.deleteLineTalkRoomConfig(sourceId);
     LineTalkRoomConfig config = getOrCreateLineTalkRoomConfig(sourceId);
-    if (config == null) {
-      return;
-    }
-    mOfyRepository.saveLineTalkRoomConfig(config);
+    deleteReminderTask(config);
+    mOfyRepository.deleteLineTalkRoomConfig(sourceId);
+  }
+
+  private void deleteReminderTask(LineTalkRoomConfig config) {
+    mPushQueueRepository.deleteReminderTask(config.getReminderEnqueuedTaskName());
+    config.setReminderEnqueuedTaskName(null);
   }
 
   private LineTalkRoomConfig getOrCreateLineTalkRoomConfig(String sourceId) {
     LineTalkRoomConfig config = mOfyRepository.loadLineTalkRoomConfig(sourceId);
     if (config == null) {
       config = new LineTalkRoomConfig(sourceId);
-      mOfyRepository.saveLineTalkRoomConfig(config);
     }
     return config;
   }
@@ -143,9 +144,11 @@ public RequestBody getRequestBody(HttpServletRequest req) {
 
   public void enqueueReminderTask(String sourceId, long etaMillis) {
     LineTalkRoomConfig config = getOrCreateLineTalkRoomConfig(sourceId);
-    mPushQueueRepository.enqueueReminderTask(
-        config.getSourceId(), etaMillis, config.getReminderMessage());
-    config.setReminderEnqueued();
+    String taskName =
+        mPushQueueRepository.enqueueReminderTask(
+            config.getSourceId(), etaMillis, config.getReminderMessage());
+    LOG.info("enqueueReminderTask taskName: " + taskName);
+    config.setReminderEnqueuedTaskName(taskName);
     mOfyRepository.saveLineTalkRoomConfig(config);
   }
 }
diff --git a/src/main/java/com/mizo0203/lilywhite/repo/objectify/entity/LineTalkRoomConfig.java b/src/main/java/com/mizo0203/lilywhite/repo/objectify/entity/LineTalkRoomConfig.java
@@ -20,13 +20,12 @@ public class LineTalkRoomConfig {
 
   @Id private String sourceId;
   private String reminderMessage;
-
-  private boolean reminderEnqueued;
+  private String reminderEnqueuedTaskName;
 
   public LineTalkRoomConfig() {
     // LineTalkRoomConfig must have a no-arg constructor
     reminderMessage = null;
-    reminderEnqueued = false;
+    reminderEnqueuedTaskName = null;
   }
 
   /** A convenience constructor */
@@ -48,10 +47,14 @@ public void setReminderMessage(String reminderMessage) {
   }
 
   public boolean isReminderEnqueued() {
-    return reminderEnqueued;
+    return reminderEnqueuedTaskName != null;
+  }
+
+  public String getReminderEnqueuedTaskName() {
+    return reminderEnqueuedTaskName;
   }
 
-  public void setReminderEnqueued() {
-    reminderEnqueued = true;
+  public void setReminderEnqueuedTaskName(String taskName) {
+    reminderEnqueuedTaskName = taskName;
   }
 }