feat: update response

dungngminh · Feb 7, 2024 · 4afc93a · 4afc93a
1 parent b236965
commit 4afc93a
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 21 deletions.
diff --git a/.DS_Store b/.DS_Store
diff --git a/e2e/auth_test.dart b/e2e/auth_test.dart
@@ -91,7 +91,7 @@ void main() {
       );
 
       final loginResponse =
-          LoginResponse.fromJson(baseResponse.data as Map<String, dynamic>);
+          LoginResponse.fromJson(baseResponse.result as Map<String, dynamic>);
 
       expect(response.statusCode, HttpStatus.ok);
       expect(

diff --git a/lib/dtos/response/base_response_data.dart b/lib/dtos/response/base_response_data.dart
@@ -13,17 +13,17 @@ part 'base_response_data.g.dart';
 class BaseResponseData {
   const BaseResponseData({
     required this.success,
-    this.data,
+    this.result,
     this.message = kSuccessResponseMessage,
   });
 
   factory BaseResponseData.fromJson(Map<String, dynamic> json) =>
       _$BaseResponseDataFromJson(json);
 
-  factory BaseResponseData.data(dynamic data) {
+  factory BaseResponseData.data(dynamic result) {
     return BaseResponseData(
       success: true,
-      data: data,
+      result: result,
     );
   }
 
@@ -43,7 +43,7 @@ class BaseResponseData {
 
   final bool success;
   final String message;
-  final dynamic data;
+  final dynamic result;
 
   Map<String, dynamic> toJson() => _$BaseResponseDataToJson(this);
 
@@ -55,7 +55,7 @@ class BaseResponseData {
     return BaseResponseData(
       success: success ?? this.success,
       message: message ?? this.message,
-      data: data ?? this.data,
+      result: data ?? result,
     );
   }
 }

diff --git a/lib/dtos/response/base_response_data.g.dart b/lib/dtos/response/base_response_data.g.dart
diff --git a/routes/api/blogs/index.dart b/routes/api/blogs/index.dart
@@ -4,7 +4,6 @@ import 'package:stormberry/stormberry.dart';
 import 'package:uuid/uuid.dart';
 import 'package:very_good_blog_app_backend/common/extensions/json_ext.dart';
 import 'package:very_good_blog_app_backend/dtos/request/blogs/create_blog_request.dart';
-import 'package:very_good_blog_app_backend/dtos/response/base_pagination_response.dart';
 import 'package:very_good_blog_app_backend/dtos/response/base_response_data.dart';
 import 'package:very_good_blog_app_backend/dtos/response/blogs/get_blog_response.dart';
 import 'package:very_good_blog_app_backend/models/blog.dart';
@@ -26,26 +25,21 @@ Future<Response> _onBlogsGetRequest(RequestContext context) async {
   final queryParams = context.request.uri.queryParameters;
   final limit = int.tryParse(queryParams['limit'] ?? '') ?? 20;
   final currentPage = int.tryParse(queryParams['page'] ?? '') ?? 1;
+  final searchValue = queryParams['search'];
+
+  // fuzzy search
+
 
   try {
     final results = await db.blogs.queryBlogs(
       QueryParams(
         limit: limit,
         offset: (currentPage - 1) * limit,
-      ),
+        where: 
+      ,),
     );
     final blogs = results.map(GetBlogResponse.fromView);
-    final pagination = BasePaginationResponse(
-      currentPage: currentPage,
-      limit: limit,
-      totalCount: blogs.length,
-    );
-    return OkResponse(
-      {
-        'blogs': blogs.map((e) => e.toJson()).toList(),
-        'pagination': pagination.toJson(),
-      },
-    );
+    return OkResponse(blogs.map((e) => e.toJson()).toList());
   } catch (e) {
     return ServerErrorResponse(e.toString());
   }