Skip to content

Commit c16bc4f

Browse files
fullenifulleni
committed
style: format
1 parent 3747b47 commit c16bc4f

File tree

7 files changed

+58
-50
lines changed

7 files changed

+58
-50
lines changed

‎lib/src/config/app_dependencies.dart

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ class AppDependencies {
4949
late final HtDataRepository<User> userRepository;
5050
late final HtDataRepository<UserAppSettings> userAppSettingsRepository;
5151
late final HtDataRepository<UserContentPreferences>
52-
userContentPreferencesRepository;
52+
userContentPreferencesRepository;
5353
late final HtDataRepository<RemoteConfig> remoteConfigRepository;
5454
late final HtEmailRepository emailRepository;
5555

@@ -134,12 +134,12 @@ class AppDependencies {
134134
);
135135
final userContentPreferencesClient =
136136
HtDataMongodb<UserContentPreferences>(
137-
connectionManager: _mongoDbConnectionManager,
138-
modelName: 'user_content_preferences',
139-
fromJson: UserContentPreferences.fromJson,
140-
toJson: (item) => item.toJson(),
141-
logger: Logger('HtDataMongodb<UserContentPreferences>'),
142-
);
137+
connectionManager: _mongoDbConnectionManager,
138+
modelName: 'user_content_preferences',
139+
fromJson: UserContentPreferences.fromJson,
140+
toJson: (item) => item.toJson(),
141+
logger: Logger('HtDataMongodb<UserContentPreferences>'),
142+
);
143143
final remoteConfigClient = HtDataMongodb<RemoteConfig>(
144144
connectionManager: _mongoDbConnectionManager,
145145
modelName: 'remote_configs',
@@ -154,12 +154,13 @@ class AppDependencies {
154154
sourceRepository = HtDataRepository(dataClient: sourceClient);
155155
countryRepository = HtDataRepository(dataClient: countryClient);
156156
userRepository = HtDataRepository(dataClient: userClient);
157-
userAppSettingsRepository =
158-
HtDataRepository(dataClient: userAppSettingsClient);
159-
userContentPreferencesRepository =
160-
HtDataRepository(dataClient: userContentPreferencesClient);
161-
remoteConfigRepository =
162-
HtDataRepository(dataClient: remoteConfigClient);
157+
userAppSettingsRepository = HtDataRepository(
158+
dataClient: userAppSettingsClient,
159+
);
160+
userContentPreferencesRepository = HtDataRepository(
161+
dataClient: userContentPreferencesClient,
162+
);
163+
remoteConfigRepository = HtDataRepository(dataClient: remoteConfigClient);
163164

164165
final emailClient = HtEmailInMemoryClient(
165166
logger: Logger('HtEmailInMemoryClient'),
@@ -176,8 +177,7 @@ class AppDependencies {
176177
uuidGenerator: const Uuid(),
177178
log: Logger('JwtAuthTokenService'),
178179
);
179-
verificationCodeStorageService =
180-
InMemoryVerificationCodeStorageService();
180+
verificationCodeStorageService = InMemoryVerificationCodeStorageService();
181181
permissionService = const PermissionService();
182182
authService = AuthService(
183183
userRepository: userRepository,
@@ -219,4 +219,4 @@ class AppDependencies {
219219
_isInitialized = false;
220220
_log.info('Application dependencies disposed.');
221221
}
222-
}
222+
}

‎lib/src/config/environment_config.dart

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,15 +43,19 @@ abstract final class EnvironmentConfig {
4343
env.load([envPath]); // Load variables from the found .env file
4444
return env; // Return immediately upon finding
4545
} else {
46-
_log.warning('pubspec.yaml found, but no .env in the same directory.');
46+
_log.warning(
47+
'pubspec.yaml found, but no .env in the same directory.',
48+
);
4749
break; // Stop searching since pubspec.yaml should contain .env
4850
}
4951
}
5052
currentDir = currentDir.parent; // Move to the parent directory
5153
_log.finer('Moving up to parent directory: ${currentDir.path}');
5254
}
5355
// If loop completes without returning, .env was not found
54-
_log.warning('.env not found by searching. Falling back to default load().');
56+
_log.warning(
57+
'.env not found by searching. Falling back to default load().',
58+
);
5559
env.load(); // Fallback to default load
5660
return env; // Return even if fallback
5761
}

