[이벤트][New] 응모형 - 모든 질문이 필수가 아닐 때 진입 시 응모 버튼 활성화

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

@@ -33,6 +33,7 @@ import kr.co.zumo.app.lifeplus.model.module.APIEventPolicyModule;
 import kr.co.zumo.app.lifeplus.model.module.APIModuleListener;
 import kr.co.zumo.app.lifeplus.network.api.LifeplusAPIRepository;
 import kr.co.zumo.app.lifeplus.util.FileUtil;
+import kr.co.zumo.app.lifeplus.util.StringUtil;
 import kr.co.zumo.app.lifeplus.view.Event;
 import okhttp3.MediaType;
 import okhttp3.MultipartBody;
@@ -191,10 +192,12 @@ public class EventQuestionModel extends CoinModel implements IUriListProvider {
           }
         }
         else if (EventQuestionBean.QUESTION_TYPE_ANSWER.equals(eventQuestionBean.getQuestionType())) {
-          answerBean = new EventAnswerBean();
-          answerBean.setQuestionItemNo(eventQuestionBean.getQuestionNo());
-          answerBean.setAnswer(eventQuestionBean.getAnswer());
-          list.add(answerBean);
+          if (StringUtil.isFull(eventQuestionBean.getAnswer())) {
+            answerBean = new EventAnswerBean();
+            answerBean.setQuestionItemNo(eventQuestionBean.getQuestionNo());
+            answerBean.setAnswer(eventQuestionBean.getAnswer());
+            list.add(answerBean);
+          }
         }
         else if (EventQuestionBean.QUESTION_TYPE_IMAGE.equals(eventQuestionBean.getQuestionType())) {
           if (null != eventQuestionBean.getUploadedFiles()) {
@@ -562,6 +565,15 @@ public class EventQuestionModel extends CoinModel implements IUriListProvider {
     return true;
   }
 
+  /**
+   * 1개 이상 응답을 했는지 확인
+   *
+   * @return
+   */
+  public boolean hasAtLeastAAnswer() {
+    return null != getAnswerList() && getAnswerList().size() > 0;
+  }
+
   /**
    * 당첨자 발표 여부
    *

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

@@ -62,6 +62,8 @@ public class EventQuestionPresenter extends Presenter<EventQuestionModel, IEvent
     }
     else {
       view.drawList(model.getEventDetailBean());
+      // 모든 질문이 필수가 아닐 경우 바로 버튼 활성화
+      setSubmitButton();
     }
   }
 
@@ -172,7 +174,8 @@ public class EventQuestionPresenter extends Presenter<EventQuestionModel, IEvent
   }
 
   private void setSubmitButton() {
-    view.setEnabledSubmitButton(model.isValidateAll());
+    // todo 모든 질문이 필수가 아닐 때 하나도 응답을 하지 않으면 응모할 수 있을지?
+    view.setEnabledSubmitButton(model.isValidateAll()/* && model.hasAtLeastAAnswer()*/);
   }
 
   @Override