eduvia/workavia-mail-front
11
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

HOTFIX Separate language from preference update (#4062)

Browse Source
This commit is contained in:
Dat Dang
2025-09-26 11:58:25 +07:00
committed by GitHub
parent eb73a0773c
commit 24095dc147
14 changed files with 65 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/features/manage_account/domain/usecases/save_language_to_server_settings_interactor.dart
+3
View File
@@ -4,6 +4,7 @@ import 'package:core/utils/app_logger.dart';
import 'package:dartz/dartz.dart';
import 'package:flutter/widgets.dart';
import 'package:jmap_dart_client/jmap/account_id.dart';
import 'package:jmap_dart_client/jmap/core/session/session.dart';
import 'package:server_settings/server_settings/tmail_server_settings.dart';
import 'package:tmail_ui_user/features/manage_account/domain/state/save_language_to_server_settings_state.dart';
import 'package:tmail_ui_user/features/server_settings/domain/repository/server_settings_repository.dart';
@@ -14,6 +15,7 @@ class SaveLanguageToServerSettingsInteractor {
final ServerSettingsRepository _serverSettingsRepository;
Stream<Either<Failure, Success>> execute(
Session session,
AccountId accountId,
Locale locale,
) async* {
@@ -27,6 +29,7 @@ class SaveLanguageToServerSettingsInteractor {
) ?? TMailServerSettingOptions(language: locale.languageCode),
);
await _serverSettingsRepository.updateServerSettings(
session,
accountId,
TMailServerSettings(settings: newSettings.settings),
);
lib/features/manage_account/presentation/language_and_region/language_and_region_controller.dart
+1
View File
@@ -75,6 +75,7 @@ class LanguageAndRegionController extends BaseController {
}
consumeState(saveLanguageToServerSettingsInteractor.execute(
session,
accountId,
localeCurrent,
));
lib/features/manage_account/presentation/preferences/preferences_controller.dart
+3 -1
View File
@@ -179,10 +179,12 @@ class PreferencesController extends BaseController {
break;
}
final session = _manageAccountDashBoardController.sessionCurrent;
final accountId = _manageAccountDashBoardController.accountId.value;
if (accountId != null && newSettingOption != null) {
if (session != null && accountId != null && newSettingOption != null) {
consumeState(
_updateServerSettingInteractor.execute(
session,
accountId,
newSettingOption,
),
lib/features/server_settings/data/datasource/server_settings_data_source.dart
+2
View File
@@ -1,9 +1,11 @@
import 'package:jmap_dart_client/jmap/account_id.dart';
import 'package:jmap_dart_client/jmap/core/session/session.dart';
import 'package:server_settings/server_settings/tmail_server_settings.dart';
abstract class ServerSettingsDataSource {
Future<TMailServerSettings> getServerSettings(AccountId accountId);
Future<TMailServerSettings> updateServerSettings(
Session session,
AccountId accountId,
TMailServerSettings serverSettings);
}
lib/features/server_settings/data/datasource_impl/remote_server_settings_data_source_impl.dart
+3 -2
View File
@@ -1,4 +1,5 @@
import 'package:jmap_dart_client/jmap/account_id.dart';
import 'package:jmap_dart_client/jmap/core/session/session.dart';
import 'package:server_settings/server_settings/tmail_server_settings.dart';
import 'package:tmail_ui_user/features/server_settings/data/datasource/server_settings_data_source.dart';
import 'package:tmail_ui_user/features/server_settings/data/network/server_settings_api.dart';
@@ -20,9 +21,9 @@ class RemoteServerSettingsDataSourceImpl implements ServerSettingsDataSource {
}
@override
Future<TMailServerSettings> updateServerSettings(AccountId accountId, TMailServerSettings serverSettings) {
Future<TMailServerSettings> updateServerSettings(Session session, AccountId accountId, TMailServerSettings serverSettings) {
return Future.sync(() async {
return await _serverSettingsAPI.updateServerSettings(accountId, serverSettings);
return await _serverSettingsAPI.updateServerSettings(session, accountId, serverSettings);
}).catchError(_exceptionThrower.throwException);
}
}
lib/features/server_settings/data/network/server_settings_api.dart
+4
View File
@@ -1,6 +1,7 @@
import 'package:jmap_dart_client/http/http_client.dart';
import 'package:jmap_dart_client/jmap/account_id.dart';
import 'package:jmap_dart_client/jmap/core/error/method/exception/error_method_response_exception.dart';
import 'package:jmap_dart_client/jmap/core/session/session.dart';
import 'package:jmap_dart_client/jmap/jmap_request.dart';
import 'package:server_settings/server_settings/get/get_server_settings_method.dart';
import 'package:server_settings/server_settings/get/get_server_settings_response.dart';
@@ -10,6 +11,7 @@ import 'package:server_settings/server_settings/set/set_server_settings_response
import 'package:server_settings/server_settings/tmail_server_settings.dart';
import 'package:tmail_ui_user/features/base/mixin/handle_error_mixin.dart';
import 'package:tmail_ui_user/features/server_settings/domain/exceptions/server_settings_exception.dart';
import 'package:tmail_ui_user/features/server_settings/domain/extensions/tmail_server_settings_extension.dart';
class ServerSettingsAPI with HandleSetErrorMixin {
final HttpClient httpClient;
@@ -44,10 +46,12 @@ class ServerSettingsAPI with HandleSetErrorMixin {
}
Future<TMailServerSettings> updateServerSettings(
Session session,
AccountId accountId,
TMailServerSettings serverSettings
) async {
final processingInvocation = ProcessingInvocation();
serverSettings = serverSettings.normalized(session, accountId);
final setServerSettingsMethod = SetServerSettingsMethod(accountId)
..addUpdatesSingleton({
lib/features/server_settings/data/repository/server_settings_repository_impl.dart
+3 -1
View File
@@ -1,4 +1,5 @@
import 'package:jmap_dart_client/jmap/account_id.dart';
import 'package:jmap_dart_client/jmap/core/session/session.dart';
import 'package:server_settings/server_settings/tmail_server_settings.dart';
import 'package:tmail_ui_user/features/server_settings/data/datasource/server_settings_data_source.dart';
import 'package:tmail_ui_user/features/server_settings/domain/repository/server_settings_repository.dart';
@@ -14,7 +15,8 @@ class ServerSettingsRepositoryImpl implements ServerSettingsRepository {
@override
Future<TMailServerSettings> updateServerSettings(
Session session,
AccountId accountId,
TMailServerSettings serverSettings)
=> _serverSettingsDataSource.updateServerSettings(accountId, serverSettings);
=> _serverSettingsDataSource.updateServerSettings(session, accountId, serverSettings);
}
lib/features/server_settings/domain/extensions/tmail_server_settings_extension.dart
+19
View File
@@ -0,0 +1,19 @@
import 'package:jmap_dart_client/jmap/account_id.dart';
import 'package:jmap_dart_client/jmap/core/session/session.dart';
import 'package:server_settings/server_settings/tmail_server_settings.dart';
import 'package:tmail_ui_user/features/home/domain/extensions/session_extensions.dart';
extension TmailServerSettingsExtension on TMailServerSettings {
TMailServerSettings normalized(Session session, AccountId accountId) {
if (session.isLanguageReadOnly(accountId)) {
return TMailServerSettings(
id: id,
settings: TMailServerSettingOptions(
alwaysReadReceipts: settings?.alwaysReadReceipts,
displaySenderPriority: settings?.displaySenderPriority,
),
);
}
return this;
}
}
lib/features/server_settings/domain/repository/server_settings_repository.dart
+2
View File
@@ -1,9 +1,11 @@
import 'package:jmap_dart_client/jmap/account_id.dart';
import 'package:jmap_dart_client/jmap/core/session/session.dart';
import 'package:server_settings/server_settings/tmail_server_settings.dart';
abstract class ServerSettingsRepository {
Future<TMailServerSettings> getServerSettings(AccountId accountId);
Future<TMailServerSettings> updateServerSettings(
Session session,
AccountId accountId,
TMailServerSettings serverSettings);
}
lib/features/server_settings/domain/usecases/update_server_setting_interactor.dart
+3
View File
@@ -2,6 +2,7 @@ import 'package:core/presentation/state/failure.dart';
import 'package:core/presentation/state/success.dart';
import 'package:dartz/dartz.dart';
import 'package:jmap_dart_client/jmap/account_id.dart';
import 'package:jmap_dart_client/jmap/core/session/session.dart';
import 'package:server_settings/server_settings/tmail_server_settings.dart';
import 'package:tmail_ui_user/features/server_settings/domain/exceptions/server_settings_exception.dart';
import 'package:tmail_ui_user/features/server_settings/domain/repository/server_settings_repository.dart';
@@ -13,12 +14,14 @@ class UpdateServerSettingInteractor {
UpdateServerSettingInteractor(this._serverSettingsRepository);
Stream<Either<Failure, Success>> execute(
Session session,
AccountId accountId,
TMailServerSettingOptions newSettingOption,
) async* {
yield Right(UpdatingServerSetting());
try {
final serverSetting = await _serverSettingsRepository.updateServerSettings(
session,
accountId,
TMailServerSettings(settings: newSettingOption),
);
test/features/server_settings/data/datasource_impl/remote_server_settings_data_source_impl_test.dart
+6 -3
View File
@@ -10,6 +10,7 @@ import 'package:tmail_ui_user/features/server_settings/data/network/server_setti
import 'package:tmail_ui_user/features/server_settings/domain/exceptions/server_settings_exception.dart';
import 'package:tmail_ui_user/main/exceptions/remote_exception_thrower.dart';
import '../../../../fixtures/session_fixtures.dart';
import 'remote_server_settings_data_source_impl_test.mocks.dart';
@GenerateNiceMocks([MockSpec<ServerSettingsAPI>()])
@@ -18,6 +19,7 @@ void main() {
id: ServerSettingsId(id: Id('123')),
settings: TMailServerSettingOptions(alwaysReadReceipts: true),
);
final session = SessionFixtures.aliceSession;
final accountId = AccountId(Id('321'));
final serverSettingsAPI = MockServerSettingsAPI();
final remoteServerSettingsDataSource = RemoteServerSettingsDataSourceImpl(
@@ -55,12 +57,12 @@ void main() {
group('update server settings', () {
test('should return value when ServerSettingsAPI returns value',() async {
// arrange
when(serverSettingsAPI.updateServerSettings(any, any))
when(serverSettingsAPI.updateServerSettings(any, any, any))
.thenAnswer((_) async => serverSettings);
// act
final result = await remoteServerSettingsDataSource
.updateServerSettings(accountId, serverSettings);
.updateServerSettings(session, accountId, serverSettings);
// assert
expect(result, serverSettings);
@@ -68,12 +70,13 @@ void main() {
test('should rethrow exception when ServerSettingsAPI throws exception',() async {
// arrange
when(serverSettingsAPI.updateServerSettings(any, any))
when(serverSettingsAPI.updateServerSettings(any, any, any))
.thenThrow(CanNotUpdateServerSettingsException());
// assert
expect(
() => remoteServerSettingsDataSource.updateServerSettings(
session,
accountId,
serverSettings),
throwsA(const TypeMatcher<CanNotUpdateServerSettingsException>()));
test/features/server_settings/data/network/server_settings_api_test.dart
+4
View File
@@ -9,6 +9,8 @@ import 'package:server_settings/server_settings/tmail_server_settings.dart';
import 'package:tmail_ui_user/features/server_settings/data/network/server_settings_api.dart';
import 'package:tmail_ui_user/features/server_settings/domain/exceptions/server_settings_exception.dart';
import '../../../../fixtures/session_fixtures.dart';
void main() {
final newServerSettings = TMailServerSettings(
id: ServerSettingsIdExtension.serverSettingsIdSingleton,
@@ -91,11 +93,13 @@ void main() {
final httpClient = HttpClient(dio);
final serverSettingsAPI = ServerSettingsAPI(httpClient);
final session = SessionFixtures.aliceSession;
final accountId = AccountId(Id('123'));
// assert
expect(
serverSettingsAPI.updateServerSettings(
session,
accountId,
newServerSettings),
throwsA(isA<CanNotUpdateServerSettingsException>()));
test/features/server_settings/data/repository/server_settings_repository_impl_test.dart
+6 -4
View File
@@ -8,11 +8,13 @@ import 'package:tmail_ui_user/features/server_settings/data/datasource/server_se
import 'package:tmail_ui_user/features/server_settings/data/repository/server_settings_repository_impl.dart';
import 'package:tmail_ui_user/features/server_settings/domain/exceptions/server_settings_exception.dart';
import '../../../../fixtures/session_fixtures.dart';
import 'server_settings_repository_impl_test.mocks.dart';
@GenerateNiceMocks([MockSpec<ServerSettingsDataSource>()])
void main() {
final serverSettings = TMailServerSettings();
final session = SessionFixtures.aliceSession;
final accountId = AccountId(Id('123'));
final serverSettingsDataSource = MockServerSettingsDataSource();
final serverSettingsRepository = ServerSettingsRepositoryImpl(
@@ -48,12 +50,12 @@ void main() {
group('update server settings', () {
test('should return value when ServerSettingsDataSource returns value', () async {
// arrange
when(serverSettingsDataSource.updateServerSettings(accountId, serverSettings))
when(serverSettingsDataSource.updateServerSettings(session, accountId, serverSettings))
.thenAnswer((_) async => serverSettings);
// act
final result = await serverSettingsRepository
.updateServerSettings(accountId, serverSettings);
.updateServerSettings(session, accountId, serverSettings);
// assert
expect(result, serverSettings);
@@ -61,12 +63,12 @@ void main() {
test('should rethrow exception when ServerSettingsDataSource throws exception', () async {
// arrange
when(serverSettingsDataSource.updateServerSettings(accountId, serverSettings))
when(serverSettingsDataSource.updateServerSettings(session, accountId, serverSettings))
.thenThrow(NotFoundServerSettingsException());
// assert
expect(
() => serverSettingsRepository.updateServerSettings(accountId, serverSettings),
() => serverSettingsRepository.updateServerSettings(session, accountId, serverSettings),
throwsA(const TypeMatcher<NotFoundServerSettingsException>()));
});
});
test/features/server_settings/domain/usecases/update_server_setting_interactor_test.dart
+6 -2
View File
@@ -10,10 +10,12 @@ import 'package:tmail_ui_user/features/server_settings/domain/repository/server_
import 'package:tmail_ui_user/features/server_settings/domain/state/update_server_setting_state.dart';
import 'package:tmail_ui_user/features/server_settings/domain/usecases/update_server_setting_interactor.dart';
import '../../../../fixtures/session_fixtures.dart';
import 'update_server_setting_interactor_test.mocks.dart';
@GenerateNiceMocks([MockSpec<ServerSettingsRepository>()])
void main() {
final session = SessionFixtures.aliceSession;
final accountId = AccountId(Id('123'));
const alwaysReadReceipts = false;
final serverSettings = TMailServerSettings(
@@ -24,12 +26,13 @@ void main() {
group('update always read receipt setting interactor', () {
test('should return right with value returned from repository', () {
// arrange
when(serverSettingsRepository.updateServerSettings(any, any))
when(serverSettingsRepository.updateServerSettings(any, any, any))
.thenAnswer((_) async => serverSettings);
// assert
expect(
updateServerSettingInteractor.execute(
session,
accountId,
TMailServerSettingOptions(alwaysReadReceipts: alwaysReadReceipts),
),
@@ -43,12 +46,13 @@ void main() {
test('should return left with exception returned from repository', () {
// arrange
final exception = NotFoundServerSettingsException();
when(serverSettingsRepository.updateServerSettings(any, any))
when(serverSettingsRepository.updateServerSettings(any, any, any))
.thenThrow(exception);
// assert
expect(
updateServerSettingInteractor.execute(
session,
accountId,
TMailServerSettingOptions(alwaysReadReceipts: alwaysReadReceipts),
),