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.

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

TW-281: Enable global search for recent chat, contacts #294

Merged
merged 6 commits into from
Jul 18, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
22 changes: 12 additions & 10 deletions lib/config/routes.dart
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import 'package:fluffychat/di/chat/chat_di.dart';
import 'package:fluffychat/di/contact/contact_di.dart';
import 'package:fluffychat/di/search/search_di.dart';
import 'package:fluffychat/pages/add_story/add_story.dart';
import 'package:fluffychat/pages/archive/archive.dart';
import 'package:fluffychat/pages/chat/chat.dart';
Expand Down Expand Up @@ -34,6 +35,7 @@ import 'package:fluffychat/widgets/layouts/loading_view.dart';
import 'package:fluffychat/widgets/layouts/side_view_layout.dart';
import 'package:fluffychat/widgets/layouts/two_column_layout.dart';
import 'package:fluffychat/widgets/log_view.dart';
import 'package:fluffychat/widgets/vwidget_with_dependencies.dart';
import 'package:fluffychat/widgets/vwidget_with_dependency.dart';
import 'package:flutter/material.dart';
import 'package:vrouter/vrouter.dart';
Expand Down Expand Up @@ -173,11 +175,11 @@ class AppRoutes {
),
]
),
VWidgetWithDependency(
di: ContactDI(),
path: '/search',
widget: const Search(),
buildTransition: rightToLeftTransition,
VWidgetWithDependencies(
dies: [SearchDI()],
path: '/search',
widget: const Search(),
buildTransition: rightToLeftTransition,
),
],
)
Expand Down Expand Up @@ -264,11 +266,11 @@ class AppRoutes {
),
],
),
VWidgetWithDependency(
di: ContactDI(),
path: '/search',
widget: const Search(),
buildTransition: rightToLeftTransition
VWidgetWithDependencies(
dies: [SearchDI()],
path: '/search',
widget: const Search(),
buildTransition: rightToLeftTransition
),
],
),
Expand Down
36 changes: 36 additions & 0 deletions lib/di/search/search_di.dart
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
import 'package:fluffychat/data/datasource/tom_contacts_datasource.dart';
import 'package:fluffychat/data/datasource_impl/contact/tom_contacts_datasource_impl.dart';
import 'package:fluffychat/data/network/contact/tom_contact_api.dart';
import 'package:fluffychat/data/repository/contact/tom_contact_repository_impl.dart';
import 'package:fluffychat/di/base_di.dart';
import 'package:fluffychat/domain/repository/contact_repository.dart';
import 'package:fluffychat/domain/usecase/fetch_contacts_interactor.dart';
import 'package:fluffychat/domain/usecase/lookup_contacts_interactor.dart';
import 'package:fluffychat/domain/usecase/search/search_interactor.dart';
import 'package:get_it/get_it.dart';
import 'package:matrix/matrix.dart';

class SearchDI extends BaseDI {

@override
String get scopeName => 'Search';

@override
void setUp(GetIt get) {
Logs().d('SearchDI::setUp()');

get.registerSingleton<TomContactAPI>(TomContactAPI());

get.registerSingleton<TomContactsDatasource>(TomContactsDatasourceImpl());

get.registerSingleton<ContactRepository>(TomContactRepositoryImpl());

get.registerSingleton<LookupContactsInteractor>(LookupContactsInteractor());

get.registerSingleton<FetchContactsInteractor>(FetchContactsInteractor());

get.registerSingleton<SearchContactsAndRecentChatInteractor>(SearchContactsAndRecentChatInteractor());

Logs().d('SearchDI::setUp() - done');
}
}
23 changes: 23 additions & 0 deletions lib/domain/app_state/search/search_interactor_state.dart
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
import 'package:fluffychat/app_state/failure.dart';
import 'package:fluffychat/app_state/success.dart';
import 'package:fluffychat/domain/model/search/search_model.dart';

class GetContactAndRecentChatSuccess extends Success {
final List<SearchModel> search;

const GetContactAndRecentChatSuccess({required this.search});

@override
List<Object?> get props => [search];
}

class GetContactAndRecentChatFailed extends Failure {

final dynamic exception;

const GetContactAndRecentChatFailed({required this.exception});

@override
List<Object?> get props => [exception];

}
19 changes: 19 additions & 0 deletions lib/domain/model/extensions/contact/contact_extension.dart
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import 'package:fluffychat/domain/model/contact/contact.dart';
import 'package:fluffychat/domain/model/search/search_model.dart';
import 'package:fluffychat/presentation/model/presentation_contact.dart';

