Merge pull request #21 from Liuchy1/master

add schedule update apis

Author: Liuchy1

example/main/java/cn/jpush/api/examples/ScheduleExample.java

@@ -1,13 +1,15 @@
 package cn.jpush.api.examples;
 
 import cn.jpush.api.JPushClient;
+import cn.jpush.api.common.TimeUnit;
 import cn.jpush.api.common.Week;
 import cn.jpush.api.common.resp.APIConnectionException;
 import cn.jpush.api.common.resp.APIRequestException;
 import cn.jpush.api.push.model.PushPayload;
 import cn.jpush.api.schedule.ScheduleListResult;
 import cn.jpush.api.schedule.ScheduleResult;
 import cn.jpush.api.schedule.model.SchedulePayload;
+import cn.jpush.api.schedule.model.TriggerPayload;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -70,7 +72,7 @@ public static void testCreateWeeklySchedule() {
         String start = "2015-08-06 12:16:13";
         String end = "2115-08-06 12:16:13";
         String time = "14:00:00";
-        Week[] days = {Week.MON, Week.FIR};
+        Week[] days = {Week.MON, Week.FRI};
         PushPayload push = PushPayload.alertAll("test weekly example.");
         try {
             ScheduleResult result = jPushClient.createWeeklySchedule(name, start, end, time, days, push);
@@ -145,8 +147,15 @@ public static void testGetScheduleList() {
     public static void testUpdateSchedule() {
         String scheduleId = "95bbd066-3a88-11e5-8e62-0021f652c102";
         JPushClient jpushClient = new JPushClient(masterSecret, appKey);
+        String[] points = {Week.MON.name(), Week.FRI.name()};
+        TriggerPayload trigger = TriggerPayload.newBuilder()
+                .setPeriodTime("2015-08-01 12:10:00", "2015-08-30 12:12:12", "15:00:00")
+                .setTimeFrequency(TimeUnit.WEEK, 2, points)
+                .buildPeriodical();
         SchedulePayload payload = SchedulePayload.newBuilder()
+                .setName("test_update_schedule")
                 .setEnabled(false)
+                .setTrigger(trigger)
                 .build();
         try {
             jpushClient.updateSchedule(scheduleId, payload);

src/main/java/cn/jpush/api/JPushClient.java

@@ -585,6 +585,88 @@ public ScheduleListResult getScheduleList(int page)
         return _scheduleClient.getScheduleList(page);
     }
 
+    /**
+     * Update the schedule name
+     * @param scheduleId The schedule id.
+     * @param name The new name.
+     * @return The schedule information after updated.
+     * @throws APIConnectionException
+     * @throws APIRequestException
+     */
+    public ScheduleResult updateScheduleName(String scheduleId, String name)
+            throws APIConnectionException, APIRequestException {
+        SchedulePayload payload = SchedulePayload.newBuilder()
+                .setName(name)
+                .build();
+
+        return updateSchedule(scheduleId, payload);
+    }
+
+    /**
+     * Enable the schedule.
+     * @param scheduleId The schedule id.
+     * @return The schedule information after updated.
+     * @throws APIConnectionException
+     * @throws APIRequestException
+     */
+    public ScheduleResult enableSchedule(String scheduleId)
+            throws APIConnectionException, APIRequestException {
+        SchedulePayload payload = SchedulePayload.newBuilder()
+                .setEnabled(true)
+                .build();
+
+        return updateSchedule(scheduleId, payload);
+    }
+
+    /**
+     * Disable the schedule.
+     * @param scheduleId The schedule id.
+     * @return The schedule information after updated.
+     * @throws APIConnectionException
+     * @throws APIRequestException
+     */
+    public ScheduleResult disableSchedule(String scheduleId)
+            throws APIConnectionException, APIRequestException {
+        SchedulePayload payload = SchedulePayload.newBuilder()
+                .setEnabled(false)
+                .build();
+        return updateSchedule(scheduleId, payload);
+    }
+
+    /**
+     * Update the trigger of the schedule.
+     * @param scheduleId The schedule id.
+     * @param trigger The new trigger.
+     * @return The schedule information after updated.
+     * @throws APIConnectionException
+     * @throws APIRequestException
+     */
+    public ScheduleResult updateScheduleTrigger(String scheduleId, TriggerPayload trigger)
+            throws APIConnectionException, APIRequestException {
+        SchedulePayload payload = SchedulePayload.newBuilder()
+                .setTrigger(trigger)
+                .build();
+
+        return updateSchedule(scheduleId, payload);
+    }
+
+    /**
+     * Update the push content of the schedule.
+     * @param scheduleId The schedule id.
+     * @param push The new push payload.
+     * @return The schedule information after updated.
+     * @throws APIConnectionException
+     * @throws APIRequestException
+     */
+    public ScheduleResult updateSchedulePush(String scheduleId, PushPayload push)
+            throws APIConnectionException, APIRequestException {
+        SchedulePayload payload = SchedulePayload.newBuilder()
+                .setPush(push)
+                .build();
+
+        return updateSchedule(scheduleId, payload);
+    }
+
     /**
      * Update a schedule by the id.
      * @param scheduleId The schedule id to update.

src/main/java/cn/jpush/api/common/Week.java

@@ -5,7 +5,7 @@ public enum Week {
     TUE,
     WED,
     THU,
-    FIR,
+    FRI,
     SAT,
     SUN
 }

src/main/java/cn/jpush/api/schedule/model/TriggerPayload.java

@@ -146,11 +146,26 @@ public TriggerPayload buildPeriodical() {
             Preconditions.checkArgument(TimeUtils.isTimeFormat(time), "The time format is incorrect.");
 
             Preconditions.checkNotNull(time_unit, "The time_unit must not be null.");
+            Preconditions.checkArgument(isTimeUnitOk(time_unit), "The time unit must be DAY, WEEK or MONTH.");
+
             Preconditions.checkArgument(frequency > 0 && frequency < 101, "The frequency must be a int between 1 and 100.");
 
             return new TriggerPayload(start, end, time, time_unit, frequency, point);
         }
 
+        private boolean isTimeUnitOk(TimeUnit timeUnit) {
+            switch (timeUnit) {
+                case HOUR:
+                    return false;
+                case DAY:
+                case WEEK:
+                case MONTH:
+                    return true;
+                default:
+                    return false;
+            }
+        }
+
     }
 
 }