Bladeren bron

[공통][Bug] UserIdBean -> UserNoBean 이름 변경
- API 와 같은 이름 (user_no)로 클래스이름 변경

hyodong.min 7 jaren geleden
bovenliggende
commit
8165657101

+ 2 - 2
app/src/main/java/kr/co/zumo/app/lifeplus/activity/ActivityStarter.java

@@ -10,7 +10,7 @@ import android.util.Log;
 import io.reactivex.android.schedulers.AndroidSchedulers;
 import io.reactivex.schedulers.Schedulers;
 import kr.co.zumo.app.lifeplus.bean.api.LoginBean;
-import kr.co.zumo.app.lifeplus.bean.api.UserIDBean;
+import kr.co.zumo.app.lifeplus.bean.api.UserNoBean;
 import kr.co.zumo.app.lifeplus.model.LifeplusPreferences;
 import kr.co.zumo.app.lifeplus.model.SuperModel;
 import kr.co.zumo.app.lifeplus.network.api.LifeplusAPIService;
@@ -79,7 +79,7 @@ public class ActivityStarter {
 
       // todo waiter 표시
 
-      new LifeplusAPIService().selectMember(new UserIDBean(SuperModel.getInstance().getUserId()))
+      new LifeplusAPIService().selectMember(new UserNoBean(SuperModel.getInstance().getUserId()))
         .subscribeOn(Schedulers.io())
         .observeOn(AndroidSchedulers.mainThread())
         .subscribe(loginResultBean -> {

+ 1 - 1
app/src/main/java/kr/co/zumo/app/lifeplus/bean/api/MemberJoinDataBean.java

@@ -15,7 +15,7 @@ import com.google.gson.annotations.SerializedName;
  * @history 민효동   [2018. 10. 5.]   [최초 작성]
  * @since 2018. 10. 5.
  */
-public class MemberJoinDataBean extends UserIDBean {
+public class MemberJoinDataBean extends UserNoBean {
   /*
   "user_no": "201810050000000007",
   "user_name": "나나나",

+ 9 - 9
app/src/main/java/kr/co/zumo/app/lifeplus/bean/api/UserIDBean.java

@@ -6,7 +6,7 @@ package kr.co.zumo.app.lifeplus.bean.api;
 import com.google.gson.annotations.SerializedName;
 
 /**
- * UserIDBean
+ * UserNoBean
  * <pre>
  * </pre>
  *
@@ -15,19 +15,19 @@ import com.google.gson.annotations.SerializedName;
  * @history 민효동   [2018. 10. 1.]   [최초 작성]
  * @since 2018. 10. 1.
  */
-public class UserIDBean extends RequestBean {
+public class UserNoBean extends RequestBean {
   @SerializedName("user_no")
-  private String userId;
+  private String userNo;
 
-  public UserIDBean(String userId) {
-    this.userId = userId;
+  public UserNoBean(String userNo) {
+    this.userNo = userNo;
   }
 
-  public String getUserId() {
-    return userId;
+  public String getUserNo() {
+    return userNo;
   }
 
-  public void setUserId(String userId) {
-    this.userId = userId;
+  public void setUserNo(String userNo) {
+    this.userNo = userNo;
   }
 }

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

@@ -254,7 +254,7 @@ public class SignUpModel extends Model {
           .observeOn(AndroidSchedulers.mainThread())
           .subscribe(resultBean -> {
             Log.i("APP# SignUpModel | signUp", "|" + resultBean.toPrettyJson());
-            saveUserId(resultBean.getData().getUserId());
+            saveUserId(resultBean.getData().getUserNo());
             onResult(new Event.Builder(Event.RESULT).integer(EVENT_JOINED).build());
           }, e -> {
 

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

@@ -14,7 +14,7 @@ import kr.co.zumo.app.lifeplus.bean.api.MemberJoinResultBean;
 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.RequestBean;
-import kr.co.zumo.app.lifeplus.bean.api.UserIDBean;
+import kr.co.zumo.app.lifeplus.bean.api.UserNoBean;
 import retrofit2.http.Body;
 import retrofit2.http.POST;
 
@@ -46,11 +46,11 @@ public interface LifeplusAPI {
   Single<MemberJoinResultBean> insertMember(@Body MemberJoinRequestBean bean);
 
   @POST("api/v1/member/deleteMember.plus")
-  Single<LifeplusAPIBean> deleteMember(@Body UserIDBean bean);
+  Single<LifeplusAPIBean> deleteMember(@Body UserNoBean bean);
 
   @POST("/api/v1/textRes/getFaqList.plus")
   Single<FAQResultBean> getFaqList(@Body RequestBean bean);
 
   @POST("api/v1/member/selectMember.plus")
-  Single<LoginResultBean> selectMember(@Body UserIDBean bean);
+  Single<LoginResultBean> selectMember(@Body UserNoBean bean);
 }

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

@@ -16,7 +16,7 @@ import kr.co.zumo.app.lifeplus.bean.api.MemberJoinResultBean;
 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.RequestBean;
-import kr.co.zumo.app.lifeplus.bean.api.UserIDBean;
+import kr.co.zumo.app.lifeplus.bean.api.UserNoBean;
 import kr.co.zumo.app.lifeplus.config.NetworkConfig;
 import kr.co.zumo.app.lifeplus.model.SuperModel;
 import kr.co.zumo.app.lifeplus.util.AppUtil;
@@ -117,7 +117,7 @@ public class LifeplusAPIService extends RetrofitService implements LifeplusAPI {
    * @return
    */
   @Override
-  public Single<LifeplusAPIBean> deleteMember(UserIDBean bean) {
+  public Single<LifeplusAPIBean> deleteMember(UserNoBean bean) {
     mapBasicParameter(bean);
     return api(AUTH_URL).deleteMember(bean);
   }
@@ -141,7 +141,7 @@ public class LifeplusAPIService extends RetrofitService implements LifeplusAPI {
    * @return
    */
   @Override
-  public Single<LoginResultBean> selectMember(UserIDBean bean) {
+  public Single<LoginResultBean> selectMember(UserNoBean bean) {
     mapBasicParameter(bean);
     return api(AUTH_URL).selectMember(bean);
   }

+ 2 - 2
app/src/main/java/kr/co/zumo/app/lifeplus/view/command/DeleteAccountCommand.java

@@ -6,7 +6,7 @@ package kr.co.zumo.app.lifeplus.view.command;
 import io.reactivex.android.schedulers.AndroidSchedulers;
 import io.reactivex.disposables.Disposable;
 import io.reactivex.schedulers.Schedulers;
-import kr.co.zumo.app.lifeplus.bean.api.UserIDBean;
+import kr.co.zumo.app.lifeplus.bean.api.UserNoBean;
 import kr.co.zumo.app.lifeplus.model.Model;
 import kr.co.zumo.app.lifeplus.network.api.LifeplusAPIService;
 import kr.co.zumo.app.lifeplus.view.Event;
@@ -39,7 +39,7 @@ public class DeleteAccountCommand extends Command<Model, IView, Presenter> {
 
   @Override
   public void execute(Model model, IView view, Presenter presenter) {
-    disposable = new LifeplusAPIService().deleteMember(new UserIDBean(userId))
+    disposable = new LifeplusAPIService().deleteMember(new UserNoBean(userId))
       .subscribeOn(Schedulers.io())
       .observeOn(AndroidSchedulers.mainThread())
       .subscribe(resultBean -> {

+ 4 - 4
app/src/test/java/kr/co/zumo/app/lifeplus/bean/api/UserIDBeanTest.java

@@ -18,12 +18,12 @@ public class UserIDBeanTest {
 
   @Test
   public void setUserId() {
-    UserIDBean bean = new UserIDBean("id");
+    UserNoBean bean = new UserNoBean("id");
 
-    assertEquals("id", bean.getUserId());
+    assertEquals("id", bean.getUserNo());
 
-    bean.setUserId("id2");
+    bean.setUserNo("id2");
 
-    assertEquals("id2", bean.getUserId());
+    assertEquals("id2", bean.getUserNo());
   }
 }