[마이][New] 버킷리스트 달성 갱신 API 추가

app/src/common/java/kr/co/zumo/app/lifeplus/network/api/LifeplusAPIService.java

@@ -12,6 +12,7 @@ import kr.co.zumo.app.lifeplus.bean.api.BookmarkMyCategoryRequestBean;
 import kr.co.zumo.app.lifeplus.bean.api.BookmarkResultBean;
 import kr.co.zumo.app.lifeplus.bean.api.BucketBackgroundListResultBean;
 import kr.co.zumo.app.lifeplus.bean.api.BucketBestListResultBean;
+import kr.co.zumo.app.lifeplus.bean.api.BucketCompleteRequestBean;
 import kr.co.zumo.app.lifeplus.bean.api.BucketListRequestBean;
 import kr.co.zumo.app.lifeplus.bean.api.BucketListResultBean;
 import kr.co.zumo.app.lifeplus.bean.api.BucketListTagResultBean;
@@ -412,7 +413,7 @@ public class LifeplusAPIService extends RetrofitService implements LifeplusAPI {
    * @return
    */
   @Override
-  public Single<LifeplusAPIBean> finishMyBucket(BucketNumberRequestBean bean) {
+  public Single<LifeplusAPIBean> finishMyBucket(BucketCompleteRequestBean bean) {
     return api().finishMyBucket(bean);
   }
 

app/src/main/java/kr/co/zumo/app/lifeplus/bean/api/BucketCompleteRequestBean.java

@@ -0,0 +1,38 @@
+/*
+ * COPYRIGHT (c) 2018 All rights reserved by HANWHA LIFE.
+ */
+package kr.co.zumo.app.lifeplus.bean.api;
+
+import com.google.gson.annotations.SerializedName;
+
+/**
+ * UserNameRequestBean
+ * <pre>
+ * </pre>
+ *
+ * @author 민효동
+ * @version 1.0
+ * @history 민효동   [2018. 11. 8.]   [최초 작성]
+ * @since 2018. 11. 8.
+ */
+public class BucketCompleteRequestBean extends BucketNumberRequestBean {
+  @SerializedName("achvYn")
+  private String completed;
+
+  public BucketCompleteRequestBean(String userName, String bucketNumber, String completed) {
+    super(userName, bucketNumber);
+    this.completed = completed;
+  }
+
+  public String getCompleted() {
+    return completed;
+  }
+
+  public void setCompleted(String completed) {
+    this.completed = completed;
+  }
+
+  public boolean isCompleted() {
+    return LifeplusData.isTrue(completed);
+  }
+}

app/src/main/java/kr/co/zumo/app/lifeplus/bean/api/BucketNumberRequestBean.java

@@ -32,4 +32,5 @@ public class BucketNumberRequestBean extends UserNameRequestBean {
   public void setBucketNumber(String bucketNumber) {
     this.bucketNumber = bucketNumber;
   }
+
 }

app/src/main/java/kr/co/zumo/app/lifeplus/model/module/APIBucketCompleteModule.java

@@ -4,7 +4,7 @@
 package kr.co.zumo.app.lifeplus.model.module;
 
 import io.reactivex.Single;
-import kr.co.zumo.app.lifeplus.bean.api.BucketNumberRequestBean;
+import kr.co.zumo.app.lifeplus.bean.api.BucketCompleteRequestBean;
 import kr.co.zumo.app.lifeplus.bean.api.LifeplusAPIBean;
 import kr.co.zumo.app.lifeplus.network.api.LifeplusAPIRepository;
 
@@ -19,9 +19,9 @@ import kr.co.zumo.app.lifeplus.network.api.LifeplusAPIRepository;
  * @history 민효동   [2018. 11. 13.]   [최초 작성]
  * @since 2018. 11. 13.
  */
-public class APIBucketCompleteModule extends APIModule<BucketNumberRequestBean, LifeplusAPIBean> {
+public class APIBucketCompleteModule extends APIModule<BucketCompleteRequestBean, LifeplusAPIBean> {
   @Override
-  protected Single<LifeplusAPIBean> getAPI(BucketNumberRequestBean requestBean) {
+  protected Single<LifeplusAPIBean> getAPI(BucketCompleteRequestBean requestBean) {
     return new LifeplusAPIRepository().finishMyBucket(requestBean);
   }
 }

app/src/main/java/kr/co/zumo/app/lifeplus/network/api/LifeplusAPI.java

@@ -12,6 +12,7 @@ import kr.co.zumo.app.lifeplus.bean.api.BookmarkMyCategoryRequestBean;
 import kr.co.zumo.app.lifeplus.bean.api.BookmarkResultBean;
 import kr.co.zumo.app.lifeplus.bean.api.BucketBackgroundListResultBean;
 import kr.co.zumo.app.lifeplus.bean.api.BucketBestListResultBean;
+import kr.co.zumo.app.lifeplus.bean.api.BucketCompleteRequestBean;
 import kr.co.zumo.app.lifeplus.bean.api.BucketListRequestBean;
 import kr.co.zumo.app.lifeplus.bean.api.BucketListResultBean;
 import kr.co.zumo.app.lifeplus.bean.api.BucketListTagResultBean;
@@ -180,7 +181,7 @@ public interface LifeplusAPI {
 
   // 버킷 리스트 달성
   @POST("mapi/my/arhvbucket.plus")
-  Single<LifeplusAPIBean> finishMyBucket(@Body BucketNumberRequestBean bean);
+  Single<LifeplusAPIBean> finishMyBucket(@Body BucketCompleteRequestBean bean);
 
   // 버킷 리스트 삭제
   @POST("mapi/my/delbucket.plus")

app/src/main/java/kr/co/zumo/app/lifeplus/network/api/LifeplusAPIRepository.java

@@ -12,6 +12,7 @@ import kr.co.zumo.app.lifeplus.bean.api.BookmarkMyCategoryRequestBean;
 import kr.co.zumo.app.lifeplus.bean.api.BookmarkResultBean;
 import kr.co.zumo.app.lifeplus.bean.api.BucketBackgroundListResultBean;
 import kr.co.zumo.app.lifeplus.bean.api.BucketBestListResultBean;
+import kr.co.zumo.app.lifeplus.bean.api.BucketCompleteRequestBean;
 import kr.co.zumo.app.lifeplus.bean.api.BucketListRequestBean;
 import kr.co.zumo.app.lifeplus.bean.api.BucketListResultBean;
 import kr.co.zumo.app.lifeplus.bean.api.BucketListTagResultBean;
@@ -192,7 +193,7 @@ public class LifeplusAPIRepository implements LifeplusAPI {
   }
 
   @Override
-  public Single<LifeplusAPIBean> finishMyBucket(BucketNumberRequestBean bean) {
+  public Single<LifeplusAPIBean> finishMyBucket(BucketCompleteRequestBean bean) {
     return new LifeplusAPIService().finishMyBucket(bean);
   }
 

app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/my/bucketlist/AddMyBucketListModel.java

@@ -5,6 +5,7 @@ import java.util.List;
 
 import io.reactivex.disposables.Disposable;
 import kr.co.zumo.app.lifeplus.bean.api.BucketBackgroundListResultBean;
+import kr.co.zumo.app.lifeplus.bean.api.BucketCompleteRequestBean;
 import kr.co.zumo.app.lifeplus.bean.api.BucketListResultBean;
 import kr.co.zumo.app.lifeplus.bean.api.BucketListTagResultBean;
 import kr.co.zumo.app.lifeplus.bean.api.BucketNumberRequestBean;
@@ -220,13 +221,14 @@ public class AddMyBucketListModel extends Model {
    * 버킷 달성
    */
   public void completeBucket() {
-    disposableAchieve = new APIBucketCompleteModule().call(new BucketNumberRequestBean(getUserName(), bucketMyBeanForEditing.getBucketNumber()), new IAPIModuleListener<LifeplusAPIBean>() {
+    // 달성 미달성 데이터 토글
+    boolean bool = bucketMyBeanForEditing.isCompleted();
+    String yn = LifeplusData.valueOf(!bool);
+    disposableAchieve = new APIBucketCompleteModule().call(new BucketCompleteRequestBean(getUserName(), bucketMyBeanForEditing.getBucketNumber(), yn), new IAPIModuleListener<LifeplusAPIBean>() {
       @Override
       public void onApiSuccess(LifeplusAPIBean resultBean) {
 
-        // 달성 미달성 데이터 토글
-        boolean bool = bucketMyBeanForEditing.isCompleted();
-        bucketMyBeanForEditing.setCompleted(LifeplusData.valueOf(!bool));
+        bucketMyBeanForEditing.setCompleted(yn);
 
         onResult(new Event.Builder(Event.COMPLETED).build());
       }

app/src/sandbox/java/kr/co/zumo/app/lifeplus/network/api/LifeplusAPIService.java

@@ -340,7 +340,7 @@ public class LifeplusAPIService implements LifeplusAPI {
   }
 
   @Override
-  public Single<LifeplusAPIBean> finishMyBucket(BucketNumberRequestBean bean) {
+  public Single<LifeplusAPIBean> finishMyBucket(BucketCompleteRequestBean bean) {
     return Single.fromCallable(() -> {
       return new LifeplusAPIBean(LifeplusAPIBean.RETURN_SUCCESS, "");
     });