extension ContactExtension on Contact {
Expand All @@ -21,4 +22,22 @@ extension ContactExtension on Contact {

return listContacts;
}

Set<SearchModel> toSearch() {
final listContacts = emails?.map((email) => SearchModel(
email: email,
displayName: displayName,
matrixId: matrixId,
)).toSet() ?? {};

if (emails == null || emails!.isEmpty) {
listContacts.add(SearchModel(
email: null,
displayName: displayName,
matrixId: matrixId,
));
}

return listContacts;
}
}
15 changes: 15 additions & 0 deletions lib/domain/model/extensions/search/search_extension.dart
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
import 'package:fluffychat/domain/model/search/search_model.dart';
import 'package:fluffychat/presentation/model/search/presentation_search.dart';

extension SearchExtension on SearchModel {
PresentationSearch toPresentationSearch() {
return PresentationSearch(
email: email,
displayName: displayName,
matrixId: matrixId,
searchElementTypeEnum: searchElementTypeEnum,
roomSummary: roomSummary,
directChatMatrixID: directChatMatrixID
);
}
}
9 changes: 9 additions & 0 deletions lib/domain/model/extensions/search/search_list_extension.dart
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
import 'package:fluffychat/domain/model/extensions/search/search_extension.dart';
import 'package:fluffychat/domain/model/search/search_model.dart';
import 'package:fluffychat/presentation/model/search/presentation_search.dart';

extension SearchListExtenstion on List<SearchModel> {
List<PresentationSearch> toPresentationSearch() {
return map((search) => search.toPresentationSearch()).toList();
}
}
40 changes: 40 additions & 0 deletions lib/domain/model/room/room_extension.dart
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@

import 'package:fluffychat/domain/model/search/search_model.dart';
import 'package:fluffychat/utils/matrix_sdk_extensions/client_stories_extension.dart';
import 'package:matrix/matrix.dart';

extension RoomExtension on Room {
hoangdat marked this conversation as resolved.
Show resolved Hide resolved
SearchModel toSearch(MatrixLocalizations matrixLocalizations) {
return SearchModel(
displayName: getLocalizedDisplayname(matrixLocalizations),
roomSummary: summary,
directChatMatrixID: directChatMatrixID,
matrixId: id,
searchElementTypeEnum: SearchElementTypeEnum.recentChat
);
}

bool isNotSpaceAndStoryRoom() {
return !isSpace && !isStoryRoom;
}

bool isShowInChatList() {
return _isDirectChatHaveMessage() || _isGroupChat();
}

bool _isGroupChat() {
return !isDirectChat;
}

bool _isDirectChatHaveMessage() {
return isDirectChat && _isLastEventInRoomIsMessage();
}

bool _isLastEventInRoomIsMessage() {
return [
EventTypes.Message,
EventTypes.Sticker,
EventTypes.Encrypted,
].contains(lastEvent?.type);
}
}
9 changes: 9 additions & 0 deletions lib/domain/model/room/room_list_extension.dart
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
import 'package:fluffychat/domain/model/room/room_extension.dart';
import 'package:fluffychat/domain/model/search/search_model.dart';
import 'package:matrix/matrix.dart';

extension RoomListExtension on List<Room> {
List<SearchModel> toSearchList(MatrixLocalizations matrixLocalizations) {
return map((room) => room.toSearch(matrixLocalizations)).toList();
}
}
41 changes: 41 additions & 0 deletions lib/domain/model/search/search_model.dart
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
import 'package:equatable/equatable.dart';
import 'package:matrix/matrix.dart';

enum SearchElementTypeEnum {
contact,
recentChat,
}

class SearchModel extends Equatable {

final String? email;

final String? displayName;

final String? matrixId;

final SearchElementTypeEnum? searchElementTypeEnum;

final RoomSummary? roomSummary;

final String? directChatMatrixID;

const SearchModel({
this.email,
this.displayName,
this.matrixId,
this.searchElementTypeEnum,
this.roomSummary,
this.directChatMatrixID
});

@override
List<Object?> get props => [
email,
displayName,
matrixId,
searchElementTypeEnum,
roomSummary,
directChatMatrixID
];
}
89 changes: 89 additions & 0 deletions lib/domain/usecase/search/search_interactor.dart
Original file line number Diff line number Diff line change
@@ -0,0 +1,89 @@
import 'package:dartz/dartz.dart';
import 'package:fluffychat/app_state/failure.dart';
import 'package:fluffychat/di/global/get_it_initializer.dart';
import 'package:fluffychat/domain/app_state/search/search_interactor_state.dart';
import 'package:fluffychat/domain/model/contact/contact_query.dart';
import 'package:fluffychat/domain/model/extensions/contact/contact_extension.dart';
import 'package:fluffychat/domain/model/room/room_extension.dart';
import 'package:fluffychat/domain/model/room/room_list_extension.dart';
import 'package:fluffychat/domain/model/search/search_model.dart';
import 'package:fluffychat/domain/repository/contact_repository.dart';
import 'package:matrix/matrix.dart';

