[가입][Bug] 가입 시 약관 동의 API 적용

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

@@ -38,7 +38,6 @@ import kr.co.zumo.app.lifeplus.bean.api.MemberPhoneNumberRequestBean;
 import kr.co.zumo.app.lifeplus.bean.api.MemberPolicyRequestBean;
 import kr.co.zumo.app.lifeplus.bean.api.MemberPushAgreeRequestBean;
 import kr.co.zumo.app.lifeplus.bean.api.NotificationResultBean;
-import kr.co.zumo.app.lifeplus.bean.api.PolicyConfirmRequestBean;
 import kr.co.zumo.app.lifeplus.bean.api.PolicyListResultBean;
 import kr.co.zumo.app.lifeplus.bean.api.PolicyNoRequestBean;
 import kr.co.zumo.app.lifeplus.bean.api.PolicyResultBean;
@@ -138,17 +137,6 @@ public class LifeplusAPIService extends RetrofitService implements LifeplusAPI {
     return api().getMemberPolicyList(bean);
   }
 
-  /**
-   * 약관 확인
-   *
-   * @param bean
-   * @return
-   */
-  @Override
-  public Single<LifeplusAPIBean> confirmPolicy(PolicyConfirmRequestBean bean) {
-    return api().confirmPolicy(bean);
-  }
-
   /**
    * 회원 가입
    *

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

@@ -5,6 +5,8 @@ package kr.co.zumo.app.lifeplus.bean.api;
 
 import com.google.gson.annotations.SerializedName;
 
+import java.util.List;
+
 /**
  * MemberJoinRequestBean
  * <pre>
@@ -29,14 +31,17 @@ public class MemberJoinRequestBean extends RequestBean {
   private String nationality;
   @SerializedName("corpDvsn")
   private String mobileCompany;
+  @SerializedName("stplList")
+  private List<PolicyNumberBean> policyNumberList;
 
-  public MemberJoinRequestBean(String name, String phoneNumber, String birthDate, String deviceId, String nationality, String mobileCompany) {
+  public MemberJoinRequestBean(String name, String phoneNumber, String birthDate, String deviceId, String nationality, String mobileCompany, List<PolicyNumberBean> policyNumberList) {
     this.name = name;
     this.phoneNumber = phoneNumber;
     this.birthDate = birthDate;
     this.deviceId = deviceId;
     this.nationality = nationality;
     this.mobileCompany = mobileCompany;
+    this.policyNumberList = policyNumberList;
   }
 
   public String getName() {
@@ -51,4 +56,5 @@ public class MemberJoinRequestBean extends RequestBean {
     return birthDate;
   }
 
+
 }

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

@@ -5,8 +5,6 @@ package kr.co.zumo.app.lifeplus.bean.api;
 
 import com.google.gson.annotations.SerializedName;
 
-import kr.co.zumo.app.lifeplus.bean.JsonBeanBase;
-
 /**
  * PolicyBean
  * <pre>
@@ -17,7 +15,7 @@ import kr.co.zumo.app.lifeplus.bean.JsonBeanBase;
  * @history 민효동   [2018. 10. 1.]   [최초 작성]
  * @since 2018. 10. 1.
  */
