Skip to content

Commit fc1cdd7

Browse files
authored
Merge pull request #52 from flutter-news-app-full-source-code/Remove-CountryService-and-its-Direct-Integrations
Remove `country service` and its direct integrations
2 parents 3a8b6ee + 677a2c9 commit fc1cdd7

File tree

5 files changed

+6
-401
lines changed

5 files changed

+6
-401
lines changed

lib/src/config/app_dependencies.dart

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ import 'package:flutter_news_app_api_server_full_source_code/src/config/environm
99
import 'package:flutter_news_app_api_server_full_source_code/src/rbac/permission_service.dart';
1010
import 'package:flutter_news_app_api_server_full_source_code/src/services/auth_service.dart';
1111
import 'package:flutter_news_app_api_server_full_source_code/src/services/auth_token_service.dart';
12-
import 'package:flutter_news_app_api_server_full_source_code/src/services/country_service.dart';
1312
import 'package:flutter_news_app_api_server_full_source_code/src/services/dashboard_summary_service.dart';
1413
import 'package:flutter_news_app_api_server_full_source_code/src/services/database_seeding_service.dart';
1514
import 'package:flutter_news_app_api_server_full_source_code/src/services/default_user_preference_limit_service.dart';
@@ -62,7 +61,6 @@ class AppDependencies {
6261
late final EmailRepository emailRepository;
6362

6463
// Services
65-
late final CountryService countryService;
6664
late final TokenBlacklistService tokenBlacklistService;
6765
late final AuthTokenService authTokenService;
6866
late final VerificationCodeStorageService verificationCodeStorageService;
@@ -239,12 +237,6 @@ class AppDependencies {
239237
connectionManager: _mongoDbConnectionManager,
240238
log: Logger('MongoDbRateLimitService'),
241239
);
242-
countryService = CountryService(
243-
countryRepository: countryRepository,
244-
headlineRepository: headlineRepository,
245-
sourceRepository: sourceRepository,
246-
logger: Logger('CountryService'),
247-
);
248240

249241
_isInitialized = true;
250242
_log.info('Application dependencies initialized successfully.');

lib/src/registry/data_operation_registry.dart

Lines changed: 6 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ import 'package:core/core.dart';
22
import 'package:dart_frog/dart_frog.dart';
33
import 'package:data_repository/data_repository.dart';
44
import 'package:flutter_news_app_api_server_full_source_code/src/middlewares/ownership_check_middleware.dart';
5-
import 'package:flutter_news_app_api_server_full_source_code/src/services/country_service.dart';
65
import 'package:flutter_news_app_api_server_full_source_code/src/services/dashboard_summary_service.dart';
76

87
// --- Typedefs for Data Operations ---
@@ -129,32 +128,12 @@ class DataOperationRegistry {
129128
sort: s,
130129
pagination: p,
131130
),
132-
'country': (c, uid, f, s, p) async {
133-
final usage = f?['usage'] as String?;
134-
final name = f?['name'] as String?;
135-
136-
// If either 'usage' or 'name' filter is present, delegate to CountryService.
137-
// Sorting and pagination are handled by CountryService for these specialized queries.
138-
if ((usage != null && usage.isNotEmpty) ||
139-
(name != null && name.isNotEmpty)) {
140-
final countryService = c.read<CountryService>();
141-
final countries = await countryService.getCountries(f);
142-
return PaginatedResponse<Country>(
143-
items: countries,
144-
cursor: null, // No cursor for this type of filtered list
145-
hasMore: false, // No more items as it's a complete filtered set
146-
);
147-
} else {
148-
// For standard requests without specialized filters, use the repository
149-
// which supports pagination/sorting.
150-
return c.read<DataRepository<Country>>().readAll(
151-
userId: uid,
152-
filter: f,
153-
sort: s,
154-
pagination: p,
155-
);
156-
}
157-
},
131+
'country': (c, uid, f, s, p) => c.read<DataRepository<Country>>().readAll(
132+
userId: uid,
133+
filter: f,
134+
sort: s,
135+
pagination: p,
136+
),
158137
'language': (c, uid, f, s, p) => c
159138
.read<DataRepository<Language>>()
160139
.readAll(userId: uid, filter: f, sort: s, pagination: p),

0 commit comments

Comments
 (0)