Task 목록 조회 소스 분리

app/src/main/java/kr/co/hanwha/hifive/data/source/TaskDataRepository.java

@@ -14,12 +14,8 @@ import kr.co.hanwha.hifive.data.model.AddTaskRoot;
 import kr.co.hanwha.hifive.data.model.BaseData;
 import kr.co.hanwha.hifive.data.model.CampaignData;
 import kr.co.hanwha.hifive.data.model.CampaignDataRoot;
-import kr.co.hanwha.hifive.data.model.MainHomeAssignedRoot;
-import kr.co.hanwha.hifive.data.model.MainHomeRequestRoot;
 import kr.co.hanwha.hifive.data.model.MemberInfoData;
 import kr.co.hanwha.hifive.data.model.MemberInfoRoot;
-import kr.co.hanwha.hifive.data.model.MessageAddData;
-import kr.co.hanwha.hifive.data.model.MessageListRoot;
 import kr.co.hanwha.hifive.data.model.ProjectCampaignData;
 import kr.co.hanwha.hifive.data.model.ProjectInfoData;
 import kr.co.hanwha.hifive.data.model.ReqMemberInfo;
@@ -242,70 +238,6 @@ public class TaskDataRepository implements TaskDataSource {
         networkUtil.requestTasksUpdateToday(context, taskData, encryption_member_id, callback);
     }
 