class SearchContactsAndRecentChatInteractor {
final ContactRepository contactRepository = getIt.get<ContactRepository>();

SearchContactsAndRecentChatInteractor();

Stream<Either<Failure, GetContactAndRecentChatSuccess>> execute({
required List<Room> rooms,
required MatrixLocalizations matrixLocalizations,
required String keyword,
int? limitContacts,
int? limitRecentChats,
}) async* {
try {
if (keyword.isNotEmpty) {
final recentChat = await _searchRecentChat(rooms: rooms, matrixLocalizations: matrixLocalizations, keyword: keyword);
final contacts = await contactRepository.searchContact(query: ContactQuery(keyword: keyword), limit: limitContacts);
hoangdat marked this conversation as resolved.
Show resolved Hide resolved

final presentationSearches = _comparePresentationSearches(
recentChat.toSearchList(matrixLocalizations),
contacts.expand((contact) => contact.toSearch())
.where((contact) => _compareDisplayNameWithKeyword(contact, keyword))
.toList()
);
yield Right(GetContactAndRecentChatSuccess(search: presentationSearches));
} else {
final recentChat = await _getRecentChat(rooms: rooms, limitRecentChats: limitRecentChats);
yield Right(GetContactAndRecentChatSuccess(search: recentChat.toSearchList(matrixLocalizations)));
}
} catch (e) {
yield Left(GetContactAndRecentChatFailed(exception: e));
}
}

bool _compareDisplayNameWithKeyword(SearchModel search, String keyword) {
if (search.displayName != null) {
return search.displayName!.toLowerCase().contains(keyword.toLowerCase());
} else {
return false;
}
}

Future<List<Room>> _getRecentChat({
required List<Room> rooms,
int? limitRecentChats
}) async {
return rooms.where((room) => room.isNotSpaceAndStoryRoom())
.where((room) => room.isShowInChatList())
.take(limitRecentChats ?? 0)
.toList();
}

Future<List<Room>> _searchRecentChat({
required List<Room> rooms,
required MatrixLocalizations matrixLocalizations,
required String keyword,
}) async {
return rooms.where((room) => room.isNotSpaceAndStoryRoom())
.where((room) =>
hoangdat marked this conversation as resolved.
Show resolved Hide resolved
room.getLocalizedDisplayname(matrixLocalizations)
.toLowerCase()
.contains(keyword.toLowerCase())
).toList();
}

List<SearchModel> _comparePresentationSearches(List<SearchModel> recentChat, List<SearchModel> contacts) {
final isDuplicateElement = contacts.where((contact) {
dab246 marked this conversation as resolved.
Show resolved Hide resolved
return recentChat.any((recentChat) => recentChat.directChatMatrixID == contact.directChatMatrixID);
}).toList();
if (isDuplicateElement.isNotEmpty) {
final presentationSearches = recentChat + contacts;
presentationSearches.removeWhere((contact) => isDuplicateElement.contains(contact));
return presentationSearches;
} else {
return recentChat + contacts;
}
}
}
2 changes: 1 addition & 1 deletion lib/domain/usecase/send_file_interactor.dart
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@

import 'package:file_picker/file_picker.dart';
import 'package:fluffychat/presentation/extensions/room_extension.dart';
import 'package:fluffychat/presentation/extensions/send_image_extension.dart';
import 'package:fluffychat/utils/matrix_sdk_extensions/matrix_file_extension.dart';
import 'package:matrix/matrix.dart';

Expand Down
2 changes: 1 addition & 1 deletion lib/domain/usecase/send_image_interactor.dart
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@

import 'package:fluffychat/presentation/extensions/asset_entity_extension.dart';
import 'package:fluffychat/presentation/extensions/room_extension.dart';
import 'package:fluffychat/presentation/extensions/send_image_extension.dart';
import 'package:matrix/matrix.dart';
import 'package:photo_manager/photo_manager.dart';

Expand Down
2 changes: 1 addition & 1 deletion lib/domain/usecase/send_images_interactor.dart
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import 'package:fluffychat/presentation/extensions/room_extension.dart';
import 'package:fluffychat/presentation/extensions/send_image_extension.dart';
import 'package:matrix/matrix.dart';
import 'package:photo_manager/photo_manager.dart';

Expand Down
Loading
Loading