ReWorked The Watchlist System & Improved Overall Performance

Author: MomenMuhammad01

lib/config/router/app_router.gr.dart

@@ -7,15 +7,18 @@ import 'package:tmda/features/shared/domain/usecases/get_session_id_usecase.dart
 @lazySingleton
 class AuthenticatedInterceptor extends Interceptor{
   final GetSessionIdUseCase _getSessionIdUseCase;
-
-  const AuthenticatedInterceptor(this._getSessionIdUseCase);
+   String _sessionId = '';
+  AuthenticatedInterceptor(this._getSessionIdUseCase);
   @override
   void onRequest(RequestOptions options, RequestInterceptorHandler handler) async{
-    options.queryParameters['session_id'] = await _getSessionIdUseCase();
+    if(_sessionId.isEmpty){
+      _sessionId = await _getSessionIdUseCase();
+    }
     if (kDebugMode) {
       print('REQUEST[${options.method}] => PATH: ${options.path}');
     }
     options.headers[ApiConstants.headerContentType] = ApiConstants.headerContentTypeValue;
+    options.queryParameters['session_id'] = _sessionId;
     super.onRequest(options, handler);
   }
 

lib/core/api/authenticated_interceptor.dart

@@ -5,8 +5,8 @@ import 'package:flutter/foundation.dart';
 import 'package:dio/dio.dart';
 import 'package:tmda/core/api/api_consumer.dart';
 import 'package:tmda/core/api/api_status_code.dart';
-import 'package:tmda/core/api/authenticated_interceptor.dart';
 import 'package:tmda/core/api/dio_logger.dart';
+import 'package:tmda/core/api/unauthenticated_interceptor.dart';
 import 'package:tmda/core/constants/api_constants.dart';
 import 'package:tmda/core/error/exception.dart';
 import 'package:tmda/injection_container.dart';
@@ -34,7 +34,7 @@ class DioApiConsumer extends ApiConsumer {
     if(interceptor != null){
       dioClient.interceptors.add(interceptor!);
     }else{
-      dioClient.interceptors.add(getIt<AuthenticatedInterceptor>());
+      dioClient.interceptors.add(getIt<UnAuthenticatedInterceptor>());
     }
 
     if (kDebugMode) {

lib/core/api/dio_consumer.dart

@@ -1,7 +1,7 @@
 final class ApiConstants {
   //! Core Api
-  static const String apiKey = '45fe17b977fb94a0c0c099b894af2c74';
-  static const String accountId = '15269101';
+  static const String apiKey = 'YOUR_API_KEY';
+  static const String accountId = 'YOUR_ACCOUNT_ID';
   static const String apiKeyQuery = 'api_key';
   static const String baseUrl = 'https://api.themoviedb.org/3';
   static const String baseImageUrl = 'https://image.tmdb.org/t/p/w500';
@@ -14,7 +14,7 @@ final class ApiConstants {
   static const String headerContentTypeValue = 'application/json';
   static const String headerContentType = 'Content-Type';
   static const String personEndPointAppendedToResponse = 'movie_credits,tv_credits';
-  static const String endPointsAppendedToResponse = 'videos,account_states,credits,similar,reviews,recommendations';
+  static const String detailsEndPointsAppendedToResponse = 'videos,credits,similar,reviews,recommendations';
   static const String movieMediaTypeTitle = 'movie';
   static const String tvMediaTypeTitle = 'tv';
   //! Auth Endpoints & Urls

lib/core/constants/api_constants.dart

@@ -3,20 +3,8 @@ import 'package:tmda/core/api/api_consumer.dart';
 import 'package:tmda/core/constants/api_constants.dart';
 import 'package:tmda/core/error/exception.dart';
 import 'package:tmda/features/account/data/models/account_model.dart';
-import 'package:tmda/features/account/data/models/account_states_model.dart';
-import 'package:tmda/features/account/data/models/watchlist_movie_model.dart';
-import 'package:tmda/features/account/data/models/watchlist_tv_show_model.dart';
-
 abstract class AccountDataSource{
   Future<AccountModel> getAccountDetails();
-  Future<List<WatchListMovieModel>> getMoviesWatchList();
-  Future<List<WatchListTvShowModel>> getTvShowsWatchList();
-  Future<List<WatchListMovieModel>> getAllMoviesWatchList({required int pageNumber});
-  Future<List<WatchListTvShowModel>> getAllTvShowsWatchList({ required int pageNumber});
-  Future<AccountStatesModel> removeTvShowFromWatchList({required int contentId});
-  Future<AccountStatesModel> removeMovieFromWatchList({required int contentId});
-  Future<AccountStatesModel> getTvShowWatchListStates({required int contentId});
-  Future<AccountStatesModel> getMovieWatchListStates({required int contentId});
   Future<void> accountLogOut({required String sessionId});
 }
 
@@ -31,100 +19,6 @@ class AccountDataSourceImpl extends AccountDataSource{
     return AccountModel.fromJson(accountDetails);
   }
 
-  @override
-  Future<List<WatchListMovieModel>> getMoviesWatchList() async{
-    final listOfMovies =
-        await _apiConsumer.get('${ApiConstants.accountEndPoint}${ApiConstants.accountMoviesWatchListPath}');
-    return List<WatchListMovieModel>.from(
-      (listOfMovies['results'] as List).map(
-            (watchlistMovie) => WatchListMovieModel.fromJson(watchlistMovie),
-      ),
-    );
-  }
-
-  @override
-  Future<List<WatchListTvShowModel>> getTvShowsWatchList() async{
-    final listOfTvShows = await _apiConsumer.get('${ApiConstants.accountEndPoint}${ApiConstants.accountTvWatchListPath}');
-    return List<WatchListTvShowModel>.from(
-      (listOfTvShows['results'] as List).map(
-            (watchlistTvShow) => WatchListTvShowModel.fromJson(watchlistTvShow),
-      ),
-    );
-  }
-
-  @override
-  Future<List<WatchListMovieModel>> getAllMoviesWatchList({required int pageNumber}) async{
-    final listOfMovies = await _apiConsumer.get('${ApiConstants.accountEndPoint}${ApiConstants.accountMoviesWatchListPath}',  queryParameters: {
-      'page': pageNumber,
-    });
-    final movieIds = listOfMovies['results'].map((movie) => movie['id']).toList();
-    final movieStatuses = await Future.wait(movieIds.map((id) => _apiConsumer.get('${ApiConstants.movieDetailsEndPoint}$id${ApiConstants.accountStatusPath}')).toList().cast<Future<dynamic>>());
-    return List<WatchListMovieModel>.generate(movieIds.length, (index) {
-      final Map<String, dynamic> movie = listOfMovies['results'][index];
-      movie.addAll({'account_status' : movieStatuses[index]});
-      return WatchListMovieModel.fromJson(movie);
-    });
-  }
-
-  @override
-  Future<List<WatchListTvShowModel>> getAllTvShowsWatchList({required int pageNumber}) async{
-    final listOfTvShows = await _apiConsumer.get('${ApiConstants.accountEndPoint}${ApiConstants.accountTvWatchListPath}',  queryParameters: {
-      'page': pageNumber,
-    });
-    final tvShowsIds = listOfTvShows['results'].map((movie) => movie['id']).toList();
-    final tvShowsStatuses = await Future.wait(tvShowsIds.map((id) => _apiConsumer.get('${ApiConstants.tvShowDetailsEndPoint}$id${ApiConstants.accountStatusPath}')).toList().cast<Future<dynamic>>());
-    return List<WatchListTvShowModel>.generate(tvShowsIds.length, (index) {
-      final Map<String, dynamic> tvShow = listOfTvShows['results'][index];
-      tvShow.addAll({'account_status' : tvShowsStatuses[index]});
-      return WatchListTvShowModel.fromJson(tvShow);
-    });
-  }
-
-  @override
-  Future<AccountStatesModel> removeTvShowFromWatchList({required int contentId}) async{
-    final response = await _apiConsumer.post(ApiConstants.addOrRemoveFromWatchListEndPoint,
-      body: {
-        'media_type': 'tv',
-        "media_id": contentId,
-        "watchlist": false
-      },
-    );
-    if (response['success'] == true) {
-      return AccountStatesModel(inWatchList: false, contentId: contentId);
-    } else {
-      throw ServerException('${response['status_message']}');
-    }
-  }
-  @override
-  Future<AccountStatesModel> removeMovieFromWatchList({required int contentId}) async{
-    final response = await _apiConsumer.post(ApiConstants.addOrRemoveFromWatchListEndPoint,
-      body: {
-        'media_type': 'movie',
-        "media_id": contentId,
-        "watchlist": false
-      },
-    );
-    if (response['success'] == true) {
-      return  AccountStatesModel(inWatchList: false, contentId: contentId);
-    } else {
-      throw ServerException('${response['status_message']}');
-    }
-  }
-
-  @override
-  Future<AccountStatesModel> getTvShowWatchListStates({required int contentId}) async{
-    final Map<String, dynamic> watchListStates = await _apiConsumer.get('${ApiConstants.tvShowDetailsEndPoint}$contentId${ApiConstants.accountStatusPath}');
-    watchListStates.addAll({'content_id' : contentId});
-    return AccountStatesModel.fromJson(watchListStates);
-  }
-
-  @override
-  Future<AccountStatesModel> getMovieWatchListStates({required int contentId}) async{
-    final Map<String, dynamic> watchListStates = await _apiConsumer.get('${ApiConstants.movieDetailsEndPoint}$contentId${ApiConstants.accountStatusPath}');
-    watchListStates.addAll({'content_id' : contentId});
-    return AccountStatesModel.fromJson(watchListStates);
-  }
-
   @override
   Future<void> accountLogOut({required String sessionId}) async{
     final response = await _apiConsumer.delete(ApiConstants.accountLogoutEndPoint, body: {