-    @Override
-    public void requestTasksGetMainAssigned(@NonNull Context context,
-                                            @NonNull final HanwhaNetworkCallback<MainHomeAssignedRoot> callback) {
-        String encryption_member_id = MemberDataRepository.getInstance().getEncryptionMemberId();
-
-        HFNetworkUtil networkUtil = new HFNetworkUtil();
-        networkUtil.requestTasksGetMainAssigned(context, encryption_member_id, new HanwhaNetworkCallback<MainHomeAssignedRoot>() {
-            @Override
-            public void onSuccess(MainHomeAssignedRoot response) {
-                callback.onSuccess(response);
-            }
-
-            @Override
-            public void onFailure(HanwhaNetworkError error) {
-                if (error != null && error.getStatusCode() == HanwhaNetworkError.CODE_EMPTY_DATA) {
-                    callback.onSuccess(null);
-                } else
-                    callback.onFailure(error);
-            }
-
-            @Override
-            public void onPreExecute() {
-                callback.onPreExecute();
-            }
-
-            @Override
-            public void onPostExecute() {
-                callback.onPostExecute();
-            }
-        });
-    }
-
-    @Override
-    public void requestTasksGetMainRequest(@NonNull Context context,
-                                           @NonNull final HanwhaNetworkCallback<MainHomeRequestRoot> callback) {
-        String encryption_member_id = MemberDataRepository.getInstance().getEncryptionMemberId();
-
-        HFNetworkUtil networkUtil = new HFNetworkUtil();
-        networkUtil.requestTasksGetMainRequest(context, encryption_member_id, new HanwhaNetworkCallback<MainHomeRequestRoot>() {
-            @Override
-            public void onSuccess(MainHomeRequestRoot response) {
-                callback.onSuccess(response);
-            }
-
-            @Override
-            public void onFailure(HanwhaNetworkError error) {
-                if (error != null && error.getStatusCode() == HanwhaNetworkError.CODE_EMPTY_DATA) {
-                    callback.onSuccess(null);
-                } else
-                    callback.onFailure(error);
-            }
-
-            @Override
-            public void onPreExecute() {
-                callback.onPreExecute();
-            }
-
-            @Override
-            public void onPostExecute() {
-                callback.onPostExecute();
-            }
-        });
-    }
-
     @Override
     public void requestAllMember(@NonNull Context context,
                                  @NonNull final HanwhaNetworkCallback callback) {

app/src/main/java/kr/co/hanwha/hifive/data/source/TaskListDataRepository.java

@@ -0,0 +1,96 @@
+package kr.co.hanwha.hifive.data.source;
+
+import android.content.Context;
+import android.support.annotation.NonNull;
+
+import kr.co.hanwha.hifive.data.model.MainHomeAssignedRoot;
+import kr.co.hanwha.hifive.data.model.MainHomeRequestRoot;
+import kr.co.hanwha.hifive.data.source.contract.TaskListDataSource;
+import kr.co.hanwha.hifive.network.HFNetworkUtil;
+import kr.co.hanwha.hifive.network.hanwha.HanwhaNetworkCallback;
+import kr.co.hanwha.hifive.network.hanwha.HanwhaNetworkError;
+
+public class TaskListDataRepository implements TaskListDataSource {
+    private static TaskListDataRepository sInstance = null;
+
+    public static TaskListDataRepository getInstance() {
+        if (sInstance == null) {
+            sInstance = new TaskListDataRepository();
+        }
+        return sInstance;
+    }
+
+    public static void destroyInstance() {
+        sInstance = null;
+    }
+
+    @Override
+    public void clearData() {
+
+    }
+
+    @Override
+    public void requestTasksGetMainAssigned(@NonNull Context context,
+                                            @NonNull final HanwhaNetworkCallback<MainHomeAssignedRoot> callback) {
+        String encryption_member_id = MemberDataRepository.getInstance().getEncryptionMemberId();
+
+        HFNetworkUtil networkUtil = new HFNetworkUtil();
+        networkUtil.requestTasksGetMainAssigned(context, encryption_member_id, new HanwhaNetworkCallback<MainHomeAssignedRoot>() {
+            @Override
+            public void onSuccess(MainHomeAssignedRoot response) {
+                callback.onSuccess(response);
+            }
+
+            @Override
+            public void onFailure(HanwhaNetworkError error) {
+                if (error != null && error.getStatusCode() == HanwhaNetworkError.CODE_EMPTY_DATA) {
+                    callback.onSuccess(null);
+                } else
+                    callback.onFailure(error);
+            }
+
+            @Override
+            public void onPreExecute() {
+                callback.onPreExecute();
+            }
+
+            @Override
+            public void onPostExecute() {
+                callback.onPostExecute();
+            }
+        });
+    }
+
+    @Override
+    public void requestTasksGetMainRequest(@NonNull Context context,
+                                           @NonNull final HanwhaNetworkCallback<MainHomeRequestRoot> callback) {
+        String encryption_member_id = MemberDataRepository.getInstance().getEncryptionMemberId();
+
+        HFNetworkUtil networkUtil = new HFNetworkUtil();
+        networkUtil.requestTasksGetMainRequest(context, encryption_member_id, new HanwhaNetworkCallback<MainHomeRequestRoot>() {
+            @Override
+            public void onSuccess(MainHomeRequestRoot response) {
+                callback.onSuccess(response);
+            }
+
+            @Override
+            public void onFailure(HanwhaNetworkError error) {
+                if (error != null && error.getStatusCode() == HanwhaNetworkError.CODE_EMPTY_DATA) {
+                    callback.onSuccess(null);
+                } else
+                    callback.onFailure(error);
+            }
+
+            @Override
+            public void onPreExecute() {
+                callback.onPreExecute();
+            }
+
+            @Override
+            public void onPostExecute() {
+                callback.onPostExecute();
+            }
+        });
+    }
+
+}

app/src/main/java/kr/co/hanwha/hifive/data/source/contract/TaskDataSource.java

@@ -28,21 +28,6 @@ import kr.co.hanwha.hifive.network.hanwha.HanwhaNetworkCallback;
  */
 
 public interface TaskDataSource extends BaseDataSource {
-    /**
-     * MAIN - HOME : TASK 목록 - 나의 업무 목록 조회
-     *
-     * @param context  Context
-     * @param callback 콜백
-     */
-    void requestTasksGetMainAssigned(@NonNull Context context, @NonNull HanwhaNetworkCallback<MainHomeAssignedRoot> callback);
-
-    /**
-     * MAIN - HOME : TASK 목록 - 요청한 업무 목록 조회
-     *
-     * @param context  Context
-     * @param callback 콜백
-     */
-    void requestTasksGetMainRequest(@NonNull Context context, @NonNull HanwhaNetworkCallback<MainHomeRequestRoot> callback);
 
     /**
      * 내 TASK -> 오늘 할일 등록

app/src/main/java/kr/co/hanwha/hifive/data/source/contract/TaskListDataSource.java

@@ -0,0 +1,28 @@
+package kr.co.hanwha.hifive.data.source.contract;
+
+import android.content.Context;
+import android.support.annotation.NonNull;
+
+import kr.co.hanwha.hifive.base.BaseDataSource;
+import kr.co.hanwha.hifive.data.model.MainHomeAssignedRoot;
+import kr.co.hanwha.hifive.data.model.MainHomeRequestRoot;
+import kr.co.hanwha.hifive.network.hanwha.HanwhaNetworkCallback;
+
+public interface TaskListDataSource extends BaseDataSource {
+    /**
+     * MAIN - HOME : TASK 목록 - 나의 업무 목록 조회
+     *
+     * @param context  Context
+     * @param callback 콜백
+     */
+    void requestTasksGetMainAssigned(@NonNull Context context, @NonNull HanwhaNetworkCallback<MainHomeAssignedRoot> callback);
+
+    /**
+     * MAIN - HOME : TASK 목록 - 요청한 업무 목록 조회
+     *
+     * @param context  Context
+     * @param callback 콜백
+     */
+    void requestTasksGetMainRequest(@NonNull Context context, @NonNull HanwhaNetworkCallback<MainHomeRequestRoot> callback);
+
+}

app/src/main/java/kr/co/hanwha/hifive/data/source/contract/TaskMessageDataSource.java

@@ -9,6 +9,12 @@ import kr.co.hanwha.hifive.data.model.MessageAddData;
 import kr.co.hanwha.hifive.data.model.MessageListRoot;
 import kr.co.hanwha.hifive.network.hanwha.HanwhaNetworkCallback;
 
+/**
+ * TASK - 댓글 관련 데이터 저장소 인터페이스
+ *
+ * @see kr.co.hanwha.hifive.data.source.TaskMessageDataRepository
+ * Created by sanghoonkwon on 2018. 7. 9..
+ */
 public interface TaskMessageDataSource extends BaseDataSource {
     /**
      * 댓글 - 댓글 목록 조회

app/src/main/java/kr/co/hanwha/hifive/screen/main/home/MainHomePresenter.java

@@ -15,6 +15,7 @@ import kr.co.hanwha.hifive.data.model.MainHomeRequestRoot;
 import kr.co.hanwha.hifive.data.model.TaskData;
 import kr.co.hanwha.hifive.data.model.TaskListData;
 import kr.co.hanwha.hifive.data.source.TaskDataRepository;
+import kr.co.hanwha.hifive.data.source.TaskListDataRepository;
 import kr.co.hanwha.hifive.dialog.HFTaskInputDialog;
 import kr.co.hanwha.hifive.network.hanwha.HanwhaNetworkCallback;
 import kr.co.hanwha.hifive.network.hanwha.HanwhaNetworkError;
@@ -79,7 +80,7 @@ public class MainHomePresenter implements MainHomeContract.Presenter {
 
     @Override
     public void initDataAssigned(@NonNull final boolean needLoading) {
-        TaskDataRepository.getInstance().requestTasksGetMainAssigned(getContext(), new HanwhaNetworkCallback<MainHomeAssignedRoot>() {
+        TaskListDataRepository.getInstance().requestTasksGetMainAssigned(getContext(), new HanwhaNetworkCallback<MainHomeAssignedRoot>() {
             @Override
             public void onSuccess(MainHomeAssignedRoot response) {
 
@@ -118,7 +119,7 @@ public class MainHomePresenter implements MainHomeContract.Presenter {
 
     @Override
     public void initDataRequested(@NonNull final boolean needLoading) {
-        TaskDataRepository.getInstance().requestTasksGetMainRequest(getContext(), new HanwhaNetworkCallback<MainHomeRequestRoot>() {
+        TaskListDataRepository.getInstance().requestTasksGetMainRequest(getContext(), new HanwhaNetworkCallback<MainHomeRequestRoot>() {
             @Override
             public void onSuccess(MainHomeRequestRoot response) {