Skip to content

Commit d8bebdf

Browse files
fullenifulleni
committed
refactor(api): update package imports and repository references
- Replace `ht_data_repository` with `data_repository` package - Update import paths for `flutter_news_app_api_server_full_source_code` package - Rename `HtDataRepository` to `DataRepository` - Replace `HtHttpException` with `HttpException`
1 parent 2432d4a commit d8bebdf

File tree

4 files changed

+60
-60
lines changed

4 files changed

+60
-60
lines changed

‎routes/api/v1/data/[id]/_middleware.dart‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import 'package:dart_frog/dart_frog.dart';
2-
import 'package:ht_api/src/middlewares/ownership_check_middleware.dart';
2+
import 'package:flutter_news_app_api_server_full_source_code/src/middlewares/ownership_check_middleware.dart';
33

44
/// Middleware specific to the item-level `/api/v1/data/[id]` route path.
55
///

‎routes/api/v1/data/[id]/index.dart‎

Lines changed: 40 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
import 'dart:io';
22

3+
import 'package:core/core.dart';
34
import 'package:dart_frog/dart_frog.dart';
4-
import 'package:ht_api/src/helpers/response_helper.dart';
5-
import 'package:ht_api/src/rbac/permission_service.dart';
6-
import 'package:ht_api/src/registry/model_registry.dart';
7-
import 'package:ht_api/src/services/dashboard_summary_service.dart';
8-
import 'package:ht_api/src/services/user_preference_limit_service.dart'; // Import UserPreferenceLimitService
9-
import 'package:ht_data_repository/ht_data_repository.dart';
10-
import 'package:ht_shared/ht_shared.dart';
5+
import 'package:data_repository/data_repository.dart';
6+
import 'package:flutter_news_app_api_server_full_source_code/src/helpers/response_helper.dart';
7+
import 'package:flutter_news_app_api_server_full_source_code/src/rbac/permission_service.dart';
8+
import 'package:flutter_news_app_api_server_full_source_code/src/registry/model_registry.dart';
9+
import 'package:flutter_news_app_api_server_full_source_code/src/services/dashboard_summary_service.dart';
10+
import 'package:flutter_news_app_api_server_full_source_code/src/services/user_preference_limit_service.dart'; // Import UserPreferenceLimitService
1111
import 'package:logging/logging.dart';
1212

