[이벤트][New] 선택형 참여 결과 용어 변경: history => record

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

@@ -41,8 +41,8 @@ import kr.co.zumo.app.lifeplus.bean.api.ContentsBookmarkRequestBean;
 import kr.co.zumo.app.lifeplus.bean.api.ContentsDetailResultBean;
 import kr.co.zumo.app.lifeplus.bean.api.ContentsFlagResultBean;
 import kr.co.zumo.app.lifeplus.bean.api.ContentsLikeRequestBean;
-import kr.co.zumo.app.lifeplus.bean.api.EventAnswerHistoryRequestBean;
-import kr.co.zumo.app.lifeplus.bean.api.EventAnswerHistoryResultBean;
+import kr.co.zumo.app.lifeplus.bean.api.EventAnswerRecordRequestBean;
+import kr.co.zumo.app.lifeplus.bean.api.EventAnswerRecordResultBean;
 import kr.co.zumo.app.lifeplus.bean.api.EventAnswerRequestBean;
 import kr.co.zumo.app.lifeplus.bean.api.EventAnswerResultBean;
 import kr.co.zumo.app.lifeplus.bean.api.EventDetailResultBean;
@@ -793,8 +793,8 @@ public class LifeplusAPIService extends LifeplusRetrofitService implements Lifep
    * @return
    */
   @Override
