Changeset 63f5ced

Timestamp:

08/24/22 17:11:52 (2 years ago)

Author:

Danilo <danilo.najkov@…>

Branches:

master

Children:

d86edb7

Parents:

a569b7c

Message:

reviews pagination

Files:

• frontend/src/Dashboard/Review.js (modified) (5 diffs)
• resTools_backend/backend/Controllers/ReviewsController.cs (modified) (1 diff)
• resTools_backend/backend/Services/RestaurantService.cs (modified) (1 diff)
• resTools_backend/backend/Services/ReviewService.cs (modified) (2 diffs)

frontend/src/Dashboard/Review.js

@@ -1 +1 @@
 import React, {useEffect, useState} from 'react'
-import {Button, Card, Input, List, notification, Rate, Spin, Tooltip} from "antd";
+import {Button, Card, Input, List, notification, Pagination, Rate, Spin, Tooltip} from "antd";
 import axios from "axios";
 import env from "../env";
@@ -6 +6 @@
 
 const Review = props => {
-    const [restaurant, setRestaurant] = useState({});
+    const [reviews, setReviews] = useState([]);
+    const [restaurant, setRestaurant] = useState({})
     const [loading, setLoading] = useState(true);
+    const [reviewSize, setReviewSize] = useState(0)
+
 
     useEffect(()=> {
@@ -18 +21 @@
     },[props.refresh])
 
-    const getRestaurant = () => {
+
+    const getRestaurant = (pg = 1, size = 5) => {
+        axios.get(env.api + 'Reviews/count',).then(res=>{
+            setReviewSize(res.data);
+        });
         axios.get(env.api + 'Restaurants').then(res=>{
             setRestaurant(res.data);
-            setLoading(false);
+            console.log(pg, size)
+            axios.get(env.api + 'Reviews',{params:{page:pg-1, pageSize: size}}).then(res=>{
+                setReviews(res.data);
+                setLoading(false);
+            });
         });
     }
@@ -45 +56 @@
                 <div>
                     <div style={{backgroundColor: 'white',padding:'10px', border:'1px solid lightgray', borderTop: 'none'}}>
-                        <h3>Средна оценка: <Rate disabled allowHalf value={restaurant.averageReview}/> од вкупно {restaurant.reviews.length} оценки</h3>
+                        <h3>Средна оценка: <Rate disabled allowHalf value={restaurant.averageReview}/> од вкупно {reviewSize} оценки</h3>
                     </div>
-                    <List dataSource={restaurant.reviews} itemLayout={'horizontal'} locale={{emptyText:'Нема оставени оценки за овој ресторан'}}
+                    <List dataSource={reviews} itemLayout={'horizontal'} locale={{emptyText:'Нема оставени оценки за овој ресторан'}}
                           renderItem={item => (
                               <Card title={item.title} style={{width:'98%',backgroundColor:'white',margin:'1%'}}>
@@ -55 +66 @@
                               </Card>
                           )}/>
+                    <div style={{paddingBottom:'20px', textAlign:'center'}}>
+                        <Pagination defaultPageSize={5} total={reviewSize} onChange={(pg,size)=>getRestaurant(pg,size)} showSizeChanger pageSizeOptions={[5,10,20,50]}/>
+                    </div>
                 </div>
-
             }
         </div>

resTools_backend/backend/Controllers/ReviewsController.cs

@@ -18 +18 @@
         }
 
+        [HttpGet]
+        public async Task<List<ReviewResponse>> GetReviews(int page, int pageSize)
+        {
+            return await _reviewService.GetReviews(page, pageSize);
+        }
+
+        [HttpGet("count")]
+        public async Task<int> GetReviewsCount()
+        {
+            return await _reviewService.GetCount();
+        }
 
         [Authorize]

resTools_backend/backend/Services/RestaurantService.cs

@@ -47 +47 @@
                         Price = x.Price
                     }).ToList(),
-                    Reviews = x.Reviews.OrderByDescending(x => x.CreatedAt).Select(x => new ReviewResponse()
+                    Reviews = x.Reviews.Select(x => new ReviewResponse()
                     {
+                        CreatedAt = x.CreatedAt,
+                        Description = x.Description,
                         Id = x.Id,
+                        Stars = x.Stars,
                         Title = x.Title,
-                        Description = x.Description,
-                        Stars = x.Stars,
-                        CreatedAt = x.CreatedAt,
                         Username = x.User == null ? "Anonymous" : x.User.Email
                     }).ToList(),

resTools_backend/backend/Services/ReviewService.cs

@@ -9 +9 @@
     {
         public Task AddReview(CreateReviewRequest review, int userId);
+        public Task<List<ReviewResponse>> GetReviews(int page, int pageSize);
+        public Task<int> GetCount();
     }
     public class ReviewService : IReviewService
@@ -38 +40 @@
             await _context.SaveChangesAsync();
         }
+
+        public async Task<int> GetCount()
+        {
+            return await _context.Reviews.CountAsync();
+        }
+
+        public async Task<List<ReviewResponse>> GetReviews(int page, int pageSize)
+        {
+            return await _context.Reviews
+                .Include(x => x.User)
+                .OrderByDescending(x => x.CreatedAt)
+                .Skip(page * pageSize)
+                .Take(pageSize)
+                .Select(x => new ReviewResponse()
+                {
+                    CreatedAt = x.CreatedAt,
+                    Description = x.Description,
+                    Id = x.Id,
+                    Stars = x.Stars,
+                    Title = x.Title,
+                    Username = x.User == null ? "Anonymous" : x.User.Email
+                })
+                .ToListAsync();
+        }
     }
 }