-public class PolicyBean extends JsonBeanBase {
+public class PolicyBean extends PolicyNumberBean {
   /*
   {
       "stplSqno": 3,
@@ -30,8 +28,6 @@ public class PolicyBean extends JsonBeanBase {
       "agreDttm": null
   },
    */
-  @SerializedName("stplSqno")
-  private String policyNumber;
 
   @SerializedName("essnYn")
   private String mandatory;
@@ -50,6 +46,9 @@ public class PolicyBean extends JsonBeanBase {
   @SerializedName("ver")
   private String version;
 
+  public PolicyBean(String policyNumber) {
+    super(policyNumber);
+  }
 
   public boolean isChecked() {
     return LifeplusData.isTrue(checked);
@@ -83,14 +82,6 @@ public class PolicyBean extends JsonBeanBase {
     this.title = title;
   }
 
-  public String getPolicyNumber() {
-    return policyNumber;
-  }
-
-  public void setPolicyNumber(String policyNumber) {
-    this.policyNumber = policyNumber;
-  }
-
   public String getAgreeDateTime() {
     return agreeDateTime;
   }

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

@@ -0,0 +1,40 @@
+/*
+ * COPYRIGHT (c) 2018 All rights reserved by HANWHA LIFE.
+ */
+package kr.co.zumo.app.lifeplus.bean.api;
+
+import com.google.gson.annotations.SerializedName;
+
+import kr.co.zumo.app.lifeplus.bean.JsonBeanBase;
+
+/**
+ * PolicyBean
+ * <pre>
+ * </pre>
+ *
+ * @author 민효동
+ * @version 1.0
+ * @history 민효동   [2018. 10. 1.]   [최초 작성]
+ * @since 2018. 10. 1.
+ */
+public class PolicyNumberBean extends JsonBeanBase {
+  /*
+  {
+      "stplSqno": 3,
+  },
+   */
+  @SerializedName("stplSqno")
+  private String policyNumber;
+
+  public PolicyNumberBean(String policyNumber) {
+    this.policyNumber = policyNumber;
+  }
+
+  public String getPolicyNumber() {
+    return policyNumber;
+  }
+
+  public void setPolicyNumber(String policyNumber) {
+    this.policyNumber = policyNumber;
+  }
+}

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

@@ -38,7 +38,6 @@ import kr.co.zumo.app.lifeplus.bean.api.MemberPhoneNumberRequestBean;
 import kr.co.zumo.app.lifeplus.bean.api.MemberPolicyRequestBean;
 import kr.co.zumo.app.lifeplus.bean.api.MemberPushAgreeRequestBean;
 import kr.co.zumo.app.lifeplus.bean.api.NotificationResultBean;
-import kr.co.zumo.app.lifeplus.bean.api.PolicyConfirmRequestBean;
 import kr.co.zumo.app.lifeplus.bean.api.PolicyListResultBean;
 import kr.co.zumo.app.lifeplus.bean.api.PolicyNoRequestBean;
 import kr.co.zumo.app.lifeplus.bean.api.PolicyResultBean;
@@ -75,11 +74,8 @@ public interface LifeplusAPI {
   @POST("mapi/mobileauth/confmobileauth.plus")
   Single<LifeplusAPIBean> confirmMobileAuth(@Body AuthConfirmRequestBean bean);
 
-  @POST("api/v1/textRes/confirmPolicy.plus")
-  Single<LifeplusAPIBean> confirmPolicy(@Body PolicyConfirmRequestBean bean);
-
   /***********************************
-   * 가입
+   * 인증
    ***********************************/
   @POST("mapi/mobileauth/reqmobilebaseauth.plus")
   Single<LifeplusAPIBean> requestMobileAuthSimple(@Body AuthNumberRequestBean bean);

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

@@ -38,7 +38,6 @@ import kr.co.zumo.app.lifeplus.bean.api.MemberPhoneNumberRequestBean;
 import kr.co.zumo.app.lifeplus.bean.api.MemberPolicyRequestBean;
 import kr.co.zumo.app.lifeplus.bean.api.MemberPushAgreeRequestBean;
 import kr.co.zumo.app.lifeplus.bean.api.NotificationResultBean;
-import kr.co.zumo.app.lifeplus.bean.api.PolicyConfirmRequestBean;
 import kr.co.zumo.app.lifeplus.bean.api.PolicyListResultBean;
 import kr.co.zumo.app.lifeplus.bean.api.PolicyNoRequestBean;
 import kr.co.zumo.app.lifeplus.bean.api.PolicyResultBean;
@@ -75,11 +74,6 @@ public class LifeplusAPIRepository implements LifeplusAPI {
     return new LifeplusAPIService().confirmMobileAuth(bean);
   }
 
-  @Override
-  public Single<LifeplusAPIBean> confirmPolicy(PolicyConfirmRequestBean bean) {
-    return new LifeplusAPIService().confirmPolicy(bean);
-  }
-
   @Override
   public Single<LifeplusAPIBean> requestMobileAuthSimple(AuthNumberRequestBean bean) {
     return new LifeplusAPIService().requestMobileAuthSimple(bean);

app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/signup/SignUpAgreeModel.java

@@ -16,6 +16,7 @@ import kr.co.zumo.app.lifeplus.bean.api.MemberJoinRequestBean;
 import kr.co.zumo.app.lifeplus.bean.api.MemberJoinResultBean;
 import kr.co.zumo.app.lifeplus.bean.api.PolicyBean;
 import kr.co.zumo.app.lifeplus.bean.api.PolicyListResultBean;
+import kr.co.zumo.app.lifeplus.bean.api.PolicyNumberBean;
 import kr.co.zumo.app.lifeplus.bean.api.UserNoRequestBean;
 import kr.co.zumo.app.lifeplus.model.Model;
 import kr.co.zumo.app.lifeplus.model.SuperModel;
@@ -162,13 +163,26 @@ public class SignUpAgreeModel extends Model {
     else {
       // 필수 항목 체크 완료;
 
+      ArrayList<PolicyNumberBean> policyList = new ArrayList<>();
+      List<PolicyBean> agreeBean = getAgreeItems();
+      if (null != agreeBean) {
+
+        for (PolicyBean bean : agreeBean) {
+          if (bean.isMandatory() == false && bean.isChecked()) {
+            policyList.add(new PolicyNumberBean(bean.getPolicyNumber()));
+          }
+        }
+      }
+
       MemberJoinRequestBean bean = new MemberJoinRequestBean(
         mobileAuthBean.getName(),
         mobileAuthBean.getFullPhoneNumber(),
         mobileAuthBean.getBirthDate(),
         SuperModel.getInstance().getDeviceId(),
         mobileAuthBean.getNationalityIndex(),
-        mobileAuthBean.getMobileCompany());
+        mobileAuthBean.getMobileCompany(),
+        policyList
+      );
 
       disposable.add(new APIMemberInsertModule().call(bean, new IAPIModuleListener<MemberJoinResultBean>() {
           @Override