refactor: remove unused comments and imports

- Removed unused imports
- Removed commented out code
- Improved code readability

Author: fulleni

analysis_options.yaml

@@ -7,6 +7,7 @@ analyzer:
     avoid_catches_without_on_clauses: ignore
     lines_longer_than_80_chars: ignore
     avoid_dynamic_calls: ignore
+    avoid_catching_errors: ignore
   exclude:
     - build/**
 linter:

routes/_middleware.dart

@@ -1,7 +1,3 @@
-// routes/_middleware.dart
-//
-// ignore_for_file: avoid_slow_async_io, avoid_catches_without_on_clauses
-
 import 'dart:convert';
 import 'dart:io';
 
@@ -10,19 +6,17 @@ import 'package:ht_api/src/middlewares/error_handler.dart';
 import 'package:ht_api/src/registry/model_registry.dart';
 import 'package:ht_api/src/services/auth_service.dart';
 import 'package:ht_api/src/services/auth_token_service.dart';
-// Import the JWT service and blacklist service
 import 'package:ht_api/src/services/jwt_auth_token_service.dart';
 import 'package:ht_api/src/services/token_blacklist_service.dart';
 import 'package:ht_api/src/services/verification_code_storage_service.dart';
-// Import HtAppSettingsClient interface
 import 'package:ht_app_settings_client/ht_app_settings_client.dart';
 import 'package:ht_app_settings_inmemory/ht_app_settings_inmemory.dart';
 import 'package:ht_data_inmemory/ht_data_inmemory.dart';
 import 'package:ht_data_repository/ht_data_repository.dart';
 import 'package:ht_email_inmemory/ht_email_inmemory.dart';
 import 'package:ht_email_repository/ht_email_repository.dart';
 import 'package:ht_shared/ht_shared.dart';
-import 'package:uuid/uuid.dart'; // Import the uuid package
+import 'package:uuid/uuid.dart';
 
 // --- Request ID Wrapper ---
 
@@ -68,14 +62,13 @@ class RequestId {
 
 // --- Helper Function to Load Fixtures ---
 // Note:
-// Error handling here is basic. In a real app,
-// consider more robust file checks.
+// Error handling here is basic, consider more robust file checks.
 // ignore: unused_element
 Future<List<Map<String, dynamic>>> _loadFixture(String fileName) async {
   final path = 'lib/src/fixtures/$fileName';
   try {
     final file = File(path);
-    if (!await file.exists()) {
+    if (!file.existsSync()) {
       print('Warning: Fixture file not found at $path. Returning empty list.');
       return [];
     }
@@ -168,7 +161,7 @@ Handler middleware(Handler handler) {
   final categoryRepository = _createCategoryRepository();
   final sourceRepository = _createSourceRepository();
   final countryRepository = _createCountryRepository();
-  final settingsClientImpl = HtAppSettingsInMemory(); // Using in-memory for now
+  final settingsClientImpl = HtAppSettingsInMemory();
   const uuid = Uuid();
 
   // --- Auth Dependencies ---

routes/api/v1/auth/anonymous.dart

@@ -2,7 +2,6 @@ import 'dart:io';
 
 import 'package:dart_frog/dart_frog.dart';
 import 'package:ht_api/src/services/auth_service.dart';
-// Import exceptions, User, SuccessApiResponse, AND AuthSuccessResponse
 import 'package:ht_shared/ht_shared.dart';
 
 /// Handles POST requests to `/api/v1/auth/anonymous`.

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

@@ -1,32 +1,8 @@
-//
-// ignore_for_file: lines_longer_than_80_chars, no_default_cases, avoid_catches_without_on_clauses, avoid_catching_errors
-
 import 'dart:io';
 
-// --- Error Handling Strategy ---
-// Route-specific handlers (_handleGet, _handlePut, _handleDelete, etc.) should
-// generally allow HtHttpExceptions (like NotFoundException, BadRequestException)
-// and FormatExceptions thrown by lower layers (Repositories, Clients, JSON parsing)
-// to propagate upwards.
-//
-// These specific exceptions are caught and re-thrown by the main `onRequest`
-// handler in this file.
-//
-// The centralized `errorHandler` middleware (defined in lib/src/middlewares/)
-// is responsible for catching these re-thrown exceptions and mapping them to
-// appropriate, standardized JSON error responses (e.g., 400, 404, 500).
-//
-// Local try-catch blocks within specific _handle* methods should be reserved
-// for handling errors that require immediate, localized responses (like the
-// TypeError during deserialization in _handlePut) or for logging specific
-// context before allowing propagation.
-
 import 'package:dart_frog/dart_frog.dart';
-// Import RequestId from the middleware file where it's defined
 import 'package:ht_api/src/registry/model_registry.dart';
 import 'package:ht_data_repository/ht_data_repository.dart';
-// Import exceptions
-// Import models, SuccessApiResponse, ResponseMetadata
 import 'package:ht_shared/ht_shared.dart';
 
 import '../../../_middleware.dart';
@@ -48,7 +24,7 @@ Future<Response> onRequest(RequestContext context, String id) async {
           context,
           id,
           modelName,
-          modelConfig, // Pass modelConfig
+          modelConfig,
           authenticatedUser,
           requestId,
         );
@@ -66,11 +42,10 @@ Future<Response> onRequest(RequestContext context, String id) async {
           context,
           id,
           modelName,
-          modelConfig, // Pass modelConfig
+          modelConfig,
           authenticatedUser,
           requestId,
         );
-      // Add cases for other methods if needed in the future
       default:
         // Methods not allowed on the item endpoint
         return Response(statusCode: HttpStatus.methodNotAllowed);
@@ -101,11 +76,11 @@ Future<Response> _handleGet(
   RequestContext context,
   String id,
   String modelName,
-  ModelConfig<dynamic> modelConfig, // Receive modelConfig
-  User authenticatedUser, // Receive authenticatedUser
+  ModelConfig<dynamic> modelConfig,
+  User authenticatedUser,
   String requestId,
 ) async {
-  dynamic item; // Use dynamic
+  dynamic item;
 
   String? userIdForRepoCall;
   if (modelConfig.ownership == ModelOwnership.userOwned) {
@@ -179,7 +154,7 @@ Future<Response> _handlePut(
   String id,
   String modelName,
   ModelConfig<dynamic> modelConfig,
-  User authenticatedUser, // Receive authenticatedUser
+  User authenticatedUser,
   String requestId,
 ) async {
   final requestBody = await context.request.json() as Map<String, dynamic>?;
@@ -191,7 +166,7 @@ Future<Response> _handlePut(
   }
 
   // Deserialize using ModelConfig's fromJson, catching TypeErrors locally
-  dynamic itemToUpdate; // Use dynamic initially
+  dynamic itemToUpdate;
   try {
     itemToUpdate = modelConfig.fromJson(requestBody);
   } on TypeError catch (e) {
@@ -213,14 +188,14 @@ Future<Response> _handlePut(
     );
   }
 
-  dynamic updatedItem; // Use dynamic
+  dynamic updatedItem;
 
   String? userIdForRepoCall;
   if (modelConfig.ownership == ModelOwnership.userOwned) {
     userIdForRepoCall = authenticatedUser.id;
   } else {
-    // For global models, update might imply admin rights.
-    // For now, pass null, assuming repo handles global updates or has other checks.
+    // TODO(fulleni): For global models, update might imply admin rights.
+    // For now, pass null, consider adding an admin user check.
     userIdForRepoCall = null;
   }
 
@@ -326,7 +301,7 @@ Future<Response> _handlePut(
   // Wrap the updated item in SuccessApiResponse with metadata
   final successResponse = SuccessApiResponse<dynamic>(
     data: updatedItem,
-    metadata: metadata, // Include the created metadata
+    metadata: metadata,
   );
 
   // Provide the correct toJsonT for the specific model type
@@ -344,16 +319,16 @@ Future<Response> _handleDelete(
   RequestContext context,
   String id,
   String modelName,
-  ModelConfig<dynamic> modelConfig, // Receive modelConfig
-  User authenticatedUser, // Receive authenticatedUser
+  ModelConfig<dynamic> modelConfig,
+  User authenticatedUser,
   String requestId,
 ) async {
   String? userIdForRepoCall;
   if (modelConfig.ownership == ModelOwnership.userOwned) {
     userIdForRepoCall = authenticatedUser.id;
   } else {
-    // For global models, delete might imply admin rights.
-    // For now, pass null.
+    // TODO(fulleni): For global models, update might imply admin rights.
+    // For now, pass null, consider adding an admin user check.
     userIdForRepoCall = null;
   }
 

routes/api/v1/data/_middleware.dart

@@ -1,6 +1,3 @@
-//
-// ignore_for_file: lines_longer_than_80_chars
-
 import 'package:dart_frog/dart_frog.dart';
 import 'package:ht_api/src/middlewares/authentication_middleware.dart';
 import 'package:ht_api/src/registry/model_registry.dart';

routes/api/v1/data/index.dart

@@ -1,32 +1,8 @@
-//
-// ignore_for_file: lines_longer_than_80_chars, no_default_cases, avoid_catches_without_on_clauses, avoid_catching_errors
-
 import 'dart:io';
 
-// --- Error Handling Strategy ---
-// Route-specific handlers (_handleGet, _handlePost, etc.) should generally
-// allow HtHttpExceptions (like NotFoundException, BadRequestException)
-// and FormatExceptions thrown by lower layers (Repositories, Clients, JSON parsing)
-// to propagate upwards.
-//
-// These specific exceptions are caught and re-thrown by the main `onRequest`
-// handler in this file.
-//
-// The centralized `errorHandler` middleware (defined in lib/src/middlewares/)
-// is responsible for catching these re-thrown exceptions and mapping them to
-// appropriate, standardized JSON error responses (e.g., 400, 404, 500).
-//
-// Local try-catch blocks within specific _handle* methods should be reserved
-// for handling errors that require immediate, localized responses (like the
-// TypeError during deserialization in _handlePost) or for logging specific
-// context before allowing propagation.
-
 import 'package:dart_frog/dart_frog.dart';
-// Import RequestId from the middleware file where it's defined
 import 'package:ht_api/src/registry/model_registry.dart';
 import 'package:ht_data_repository/ht_data_repository.dart';
-// Import exceptions
-// Import models, SuccessApiResponse, PaginatedResponse, ResponseMetadata
 import 'package:ht_shared/ht_shared.dart';
 
 import '../../../_middleware.dart';
@@ -47,7 +23,7 @@ Future<Response> onRequest(RequestContext context) async {
         return await _handleGet(
           context,
           modelName,
-          modelConfig, // Pass modelConfig
+          modelConfig,
           authenticatedUser,
           requestId,
         );
@@ -89,8 +65,8 @@ Future<Response> onRequest(RequestContext context) async {
 Future<Response> _handleGet(
   RequestContext context,
   String modelName,
-  ModelConfig<dynamic> modelConfig, // Receive modelConfig
-  User authenticatedUser, // Receive authenticatedUser
+  ModelConfig<dynamic> modelConfig,
+  User authenticatedUser,
   String requestId,
 ) async {
   // Read query parameters
@@ -104,7 +80,7 @@ Future<Response> _handleGet(
     ..remove('limit');
 
   // Process based on model type
-  PaginatedResponse<dynamic> paginatedResponse; // Use dynamic for the list
+  PaginatedResponse<dynamic> paginatedResponse;
 
   String? userIdForRepoCall;
   if (modelConfig.ownership == ModelOwnership.userOwned) {
@@ -222,7 +198,7 @@ Future<Response> _handlePost(
   RequestContext context,
   String modelName,
   ModelConfig<dynamic> modelConfig,
-  User authenticatedUser, // Receive authenticatedUser
+  User authenticatedUser,
   String requestId,
 ) async {
   final requestBody = await context.request.json() as Map<String, dynamic>?;
@@ -234,7 +210,7 @@ Future<Response> _handlePost(
   }
 
   // Deserialize using ModelConfig's fromJson, catching TypeErrors
-  dynamic newItem; // Use dynamic initially
+  dynamic newItem;
   try {
     newItem = modelConfig.fromJson(requestBody);
   } on TypeError catch (e) {
@@ -255,15 +231,14 @@ Future<Response> _handlePost(
   }
 
   // Process based on model type
-  dynamic createdItem; // Use dynamic
+  dynamic createdItem;
 
   String? userIdForRepoCall;
   if (modelConfig.ownership == ModelOwnership.userOwned) {
     userIdForRepoCall = authenticatedUser.id;
   } else {
-    // For global models, creation might imply admin rights or specific logic.
-    // For now, we pass null, assuming the repository handles global creation.
-    // Or, a check could be added here: if global and user is not admin, throw Forbidden.
+    // TODO(fulleni): For global models, update might imply admin rights.
+    // For now, pass null, consider adding an admin user check.
     userIdForRepoCall = null;
   }
 
@@ -325,7 +300,7 @@ Future<Response> _handlePost(
   // Wrap the created item in SuccessApiResponse with metadata
   final successResponse = SuccessApiResponse<dynamic>(
     data: createdItem,
-    metadata: metadata, // Include the created metadata
+    metadata: metadata,
   );
 
   // Provide the correct toJsonT for the specific model type

routes/api/v1/users/[userId]/settings/display.dart

@@ -1,22 +1,16 @@
-//
-// ignore_for_file: lines_longer_than_80_chars, avoid_catches_without_on_clauses
-
 import 'dart:io';
 
 import 'package:dart_frog/dart_frog.dart';
 import 'package:ht_app_settings_client/ht_app_settings_client.dart';
 import 'package:ht_app_settings_repository/ht_app_settings_repository.dart';
 import 'package:ht_shared/ht_shared.dart';
 
-// Import RequestId from the root middleware file
-// Note: RequestId is provided by routes/_middleware.dart
-// User is provided by authentication_middleware.dart via routes/api/v1/users/[userId]/settings/_middleware.dart
 import '../../../../../_middleware.dart' show RequestId;
 
 /// Handles requests for the /api/v1/users/{userId}/settings/display endpoint.
 Future<Response> onRequest(
   RequestContext context,
-  String userIdFromPath, // userId from the path parameter
+  String userIdFromPath,
 ) async {
   // Read dependencies provided by middleware
   final requestId = context.read<RequestId>().id;
@@ -60,7 +54,7 @@ Future<Response> onRequest(
 // --- GET Handler ---
 Future<Response> _handleGet(
   RequestContext context,
-  User authenticatedUser, // Receive the authenticated user
+  User authenticatedUser,
   String requestId,
 ) async {
   // Read the HtAppSettingsClient to instantiate a user-scoped repository

routes/api/v1/users/[userId]/settings/index.dart

@@ -1,6 +1,3 @@
-//
-// ignore_for_file: lines_longer_than_80_chars, avoid_catches_without_on_clauses
-
 import 'dart:io';
 
 import 'package:dart_frog/dart_frog.dart';
@@ -57,14 +54,14 @@ Future<Response> onRequest(
 // --- DELETE Handler ---
 Future<Response> _handleDelete(
   RequestContext context,
-  User authenticatedUser, // Receive the authenticated user
+  User authenticatedUser,
   String requestId, // For logging
 ) async {
   // Read the HtAppSettingsClient to instantiate a user-scoped repository
   final settingsClient = context.read<HtAppSettingsClient>();
   final userSettingsRepo = HtAppSettingsRepository(
     client: settingsClient,
-    userId: authenticatedUser.id, // Use the authenticated user's ID
+    userId: authenticatedUser.id,
   );
 
   // Call the repository method to clear settings.