Changeset 13f1472 for resTools_backend/backend/Services/UserService.cs

Timestamp:

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

Author:

Danilo <danilo.najkov@…>

Branches:

master

Parents:

49b0bbd

Message:

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

File:

• resTools_backend/backend/Services/UserService.cs (modified) (5 diffs)

resTools_backend/backend/Services/UserService.cs

@@ -20 +20 @@
     Task<AuthenticateResponse> Register(CreateUserRequest req, bool isFirst);
     Task<User> GetById(int id);
+    Task<User> GetByEmail(string email);
     Task SendEmailConfirmation(string email);
     Task SendPasswordReset(string email);
     Task ConfirmEmail(User user, string checkValid);
     Task ResetPassword(string checkValid, string password);
+    Task<List<UserResponse>> GetUsers();
+    Task UpdateVipStatus(int id, bool isVip);
+
 }
 
@@ -39 +43 @@
     }
 
+    public async Task<User> GetByEmail(string email)
+    {
+        return await _context.Users.FirstOrDefaultAsync(x => x.Email == email);
+    }
+
     public async Task<AuthenticateResponse> Authenticate(AuthenticateRequest model)
     {
@@ -49 +58 @@
         var token = generateJwtToken(user);
 
-        return new AuthenticateResponse { Email = user.Email, Id = user.Id, Token = token, IsAdmin = user.IsAdmin, IsConfirmed = user.IsConfirmed};
+        return new AuthenticateResponse { Email = user.Email, Id = user.Id, Token = token, IsAdmin = user.IsAdmin, IsConfirmed = user.IsConfirmed, isVip = user.IsVip};
     }
 
@@ -75 +84 @@
     public async Task<AuthenticateResponse> Register(CreateUserRequest req, bool isFirst)
     {
-        User user = new User() { Email = req.Email, Password = req.Password, IsAdmin = isFirst, IsConfirmed = false };
+        var exists = await _context.Users.FirstOrDefaultAsync(x => x.Email == req.Email);
+        if(exists != null && req.IsConfirmed)
+        {
+            return new AuthenticateResponse { Email = exists.Email, Id = exists.Id, IsAdmin = exists.IsAdmin, IsConfirmed = true };
+        }
+        User user = new User() { Email = req.Email, Password = req.Password, IsAdmin = isFirst, IsConfirmed = req.IsConfirmed, IsVip = false };
         await _context.Users.AddAsync(user);
         await _context.SaveChangesAsync();
         var token = generateJwtToken(user);
-        return new AuthenticateResponse { Email = user.Email, Id = user.Id, Token = token, IsAdmin = user.IsAdmin, IsConfirmed = false };
+        return new AuthenticateResponse { Email = user.Email, Id = user.Id, Token = token, IsAdmin = user.IsAdmin, IsConfirmed = req.IsConfirmed, isVip = user.IsVip };
     }
 
@@ -125 +139 @@
     }
 
+    public async Task<List<UserResponse>> GetUsers()
+    {
+        return await _context.Users.Select(x => new UserResponse()
+        {
+            Email = x.Email,
+            Id = x.Id,
+            IsVip = x.IsVip
+        }).OrderBy(x => x.Id).ToListAsync();
+    }
+
+    public async Task UpdateVipStatus(int id, bool isVip)
+    {
+        var user = await _context.Users.FindAsync(id);
+        user.IsVip = isVip;
+        _context.Users.Update(user);
+        await _context.SaveChangesAsync();
+    }
+
     private string generateJwtToken(User user)
     {