Changeset 899b19d for resTools_backend/backend/Services

Timestamp:

07/10/22 10:27:45 (2 years ago)

Author:

Danilo <danilo.najkov@…>

Branches:

master

Children:

a26f6a1

Parents:

cc4db18

Message:

reviews full feature

Location:

resTools_backend/backend/Services

Files:

• RestaurantService.cs (modified) (2 diffs)
• ReviewService.cs (added)
• UserService.cs (modified) (3 diffs)

resTools_backend/backend/Services/RestaurantService.cs

@@ -32 +32 @@
         {
             RestaurantResponse res = await _context.Restoraunts
+                .Include(x => x.Menu)
+                .Include(x => x.Reviews).ThenInclude(x => x.User)
                 .Select(x => new RestaurantResponse()
                 {
@@ -44 +46 @@
                         Description = x.Description,
                         Price = x.Price
-                    }).ToList()
+                    }).ToList(),
+                    Reviews = x.Reviews.OrderByDescending(x => x.CreatedAt).Select(x => new ReviewResponse()
+                    {
+                        Id = x.Id,
+                        Title = x.Title,
+                        Description = x.Description,
+                        Stars = x.Stars,
+                        CreatedAt = x.CreatedAt,
+                        Username = x.User == null ? "Anonymous" : x.User.Email
+                    }).ToList(),
+                    AverageReview = x.Reviews.Count>0 ? x.Reviews.Select(x => x.Stars).Average() : 0
                 })
                 .FirstOrDefaultAsync();

resTools_backend/backend/Services/UserService.cs

@@ -15 +15 @@
 {
     Task<AuthenticateResponse> Authenticate(AuthenticateRequest model);
-    Task<AuthenticateResponse> Register(CreateUserRequest req);
+    Task<AuthenticateResponse> Register(CreateUserRequest req, bool isFirst);
     Task<User> GetById(int id);
 }
@@ -40 +40 @@
         var token = generateJwtToken(user);
 
-        return new AuthenticateResponse { Email = user.Email, Id = user.Id, Token = token};
+        return new AuthenticateResponse { Email = user.Email, Id = user.Id, Token = token, IsAdmin = user.IsAdmin};
     }
 
@@ -48 +48 @@
     }
 
-    public async Task<AuthenticateResponse> Register(CreateUserRequest req)
+    public async Task<AuthenticateResponse> Register(CreateUserRequest req, bool isFirst)
     {
-        User user = new User() { Email = req.Email, Password = req.Password };
+        User user = new User() { Email = req.Email, Password = req.Password, IsAdmin = isFirst };
         await _context.Users.AddAsync(user);
         await _context.SaveChangesAsync();
         var token = generateJwtToken(user);
-        return new AuthenticateResponse { Email = user.Email, Id = user.Id, Token = token };
+        return new AuthenticateResponse { Email = user.Email, Id = user.Id, Token = token, IsAdmin = user.IsAdmin };
     }