Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

채팅 버그 수정 #163

Open
wants to merge 6 commits into
base: develop
Choose a base branch
from
Open

채팅 버그 수정 #163

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
875eb13
feature/R-125
HoneyPot8014 Feb 22, 2019
696b4cd
feature/R-125
HoneyPot8014 Feb 23, 2019
6a4bcc1
feature/R-125
HoneyPot8014 Feb 23, 2019
6465549
feature/R-125
HoneyPot8014 Feb 23, 2019
739263d
feature/R-125
HoneyPot8014 Feb 23, 2019
cf1382b
feature/R-125
HoneyPot8014 Feb 23, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
feature/R-125 
FavoriteRoom Repository 추가
  • Loading branch information
@HoneyPot8014
HoneyPot8014 committed Feb 23, 2019
commit 6465549f5dbf844e539e9034bc0192998b3be9ab
2 changes: 1 addition & 1 deletion app/src/main/java/com/swsnack/catchhouse/data/db/AppDatabase.java
View file
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@
import com.swsnack.catchhouse.AppApplication;
import com.swsnack.catchhouse.data.entity.FavoriteRoomEntity;
import com.swsnack.catchhouse.data.entity.SellRoomEntity;
import com.swsnack.catchhouse.repository.room.local.FavoriteRoomDao;
import com.swsnack.catchhouse.repository.favoriteroom.FavoriteRoomDao;
import com.swsnack.catchhouse.repository.room.local.SellRoomDao;
import com.swsnack.catchhouse.repository.room.local.TypeConverter;

