[공통][Bug] API 공통 파라메터 설정 위치 변경

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

@@ -3,8 +3,6 @@
  */
 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;
@@ -18,8 +16,6 @@ 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.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;
 
 /**
  * LifeplusAPIService
@@ -39,16 +35,6 @@ public class LifeplusAPIService extends RetrofitService implements LifeplusAPI {
     return retrofit(url, LifeplusAPI.class, 2000);
   }
 
-  private void mapBasicParameter(RequestBean bean) {
-    SuperModel model = SuperModel.getInstance();
-    bean.setAppVersion(AppUtil.getVersionName());
-    bean.setSid(model.getUserId());
-    bean.setDeviceId(model.getDeviceUuid());
-    bean.setToken(model.getToken());
-
-    Log.i("APP# LifeplusAPIService | mapBasicParameter", "|" + bean.toPrettyJson());
-  }
-
   /**
    * 모바일 인증 번호 요청
    *
@@ -57,7 +43,6 @@ public class LifeplusAPIService extends RetrofitService implements LifeplusAPI {
    */
   @Override
   public Single<LifeplusAPIBean> requestMobileAuth(AuthRequestBean bean) {
-    mapBasicParameter(bean);
     return api(AUTH_URL).requestMobileAuth(bean);
   }
 
@@ -69,7 +54,6 @@ public class LifeplusAPIService extends RetrofitService implements LifeplusAPI {
    */
   @Override
   public Single<LifeplusAPIBean> confirmMobileAuth(AuthConfirmRequestBean bean) {
-    mapBasicParameter(bean);
     return api(AUTH_URL).confirmMobileAuth(bean);
   }
 
@@ -81,7 +65,6 @@ public class LifeplusAPIService extends RetrofitService implements LifeplusAPI {
    */
   @Override
   public Single<PolicyResultBean> getPolicyList(RequestBean bean) {
-    mapBasicParameter(bean);
     return api(AUTH_URL).getPolicyList(bean);
   }
 
@@ -93,7 +76,6 @@ public class LifeplusAPIService extends RetrofitService implements LifeplusAPI {
    */
   @Override
   public Single<LifeplusAPIBean> confirmPolicy(PolicyConfirmRequestBean bean) {
-    mapBasicParameter(bean);
     return api(AUTH_URL).confirmPolicy(bean);
   }
 
@@ -105,7 +87,6 @@ public class LifeplusAPIService extends RetrofitService implements LifeplusAPI {
    */
   @Override
   public Single<MemberJoinResultBean> insertMember(MemberJoinRequestBean bean) {
-    mapBasicParameter(bean);
     return api(AUTH_URL).insertMember(bean);
   }
 
@@ -117,7 +98,6 @@ public class LifeplusAPIService extends RetrofitService implements LifeplusAPI {
    */
   @Override
   public Single<LifeplusAPIBean> deleteMember(UserNoBean bean) {
-    mapBasicParameter(bean);
     return api(AUTH_URL).deleteMember(bean);
   }
 
@@ -129,7 +109,6 @@ public class LifeplusAPIService extends RetrofitService implements LifeplusAPI {
    */
   @Override
   public Single<FAQResultBean> getFaqList(RequestBean bean) {
-    mapBasicParameter(bean);
     return api(AUTH_URL).getFaqList(bean);
   }
 
@@ -141,7 +120,6 @@ public class LifeplusAPIService extends RetrofitService implements LifeplusAPI {
    */
   @Override
   public Single<LoginResultBean> selectMember(UserNoBean bean) {
-    mapBasicParameter(bean);
     return api(AUTH_URL).selectMember(bean);
   }
 
@@ -153,7 +131,6 @@ public class LifeplusAPIService extends RetrofitService implements LifeplusAPI {
    */
   @Override
   public Single<LifeplusAPIBean> activeMember(RequestBean bean) {
-    mapBasicParameter(bean);
     return api(AUTH_URL).activeMember(bean);
   }
 }

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

@@ -3,6 +3,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;
@@ -15,6 +17,8 @@ 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.UserNoBean;
+import kr.co.zumo.app.lifeplus.model.SuperModel;
+import kr.co.zumo.app.lifeplus.util.AppUtil;
 
 /**
  * LifeplusAPIRepository
@@ -29,48 +33,67 @@ import kr.co.zumo.app.lifeplus.bean.api.UserNoBean;
  */
 public class LifeplusAPIRepository implements LifeplusAPI {
 
+  private void mapBasicParameter(RequestBean bean) {
+    SuperModel model = SuperModel.getInstance();
+    bean.setAppVersion(AppUtil.getVersionName());
+    bean.setSid(model.getUserId());
+    bean.setDeviceId(model.getDeviceUuid());
+    bean.setToken(model.getToken());
+
+    Log.i("APP# LifeplusAPIRepository | mapBasicParameter", "|" + bean.toPrettyJson());
+  }
+
   @Override
   public Single<LifeplusAPIBean> requestMobileAuth(AuthRequestBean bean) {
+    mapBasicParameter(bean);
     return new LifeplusAPIService().requestMobileAuth(bean);
   }
 
   @Override
   public Single<LifeplusAPIBean> confirmMobileAuth(AuthConfirmRequestBean bean) {
+    mapBasicParameter(bean);
     return new LifeplusAPIService().confirmMobileAuth(bean);
   }
 
   @Override
   public Single<PolicyResultBean> getPolicyList(RequestBean bean) {
+    mapBasicParameter(bean);
     return new LifeplusAPIService().getPolicyList(bean);
   }
 
   @Override
   public Single<LifeplusAPIBean> confirmPolicy(PolicyConfirmRequestBean bean) {
+    mapBasicParameter(bean);
     return new LifeplusAPIService().confirmPolicy(bean);
   }
 
   @Override
   public Single<MemberJoinResultBean> insertMember(MemberJoinRequestBean bean) {
+    mapBasicParameter(bean);
     return new LifeplusAPIService().insertMember(bean);
   }
 
   @Override
   public Single<LifeplusAPIBean> deleteMember(UserNoBean bean) {
+    mapBasicParameter(bean);
     return new LifeplusAPIService().deleteMember(bean);
   }
 
   @Override
   public Single<FAQResultBean> getFaqList(RequestBean bean) {
+    mapBasicParameter(bean);
     return new LifeplusAPIService().getFaqList(bean);
   }
 
   @Override
   public Single<LoginResultBean> selectMember(UserNoBean bean) {
+    mapBasicParameter(bean);
     return new LifeplusAPIService().selectMember(bean);
   }
 
   @Override
   public Single<LifeplusAPIBean> activeMember(RequestBean bean) {
+    mapBasicParameter(bean);
     return new LifeplusAPIService().activeMember(bean);
   }