[공통][Bug] Bean 이름 변경

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

@@ -4,8 +4,8 @@
 package kr.co.zumo.app.lifeplus.network.api;
 
 import io.reactivex.Single;
-import kr.co.zumo.app.lifeplus.bean.api.AuthConfirmRequestBean;
-import kr.co.zumo.app.lifeplus.bean.api.AuthRequestBean;
+import kr.co.zumo.app.lifeplus.bean.api.AuthConfirmBean;
+import kr.co.zumo.app.lifeplus.bean.api.AuthNumberBean;
 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.LoginResultBean;
@@ -38,22 +38,22 @@ public class LifeplusAPIService extends RetrofitService implements LifeplusAPI {
   /**
    * 모바일 인증 번호 요청
    *
-   * @param bean AuthRequestBean
+   * @param bean AuthNumberBean
    * @return rx single with LifeplusAPIBean
    */
   @Override
-  public Single<LifeplusAPIBean> requestMobileAuth(AuthRequestBean bean) {
+  public Single<LifeplusAPIBean> requestMobileAuth(AuthNumberBean bean) {
     return api(AUTH_URL).requestMobileAuth(bean);
   }
 
   /**
    * 인증 번호 확인 요청
    *
-   * @param bean AuthConfirmRequestBean
+   * @param bean AuthConfirmBean
    * @return rx single with LifeplusAPIBean
    */
   @Override
-  public Single<LifeplusAPIBean> confirmMobileAuth(AuthConfirmRequestBean bean) {
+  public Single<LifeplusAPIBean> confirmMobileAuth(AuthConfirmBean bean) {
     return api(AUTH_URL).confirmMobileAuth(bean);
   }
 

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

@@ -6,7 +6,7 @@ package kr.co.zumo.app.lifeplus.bean.api;
 import com.google.gson.annotations.SerializedName;
 
 /**
- * AuthConfirmRequestBean
+ * AuthConfirmBean
  * <pre>
  * </pre>
  *
@@ -15,7 +15,7 @@ import com.google.gson.annotations.SerializedName;
  * @history 민효동   [2018. 9. 27.]   [최초 작성]
  * @since 2018. 9. 27.
  */
-public class AuthConfirmRequestBean extends RequestBean {
+public class AuthConfirmBean extends RequestBean {
   /*
   ""auth_no"" : 인증번호(string) ,
   ""phone_no"" :  폰번호(string) 인증서버 연결 이전까지 테스트용

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

@@ -6,7 +6,7 @@ package kr.co.zumo.app.lifeplus.bean.api;
 import com.google.gson.annotations.SerializedName;
 
 /**
- * AuthRequestBean
+ * AuthNumberBean
  * <pre>
  * </pre>
  *
@@ -15,7 +15,7 @@ import com.google.gson.annotations.SerializedName;
  * @history 민효동   [2018. 9. 27.]   [최초 작성]
  * @since 2018. 9. 27.
  */
-public class AuthRequestBean extends RequestBean {
+public class AuthNumberBean extends RequestBean {
   /*
   "name" :             이름(string) ,
    "gender" :           성별(string) ,

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

@@ -4,8 +4,8 @@
 package kr.co.zumo.app.lifeplus.network.api;
 
 import io.reactivex.Single;
-import kr.co.zumo.app.lifeplus.bean.api.AuthConfirmRequestBean;
-import kr.co.zumo.app.lifeplus.bean.api.AuthRequestBean;
+import kr.co.zumo.app.lifeplus.bean.api.AuthConfirmBean;
+import kr.co.zumo.app.lifeplus.bean.api.AuthNumberBean;
 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.LoginResultBean;
@@ -31,10 +31,10 @@ import retrofit2.http.POST;
 public interface LifeplusAPI {
 
   @POST("api/v1/mobileAuth/requestMobileAuth.plus")
-  Single<LifeplusAPIBean> requestMobileAuth(@Body AuthRequestBean bean);
+  Single<LifeplusAPIBean> requestMobileAuth(@Body AuthNumberBean bean);
 
   @POST("api/v1/mobileAuth/confirmMobileAuth.plus")
-  Single<LifeplusAPIBean> confirmMobileAuth(@Body AuthConfirmRequestBean bean);
+  Single<LifeplusAPIBean> confirmMobileAuth(@Body AuthConfirmBean bean);
 
   @POST("api/v1/textRes/getPolicyList.plus")
   Single<PolicyResultBean> getPolicyList(@Body RequestBean bean);

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

@@ -6,8 +6,8 @@ package kr.co.zumo.app.lifeplus.network.api;
 import android.util.Log;
 
 import io.reactivex.Single;
-import kr.co.zumo.app.lifeplus.bean.api.AuthConfirmRequestBean;
-import kr.co.zumo.app.lifeplus.bean.api.AuthRequestBean;
+import kr.co.zumo.app.lifeplus.bean.api.AuthConfirmBean;
+import kr.co.zumo.app.lifeplus.bean.api.AuthNumberBean;
 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.LoginResultBean;
@@ -44,13 +44,13 @@ public class LifeplusAPIRepository implements LifeplusAPI {
   }
 
   @Override
-  public Single<LifeplusAPIBean> requestMobileAuth(AuthRequestBean bean) {
+  public Single<LifeplusAPIBean> requestMobileAuth(AuthNumberBean bean) {
     mapBasicParameter(bean);
     return new LifeplusAPIService().requestMobileAuth(bean);
   }
 
   @Override
-  public Single<LifeplusAPIBean> confirmMobileAuth(AuthConfirmRequestBean bean) {
+  public Single<LifeplusAPIBean> confirmMobileAuth(AuthConfirmBean bean) {
     mapBasicParameter(bean);
     return new LifeplusAPIService().confirmMobileAuth(bean);
   }

app/src/main/java/kr/co/zumo/app/lifeplus/view/custom/auth/MobileAuthPresenter.java

@@ -14,10 +14,12 @@ import io.reactivex.disposables.Disposable;
 import io.reactivex.schedulers.Schedulers;
 import kr.co.zumo.app.R;
 import kr.co.zumo.app.lifeplus.bean.MobileAuthBean;
-import kr.co.zumo.app.lifeplus.bean.api.AuthConfirmRequestBean;
-import kr.co.zumo.app.lifeplus.bean.api.AuthRequestBean;
+import kr.co.zumo.app.lifeplus.bean.api.AuthConfirmBean;
+import kr.co.zumo.app.lifeplus.bean.api.AuthNumberBean;
 import kr.co.zumo.app.lifeplus.bean.api.LifeplusAPIBean;
 import kr.co.zumo.app.lifeplus.model.SuperModel;
+import kr.co.zumo.app.lifeplus.model.module.APIAuthNumberModule;
+import kr.co.zumo.app.lifeplus.model.module.IAPIModuleListener;
 import kr.co.zumo.app.lifeplus.network.api.LifeplusAPIRepository;
 import kr.co.zumo.app.lifeplus.util.DateUtil;
 import kr.co.zumo.app.lifeplus.util.Formatter;
@@ -326,7 +328,7 @@ public class MobileAuthPresenter implements IMobileAuthContract.Presenter {
       doHideKeyBoard();
       view.setEnabledRequestConfirmButton(false);
 
-      AuthConfirmRequestBean bean = new AuthConfirmRequestBean();
+      AuthConfirmBean bean = new AuthConfirmBean();
       bean.setPhoneNumber(succeedUserBean.getFirstPhoneNumber() + succeedUserBean.getPhoneNumber());
       bean.setAuthorizationNumber(this.authorizationNumber);
 
@@ -492,7 +494,7 @@ public class MobileAuthPresenter implements IMobileAuthContract.Presenter {
 
       view.setEnabledRequestNumberButton(false);
 
-      AuthRequestBean bean = new AuthRequestBean();
+      AuthNumberBean bean = new AuthNumberBean();
       bean.setName(userBean.getName());
       bean.setGender(userBean.getGender());
       bean.setNationality(userBean.getNationality());

app/src/test/java/kr/co/zumo/app/lifeplus/bean/api/AuthConfirmRequestBeanTest.java

@@ -5,7 +5,7 @@ import org.junit.Test;
 import static org.junit.Assert.*;
 
 /**
- * AuthConfirmRequestBeanTest
+ * AuthConfirmBeanTest
  * <pre>
  * </pre>
  *
@@ -14,11 +14,11 @@ import static org.junit.Assert.*;
  * @history 민효동   [2018. 10. 5.]   [최초 작성]
  * @since 2018. 10. 5.
  */
-public class AuthConfirmRequestBeanTest {
+public class AuthConfirmBeanTest {
 
   @Test
   public void setAuthorizationNumber() {
-    AuthConfirmRequestBean bean = new AuthConfirmRequestBean();
+    AuthConfirmBean bean = new AuthConfirmBean();
     bean.setAuthorizationNumber("1111111");
 
     assertEquals("1111111", bean.getAuthorizationNumber());
@@ -27,7 +27,7 @@ public class AuthConfirmRequestBeanTest {
 
   @Test
   public void setDeviceUuid() {
-    AuthConfirmRequestBean bean = new AuthConfirmRequestBean();
+    AuthConfirmBean bean = new AuthConfirmBean();
     bean.setPhoneNumber("234drgfsd");
 
     assertEquals(null, bean.getAuthorizationNumber());

app/src/test/java/kr/co/zumo/app/lifeplus/bean/api/AuthRequestBeanTest.java

@@ -5,7 +5,7 @@ import org.junit.Test;
 import static org.junit.Assert.*;
 
 /**
- * AuthRequestBeanTest
+ * AuthNumberBeanTest
  * <pre>
  * </pre>
  *
@@ -14,11 +14,11 @@ import static org.junit.Assert.*;
  * @history 민효동   [2018. 10. 5.]   [최초 작성]
  * @since 2018. 10. 5.
  */
-public class AuthRequestBeanTest {
+public class AuthNumberBeanTest {
 
   @Test
   public void setName() {
-    AuthRequestBean bean = new AuthRequestBean();
+    AuthNumberBean bean = new AuthNumberBean();
     bean.setName("1111111");
 
     assertEquals("1111111", bean.getName());
@@ -32,7 +32,7 @@ public class AuthRequestBeanTest {
 
   @Test
   public void setGender() {
-    AuthRequestBean bean = new AuthRequestBean();
+    AuthNumberBean bean = new AuthNumberBean();
     bean.setGender("man");
 
     assertEquals(null, bean.getName());
@@ -46,7 +46,7 @@ public class AuthRequestBeanTest {
 
   @Test
   public void setNationality() {
-    AuthRequestBean bean = new AuthRequestBean();
+    AuthNumberBean bean = new AuthNumberBean();
     bean.setNationality("domestic");
 
     assertEquals(null, bean.getName());
@@ -60,7 +60,7 @@ public class AuthRequestBeanTest {
 
   @Test
   public void setPhoneNumber() {
-    AuthRequestBean bean = new AuthRequestBean();
+    AuthNumberBean bean = new AuthNumberBean();
     bean.setPhoneNumber("37037037");
 
     assertEquals(null, bean.getName());
@@ -74,7 +74,7 @@ public class AuthRequestBeanTest {
 
   @Test
   public void setBirthDate() {
-    AuthRequestBean bean = new AuthRequestBean();
+    AuthNumberBean bean = new AuthNumberBean();
     bean.setBirthDate("17901130");
 
     assertEquals(null, bean.getName());
@@ -88,7 +88,7 @@ public class AuthRequestBeanTest {
 
   @Test
   public void setDeviceUuid() {
-    AuthRequestBean bean = new AuthRequestBean();
+    AuthNumberBean bean = new AuthNumberBean();
     bean.setDeviceUuid("87298450237");
 
     assertEquals(null, bean.getName());
@@ -102,7 +102,7 @@ public class AuthRequestBeanTest {
 
   @Test
   public void setMobileCompany() {
-    AuthRequestBean bean = new AuthRequestBean();
+    AuthNumberBean bean = new AuthNumberBean();
     bean.setMobileCompany("LGT");
 
     assertEquals(null, bean.getName());

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

@@ -3,9 +3,9 @@ package kr.co.zumo.app.lifeplus.network.api;
 import org.junit.Test;
 
 import io.reactivex.Single;
-import kr.co.zumo.app.lifeplus.bean.api.AuthRequestBean;
+import kr.co.zumo.app.lifeplus.bean.api.AuthNumberBean;
 import kr.co.zumo.app.lifeplus.bean.api.LifeplusAPIBean;
-import kr.co.zumo.app.lifeplus.bean.api.AuthConfirmRequestBean;
+import kr.co.zumo.app.lifeplus.bean.api.AuthConfirmBean;
 
 import static junit.framework.Assert.assertTrue;
 
@@ -23,13 +23,13 @@ public class LifeplusAPIServiceTest {
 
   @Test
   public void requestMobileAuth() {
-    Single<LifeplusAPIBean> test = new LifeplusAPIService().requestMobileAuth(new AuthRequestBean());
+    Single<LifeplusAPIBean> test = new LifeplusAPIService().requestMobileAuth(new AuthNumberBean());
     assertTrue(null != test);
   }
 
   @Test
   public void confirmMobileAuth() {
-    Single<LifeplusAPIBean> test = new LifeplusAPIService().confirmMobileAuth(new AuthConfirmRequestBean());
+    Single<LifeplusAPIBean> test = new LifeplusAPIService().confirmMobileAuth(new AuthConfirmBean());
     assertTrue(null != test);
   }
 }