6 changes: 3 additions & 3 deletions app/src/main/java/com/swsnack/catchhouse/repository/APIManager.java
View file
Original file line number Diff line number Diff line change
@@ -126,8 +126,8 @@ public void firebaseDeleteUser(@NonNull String uuid,

mDataManager.cancelMessageModelObserving();
mDataManager.cancelObservingChattingList();
mDataManager.deleteRecentRoomList();
mDataManager.deleteFavoriteRoom();
// mDataManager.deleteRecentRoomList();
// mDataManager.deleteFavoriteRoom();

mDataManager.deleteUser(uuid,
deleteUserSuccess -> deleteUser(onSuccessListener, onFailedListener),
@@ -142,7 +142,7 @@ public void firebaseSignOut() {
FirebaseAuth.getInstance().signOut();
mDataManager.cancelMessageModelObserving();
mDataManager.cancelObservingChattingList();
mDataManager.deleteRecentRoomList();
// mDataManager.deleteRecentRoomList();
}

public void updatePassword(@NonNull String oldPassword,
234 changes: 149 additions & 85 deletions app/src/main/java/com/swsnack/catchhouse/repository/AppDataSource.java
View file
Original file line number Diff line number Diff line change
@@ -10,14 +10,14 @@
import com.swsnack.catchhouse.data.model.User;
import com.swsnack.catchhouse.repository.chatting.ChattingDataSource;
import com.swsnack.catchhouse.repository.chatting.remote.RemoteChattingImpl;
import com.swsnack.catchhouse.repository.favoriteroom.FavoriteRoomRepository;
import com.swsnack.catchhouse.repository.favoriteroom.FavoriteRoomRepositoryImpl;
import com.swsnack.catchhouse.repository.location.LocationDataSource;
import com.swsnack.catchhouse.repository.location.remote.RemoteLocationImpl;
import com.swsnack.catchhouse.repository.room.RoomRepository;
import com.swsnack.catchhouse.repository.room.local.FavoriteRoomDataSource;
import com.swsnack.catchhouse.repository.room.local.RecentRoomDataSource;
import com.swsnack.catchhouse.repository.room.RoomRepositoryImpl;
import com.swsnack.catchhouse.repository.room.local.SellRoomDataSource;
import com.swsnack.catchhouse.repository.room.local.SellRoomImpl;
import com.swsnack.catchhouse.repository.room.remote.RemoteRoomDataSource;
import com.swsnack.catchhouse.repository.room.local.SellRoomData;
import com.swsnack.catchhouse.repository.searching.SearchingDataSource;
import com.swsnack.catchhouse.repository.searching.remote.SearchingDataImpl;
import com.swsnack.catchhouse.repository.user.UserDataSource;
@@ -33,9 +33,11 @@ public class AppDataSource implements DataSource {
//FIXME : 이 클래스 삭제할겁니다. 사용해주지 마시고 레포에서 써주세요
private UserDataSource mUserDataSource;
private ChattingDataSource mRemoteChattingDataSource;
private RemoteRoomDataSource mRemoteRoomDataSource;
private FavoriteRoomDataSource mFavoriteRoomDataSource;
private RecentRoomDataSource mRecentRoomDataManager;
// private RemoteRoomDataSource mRemoteRoomDataSource;
// private FavoriteRoomDataSource mFavoriteRoomDataSource;
// private RecentRoomDataSource mRecentRoomDataManager;
private FavoriteRoomRepository favoriteRoomRepository;
private RoomRepository roomRepository;
private LocationDataSource mLocationDataSource;
private SearchingDataSource mSearchingDataSource;
private SellRoomDataSource mSellRoomDataSource;
@@ -44,12 +46,14 @@ private AppDataSource() {

mUserDataSource = UserDataImpl.getInstance();
mRemoteChattingDataSource = RemoteChattingImpl.getInstance();
mRemoteRoomDataSource = RoomRepository.getInstance();
mFavoriteRoomDataSource = RoomRepository.getInstance();
mRecentRoomDataManager = RoomRepository.getInstance();
// mRemoteRoomDataSource = RoomRepositoryImpl2.getInstance();
// mFavoriteRoomDataSource = RoomRepositoryImpl2.getInstance();
// mRecentRoomDataManager = RoomRepositoryImpl2.getInstance();
mLocationDataSource = RemoteLocationImpl.getInstance();
mSearchingDataSource = SearchingDataImpl.getInstance();
mSellRoomDataSource = SellRoomImpl.getInstance();
mSellRoomDataSource = SellRoomData.getInstance();
roomRepository = RoomRepositoryImpl.getInstance();
favoriteRoomRepository = FavoriteRoomRepositoryImpl.getInstance();
}

private static AppDataSource INSTANCE;
@@ -181,39 +185,39 @@ public void setChatMessage(int messagesLength,

}

@Override
public String createKey() {
return mRemoteRoomDataSource.createKey();
}

@Override
public void uploadRoomImage(@NonNull String uuid, @NonNull List<Uri> imageList,
@NonNull OnSuccessListener<List<String>> onSuccessListener,
@NonNull OnFailedListener onFailedListener) {

mRemoteRoomDataSource.uploadRoomImage(uuid, imageList, onSuccessListener, onFailedListener);
}

@Override
public void setRoom(@NonNull String key, @NonNull Room room,
@NonNull OnSuccessListener<Void> onSuccessListener,
@NonNull OnFailedListener onFailedListener) {

mRemoteRoomDataSource.setRoom(key, room, onSuccessListener, onFailedListener);
}


@Override
public void getRoom(@NonNull String key,
@NonNull OnSuccessListener<Room> onSuccessListener,
@NonNull OnFailedListener onFailedListener) {
mRemoteRoomDataSource.getRoom(key, onSuccessListener, onFailedListener);
}

@Override
public void delete(@NonNull String key, @NonNull Room room, @NonNull OnSuccessListener<Void> onSuccessListener, @NonNull OnFailedListener onFailedListener) {
mRemoteRoomDataSource.delete(key, room, onSuccessListener, onFailedListener);
}
// @Override
// public String createKey() {
// return mRemoteRoomDataSource.createKey();
// }
//
// @Override
// public void uploadRoomImage(@NonNull String uuid, @NonNull List<Uri> imageList,
// @NonNull OnSuccessListener<List<String>> onSuccessListener,
// @NonNull OnFailedListener onFailedListener) {
//
// mRemoteRoomDataSource.uploadRoomImage(uuid, imageList, onSuccessListener, onFailedListener);
// }
//
// @Override
// public void setRoom(@NonNull String key, @NonNull Room room,
// @NonNull OnSuccessListener<Void> onSuccessListener,
// @NonNull OnFailedListener onFailedListener) {
//
// mRemoteRoomDataSource.setRoom(key, room, onSuccessListener, onFailedListener);
// }
//
//
// @Override
// public void getRoom(@NonNull String key,
// @NonNull OnSuccessListener<Room> onSuccessListener,
// @NonNull OnFailedListener onFailedListener) {
// mRemoteRoomDataSource.getRoom(key, onSuccessListener, onFailedListener);
// }
//
// @Override
// public void delete(@NonNull String key, @NonNull Room room, @NonNull OnSuccessListener<Void> onSuccessListener, @NonNull OnFailedListener onFailedListener) {
// mRemoteRoomDataSource.delete(key, room, onSuccessListener, onFailedListener);
// }

@Override
public void uploadLocationData(@NonNull String uuid, @NonNull Address address,
@@ -234,79 +238,139 @@ public Single<List<Room>> getNearRoomList(@NonNull Filter filter) {
}

@Override
public void setFavoriteRoom(Room room) {
mFavoriteRoomDataSource.setFavoriteRoom(room);
}

@Override
public void deleteFavoriteRoom(Room room) {
mFavoriteRoomDataSource.deleteFavoriteRoom(room);

}

@Override
public void deleteFavoriteRoom() {
mFavoriteRoomDataSource.deleteFavoriteRoom();
}

@Override
public List<Room> getFavoriteRoomList() {
return mFavoriteRoomDataSource.getFavoriteRoomList();
public String createKey() {
return roomRepository.createKey();
}

@Override
public Room getFavoriteRoom(String key) {
return mFavoriteRoomDataSource.getFavoriteRoom(key);
public void uploadRoomImage(@NonNull String uuid, @NonNull List<Uri> imageList, @NonNull OnSuccessListener<List<String>> onSuccessListener, @NonNull OnFailedListener onFailedListener) {
roomRepository.uploadRoomImage(uuid, imageList, onSuccessListener, onFailedListener);
}

@Override
public void updateRoom(Room room) {
mFavoriteRoomDataSource.updateRoom(room);
public void setRoom(@NonNull Room room, @NonNull OnSuccessListener<Void> onSuccessListener, @NonNull OnFailedListener onFailedListener) {
roomRepository.setRoom(room, onSuccessListener, onFailedListener);
}

@Override
public void setRecentRoom(Room room) {
mRecentRoomDataManager.setRecentRoom(room);
public void getRoom(@NonNull String key, @NonNull OnSuccessListener<Room> onSuccessListener, @NonNull OnFailedListener onFailedListener) {
roomRepository.getRoom(key, onSuccessListener, onFailedListener);
}

@Override
public List<Room> getRecentRoom() {
return mRecentRoomDataManager.getRecentRoom();
public void deleteRoom(@NonNull Room room, @NonNull OnSuccessListener<Void> onSuccessListener, @NonNull OnFailedListener onFailedListener) {
roomRepository.deleteRoom(room, onSuccessListener, onFailedListener);
}

@Override
public void deleteRecentRoomList() {
mRecentRoomDataManager.deleteRecentRoomList();
public void updateRoom(@NonNull Room room, @NonNull OnSuccessListener<Void> onSuccessListener, @NonNull OnFailedListener onFailedListener) {
roomRepository.updateRoom(room, onSuccessListener, onFailedListener);
}

@Override
public void deleteRoom(Room room) {
deleteRoom(room);
public void setFavoriteRoom(Room room) {
favoriteRoomRepository.setFavoriteRoom(room);
}

@Override
public void setSellRoom(Room room) {
mSellRoomDataSource.setSellRoom(room);
public void deleteFavoriteRoom(Room room) {
favoriteRoomRepository.deleteFavoriteRoom(room);
}

@Override
public void deleteSellRoom(Room room) {
mSellRoomDataSource.deleteSellRoom(room);
public List<Room> getFavoriteRoomList() {
return favoriteRoomRepository.getFavoriteRoomList();
}

@Override
public List<Room> getSellRoomList() {
return mSellRoomDataSource.getSellRoomList();
public void deleteFavoriteRoom() {
favoriteRoomRepository.deleteFavoriteRoom();
}

@Override
public void deleteSellRoom() {
mSellRoomDataSource.deleteSellRoom();
public Room getFavoriteRoom(String key) {
return favoriteRoomRepository.getFavoriteRoom(key);
}

@Override
public Room getSellRoom(String key) {
return mSellRoomDataSource.getSellRoom(key);
}
public void updateRoom(Room room) {
favoriteRoomRepository.updateRoom(room);
}

// @Override
// public void setFavoriteRoom(Room room) {
// mFavoriteRoomDataSource.setFavoriteRoom(room);
// }
//
// @Override
// public void deleteFavoriteRoom(Room room) {
// mFavoriteRoomDataSource.deleteFavoriteRoom(room);
//
// }
//
// @Override
// public void deleteFavoriteRoom() {
// mFavoriteRoomDataSource.deleteFavoriteRoom();
// }
//
// @Override
// public List<Room> getFavoriteRoomList() {
// return mFavoriteRoomDataSource.getFavoriteRoomList();
// }
//
// @Override
// public Room getFavoriteRoom(String key) {
// return mFavoriteRoomDataSource.getFavoriteRoom(key);
// }
//
// @Override
// public void updateRoom(Room room) {
// mFavoriteRoomDataSource.updateRoom(room);
// }
//
// @Override
// public void setRecentRoom(Room room) {
// mRecentRoomDataManager.setRecentRoom(room);
// }
//
// @Override
// public List<Room> getRecentRoom() {
// return mRecentRoomDataManager.getRecentRoom();
// }
//
// @Override
// public void deleteRecentRoomList() {
// mRecentRoomDataManager.deleteRecentRoomList();
// }

// @Override
// public void deleteRoom(Room room) {
// deleteRoom(room);
// }
//
// @Override
// public void setSellRoom(Room room) {
// mSellRoomDataSource.setSellRoom(room);
// }
//
// @Override
// public void deleteSellRoom(Room room) {
// mSellRoomDataSource.deleteSellRoom(room);
// }
//
// @Override
// public List<Room> getSellRoomList() {
// return mSellRoomDataSource.getSellRoomList();
// }
//
// @Override
// public void deleteSellRoom() {
// mSellRoomDataSource.deleteSellRoom();
// }
//
// @Override
// public Room getSellRoom(String key) {
// return mSellRoomDataSource.getSellRoom(key);
// }

}
13 changes: 4 additions & 9 deletions app/src/main/java/com/swsnack/catchhouse/repository/DataSource.java
View file
Original file line number Diff line number Diff line change
@@ -1,21 +1,16 @@
package com.swsnack.catchhouse.repository;

import com.swsnack.catchhouse.repository.chatting.ChattingDataSource;
import com.swsnack.catchhouse.repository.favoriteroom.FavoriteRoomRepository;
import com.swsnack.catchhouse.repository.location.LocationDataSource;
import com.swsnack.catchhouse.repository.room.local.FavoriteRoomDataSource;
import com.swsnack.catchhouse.repository.room.local.SellRoomDataSource;
import com.swsnack.catchhouse.repository.room.local.RecentRoomDataSource;
import com.swsnack.catchhouse.repository.room.remote.RemoteRoomDataSource;
import com.swsnack.catchhouse.repository.room.RoomRepository;
import com.swsnack.catchhouse.repository.searching.SearchingDataSource;
import com.swsnack.catchhouse.repository.user.UserDataSource;

public interface DataSource extends UserDataSource,
ChattingDataSource,
RemoteRoomDataSource,
FavoriteRoomDataSource,
LocationDataSource,
SearchingDataSource,
RecentRoomDataSource,
SellRoomDataSource {

RoomRepository,
FavoriteRoomRepository {
}
2 changes: 1 addition & 1 deletion ...epository/room/local/FavoriteRoomDao.java → ...ository/favoriteroom/FavoriteRoomDao.java
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.swsnack.catchhouse.repository.room.local;
package com.swsnack.catchhouse.repository.favoriteroom;

import com.swsnack.catchhouse.data.entity.FavoriteRoomEntity;

Loading