Merge branch 'develop' of https://github.com/swict/LifeplusAndroid into develop

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

@@ -3,8 +3,13 @@
  */
 package kr.co.zumo.app.lifeplus.model.module;
 
+import java.util.ArrayList;
+
 import io.reactivex.Single;
+import kr.co.zumo.app.lifeplus.bean.api.APIData;
+import kr.co.zumo.app.lifeplus.bean.api.EventDetailBean;
 import kr.co.zumo.app.lifeplus.bean.api.EventDetailResultBean;
+import kr.co.zumo.app.lifeplus.bean.api.EventPolicyBean;
 import kr.co.zumo.app.lifeplus.bean.api.ItemNoRequestBean;
 import kr.co.zumo.app.lifeplus.network.api.LifeplusAPIRepository;
 
@@ -21,7 +26,29 @@ 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);
+    return new LifeplusAPIRepository().getEventDetail(requestBean)
+      .map(eventDetailResultBean -> {
+        // 각 배열 null 체크
+        EventDetailBean eventDetailBean = eventDetailResultBean.getData();
+        if (null == eventDetailBean.getEventQuestionList()) {
+          eventDetailBean.setEventQuestionList(new ArrayList<>());
+        }
+        if (null == eventDetailBean.getEventImageList()) {
+          eventDetailBean.setEventImageList(new ArrayList<>());
+        }
+        if (null == eventDetailBean.getEventPolicyList()) {
+          eventDetailBean.setEventPolicyList(new ArrayList<>());
+        }
+        if (null == eventDetailBean.getTagList()) {
+          eventDetailBean.setTagList(new ArrayList<>());
+        }
+
+        for (EventPolicyBean eventPolicyBean : eventDetailBean.getEventPolicyList()) {
+          eventPolicyBean.setMandatory(APIData.TRUE);
+        }
+
+        return eventDetailResultBean;
+      });
 
     // api 내용에 추가되어 삭제
 

app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/event/entry/EventQuestionModel.java

@@ -304,6 +304,7 @@ public class EventQuestionModel extends Model implements IUriListProvider {
 
   private File getFile(Uri fileUri) {
     String path = null;
+    Log.d("APP# EventQuestionModel | getFile", "|" + " fileUri: " + fileUri);
     try {
       path = FileUtil.getFilePath(context, fileUri);
     } catch (URISyntaxException e) {
@@ -352,18 +353,6 @@ public class EventQuestionModel extends Model implements IUriListProvider {
 
   public void setEventDetailBean(EventDetailBean eventDetailBean) {
     this.eventDetailBean = eventDetailBean;
-    if (null == this.eventDetailBean.getEventQuestionList()) {
-      this.eventDetailBean.setEventQuestionList(new ArrayList<>());
-    }
-    if (null == this.eventDetailBean.getEventImageList()) {
-      this.eventDetailBean.setEventImageList(new ArrayList<>());
-    }
-    if (null == this.eventDetailBean.getEventPolicyList()) {
-      this.eventDetailBean.setEventPolicyList(new ArrayList<>());
-    }
-    if (null == this.eventDetailBean.getTagList()) {
-      this.eventDetailBean.setTagList(new ArrayList<>());
-    }
   }
 
   /**