-  public Single<EventAnswerHistoryResultBean> getEventAnswerHistory(EventAnswerHistoryRequestBean bean) {
-    return api().getEventAnswerHistory(bean);
+  public Single<EventAnswerRecordResultBean> getEventAnswerRecord(EventAnswerRecordRequestBean bean) {
+    return api().getEventAnswerRecord(bean);
   }
 
   /**

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

@@ -10,7 +10,7 @@ import java.util.List;
 import kr.co.zumo.app.lifeplus.bean.JsonBeanBase;
 
 /**
- * EventAnswerHistoryBean
+ * EventAnswerRecordBean
  * <pre>
  * </pre>
  *
@@ -19,7 +19,7 @@ import kr.co.zumo.app.lifeplus.bean.JsonBeanBase;
  * @history 민효동   [2019. 2. 15.]   [최초 작성]
  * @since 2019. 2. 15.
  */
-public class EventAnswerHistoryBean extends JsonBeanBase {
+public class EventAnswerRecordBean extends JsonBeanBase {
 
   @SerializedName("itemNo")
   private String itemNo;

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

@@ -13,8 +13,8 @@ package kr.co.zumo.app.lifeplus.bean.api;
  * @history 민효동   [2019. 2. 13.]   [최초 작성]
  * @since 2019. 2. 13.
  */
-public class EventAnswerHistoryRequestBean extends ItemNoRequestBean {
-  public EventAnswerHistoryRequestBean(String itemNo) {
+public class EventAnswerRecordRequestBean extends ItemNoRequestBean {
+  public EventAnswerRecordRequestBean(String itemNo) {
     super(itemNo);
   }
 }

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

@@ -13,5 +13,5 @@ package kr.co.zumo.app.lifeplus.bean.api;
  * @history 민효동   [2019. 2. 13.]   [최초 작성]
  * @since 2019. 2. 13.
  */
-public class EventAnswerHistoryResultBean extends LifeplusAPIResultObjectBean<EventAnswerHistoryBean> {
+public class EventAnswerRecordResultBean extends LifeplusAPIResultObjectBean<EventAnswerRecordBean> {
 }

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

@@ -1,26 +0,0 @@
-/*
- * COPYRIGHT (c) 2018 All rights reserved by HANWHA LIFE.
- */
-package kr.co.zumo.app.lifeplus.model.module;
-
-import io.reactivex.Single;
-import kr.co.zumo.app.lifeplus.bean.api.EventAnswerHistoryRequestBean;
-import kr.co.zumo.app.lifeplus.bean.api.EventAnswerHistoryResultBean;
-import kr.co.zumo.app.lifeplus.network.api.LifeplusAPIRepository;
-
-/**
- * APIEventAnswerHistoryModule
- * <pre>
- * </pre>
- *
- * @author 민효동
- * @version 1.0
- * @history 민효동   [2019. 1. 29.]   [최초 작성]
- * @since 2019. 1. 29.
- */
-public class APIEventAnswerHistoryModule extends LifeplusAPIModule<EventAnswerHistoryRequestBean, EventAnswerHistoryResultBean> {
-  @Override
-  protected Single<EventAnswerHistoryResultBean> getAPI(EventAnswerHistoryRequestBean requestBean) {
-    return new LifeplusAPIRepository().getEventAnswerHistory(requestBean);
-  }
-}

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

@@ -0,0 +1,26 @@
+/*
+ * COPYRIGHT (c) 2018 All rights reserved by HANWHA LIFE.
+ */
+package kr.co.zumo.app.lifeplus.model.module;
+
+import io.reactivex.Single;
+import kr.co.zumo.app.lifeplus.bean.api.EventAnswerRecordRequestBean;
+import kr.co.zumo.app.lifeplus.bean.api.EventAnswerRecordResultBean;
+import kr.co.zumo.app.lifeplus.network.api.LifeplusAPIRepository;
+
+/**
+ * APIEventAnswerRecordModule
+ * <pre>
+ * </pre>
+ *
+ * @author 민효동
+ * @version 1.0
+ * @history 민효동   [2019. 1. 29.]   [최초 작성]
+ * @since 2019. 1. 29.
+ */
+public class APIEventAnswerRecordModule extends LifeplusAPIModule<EventAnswerRecordRequestBean, EventAnswerRecordResultBean> {
+  @Override
+  protected Single<EventAnswerRecordResultBean> getAPI(EventAnswerRecordRequestBean requestBean) {
+    return new LifeplusAPIRepository().getEventAnswerRecord(requestBean);
+  }
+}

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

@@ -41,8 +41,8 @@ import kr.co.zumo.app.lifeplus.bean.api.ContentsBookmarkRequestBean;
 import kr.co.zumo.app.lifeplus.bean.api.ContentsDetailResultBean;
 import kr.co.zumo.app.lifeplus.bean.api.ContentsFlagResultBean;
 import kr.co.zumo.app.lifeplus.bean.api.ContentsLikeRequestBean;
-import kr.co.zumo.app.lifeplus.bean.api.EventAnswerHistoryRequestBean;
-import kr.co.zumo.app.lifeplus.bean.api.EventAnswerHistoryResultBean;
+import kr.co.zumo.app.lifeplus.bean.api.EventAnswerRecordRequestBean;
+import kr.co.zumo.app.lifeplus.bean.api.EventAnswerRecordResultBean;
 import kr.co.zumo.app.lifeplus.bean.api.EventAnswerRequestBean;
 import kr.co.zumo.app.lifeplus.bean.api.EventAnswerResultBean;
 import kr.co.zumo.app.lifeplus.bean.api.EventDetailResultBean;
@@ -251,7 +251,7 @@ public interface LifeplusAPI {
 
   // 이벤트 참여 결과
   @POST("mapi/event/evntrspnresl.plus")
-  Single<EventAnswerHistoryResultBean> getEventAnswerHistory(@Body EventAnswerHistoryRequestBean bean);
+  Single<EventAnswerRecordResultBean> getEventAnswerRecord(@Body EventAnswerRecordRequestBean bean);
 
 
   /***********************************

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

@@ -43,8 +43,8 @@ import kr.co.zumo.app.lifeplus.bean.api.ContentsDetailResultBean;
 import kr.co.zumo.app.lifeplus.bean.api.ContentsFlagBean;
 import kr.co.zumo.app.lifeplus.bean.api.ContentsFlagResultBean;
 import kr.co.zumo.app.lifeplus.bean.api.ContentsLikeRequestBean;
-import kr.co.zumo.app.lifeplus.bean.api.EventAnswerHistoryRequestBean;
-import kr.co.zumo.app.lifeplus.bean.api.EventAnswerHistoryResultBean;
+import kr.co.zumo.app.lifeplus.bean.api.EventAnswerRecordRequestBean;
+import kr.co.zumo.app.lifeplus.bean.api.EventAnswerRecordResultBean;
 import kr.co.zumo.app.lifeplus.bean.api.EventAnswerRequestBean;
 import kr.co.zumo.app.lifeplus.bean.api.EventAnswerResultBean;
 import kr.co.zumo.app.lifeplus.bean.api.EventDetailResultBean;
@@ -543,8 +543,8 @@ public class LifeplusAPIRepository implements LifeplusAPI {
   }
 
   @Override
-  public Single<EventAnswerHistoryResultBean> getEventAnswerHistory(EventAnswerHistoryRequestBean bean) {
-    return new LifeplusAPIService().getEventAnswerHistory(bean);
+  public Single<EventAnswerRecordResultBean> getEventAnswerRecord(EventAnswerRecordRequestBean bean) {
+    return new LifeplusAPIService().getEventAnswerRecord(bean);
   }
 
   @Override

app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/event/recommend/EventRecommendModel.java

@@ -9,9 +9,9 @@ import java.util.ArrayList;
 import java.util.List;
 
 import io.reactivex.disposables.Disposable;
-import kr.co.zumo.app.lifeplus.bean.api.EventAnswerHistoryBean;
-import kr.co.zumo.app.lifeplus.bean.api.EventAnswerHistoryRequestBean;
-import kr.co.zumo.app.lifeplus.bean.api.EventAnswerHistoryResultBean;
+import kr.co.zumo.app.lifeplus.bean.api.EventAnswerRecordBean;
+import kr.co.zumo.app.lifeplus.bean.api.EventAnswerRecordRequestBean;
+import kr.co.zumo.app.lifeplus.bean.api.EventAnswerRecordResultBean;
 import kr.co.zumo.app.lifeplus.bean.api.EventAnswerItemBean;
 import kr.co.zumo.app.lifeplus.bean.api.EventDetailBean;
 import kr.co.zumo.app.lifeplus.bean.api.EventQuestionBean;
@@ -25,7 +25,7 @@ import kr.co.zumo.app.lifeplus.bean.api.TagBean;
 import kr.co.zumo.app.lifeplus.bean.api.TagNoBean;
 import kr.co.zumo.app.lifeplus.model.Model;
 import kr.co.zumo.app.lifeplus.model.module.APIError;
-import kr.co.zumo.app.lifeplus.model.module.APIEventAnswerHistoryModule;
+import kr.co.zumo.app.lifeplus.model.module.APIEventAnswerRecordModule;
 import kr.co.zumo.app.lifeplus.model.module.APIEventTagModule;
 import kr.co.zumo.app.lifeplus.model.module.APIEventTagRelatedModule;
 import kr.co.zumo.app.lifeplus.model.module.APIModuleListener;
@@ -225,14 +225,14 @@ public class EventRecommendModel extends Model {
     return deliveredEventDetailBean.isAnswered();
   }
 
-  public void loadEventAnswerHistory() {
+  public void loadEventAnswerRecord() {
     String itemNo = deliveredEventDetailBean.getItemNo();
-    disposableResult = new APIEventAnswerHistoryModule().call(new EventAnswerHistoryRequestBean(itemNo), new APIModuleListener<EventAnswerHistoryResultBean>(waiterCaller) {
+    disposableResult = new APIEventAnswerRecordModule().call(new EventAnswerRecordRequestBean(itemNo), new APIModuleListener<EventAnswerRecordResultBean>(waiterCaller) {
       @Override
-      public void onApiSuccess(EventAnswerHistoryResultBean resultBean) {
-        EventAnswerHistoryBean historyBean = resultBean.getData();
+      public void onApiSuccess(EventAnswerRecordResultBean resultBean) {
+        EventAnswerRecordBean recordBean = resultBean.getData();
 
-        if (null != historyBean) {
+        if (null != recordBean) {
           // fixme 현재는 질문 1개만 결과로 온다.
           // eventDetailBean 에 결과를 맵핑한다.
           // 참여 후 직접 넘오 올 경우 eventDetailBean 을 이용하기 때문에 같은 형식으로 이용
@@ -241,7 +241,7 @@ public class EventRecommendModel extends Model {
           for (EventQuestionBean eventQuestionBean : beforeList) {
             // 동일 보기 찾기 -> 문제 no 가 없어서 보기와 직접 맵핑한다.
             for (EventAnswerItemBean answerItemBean : eventQuestionBean.getEventAnswerItemBeanList()) {
-              if (answerItemBean.getAnswerItemNo().equals(historyBean.getSelectedAnswerName())) {
+              if (answerItemBean.getAnswerItemNo().equals(recordBean.getSelectedAnswerName())) {
                 answerItemBean.setChecked(true);
                 Log.d("APP# EventRecommendModel | onApiSuccess", "|" + " checked => " + answerItemBean.toJson());
               }

app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/event/recommend/EventRecommendPresenter.java

@@ -77,7 +77,7 @@ public class EventRecommendPresenter extends Presenter<EventRecommendModel, IEve
     if (null != model.getDeliveredEventDetailBean()) {
       // 참여를 한 상태라면 태그 로드, 아니라면, 참여 결과 로드
       if (model.isAnswered()) {
-        model.loadEventAnswerHistory();
+        model.loadEventAnswerRecord();
       }
       else {
         model.loadTag();