[가입][New] 가입 완료 단계에서 로그인 처리시 회원 상태 파악하지 않고 성공 처리시킴

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

@@ -10,7 +10,6 @@ import java.util.List;
 
 import io.reactivex.disposables.CompositeDisposable;
 import kr.co.zumo.app.lifeplus.bean.MobileAuthBean;
-import kr.co.zumo.app.lifeplus.bean.api.LifeplusAPIBean;
 import kr.co.zumo.app.lifeplus.bean.api.LoginResultBean;
 import kr.co.zumo.app.lifeplus.bean.api.MemberJoinRequestBean;
 import kr.co.zumo.app.lifeplus.bean.api.MemberJoinResultBean;
@@ -72,7 +71,6 @@ public class SignUpAgreeModel extends SignUpBaseModel {
 
   @Override
   protected void resumeInternal() {
-
   }
 
   @Override
@@ -100,7 +98,7 @@ public class SignUpAgreeModel extends SignUpBaseModel {
    *
    * @param userId userId
    */
-  public void saveUserId(String userId) {
+  protected void saveUserId(String userId) {
     // init
     SuperModel.getInstance().renewMemberData();
 
@@ -137,15 +135,6 @@ public class SignUpAgreeModel extends SignUpBaseModel {
   }
 
 
-  /**
-   * 약관 요청 취소
-   */
-  public void stopPolicyRequest() {
-    if (null != disposable) {
-      disposable.clear();
-    }
-  }
-
   /**
    * 회원 가입 시작
    */
@@ -194,31 +183,14 @@ public class SignUpAgreeModel extends SignUpBaseModel {
           public void onApiSuccess(MemberJoinResultBean resultBean) {
 
             saveUserId(resultBean.getData().getUserNo());
-
             SuperModel.getInstance().saveEncryptedPin(SignUpModelHelper.getInstance().getEncryptedPin());
+
             onResult(new Event.Builder(Event.RESULT).integer(Event.MEMBER_JOIN).build());
           }
 
           @Override
           public void onApiReason(MemberJoinResultBean resultBean) {
-            if (resultBean.getCode() == LifeplusAPIBean.RETURN_SIGN_UP_ERROR_ALREADY_MEMBER) {
-              // 이미 가입한 회원 (탈퇴 안한 상태?)
-
-              // 이 경우에도 userNo 는 필요함.
-              // fixme userId 를 저장하면 앱 재실행 시 이상없이 로그인 된다.
-              //
-              saveUserId(resultBean.getData().getUserNo());
-
-              onResult(new Event.Builder(Event.RESULT).integer(Event.MEMBER_ALREADY_MEMBER).build());
-            }
-            if (resultBean.getCode() == LifeplusAPIBean.RETURN_MOBILE_AUTH_ERROR_NEED_FOR_30_DAYS) {
-              // 탈퇴 30일 회원 구분
-              SuperModel.getInstance().addMemberStatus(SuperModel.MEMBER_STATUS_BIT_OUT);
-              onResult(new Event.Builder(Event.RESULT).integer(Event.MEMBER_NEED_30DAYS).build());
-            }
-            else {
-              onResult(new Event.Builder(Event.ERROR).integer(Event.MEMBER_JOIN).string(resultBean.getReturnMessage()).build());
-            }
+            onResult(new Event.Builder(Event.ERROR).integer(Event.MEMBER_JOIN).string(resultBean.getReturnMessage()).build());
           }
 
           @Override

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

@@ -5,11 +5,9 @@ package kr.co.zumo.app.lifeplus.view.screen.signup;
 
 import java.util.List;
 
-import io.reactivex.disposables.Disposable;
 import kr.co.zumo.app.R;
 import kr.co.zumo.app.lifeplus.bean.api.PolicyBean;
 import kr.co.zumo.app.lifeplus.helper.ActionBarHelper;
-import kr.co.zumo.app.lifeplus.model.SuperModel;
 import kr.co.zumo.app.lifeplus.supervisor.ScreenID;
 import kr.co.zumo.app.lifeplus.util.ResourceUtil;
 import kr.co.zumo.app.lifeplus.view.DoubleChecker;
@@ -32,8 +30,6 @@ import kr.co.zumo.app.lifeplus.view.dialog.PolicyDialog;
 public class SignUpAgreePresenter extends SignUpBasePresenter<SignUpAgreeModel, ISignUpAgreeView> {
 
   protected boolean isValidated = false;
-  protected boolean isSaved = false;
-  Disposable disposable;
   private DoubleChecker doubleChecker;
 
   public SignUpAgreePresenter(SignUpAgreeModel model, ISignUpAgreeView view) {
@@ -79,12 +75,6 @@ public class SignUpAgreePresenter extends SignUpBasePresenter<SignUpAgreeModel,
 
   @Override
   protected void destroyInternal() {
-    model.stopPolicyRequest();
-
-    if (null != disposable) {
-      disposable.dispose();
-      disposable = null;
-    }
 
     if (null != doubleChecker) {
       doubleChecker.dispose();
@@ -97,24 +87,11 @@ public class SignUpAgreePresenter extends SignUpBasePresenter<SignUpAgreeModel,
     switch (event.getEventId()) {
       case Event.RESULT:
         if (event.getInteger() == Event.POLICY_REQUEST) {
-          doubleChecker.checkFirst();
-        }
-        else if (event.getInteger() == Event.POLICY_CONFIRM) {
-          // 약관 동의 전송 했음;
-          isSaved = true;
-          signUp();
+          doubleChecker.checkSecond();
         }
         else if (event.getInteger() == Event.MEMBER_JOIN) {
           login();
         }
-        else if (event.getInteger() == Event.MEMBER_NEED_30DAYS) {
-          // 30일이내 가입
-          go(ScreenID.SIGN_UP_NEED_FOR_30DAYS);
-        }
-        else if (event.getInteger() == Event.MEMBER_ALREADY_MEMBER) {
-          // 이미 가입한 회원 (탈퇴 안한 상태?)
-          go(ScreenID.SIGN_UP_ALREADY_MEMBER);
-        }
         else if (event.getInteger() == Event.MEMBER_LOGIN) {
           onLogin();
         }
@@ -122,8 +99,6 @@ public class SignUpAgreePresenter extends SignUpBasePresenter<SignUpAgreeModel,
       case Event.ERROR:
         if (event.getInteger() == Event.POLICY_REQUEST) {
         }
-        else if (event.getInteger() == Event.POLICY_CONFIRM) {
-        }
         else if (event.getInteger() == Event.MEMBER_JOIN) {
         }
         else if (event.getInteger() == Event.MEMBER_LOGIN) {
@@ -189,17 +164,12 @@ public class SignUpAgreePresenter extends SignUpBasePresenter<SignUpAgreeModel,
 
   @Override
   public void onScreenReady() {
-    doubleChecker.checkSecond();
+    doubleChecker.checkFirst();
   }
 
   private void sendPolicyConfirm() {
     view.setAgreeButtonEnabled(false);
-    if (isSaved) {
-      signUp();
-    }
-    else {
-      model.sendPolicy();
-    }
+    signUp();
   }
 
   private void onClickDetail(Event event) {