Merge pull request #282 from mdgspace/casper/feedback

A-Kashif108 · web-flow · commit e57147ab3c86 · 2024-04-14T01:17:18.000+05:30
feat: integrates feedback with the backend
diff --git a/lib/data/services/remote/api_service.dart b/lib/data/services/remote/api_service.dart
@@ -54,7 +54,7 @@ abstract class ApiService {
   Future<List<FeedbackResponse>> responseOfFeedbacks();
 
   @POST(ApiEndpoints.newFeedback)
-  Future<AppetizerFeedback> newFeedback(
+  Future<void> newFeedback(
     @Body() Map<String, dynamic> map,
   );
 
diff --git a/lib/domain/models/feedback/appetizer_feedback.dart b/lib/domain/models/feedback/appetizer_feedback.dart
@@ -4,26 +4,18 @@ part 'appetizer_feedback.g.dart';
 
 @JsonSerializable(fieldRename: FieldRename.snake)
 class AppetizerFeedback {
-  int id;
-  String type;
   String title;
   String message;
-  int timestamp;
   dynamic mealId;
-  dynamic imageUrl;
-  int dateIssue;
-  dynamic response;
+  // dynamic imageUrl;
+  int ratings;
 
   AppetizerFeedback({
-    required this.id,
-    required this.type,
     required this.title,
     required this.message,
-    required this.timestamp,
     required this.mealId,
-    required this.imageUrl,
-    required this.dateIssue,
-    required this.response,
+    // required this.imageUrl,
+    required this.ratings,
   });
 
   factory AppetizerFeedback.fromJson(Map<String, dynamic> json) =>
diff --git a/lib/domain/repositories/feedback_repository.dart b/lib/domain/repositories/feedback_repository.dart
@@ -28,15 +28,16 @@ class FeedbackRepository {
     }
   }
 
-  Future<AppetizerFeedback> newFeedback(AppetizerFeedback feedback) async {
+  Future<void> newFeedback(AppetizerFeedback feedback) async {
     Map<String, dynamic> map = {
-      'type': feedback.type,
       'title': feedback.title,
       'message': feedback.message,
-      'date_issue': feedback.dateIssue,
+      'meal_id': feedback.mealId,
+      'ratings': feedback.ratings,
+      // 'image_url': feedback.imageUrl,
     };
     try {
-      return await _apiService.newFeedback(map);
+      await _apiService.newFeedback(map);
     } catch (e) {
       debugPrint(e.toString());
       throw Failure(AppConstants.GENERIC_FAILURE);
diff --git a/lib/presentation/feedback/bloc/feedback_page_bloc.dart b/lib/presentation/feedback/bloc/feedback_page_bloc.dart
@@ -1,3 +1,4 @@
+import 'package:appetizer/domain/models/feedback/appetizer_feedback.dart';
 import 'package:appetizer/domain/repositories/feedback_repository.dart';
 import 'package:bloc/bloc.dart';
 import 'package:equatable/equatable.dart';
@@ -10,36 +11,44 @@ class FeedbackPageBloc extends Bloc<FeedbackPageEvent, FeedbackPageState> {
   FeedbackPageBloc({
     required this.repo,
   }) : super(
-          const FeedbackPageState.initial(),
+          FeedbackPageState.initial(),
         ) {
     on<FeedbackPageSubmitEvent>(_onSubmit);
     on<FeedbackPageDescriptionChangedEvent>(_onDescriptionChange);
   }
 
   void _onSubmit(
-      FeedbackPageSubmitEvent event, Emitter<FeedbackPageState> emit) {
-    // TODO: implement repository call
-    bool submissionSuccessful = true;
-    if (submissionSuccessful) {
+      FeedbackPageSubmitEvent event, Emitter<FeedbackPageState> emit) async {
+    try {
+      int ratings = event.rating;
+      AppetizerFeedback feedback = AppetizerFeedback(
+        title: 'Feedback',
+        message: event.description,
+        mealId: event.mealId,
+        // imageUrl: null,
+        ratings: ratings,
+      );
+      await repo.newFeedback(feedback);
       emit(
         FeedbackPageState(
           rating: event.rating,
           description: event.description,
           submitted: true,
           error: false,
+          mealId: event.mealId,
+        ),
+      );
+    } catch (e) {
+      emit(
+        FeedbackPageState(
+          rating: event.rating,
+          description: event.description,
+          submitted: false,
+          error: true,
+          mealId: event.mealId,
         ),
       );
     }
-    // else {
-    //   emit(
-    //     FeedbackPageState(
-    //       rating: event.rating,
-    //       description: event.description,
-    //       submitted: false,
-    //       error: true,
-    //     ),
-    //   );
-    // }
   }
 
   void _onDescriptionChange(FeedbackPageDescriptionChangedEvent event,
@@ -50,7 +59,8 @@ class FeedbackPageBloc extends Bloc<FeedbackPageEvent, FeedbackPageState> {
           rating: state.rating,
           description: event.description,
           submitted: state.submitted,
-          error: state.error,
+          error: false,
+          mealId: state.mealId,
         ),
       );
     }
diff --git a/lib/presentation/feedback/bloc/feedback_page_event.dart b/lib/presentation/feedback/bloc/feedback_page_event.dart
@@ -11,12 +11,14 @@ class FeedbackPageSubmitEvent extends FeedbackPageEvent {
   const FeedbackPageSubmitEvent({
     required this.rating,
     required this.description,
+    required this.mealId,
   });
-  final List<int> rating;
+  final int rating;
   final String description;
+  final int mealId;
 
   @override
-  List<Object> get props => [rating, description];
+  List<Object> get props => [rating, description, mealId];
 }
 
 class FeedbackPageDescriptionChangedEvent extends FeedbackPageEvent {
diff --git a/lib/presentation/feedback/bloc/feedback_page_state.dart b/lib/presentation/feedback/bloc/feedback_page_state.dart
@@ -1,24 +1,28 @@
 part of 'feedback_page_bloc.dart';
 
+// ignore: must_be_immutable
 class FeedbackPageState extends Equatable {
-  const FeedbackPageState({
+  FeedbackPageState({
     required this.rating,
     required this.description,
+    required this.mealId,
     required this.submitted,
     required this.error,
   });
 
-  const FeedbackPageState.initial()
-      : rating = const [0, 0, 0, 0, 0],
+  FeedbackPageState.initial()
+      : rating = 0,
         description = '',
+        mealId = 0,
         submitted = false,
         error = false;
 
-  final List<int> rating;
+  int rating;
   final String description;
+  final int mealId;
   final bool submitted;
   final bool error;
 
   @override
-  List<Object> get props => [rating, description, error];
+  List<Object> get props => [rating, description, mealId, error];
 }
diff --git a/lib/presentation/feedback/components/FeedbackTile/feedback_tile.dart b/lib/presentation/feedback/components/FeedbackTile/feedback_tile.dart
@@ -9,13 +9,11 @@ class FeedbackTile extends StatelessWidget {
   const FeedbackTile({
     required this.title,
     required this.parentState,
-    required this.index,
     super.key,
   });
 
   final String title;
   final FeedbackPageState parentState;
-  final int index;
 
   @override
   Widget build(BuildContext context) {
@@ -44,7 +42,7 @@ class FeedbackTile extends StatelessWidget {
                     onPressed: () {
                       context.read<FeedbackTileBloc>().add(
                           FeedbackRatingChangedEvent(newRating: index + 1));
-                      parentState.rating[this.index] = index + 1;
+                      parentState.rating = index + 1;
                     },
                     icon: index < state.rating
                         ? SvgPicture.asset('assets/images/filledStar.svg')
diff --git a/lib/presentation/feedback/feedback_view.dart b/lib/presentation/feedback/feedback_view.dart
@@ -9,17 +9,15 @@ import 'package:appetizer/presentation/feedback/components/feedback_banner.dart'
 import 'package:auto_route/auto_route.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:fluttertoast/fluttertoast.dart';
 
 @RoutePage()
 class FeedbackScreen extends StatelessWidget {
-  FeedbackScreen({super.key});
+  FeedbackScreen({required this.mealId, super.key});
   final TextEditingController textController = TextEditingController();
+  final int mealId;
   static const List<String> feedbackHeadings = [
-    "Ambience",
-    "Hygiene and Cleanliness",
-    "Weekly Menu",
-    "Worker and Services",
-    "Diet and Nutrition",
+    "Your Feedback",
   ];
 
   @override
@@ -29,7 +27,7 @@ class FeedbackScreen extends StatelessWidget {
       body: BlocProvider(
         create: (context) =>
             FeedbackPageBloc(repo: context.read<FeedbackRepository>()),
-        child: BlocBuilder<FeedbackPageBloc, FeedbackPageState>(
+        child: BlocConsumer<FeedbackPageBloc, FeedbackPageState>(
           builder: (context, state) {
             return Column(
               children: [
@@ -52,17 +50,14 @@ class FeedbackScreen extends StatelessWidget {
                           ),
                         ),
                         6.toVerticalSizedBox,
-                        ...List.generate(feedbackHeadings.length, (ind) {
-                          return Padding(
-                            padding: EdgeInsets.symmetric(
-                                vertical: 2.toAutoScaledHeight),
-                            child: FeedbackTile(
-                              parentState: state,
-                              title: feedbackHeadings[ind],
-                              index: ind,
-                            ),
-                          );
-                        }, growable: false),
+                        Padding(
+                          padding: EdgeInsets.symmetric(
+                              vertical: 2.toAutoScaledHeight),
+                          child: FeedbackTile(
+                            parentState: state,
+                            title: "Your Feedback",
+                          ),
+                        ),
                         2.toVerticalSizedBox,
                         Text(
                           'If any other feeback, please describe below',
@@ -100,11 +95,36 @@ class FeedbackScreen extends StatelessWidget {
                         Align(
                           alignment: Alignment.bottomRight,
                           child: BlackIconButton(
-                            onTap: context.router.pop,
-                            // onTap: () => context.read<FeedbackPageBloc>().add(
-                            //     FeedbackPageSubmitEvent(
-                            //         rating: state.rating,
-                            //         description: state.description)),
+                            onTap: () {
+                              if (state.rating == 0) {
+                                Fluttertoast.showToast(
+                                    msg: "Please rate before submitting!",
+                                    toastLength: Toast.LENGTH_SHORT,
+                                    gravity: ToastGravity.BOTTOM,
+                                    timeInSecForIosWeb: 1,
+                                    textColor: Colors.white,
+                                    backgroundColor: AppTheme.red,
+                                    fontSize: 12.toAutoScaledFont);
+                                return;
+                              }
+
+                              if (state.description.trim().isEmpty) {
+                                Fluttertoast.showToast(
+                                    msg: "Please describe your Feedback!",
+                                    toastLength: Toast.LENGTH_SHORT,
+                                    gravity: ToastGravity.BOTTOM,
+                                    timeInSecForIosWeb: 1,
+                                    textColor: Colors.white,
+                                    backgroundColor: AppTheme.red,
+                                    fontSize: 12.toAutoScaledFont);
+                                return;
+                              }
+                              context.read<FeedbackPageBloc>().add(
+                                  FeedbackPageSubmitEvent(
+                                      mealId: mealId,
+                                      rating: state.rating,
+                                      description: state.description));
+                            },
                             title: "SUBMIT",
                             width: 102.toAutoScaledWidth,
                             icon: Icons.keyboard_double_arrow_right_sharp,
@@ -118,6 +138,29 @@ class FeedbackScreen extends StatelessWidget {
               ],
             );
           },
+          listener: (BuildContext context, FeedbackPageState state) {
+            if (state.submitted) {
+              Fluttertoast.showToast(
+                  msg: "Feedback submitted successfully!",
+                  toastLength: Toast.LENGTH_SHORT,
+                  gravity: ToastGravity.BOTTOM,
+                  timeInSecForIosWeb: 1,
+                  textColor: Colors.white,
+                  backgroundColor: AppTheme.green,
+                  fontSize: 12.toAutoScaledFont);
+              context.router.pop();
+            }
+            if (state.error) {
+              Fluttertoast.showToast(
+                  msg: state.description,
+                  toastLength: Toast.LENGTH_SHORT,
+                  gravity: ToastGravity.BOTTOM,
+                  timeInSecForIosWeb: 1,
+                  textColor: Colors.white,
+                  backgroundColor: AppTheme.red,
+                  fontSize: 16.0);
+            }
+          },
         ),
       ),
     );
diff --git a/lib/presentation/week_menu/components/DayMenu/menu_card.dart b/lib/presentation/week_menu/components/DayMenu/menu_card.dart
@@ -128,7 +128,7 @@ class FeedbackOrCouponButton extends StatelessWidget {
         if (meal.isOutdated) {
           return GestureDetector(
             onTap: () {
-              context.router.navigate(FeedbackRoute());
+              context.router.navigate(FeedbackRoute(mealId: meal.id));
             },
             child: const FeedbackAndCouponWidget(taken: false, coupon: false),
           );
diff --git a/pubspec.lock b/pubspec.lock
