[이벤트][New] 상세 API 에 당첨자 발표 결과 추가

- 다른 API 를 이용했던 부분 제거

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

@@ -50,6 +50,19 @@ public class EventDetailBean extends EventBean {
   @SerializedName("itemTagList")
   private List<TagBean> tagList;
 
+  @SerializedName("evntWinYn")
+  private String winner2; // 당첨자발표여부 = 상세용
+
+  @Override
+  public String getWinner() {
+    return winner2;
+  }
+
+  @Override
+  public void setWinner(String winner) {
+    this.winner2 = winner;
+  }
+
   public String getEventLimit() {
     return eventLimit;
   }

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

@@ -3,17 +3,8 @@
  */
 package kr.co.zumo.app.lifeplus.model.module;
 
-import android.util.Log;
-
-import java.util.ArrayList;
-import java.util.List;
-
 import io.reactivex.Single;
-import kr.co.zumo.app.lifeplus.bean.api.APIData;
 import kr.co.zumo.app.lifeplus.bean.api.EventDetailResultBean;
-import kr.co.zumo.app.lifeplus.bean.api.EventWinnerBean;
-import kr.co.zumo.app.lifeplus.bean.api.EventWinnerListBean;
-import kr.co.zumo.app.lifeplus.bean.api.EventWinnerResultBean;
 import kr.co.zumo.app.lifeplus.bean.api.ItemNoRequestBean;
 import kr.co.zumo.app.lifeplus.network.api.LifeplusAPIRepository;
 
@@ -30,31 +21,34 @@ import kr.co.zumo.app.lifeplus.network.api.LifeplusAPIRepository;
 public class APIEventDetailModule extends LifeplusAPIModule<ItemNoRequestBean, EventDetailResultBean> {
   @Override
   protected Single<EventDetailResultBean> getAPI(ItemNoRequestBean requestBean) {
-    return new LifeplusAPIRepository().getEventDetail(requestBean)
-      .flatMap(eventDetailResultBean -> {
-        //new ParameterMapper<ItemNoRequestBean>().map(new BasicParamProvider(), requestBean)
-        // 당첨자 발표했는지 구분
-        return new LifeplusAPIRepository().getEventWinner(requestBean)
-          .onErrorReturn(throwable -> {
-            EventWinnerResultBean bean = new EventWinnerResultBean();
-            EventWinnerListBean listBean = new EventWinnerListBean();
-            listBean.setWinnerList(new ArrayList<>());
-            bean.setData(listBean);
-            return bean;
-          })
-          .map(eventWinnerResultBean -> {
-            EventWinnerListBean resultBean = eventWinnerResultBean.getData();
+    return new LifeplusAPIRepository().getEventDetail(requestBean);
 
-            if (null != resultBean) {
-              List<EventWinnerBean> list = resultBean.getWinnerList();
-              if (null != list && null != eventDetailResultBean.getData()) {
-                eventDetailResultBean.getData().setWinner(APIData.valueOf(resultBean.getWinnerList().size() > 0));
-                Log.d("APP# APIEventDetailModule | getAPI", "|" + " winner -> " + eventDetailResultBean.getData().getWinner());
-              }
-            }
+    // api 내용에 추가되어 삭제
 
-            return eventDetailResultBean;
-          });
-      });
+//      .flatMap(eventDetailResultBean -> {
+//        //new ParameterMapper<ItemNoRequestBean>().map(new BasicParamProvider(), requestBean)
+//        // 당첨자 발표했는지 구분
+//        return new LifeplusAPIRepository().getEventWinner(requestBean)
+//          .onErrorReturn(throwable -> {
+//            EventWinnerResultBean bean = new EventWinnerResultBean();
+//            EventWinnerListBean listBean = new EventWinnerListBean();
+//            listBean.setWinnerList(new ArrayList<>());
+//            bean.setData(listBean);
+//            return bean;
+//          })
+//          .map(eventWinnerResultBean -> {
+//            EventWinnerListBean resultBean = eventWinnerResultBean.getData();
+//
+//            if (null != resultBean) {
+//              List<EventWinnerBean> list = resultBean.getWinnerList();
+//              if (null != list && null != eventDetailResultBean.getData()) {
+//                eventDetailResultBean.getData().setWinner(APIData.valueOf(resultBean.getWinnerList().size() > 0));
+//                Log.d("APP# APIEventDetailModule | getAPI", "|" + " winner -> " + eventDetailResultBean.getData().getWinner());
+//              }
+//            }
+//
+//            return eventDetailResultBean;
+//          });
+//      });
   }
 }