‎lib/src/middlewares/error_handler.dart

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,8 @@ Middleware errorHandler() {
2929
} on CheckedFromJsonException catch (e, stackTrace) {
3030
// Handle json_serializable validation errors. These are client errors.
3131
final field = e.key ?? 'unknown';
32-
final message = 'Invalid request body: Field "$field" has an '
32+
final message =
33+
'Invalid request body: Field "$field" has an '
3334
'invalid value or is missing. ${e.message}';
3435
print('CheckedFromJsonException Caught: $e\n$stackTrace');
3536
return _jsonErrorResponse(
@@ -50,7 +51,9 @@ Middleware errorHandler() {
5051
print('Unhandled Exception Caught: $e\n$stackTrace');
5152
return _jsonErrorResponse(
5253
statusCode: HttpStatus.internalServerError, // 500
53-
exception: const UnknownException('An unexpected internal server error occurred.'),
54+
exception: const UnknownException(
55+
'An unexpected internal server error occurred.',
56+
),
5457
context: context,
5558
);
5659
}
@@ -137,7 +140,9 @@ Response _jsonErrorResponse({
137140

138141
return Response.json(
139142
statusCode: statusCode,
140-
body: {'error': {'code': errorCode, 'message': exception.message}},
143+
body: {
144+
'error': {'code': errorCode, 'message': exception.message},
145+
},
141146
headers: headers,
142147
);
143148
}

‎lib/src/services/auth_service.dart

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -23,14 +23,14 @@ class AuthService {
2323
required HtEmailRepository emailRepository,
2424
required HtDataRepository<UserAppSettings> userAppSettingsRepository,
2525
required HtDataRepository<UserContentPreferences>
26-
userContentPreferencesRepository,
26+
userContentPreferencesRepository,
2727
required PermissionService permissionService,
2828
required Uuid uuidGenerator,
2929
required Logger log,
3030
}) : _userRepository = userRepository,
3131
_authTokenService = authTokenService,
3232
_verificationCodeStorageService = verificationCodeStorageService,
33-
_permissionService = permissionService,
33+
_permissionService = permissionService,
3434
_emailRepository = emailRepository,
3535
_userAppSettingsRepository = userAppSettingsRepository,
3636
_userContentPreferencesRepository = userContentPreferencesRepository,
@@ -43,7 +43,7 @@ class AuthService {
4343
final HtEmailRepository _emailRepository;
4444
final HtDataRepository<UserAppSettings> _userAppSettingsRepository;
4545
final HtDataRepository<UserContentPreferences>
46-
_userContentPreferencesRepository;
46+
_userContentPreferencesRepository;
4747
final PermissionService _permissionService;
4848
final Logger _log;
4949
final Uuid _uuid;
@@ -83,7 +83,10 @@ class AuthService {
8383
throw const UnauthorizedException(
8484
'This email address is not registered for dashboard access.',
8585
);
86-
} else if (!_permissionService.hasPermission(user, Permissions.dashboardLogin)) {
86+
} else if (!_permissionService.hasPermission(
87+
user,
88+
Permissions.dashboardLogin,
89+
)) {
8790
_log.warning(
8891
'Dashboard login failed: User ${user.id} lacks required permission (${Permissions.dashboardLogin}).',
8992
);
@@ -273,7 +276,9 @@ class AuthService {
273276
rethrow;
274277
} catch (e, s) {
275278
_log.severe(
276-
'Unexpected error during user lookup/creation for $email: $e', e, s,
279+
'Unexpected error during user lookup/creation for $email: $e',
280+
e,
281+
s,
277282
);
278283
throw const OperationFailedException('Failed to process user account.');
279284
}
@@ -652,9 +657,7 @@ class AuthService {
652657
/// Re-throws any [HtHttpException] from the repository.
653658
Future<User?> _findUserByEmail(String email) async {
654659
try {
655-
final response = await _userRepository.readAll(
656-
filter: {'email': email},
657-
);
660+
final response = await _userRepository.readAll(filter: {'email': email});
658661
if (response.items.isNotEmpty) {
659662
return response.items.first;
660663
}

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,3 @@ Handler middleware(Handler handler) {
1616
// `/api/v1/data/_middleware.dart` (authn, authz, model validation).
1717
return handler.use(ownershipCheckMiddleware());
1818
}
19-

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

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -191,9 +191,7 @@ Future<Response> _handlePut(
191191
itemToUpdate = modelConfig.fromJson(requestBody);
192192
} on TypeError catch (e) {
193193
// Catch errors during deserialization (e.g., missing required fields)
194-
print(
195-
'Deserialization TypeError in PUT /data/[id]: $e',
196-
);
194+
print('Deserialization TypeError in PUT /data/[id]: $e');
197195
// Throw BadRequestException to be caught by the errorHandler
198196
throw const BadRequestException(
199197
'Invalid request body: Missing or invalid required field(s).',

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

Lines changed: 16 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -50,17 +50,14 @@ Future<Response> _handleGet(RequestContext context) async {
5050
List<SortOption>? sort;
5151
if (params.containsKey('sort')) {
5252
try {
53-
sort = params['sort']!
54-
.split(',')
55-
.map((s) {
56-
final parts = s.split(':');
57-
final field = parts[0];
58-
final order = (parts.length > 1 && parts[1] == 'desc')
59-
? SortOrder.desc
60-
: SortOrder.asc;
61-
return SortOption(field, order);
62-
})
63-
.toList();
53+
sort = params['sort']!.split(',').map((s) {
54+
final parts = s.split(':');
55+
final field = parts[0];
56+
final order = (parts.length > 1 && parts[1] == 'desc')
57+
? SortOrder.desc
58+
: SortOrder.asc;
59+
return SortOption(field, order);
60+
}).toList();
6461
} catch (e) {
6562
throw const BadRequestException(
6663
'Invalid "sort" parameter format. Use "field:order,field2:order".',
@@ -76,7 +73,8 @@ Future<Response> _handleGet(RequestContext context) async {
7673
}
7774

7875
// --- Repository Call ---
79-
final userIdForRepoCall = (modelConfig.getOwnerId != null &&
76+
final userIdForRepoCall =
77+
(modelConfig.getOwnerId != null &&
8078
!context.read<PermissionService>().isAdmin(authenticatedUser))
8179
? authenticatedUser.id
8280
: null;
@@ -135,9 +133,9 @@ Future<Response> _handleGet(RequestContext context) async {
135133
return ResponseHelper.success(
136134
context: context,
137135
data: responseData,
138-
toJsonT: (paginated) =>
139-
(paginated as PaginatedResponse<dynamic>).toJson(
140-
(item) => (item as dynamic).toJson() as Map<String, dynamic>),
136+
toJsonT: (paginated) => (paginated as PaginatedResponse<dynamic>).toJson(
137+
(item) => (item as dynamic).toJson() as Map<String, dynamic>,
138+
),
141139
);
142140
}
143141

@@ -164,7 +162,8 @@ Future<Response> _handlePost(RequestContext context) async {
164162
}
165163

166164
// --- Repository Call ---
167-
final userIdForRepoCall = (modelConfig.getOwnerId != null &&
165+
final userIdForRepoCall =
166+
(modelConfig.getOwnerId != null &&
168167
!context.read<PermissionService>().isAdmin(authenticatedUser))
169168
? authenticatedUser.id
170169
: null;
@@ -213,4 +212,4 @@ Future<Response> _handlePost(RequestContext context) async {
213212
toJsonT: (item) => (item as dynamic).toJson() as Map<String, dynamic>,
214213
statusCode: HttpStatus.created,
215214
);
216-
}
215+
}

0 commit comments

Comments
 (0)