Feat:[공통] Pagination 마지막 페이지 체크 로직 보완 #85

lib/core/pagination/pagination_response.dart

@@ -4,6 +4,7 @@ class PaginationResponse<T> {
     required this.page,
     required this.size,
     required this.items,
+    required this.isLastPage,
   });
 
   PaginationResponse.fromJson(
@@ -13,27 +14,25 @@ class PaginationResponse<T> {
         size = json['size'] as int,
         items = (json['items'] as List<dynamic>)
             .map((e) => fromJson.call(e))
-            .toList();
+            .toList(),
+        isLastPage = json['is_last_page'] as bool;
 
   final int page;
   final int size;
   final List<T> items;
+  final bool isLastPage;
 
   @override
-  bool operator ==(Object other) {
-    if (identical(this, other)) return true;
-
-    return other is PaginationResponse &&
-        other.items == items &&
-        other.page == page &&
-        other.size == size;
-  }
+  bool operator ==(Object other) =>
+      identical(this, other) ||
+      other is PaginationResponse<T> &&
+          runtimeType == other.runtimeType &&
+          page == other.page &&
+          size == other.size &&
+          items == other.items &&
+          isLastPage == other.isLastPage;
 
   @override
-  int get hashCode => items.hashCode ^ page.hashCode ^ size.hashCode;
-
-  Map<String, dynamic> toJson() => {
-        'page': page,
-        'size': size,
-      };
+  int get hashCode =>
+      page.hashCode ^ size.hashCode ^ items.hashCode ^ isLastPage.hashCode;
 }

lib/features/pet/domain/breeds_pagination_response.dart

@@ -2,45 +2,15 @@ import 'package:pets_next_door_flutter/core/pagination/pagination_response.dart'
 import 'package:pets_next_door_flutter/features/pet/domain/breed.dart';
 
 /// Metadata used when fetching movies with the paginated search API.
-class BreedsPaginationResponse implements PaginationResponse<Breed> {
+class BreedsPaginationResponse extends PaginationResponse<Breed> {
   BreedsPaginationResponse({
-    required this.page,
-    required this.size,
-    required this.items,
+    required super.page,
+    required super.size,
+    required super.items,
+    required super.isLastPage,
   });
 
   BreedsPaginationResponse.fromJson(
     Map<String, dynamic> json,
-  )   : page = json['page'] as int,
-        size = json['size'] as int,
-        items = (json['items'] as List<dynamic>)
-            .map((e) => Breed.fromJson(e))
-            .toList();
-
-  @override
-  final int page;
-
-  @override
-  final int size;
-
-  @override
-  final List<Breed> items;
-
-  @override
-  bool operator ==(Object other) {
-    if (identical(this, other)) return true;
-
-    return other is BreedsPaginationResponse &&
-        other.page == page &&
-        other.size == size;
-  }
-
-  @override
-  int get hashCode => page.hashCode ^ size.hashCode;
-
-  @override
-  Map<String, dynamic> toJson() {
-    // TODO: implement toJson
-    throw UnimplementedError();
-  }
+  ) : super.fromJson(json, (e) => Breed.fromJson(e));
 }

lib/features/pet/repository/pet_repository.dart

@@ -1,10 +1,10 @@
 import 'package:pets_next_door_flutter/core/utils/result.dart';
-import 'package:pets_next_door_flutter/features/pet/domain/breed.dart';
 import 'package:pets_next_door_flutter/features/pet/domain/breeds_pagination_request.dart';
+import 'package:pets_next_door_flutter/features/pet/domain/breeds_pagination_response.dart';
 import 'package:pets_next_door_flutter/features/pet/entities/pet_data_entity.dart';
 
 abstract interface class PetRepository {
-  Future<Result<List<Breed>>> getBreeds({
+  Future<Result<BreedsPaginationResponse>> getBreeds({
     required BreedsPaginationRequest breedsPaginationRequest,
   });
 

lib/features/pet/repository/pet_repository_impl.dart

@@ -1,7 +1,7 @@
 import 'package:pets_next_door_flutter/core/utils/result.dart';
 import 'package:pets_next_door_flutter/features/pet/data/remote/pet_remote_data_source.dart';
-import 'package:pets_next_door_flutter/features/pet/domain/breed.dart';
 import 'package:pets_next_door_flutter/features/pet/domain/breeds_pagination_request.dart';
+import 'package:pets_next_door_flutter/features/pet/domain/breeds_pagination_response.dart';
 import 'package:pets_next_door_flutter/features/pet/entities/pet_data_entity.dart';
 import 'package:pets_next_door_flutter/features/pet/repository/pet_repository.dart';
 
@@ -13,12 +13,12 @@ final class PetRepositoryImpl implements PetRepository {
   final PetRemoteDataSource _petRemoteDataSource;
 
   @override
-  Future<Result<List<Breed>>> getBreeds(
+  Future<Result<BreedsPaginationResponse>> getBreeds(
       {required BreedsPaginationRequest breedsPaginationRequest}) async {
     try {
       final breedsData = await _petRemoteDataSource.getBreeds(
           breedsPaginationRequest: breedsPaginationRequest);
-      return Result.success(breedsData.items);
+      return Result.success(breedsData);
     } on Exception catch (e) {
       return Result.failure(e);
     }

lib/features/pet/usecases/get_breeds_use_case.dart

@@ -1,6 +1,6 @@
 import 'package:pets_next_door_flutter/core/utils/result.dart';
-import 'package:pets_next_door_flutter/features/pet/domain/breed.dart';
 import 'package:pets_next_door_flutter/features/pet/domain/breeds_pagination_request.dart';
+import 'package:pets_next_door_flutter/features/pet/domain/breeds_pagination_response.dart';
 import 'package:pets_next_door_flutter/features/pet/repository/pet_repository.dart';
 
 final class GetBreedsUseCase {
@@ -10,9 +10,10 @@ final class GetBreedsUseCase {
 
   final PetRepository _petRepository;
 
-  Future<Result<List<Breed>>> call({
+  Future<Result<BreedsPaginationResponse>> call({
     required BreedsPaginationRequest breedsPaginationRequest,
   }) async {
-    return _petRepository.getBreeds(breedsPaginationRequest: breedsPaginationRequest);
+    return _petRepository.getBreeds(
+        breedsPaginationRequest: breedsPaginationRequest);
   }
-}
+}

lib/features/sos/data/dto/sos_pagination_response_dto.dart

@@ -2,44 +2,15 @@ import 'package:pets_next_door_flutter/core/pagination/pagination_response.dart'
 import 'package:pets_next_door_flutter/features/sos/data/dto/sos_post_dto.dart';
 
 /// Metadata used when fetching movies with the paginated search API.
-class SosPostPaginationResponseDto implements PaginationResponse<SosPostDto> {
+class SosPostPaginationResponseDto extends PaginationResponse<SosPostDto> {
   SosPostPaginationResponseDto({
-    required this.page,
-    required this.size,
-    required this.items,
+    required super.page,
+    required super.size,
+    required super.items,
+    required super.isLastPage,
   });
 
   SosPostPaginationResponseDto.fromJson(
     Map<String, dynamic> json,
-  )   : page = json['page'] as int,
-        size = json['size'] as int,
-        items = (json['items'] as List<dynamic>)
-            .map((e) => SosPostDto.fromJson(e))
-            .toList();
-
-  @override
-  final int page;
-
-  @override
-  final int size;
-
-  @override
-  final List<SosPostDto> items;
-
-  @override
-  bool operator ==(Object other) {
-    if (identical(this, other)) return true;
-
-    return other is SosPostPaginationResponseDto &&
-        other.page == page &&
-        other.size == size;
-  }
-
-  @override
-  int get hashCode => page.hashCode ^ size.hashCode;
-
-  @override
-  Map<String, dynamic> toJson() {
-    throw UnimplementedError();
-  }
+  ) : super.fromJson(json, (e) => SosPostDto.fromJson(e));
 }

lib/features/sos/repositories/sos_post_repository.dart

@@ -1,8 +1,8 @@
 import 'package:pets_next_door_flutter/core/utils/result.dart';
 import 'package:pets_next_door_flutter/features/sos/data/dto/sos_pagination_request_dto.dart';
-import 'package:pets_next_door_flutter/features/sos/entities/sos_post_entity.dart';
+import 'package:pets_next_door_flutter/features/sos/data/dto/sos_pagination_response_dto.dart';
 
 abstract interface class SosPostRepository {
-  Future<Result<List<SosPostEntity>>> getSosPosts(
+  Future<Result<SosPostPaginationResponseDto>> getSosPosts(
       SosPostPaginationRequestDto request);
 }

lib/features/sos/repositories/sos_post_repository_impl.dart

@@ -1,7 +1,7 @@
 import 'package:pets_next_door_flutter/core/utils/result.dart';
 import 'package:pets_next_door_flutter/features/sos/data/dto/sos_pagination_request_dto.dart';
+import 'package:pets_next_door_flutter/features/sos/data/dto/sos_pagination_response_dto.dart';
 import 'package:pets_next_door_flutter/features/sos/data/remote/sos_post_remote_data_source.dart';
-import 'package:pets_next_door_flutter/features/sos/entities/sos_post_entity.dart';
 import 'package:pets_next_door_flutter/features/sos/repositories/sos_post_repository.dart';
 
 final class SosPostRepositoryImpl implements SosPostRepository {
@@ -12,17 +12,13 @@ final class SosPostRepositoryImpl implements SosPostRepository {
   final SosPostRemoteDataSource _sosPostRemoteDataSource;
 
   @override
-  Future<Result<List<SosPostEntity>>> getSosPosts(
+  Future<Result<SosPostPaginationResponseDto>> getSosPosts(
       SosPostPaginationRequestDto request) async {
     try {
       final sosPostResponse =
           await _sosPostRemoteDataSource.getSosPosts(request);
 
-      return Result.success(
-        sosPostResponse.items
-            .map((postDto) => SosPostEntity.fromDto(postDto))
-            .toList(),
-      );
+      return Result.success(sosPostResponse);
     } on Exception catch (e) {
       return Result.failure(e);
     }

lib/features/sos/usecases/get_sos_post_use_case.dart

@@ -1,7 +1,7 @@
 import 'package:pets_next_door_flutter/core/enums/sort_type_filter.enum.dart';
 import 'package:pets_next_door_flutter/core/utils/result.dart';
 import 'package:pets_next_door_flutter/features/sos/data/dto/sos_pagination_request_dto.dart';
-import 'package:pets_next_door_flutter/features/sos/entities/sos_post_entity.dart';
+import 'package:pets_next_door_flutter/features/sos/data/dto/sos_pagination_response_dto.dart';
 import 'package:pets_next_door_flutter/features/sos/repositories/sos_post_repository.dart';
 
 final class GetSosPostsUseCase {
@@ -11,7 +11,7 @@ final class GetSosPostsUseCase {
 
   final SosPostRepository _sosPostRepository;
 
-  Future<Result<List<SosPostEntity>>> call({
+  Future<Result<SosPostPaginationResponseDto>> call({
     required int size,
     required int page,
     required SortTypeFilter sortType,

lib/presentation/pages/pet/providers/breeds_paging_controller_provider.dart

@@ -7,7 +7,7 @@ import 'package:riverpod_annotation/riverpod_annotation.dart';
 
 part 'breeds_paging_controller_provider.g.dart';
 
-const breedsPagingSize = 20;
+const pagingSize = 20;
 
 @riverpod
 class BreedsPagingController extends _$BreedsPagingController {
@@ -24,22 +24,20 @@ class BreedsPagingController extends _$BreedsPagingController {
 
   Future<void> fetchPage(int pageKey) async {
     try {
-      final newBreeds = await getBreedsUseCase.call(
+      final newPage = await getBreedsUseCase.call(
         breedsPaginationRequest: new BreedsPaginationRequest(
           page: pageKey,
-          size: breedsPagingSize,
+          size: pagingSize,
           petType: ref.read(petStateProvider.notifier).state.petType!,
         ),
       );
 
-      newBreeds.fold(
-        onSuccess: (breeds) {
-          final isLastPage = breeds.length < breedsPagingSize;
-
-          if (isLastPage) {
-            state.appendLastPage(breeds);
+      newPage.fold(
+        onSuccess: (page) {
+          if (page.isLastPage) {
+            state.appendLastPage(page.items);
           } else {
-            state.appendPage(breeds, pageKey + 1);
+            state.appendPage(page.items, pageKey + 1);
           }
         },
         onFailure: (e) => print('::: Fold Error ::: $e'),

lib/presentation/pages/sos/providers/sos_post_paging_controller_provider.dart

@@ -23,20 +23,21 @@ class SosPagingController extends _$SosPagingController {
 
   Future<void> fetchPage(int pageKey) async {
     try {
-      final newPosts = await getSosPostUseCase.call(
+      final newPage = await getSosPostUseCase.call(
         size: _pagingSize,
         page: pageKey,
         sortType: ref.read(sosPostFilterProvider).sortFilter,
       );
 
-      newPosts.fold(
-        onSuccess: (breeds) {
-          final isLastPage = breeds.length < _pagingSize;
-
-          if (isLastPage) {
-            state.appendLastPage(breeds);
+      newPage.fold(
+        onSuccess: (page) {
+          final sosPostList = page.items
+              .map((sosPost) => SosPostEntity.fromDto(sosPost))
+              .toList();
+          if (page.isLastPage) {
+            state.appendLastPage(sosPostList);
           } else {
-            state.appendPage(breeds, pageKey + 1);
+            state.appendPage(sosPostList, pageKey + 1);
           }
         },
         onFailure: (e) => print('::: Fold Error ::: $e'),