1313
// Create a logger for this file.
@@ -96,28 +96,28 @@ Future<Response> _handleGet(
9696
// main onRequest try/catch (which is now removed, so they go to errorHandler).
9797
switch (modelName) {
9898
case 'headline':
99-
final repo = context.read<HtDataRepository<Headline>>();
99+
final repo = context.read<DataRepository<Headline>>();
100100
item = await repo.read(id: id, userId: userIdForRepoCall);
101101
case 'topic':
102-
final repo = context.read<HtDataRepository<Topic>>();
102+
final repo = context.read<DataRepository<Topic>>();
103103
item = await repo.read(id: id, userId: userIdForRepoCall);
104104
case 'source':
105-
final repo = context.read<HtDataRepository<Source>>();
105+
final repo = context.read<DataRepository<Source>>();
106106
item = await repo.read(id: id, userId: userIdForRepoCall);
107107
case 'country':
108-
final repo = context.read<HtDataRepository<Country>>();
108+
final repo = context.read<DataRepository<Country>>();
109109
item = await repo.read(id: id, userId: userIdForRepoCall);
110110
case 'user': // Handle User model specifically if needed, or rely on generic
111-
final repo = context.read<HtDataRepository<User>>();
111+
final repo = context.read<DataRepository<User>>();
112112
item = await repo.read(id: id, userId: userIdForRepoCall);
113113
case 'user_app_settings': // New case for UserAppSettings
114-
final repo = context.read<HtDataRepository<UserAppSettings>>();
114+
final repo = context.read<DataRepository<UserAppSettings>>();
115115
item = await repo.read(id: id, userId: userIdForRepoCall);
116116
case 'user_content_preferences': // New case for UserContentPreferences
117-
final repo = context.read<HtDataRepository<UserContentPreferences>>();
117+
final repo = context.read<DataRepository<UserContentPreferences>>();
118118
item = await repo.read(id: id, userId: userIdForRepoCall);
119119
case 'remote_config': // New case for RemoteConfig (read by admin)
120-
final repo = context.read<HtDataRepository<RemoteConfig>>();
120+
final repo = context.read<DataRepository<RemoteConfig>>();
121121
item = await repo.read(
122122
id: id,
123123
userId: userIdForRepoCall,
@@ -240,7 +240,7 @@ Future<Response> _handlePut(
240240
authenticatedUser,
241241
itemToUpdate,
242242
);
243-
} on HtHttpException {
243+
} on HttpException {
244244
// Propagate known exceptions from the limit service (e.g., ForbiddenException)
245245
rethrow;
246246
} catch (e, s) {
@@ -275,7 +275,7 @@ Future<Response> _handlePut(
275275
switch (modelName) {
276276
case 'headline':
277277
{
278-
final repo = context.read<HtDataRepository<Headline>>();
278+
final repo = context.read<DataRepository<Headline>>();
279279
updatedItem = await repo.update(
280280
id: id,
281281
item: itemToUpdate as Headline,
@@ -284,7 +284,7 @@ Future<Response> _handlePut(
284284
}
285285
case 'topic':
286286
{
287-
final repo = context.read<HtDataRepository<Topic>>();
287+
final repo = context.read<DataRepository<Topic>>();
288288
updatedItem = await repo.update(
289289
id: id,
290290
item: itemToUpdate as Topic,
@@ -293,7 +293,7 @@ Future<Response> _handlePut(
293293
}
294294
case 'source':
295295
{
296-
final repo = context.read<HtDataRepository<Source>>();
296+
final repo = context.read<DataRepository<Source>>();
297297
updatedItem = await repo.update(
298298
id: id,
299299
item: itemToUpdate as Source,
@@ -302,7 +302,7 @@ Future<Response> _handlePut(
302302
}
303303
case 'country':
304304
{
305-
final repo = context.read<HtDataRepository<Country>>();
305+
final repo = context.read<DataRepository<Country>>();
306306
updatedItem = await repo.update(
307307
id: id,
308308
item: itemToUpdate as Country,
@@ -311,7 +311,7 @@ Future<Response> _handlePut(
311311
}
312312
case 'user':
313313
{
314-
final repo = context.read<HtDataRepository<User>>();
314+
final repo = context.read<DataRepository<User>>();
315315
updatedItem = await repo.update(
316316
id: id,
317317
item: itemToUpdate as User,
@@ -320,7 +320,7 @@ Future<Response> _handlePut(
320320
}
321321
case 'user_app_settings': // New case for UserAppSettings
322322
{
323-
final repo = context.read<HtDataRepository<UserAppSettings>>();
323+
final repo = context.read<DataRepository<UserAppSettings>>();
324324
updatedItem = await repo.update(
325325
id: id,
326326
item: itemToUpdate as UserAppSettings,
@@ -329,7 +329,7 @@ Future<Response> _handlePut(
329329
}
330330
case 'user_content_preferences': // New case for UserContentPreferences
331331
{
332-
final repo = context.read<HtDataRepository<UserContentPreferences>>();
332+
final repo = context.read<DataRepository<UserContentPreferences>>();
333333
updatedItem = await repo.update(
334334
id: id,
335335
item: itemToUpdate as UserContentPreferences,
@@ -338,7 +338,7 @@ Future<Response> _handlePut(
338338
}
339339
case 'remote_config': // New case for RemoteConfig (update by admin)
340340
{
341-
final repo = context.read<HtDataRepository<RemoteConfig>>();
341+
final repo = context.read<DataRepository<RemoteConfig>>();
342342
updatedItem = await repo.update(
343343
id: id,
344344
item: itemToUpdate as RemoteConfig,
@@ -443,28 +443,28 @@ Future<Response> _handleDelete(
443443
// Repository exceptions (like NotFoundException) will propagate up to the errorHandler.
444444
switch (modelName) {
445445
case 'headline':
446-
final repo = context.read<HtDataRepository<Headline>>();
446+
final repo = context.read<DataRepository<Headline>>();
447447
itemToDelete = await repo.read(id: id, userId: userIdForRepoCall);
448448
case 'topic':
449-
final repo = context.read<HtDataRepository<Topic>>();
449+
final repo = context.read<DataRepository<Topic>>();
450450
itemToDelete = await repo.read(id: id, userId: userIdForRepoCall);
451451
case 'source':
452-
final repo = context.read<HtDataRepository<Source>>();
452+
final repo = context.read<DataRepository<Source>>();
453453
itemToDelete = await repo.read(id: id, userId: userIdForRepoCall);
454454
case 'country':
455-
final repo = context.read<HtDataRepository<Country>>();
455+
final repo = context.read<DataRepository<Country>>();
456456
itemToDelete = await repo.read(id: id, userId: userIdForRepoCall);
457457
case 'user':
458-
final repo = context.read<HtDataRepository<User>>();
458+
final repo = context.read<DataRepository<User>>();
459459
itemToDelete = await repo.read(id: id, userId: userIdForRepoCall);
460460
case 'user_app_settings': // New case for UserAppSettings
461-
final repo = context.read<HtDataRepository<UserAppSettings>>();
461+
final repo = context.read<DataRepository<UserAppSettings>>();
462462
itemToDelete = await repo.read(id: id, userId: userIdForRepoCall);
463463
case 'user_content_preferences': // New case for UserContentPreferences
464-
final repo = context.read<HtDataRepository<UserContentPreferences>>();
464+
final repo = context.read<DataRepository<UserContentPreferences>>();
465465
itemToDelete = await repo.read(id: id, userId: userIdForRepoCall);
466466
case 'remote_config': // New case for RemoteConfig (delete by admin)
467-
final repo = context.read<HtDataRepository<RemoteConfig>>();
467+
final repo = context.read<DataRepository<RemoteConfig>>();
468468
itemToDelete = await repo.read(
469469
id: id,
470470
userId: userIdForRepoCall,
@@ -498,42 +498,42 @@ Future<Response> _handleDelete(
498498
// upwards to be handled by the standard error handling mechanism.
499499
switch (modelName) {
500500
case 'headline':
501-
await context.read<HtDataRepository<Headline>>().delete(
501+
await context.read<DataRepository<Headline>>().delete(
502502
id: id,
503503
userId: userIdForRepoCall,
504504
);
505505
case 'topic':
506-
await context.read<HtDataRepository<Topic>>().delete(
506+
await context.read<DataRepository<Topic>>().delete(
507507
id: id,
508508
userId: userIdForRepoCall,
509509
);
510510
case 'source':
511-
await context.read<HtDataRepository<Source>>().delete(
511+
await context.read<DataRepository<Source>>().delete(
512512
id: id,
513513
userId: userIdForRepoCall,
514514
);
515515
case 'country':
516-
await context.read<HtDataRepository<Country>>().delete(
516+
await context.read<DataRepository<Country>>().delete(
517517
id: id,
518518
userId: userIdForRepoCall,
519519
);
520520
case 'user':
521-
await context.read<HtDataRepository<User>>().delete(
521+
await context.read<DataRepository<User>>().delete(
522522
id: id,
523523
userId: userIdForRepoCall,
524524
);
525525
case 'user_app_settings': // New case for UserAppSettings
526-
await context.read<HtDataRepository<UserAppSettings>>().delete(
526+
await context.read<DataRepository<UserAppSettings>>().delete(
527527
id: id,
528528
userId: userIdForRepoCall,
529529
);
530530
case 'user_content_preferences': // New case for UserContentPreferences
531-
await context.read<HtDataRepository<UserContentPreferences>>().delete(
531+
await context.read<DataRepository<UserContentPreferences>>().delete(
532532
id: id,
533533
userId: userIdForRepoCall,
534534
);
535535
case 'remote_config': // New case for RemoteConfig (delete by admin)
536-
await context.read<HtDataRepository<RemoteConfig>>().delete(
536+
await context.read<DataRepository<RemoteConfig>>().delete(
537537
id: id,
538538
userId: userIdForRepoCall,
539539
); // userId should be null for AppConfig

‎routes/api/v1/data/_middleware.dart‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1+
import 'package:core/core.dart';
12
import 'package:dart_frog/dart_frog.dart';
2-
import 'package:ht_api/src/middlewares/authentication_middleware.dart';
3-
import 'package:ht_api/src/middlewares/authorization_middleware.dart'; // Import authorization middleware
4-
import 'package:ht_api/src/registry/model_registry.dart';
5-
import 'package:ht_shared/ht_shared.dart';
3+
import 'package:flutter_news_app_api_server_full_source_code/src/middlewares/authentication_middleware.dart';
4+
import 'package:flutter_news_app_api_server_full_source_code/src/middlewares/authorization_middleware.dart'; // Import authorization middleware
5+
import 'package:flutter_news_app_api_server_full_source_code/src/registry/model_registry.dart';
66

77
/// Middleware specific to the generic `/api/v1/data` route path.
88
///

‎routes/api/v1/data/index.dart‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
import 'dart:convert';
22
import 'dart:io';
33

4+
import 'package:core/core.dart';
45
import 'package:dart_frog/dart_frog.dart';
5-
import 'package:ht_api/src/helpers/response_helper.dart';
6-
import 'package:ht_api/src/rbac/permission_service.dart';
7-
import 'package:ht_api/src/registry/model_registry.dart';
8-
import 'package:ht_data_repository/ht_data_repository.dart';
9-
import 'package:ht_shared/ht_shared.dart';
6+
import 'package:data_repository/data_repository.dart';
7+
import 'package:flutter_news_app_api_server_full_source_code/src/helpers/response_helper.dart';
8+
import 'package:flutter_news_app_api_server_full_source_code/src/rbac/permission_service.dart';
9+
import 'package:flutter_news_app_api_server_full_source_code/src/registry/model_registry.dart';
1010
import 'package:mongo_dart/mongo_dart.dart';
1111

1212
/// Handles requests for the /api/v1/data collection endpoint.
@@ -86,39 +86,39 @@ Future<Response> _handleGet(RequestContext context) async {
8686
// The query logic is handled by the repository/client.
8787
switch (modelName) {
8888
case 'headline':
89-
final repo = context.read<HtDataRepository<Headline>>();
89+
final repo = context.read<DataRepository<Headline>>();
9090
responseData = await repo.readAll(
9191
userId: userIdForRepoCall,
9292
filter: filter,
9393
sort: sort,
9494
pagination: pagination,
9595
);
9696
case 'topic':
97-
final repo = context.read<HtDataRepository<Topic>>();
97+
final repo = context.read<DataRepository<Topic>>();
9898
responseData = await repo.readAll(
9999
userId: userIdForRepoCall,
100100
filter: filter,
101101
sort: sort,
102102
pagination: pagination,
103103
);
104104
case 'source':
105-
final repo = context.read<HtDataRepository<Source>>();
105+
final repo = context.read<DataRepository<Source>>();
106106
responseData = await repo.readAll(
107107
userId: userIdForRepoCall,
108108
filter: filter,
109109
sort: sort,
110110
pagination: pagination,
111111
);
112112
case 'country':
113-
final repo = context.read<HtDataRepository<Country>>();
113+
final repo = context.read<DataRepository<Country>>();
114114
responseData = await repo.readAll(
115115
userId: userIdForRepoCall,
116116
filter: filter,
117117
sort: sort,
118118
pagination: pagination,
119119
);
120120
case 'user':
121-
final repo = context.read<HtDataRepository<User>>();
121+
final repo = context.read<DataRepository<User>>();
122122
responseData = await repo.readAll(
123123
userId: userIdForRepoCall,
124124
filter: filter,
@@ -178,31 +178,31 @@ Future<Response> _handlePost(RequestContext context) async {
178178
dynamic createdItem;
179179
switch (modelName) {
180180
case 'headline':
181-
final repo = context.read<HtDataRepository<Headline>>();
181+
final repo = context.read<DataRepository<Headline>>();
182182
createdItem = await repo.create(
183183
item: itemToCreate as Headline,
184184
userId: userIdForRepoCall,
185185
);
186186
case 'topic':
187-
final repo = context.read<HtDataRepository<Topic>>();
187+
final repo = context.read<DataRepository<Topic>>();
188188
createdItem = await repo.create(
189189
item: itemToCreate as Topic,
190190
userId: userIdForRepoCall,
191191
);
192192
case 'source':
193-
final repo = context.read<HtDataRepository<Source>>();
193+
final repo = context.read<DataRepository<Source>>();
194194
createdItem = await repo.create(
195195
item: itemToCreate as Source,
196196
userId: userIdForRepoCall,
197197
);
198198
case 'country':
199-
final repo = context.read<HtDataRepository<Country>>();
199+
final repo = context.read<DataRepository<Country>>();
200200
createdItem = await repo.create(
201201
item: itemToCreate as Country,
202202
userId: userIdForRepoCall,
203203
);
204204
case 'remote_config':
205-
final repo = context.read<HtDataRepository<RemoteConfig>>();
205+
final repo = context.read<DataRepository<RemoteConfig>>();
206206
createdItem = await repo.create(
207207
item: itemToCreate as RemoteConfig,
208208
userId: userIdForRepoCall,

0 commit comments

Comments
 (0)