[공통][New] 추가 API 구현

app/src/main/java/kr/co/zumo/app/lifeplus/model/SignUpModel.java

@@ -124,7 +124,7 @@ public class SignUpModel extends Model {
    */
   public void requestBanners() {
     disposable.add(
-      LifeplusAPIService.getBannerList(new BlankBean())
+      new LifeplusAPIService().getBannerList(new BlankBean())
         .subscribeOn(Schedulers.io())
         .observeOn(AndroidSchedulers.mainThread())
         .subscribe(resultBean -> {

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

@@ -6,9 +6,15 @@ package kr.co.zumo.app.lifeplus.network.api;
 import io.reactivex.Single;
 import kr.co.zumo.app.lifeplus.bean.BlankBean;
 import kr.co.zumo.app.lifeplus.bean.api.BannerResultBean;
+import kr.co.zumo.app.lifeplus.bean.api.FAQResultBean;
 import kr.co.zumo.app.lifeplus.bean.api.LifeplusAPIBean;
+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.MobileAuthorizationRequestBean;
 import kr.co.zumo.app.lifeplus.bean.api.MobileAuthorizationConfirmRequestBean;
+import kr.co.zumo.app.lifeplus.bean.api.PolicyConfirmRequestBean;
+import kr.co.zumo.app.lifeplus.bean.api.PolicyResultBean;
+import kr.co.zumo.app.lifeplus.bean.api.UserNumberBean;
 import kr.co.zumo.app.lifeplus.config.NetworkConfig;
 
 /**
@@ -21,12 +27,11 @@ import kr.co.zumo.app.lifeplus.config.NetworkConfig;
  * @history 민효동   [2018. 9. 19.]   [최초 작성]
  * @since 2018. 9. 19.
  */
-public class LifeplusAPIService extends RetrofitService {
+public class LifeplusAPIService extends RetrofitService implements LifeplusAPI {
 
   private static final String AUTH_URL = NetworkConfig.HOST_URL + ":" + NetworkConfig.HOST_PORT + "/";
-  private static final String METHOD_GET = "GET";
 
-  private static LifeplusAPI api(String url) {
+  private LifeplusAPI api(String url) {
     return retrofit(url, LifeplusAPI.class, 2000);
   }
 
@@ -36,7 +41,8 @@ public class LifeplusAPIService extends RetrofitService {
    * @param bean MobileAuthorizationRequestBean
    * @return rx single with LifeplusAPIBean
    */
-  public static Single<LifeplusAPIBean> requestMobileAuthorizationNumber(MobileAuthorizationRequestBean bean) {
+  @Override
+  public Single<LifeplusAPIBean> requestMobileAuth(MobileAuthorizationRequestBean bean) {
     return api(AUTH_URL).requestMobileAuth(bean);
   }
 
@@ -46,7 +52,8 @@ public class LifeplusAPIService extends RetrofitService {
    * @param bean MobileAuthorizationConfirmRequestBean
    * @return rx single with LifeplusAPIBean
    */
-  public static Single<LifeplusAPIBean> requestMobileAuthorization(MobileAuthorizationConfirmRequestBean bean) {
+  @Override
+  public Single<LifeplusAPIBean> confirmMobileAuth(MobileAuthorizationConfirmRequestBean bean) {
     return api(AUTH_URL).confirmMobileAuth(bean);
   }
 
@@ -56,7 +63,62 @@ public class LifeplusAPIService extends RetrofitService {
    * @param bean
    * @return
    */
-  public static Single<BannerResultBean> getBannerList(BlankBean bean) {
+  public Single<BannerResultBean> getBannerList(BlankBean bean) {
     return api(AUTH_URL).getBannerList(bean);
   }
+
+  /**
+   * 약관 리스트 가져오기
+   *
+   * @param bean
+   * @return
+   */
+  @Override
+  public Single<PolicyResultBean> getPolicyList(BlankBean bean) {
+    return api(AUTH_URL).getPolicyList(bean);
+  }
+
+  /**
+   * 약관 확인
+   *
+   * @param bean
+   * @return
+   */
+  @Override
+  public Single<LifeplusAPIBean> confirmPolicy(PolicyConfirmRequestBean bean) {
+    return api(AUTH_URL).confirmPolicy(bean);
+  }
+
+  /**
+   * 회원 가입
+   *
+   * @param bean
+   * @return
+   */
+  @Override
+  public Single<MemberJoinResultBean> insertMember(MemberJoinRequestBean bean) {
+    return api(AUTH_URL).insertMember(bean);
+  }
+
+  /**
+   * 회원 탈퇴
+   *
+   * @param bean
+   * @return
+   */
+  @Override
+  public Single<LifeplusAPIBean> deleteMember(UserNumberBean bean) {
+    return api(AUTH_URL).deleteMember(bean);
+  }
+
+  /**
+   * FAQ 리스트 가져오기
+   *
+   * @param bean
+   * @return
+   */
+  @Override
+  public Single<FAQResultBean> getFaqList(BlankBean bean) {
+    return api(AUTH_URL).getFaqList(bean);
+  }
 }

app/src/main/java/kr/co/zumo/app/lifeplus/view/dialog/MobileAuthorizationPresenter.java

@@ -300,12 +300,13 @@ public class MobileAuthorizationPresenter {
     if (isValidated) {
       // call api...
       view.setEnabledRequestConfirmButton(false);
+
       MobileAuthorizationConfirmRequestBean bean = new MobileAuthorizationConfirmRequestBean();
       bean.setDeviceUuid(SuperModel.getInstance().getDeviceUuid());
       bean.setAuthorizationNumber(this.authorizationNumber);
 
       disposable.add(
-        LifeplusAPIService.requestMobileAuthorization(bean)
+        new LifeplusAPIService().confirmMobileAuth(bean)
           .subscribeOn(Schedulers.io())
           .observeOn(AndroidSchedulers.mainThread())
           .subscribe(resultBean -> {
@@ -496,7 +497,7 @@ public class MobileAuthorizationPresenter {
       bean.setMobileCompany(userBean.getMobileCompany());
 
       disposable.add(
-        LifeplusAPIService.requestMobileAuthorizationNumber(bean)
+        new LifeplusAPIService().requestMobileAuth(bean)
           .subscribeOn(Schedulers.io())
           .observeOn(AndroidSchedulers.mainThread())
           .subscribe(resultBean -> {

app/src/test/java/kr/co/zumo/app/lifeplus/network/api/LifeplusAPIServiceTest.java

@@ -22,14 +22,14 @@ import static junit.framework.Assert.assertTrue;
 public class LifeplusAPIServiceTest {
 
   @Test
-  public void requestMobileAuthorizationNumber() {
-    Single<LifeplusAPIBean> test = LifeplusAPIService.requestMobileAuthorizationNumber(new MobileAuthorizationRequestBean());
+  public void requestMobileAuth() {
+    Single<LifeplusAPIBean> test = new LifeplusAPIService().requestMobileAuth(new MobileAuthorizationRequestBean());
     assertTrue(null != test);
   }
 
   @Test
-  public void requestMobileAuthorization() {
-    Single<LifeplusAPIBean> test = LifeplusAPIService.requestMobileAuthorization(new MobileAuthorizationConfirmRequestBean());
+  public void confirmMobileAuth() {
+    Single<LifeplusAPIBean> test = new LifeplusAPIService().confirmMobileAuth(new MobileAuthorizationConfirmRequestBean());
     assertTrue(null != test);
   }
 }