Changeset 13f1472 for resTools_backend/backend/Controllers

Timestamp:

09/18/22 18:09:53 (22 months ago)

Author:

Danilo <danilo.najkov@…>

Branches:

master

Parents:

49b0bbd

Message:

vip functionallity + menu fields + alergens filtering + google/fb login + email queueing

Location:

resTools_backend/backend/Controllers

Files:

• MenuController.cs (modified) (1 diff)
• ReviewsController.cs (modified) (2 diffs)
• UsersController.cs (modified) (2 diffs)

resTools_backend/backend/Controllers/MenuController.cs

@@ -35 +35 @@
         return Ok();
     }
+
+    [HttpPost("{id}/upload")]
+    public async Task<IActionResult> UploadImage(int id, [FromForm] IFormFile file)
+    {
+        await _menuService.UploadImage(id, file);
+        return Ok();
+    }
 }

resTools_backend/backend/Controllers/ReviewsController.cs

@@ -12 +12 @@
     {
         private readonly IReviewService _reviewService = null;
+        private readonly IUserService _userService = null;
 
-        public ReviewsController(IReviewService reviewService)
+        public ReviewsController(IReviewService reviewService, IUserService userService)
         {
             _reviewService = reviewService;
+            _userService = userService;
         }
 
@@ -39 +41 @@
                 userId = (int)this.HttpContext.Items["User"];
             }
-            catch (Exception ex) { return null; }
+            catch (Exception ex) {
+                var user = await _userService.GetByEmail((string)this.HttpContext.Items["User"]);
+                if (user == null)
+                {
+                    return null;
+                }
+                userId = user.Id;
+            }
             await _reviewService.AddReview(req, userId);
             return Ok();

resTools_backend/backend/Controllers/UsersController.cs

@@ -39 +39 @@
         {
             userId = (int)this.HttpContext.Items["User"];
-        }catch (Exception ex){ return null; }
+        }
+        catch (Exception ex)
+        {
+            var usr = await _userService.GetByEmail((string)this.HttpContext.Items["User"]);
+            if(usr == null)
+            {
+                return null;
+            }
+            userId = usr.Id;
+        }
         User user = await _userService.GetById(userId);
-        return new AuthenticateResponse() { Email=user.Email, Id = user.Id, IsAdmin = user.IsAdmin, IsConfirmed = user.IsConfirmed};
+        return new AuthenticateResponse() { Email=user.Email, Id = user.Id, IsAdmin = user.IsAdmin, IsConfirmed = user.IsConfirmed, isVip = user.IsVip};
     }
 
@@ -93 +102 @@
         return response;
     }
+
+    [Authorize]
+    [HttpGet()]
+    public async Task<List<UserResponse>> GetUsers()
+    {
+        return await _userService.GetUsers();
+    }
+
+    [Authorize]
+    [HttpPost("{id}/vip")]
+    public async Task UpdateVip(int id, bool newStatus)
+    {
+        await _userService.UpdateVipStatus(id,newStatus);
+    }
 }