Parcourir la source

[버킷][Common] 리팩토링, 안쓰는 메서드 표시

hyodong.min il y a 6 ans
Parent
commit
5fb4fd9c3a

+ 1 - 0
app/src/common/java/kr/co/zumo/app/lifeplus/network/api/LifeplusAPIService.java

@@ -477,6 +477,7 @@ public class LifeplusAPIService extends LifeplusRetrofitService implements Lifep
    * @param bean
    * @return
    */
+  @Deprecated
   @Override
   public Single<BucketBackgroundListResultBean> getMyBucketBackgroundList(RequestBean bean) {
     return api().getMyBucketBackgroundList(bean);

+ 4 - 3
app/src/main/java/kr/co/zumo/app/lifeplus/model/module/APIBucketBackgroundListModule.java

@@ -11,6 +11,7 @@ import kr.co.zumo.app.lifeplus.bean.api.BestBucketBean;
 import kr.co.zumo.app.lifeplus.bean.api.BucketBackgroundImageBean;
 import kr.co.zumo.app.lifeplus.bean.api.BucketBackgroundListResultBean;
 import kr.co.zumo.app.lifeplus.bean.api.RequestBean;
+import kr.co.zumo.app.lifeplus.network.api.LifeplusAPIRepository;
 
 /**
  * APIBucketBackgroundListModule
@@ -28,8 +29,8 @@ public class APIBucketBackgroundListModule extends LifeplusAPIModule<RequestBean
   protected Single<BucketBackgroundListResultBean> getAPI(RequestBean requestBean) {
 
 //    return new LifeplusAPIRepository().getMyBucketBackgroundList(requestBean);
-    // api 통합으로 베스트 버킷의 데이를 이용한다.
-    return new APIBucketBestModule().getAPI(requestBean)
+    // api 통합으로 베스트 버킷의 데이를 이용한다.
+    return new LifeplusAPIRepository().getBestBucketList(requestBean)
       .map(bucketBestListResultBean -> {
         BucketBackgroundListResultBean resultBean = new BucketBackgroundListResultBean();
         resultBean.setCode(bucketBestListResultBean.getCode());
@@ -37,7 +38,7 @@ public class APIBucketBackgroundListModule extends LifeplusAPIModule<RequestBean
         resultBean.setHeaders(bucketBestListResultBean.getHeaders());
 
         resultBean.setData(new ArrayList<>());
-        if (null != bucketBestListResultBean && null != bucketBestListResultBean.getData()) {
+        if (null != bucketBestListResultBean.getData()) {
 
           BucketBackgroundImageBean imageBean;
           BestBucketBean bestBucketBean;

+ 9 - 13
app/src/main/java/kr/co/zumo/app/lifeplus/model/module/APIBucketBestModule.java

@@ -7,7 +7,6 @@ import java.util.ArrayList;
 import java.util.List;
 
 import io.reactivex.Single;
-import io.reactivex.functions.Function;
 import kr.co.zumo.app.lifeplus.bean.api.BestBucketBean;
 import kr.co.zumo.app.lifeplus.bean.api.BucketBestListResultBean;
 import kr.co.zumo.app.lifeplus.bean.api.RequestBean;
@@ -28,21 +27,18 @@ public class APIBucketBestModule extends LifeplusAPIModule<RequestBean, BucketBe
   @Override
   protected Single<BucketBestListResultBean> getAPI(RequestBean requestBean) {
     return new LifeplusAPIRepository().getBestBucketList(requestBean)
-      .map(new Function<BucketBestListResultBean, BucketBestListResultBean>() {
-        @Override
-        public BucketBestListResultBean apply(BucketBestListResultBean bucketBestListResultBean) throws Exception {
-          if (null != bucketBestListResultBean && null != bucketBestListResultBean.getData()) {
-            if (bucketBestListResultBean.getData().size() > 5) {
-              List<BestBucketBean> list = new ArrayList<>();
-              int len = 5;
-              for (int i = 0; i < len; ++i) {
-                list.add(bucketBestListResultBean.getData().get(i));
-              }
-              bucketBestListResultBean.setData(list);
+      .map(bucketBestListResultBean -> {
+        if (null != bucketBestListResultBean && null != bucketBestListResultBean.getData()) {
+          if (bucketBestListResultBean.getData().size() > 5) {
+            List<BestBucketBean> list = new ArrayList<>();
+            int len = 5;
+            for (int i = 0; i < len; ++i) {
+              list.add(bucketBestListResultBean.getData().get(i));
             }
+            bucketBestListResultBean.setData(list);
           }
-          return bucketBestListResultBean;
         }
+        return bucketBestListResultBean;
       });
   }
 }

+ 1 - 0
app/src/main/java/kr/co/zumo/app/lifeplus/network/api/LifeplusAPI.java

@@ -241,6 +241,7 @@ public interface LifeplusAPI {
   Single<TagRelatedContentsResultBean> getTagRelatedContentsList(@Body TagRelatedContentsRequestBean bean);
 
   // 버킷 리스트 배경 이미지 목록 조회
+  @Deprecated
   @POST("mapi/my/bucketImag.plus")
   Single<BucketBackgroundListResultBean> getMyBucketBackgroundList(@Body RequestBean bean);
 

+ 1 - 0
app/src/main/java/kr/co/zumo/app/lifeplus/network/api/LifeplusAPIRepository.java

@@ -232,6 +232,7 @@ public class LifeplusAPIRepository implements LifeplusAPI {
     return new LifeplusAPIService().getTagRelatedContentsList(bean);
   }
 
+  @Deprecated
   @Override
   public Single<BucketBackgroundListResultBean> getMyBucketBackgroundList(RequestBean bean) {
     return new LifeplusAPIService().getMyBucketBackgroundList(bean);