Web API improvements (TrilonIO#182)

* Removed no longer used API

* Pluralised API to "Users" and depluralised model to "User". All UsersAPI's now point to same URI.

* Updated web API status codes

Author: LiverpoolOwen

Client/app/containers/users/users.component.ts

@@ -50,14 +50,16 @@ export class UsersComponent implements OnInit {
         //      The Client then re-uses this Http result instead of hitting the server again!
 
         //  NOTE : transferHttp also automatically does .map(res => res.json()) for you, so no need for these calls
-        this.transferHttp.get(`${this.baseUrl}/api/user/all`).subscribe(result => {
-            console.log('TransferHttp [GET] /api/user/allresult', result);
+        this.transferHttp.get(`${this.baseUrl}/api/users`).subscribe(result => {
+            console.log('Get user result: ', result);
+            console.log('TransferHttp [GET] /api/users/allresult', result);
             this.users = result as IUser[];
         });
     }
 
     deleteUser(user) {
-        this.http.delete(`${this.baseUrl}/api/user/delete/` + user.id).subscribe(result => {
+        this.http.delete(`${this.baseUrl}/api/users/` + user.id).subscribe(result => {
+            console.log('Delete user result: ', result);
             if (result.ok) {
                 let position = this.users.indexOf(user);
                 this.users.splice(position, 1);
@@ -68,23 +70,17 @@ export class UsersComponent implements OnInit {
     }
 
     editUser(user) {
-        let urlSearchParams = new URLSearchParams();
-        urlSearchParams.append('id', user.id);
-        urlSearchParams.append('name', user.name);
-
-        this.http.put(`${this.baseUrl}/api/user/update`, urlSearchParams).subscribe(result => {
-          console.log('result: ', result);
+        this.http.put(`${this.baseUrl}/api/users/` + user.id, user).subscribe(result => {
+          console.log('Put user result: ', result);
             if (!result) {
                 alert('There was an issue, Could not edit user');
             }
         });
     }
 
     addUser(newUserName) {
-        let urlSearchParams = new URLSearchParams();
-        urlSearchParams.append('name', newUserName);
-
-        this.http.post(`${this.baseUrl}/api/user/insert`, urlSearchParams).subscribe(result => {
+        this.http.post(`${this.baseUrl}/api/users`, { name: newUserName }).subscribe(result => {
+            console.log('Post user result: ', result);
             if (result) {
                 this.users.push(result.json());
                 this.newUserName = '';

Server/Data/DbInitializer.cs

@@ -17,22 +17,22 @@ public static void Initialize(SpaDbContext context)
             {
                 return;   // DB has been seeded
             }
-            var users = new Users[]
+            var users = new User[]
             {
-               new Users(){Name = "Mark Pieszak"},
-               new Users(){Name = "Abrar Jahin"},
-               new Users(){Name = "hakonamatata"},
-               new Users(){Name = "LiverpoolOwen"},
-               new Users(){Name = "Ketrex"},
-               new Users(){Name = "markwhitfeld"},
-               new Users(){Name = "daveo1001"},
-               new Users(){Name = "paonath"},
-               new Users(){Name = "nalex095"},
-               new Users(){Name = "ORuban"},
-               new Users(){Name = "Gaulomatic"}
+               new User(){Name = "Mark Pieszak"},
+               new User(){Name = "Abrar Jahin"},
+               new User(){Name = "hakonamatata"},
+               new User(){Name = "LiverpoolOwen"},
+               new User(){Name = "Ketrex"},
+               new User(){Name = "markwhitfeld"},
+               new User(){Name = "daveo1001"},
+               new User(){Name = "paonath"},
+               new User(){Name = "nalex095"},
+               new User(){Name = "ORuban"},
+               new User(){Name = "Gaulomatic"}
             };
 
-            foreach (Users s in users)
+            foreach (User s in users)
             {
                 context.User.Add(s);
             }

Server/Data/SpaDbContext.cs

@@ -12,6 +12,6 @@ public SpaDbContext(DbContextOptions<SpaDbContext> options)
         }
 
         //List of DB Models - Add your DB models here
-        public DbSet<Users> User { get; set; }
+        public DbSet<User> User { get; set; }
     }
 }

Server/Models/Users.cs renamed to Server/Models/User.cs

@@ -3,7 +3,7 @@
 
 namespace AspCoreServer.Models
 {
-    public class Users
+    public class User
     {
         public int ID { get; set; }
         public string Name { get; set; }
@@ -13,7 +13,7 @@ public class Users
         public DateTime EntryTime { get; set; }
 
         //Setting Default value
-        public Users()
+        public User()
         {
             EntryTime = DateTime.Now;
         }

Server/RestAPI/UserController.cs

@@ -0,0 +1,123 @@
+using AspCoreServer.Data;
+using AspCoreServer.Models;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.EntityFrameworkCore;
+using System;
+using System.Linq;
+using System.Threading.Tasks;
+
+namespace AspCoreServer.Controllers
+{
+  [Route("api/[controller]")]
+  public class UsersController : Controller
+  {
+    private readonly SpaDbContext _context;
+
+    public UsersController(SpaDbContext context)
+    {
+      _context = context;
+    }
+
+    [HttpGet]
+    public async Task<IActionResult> Get(int currentPageNo = 1, int pageSize = 20)
+    {
+      var users = await _context.User
+          .OrderByDescending(u => u.EntryTime)
+          .Skip((currentPageNo - 1) * pageSize)
+          .Take(pageSize)
+          .ToArrayAsync();
+
+      if (!users.Any())
+      {
+        return NotFound("Users not Found");
+      }
+      else
+      {
+        return Ok(users);
+      }
+    }
+
+    [HttpGet("{id}")]
+    public async Task<IActionResult> Get(int id)
+    {
+      var user = await _context.User
+          .Where(u => u.ID == id)
+          .AsNoTracking()
+          .SingleOrDefaultAsync(m => m.ID == id);
+
+      if (user == null)
+      {
+        return NotFound("User not Found");
+      }
+      else
+      {
+        return Ok(user);
+      }
+    }
+
+    [HttpPost]
+    public async Task<IActionResult> Post([FromBody]User user)
+    {
+      if (!string.IsNullOrEmpty(user.Name))
+      {
+        _context.Add(user);
+        await _context.SaveChangesAsync();
+        return CreatedAtAction("Post", user);
+      }
+      else
+      {
+        return BadRequest("User's name was not given");
+      }
+    }
+
+    [HttpPut("{id}")]
+    public async Task<IActionResult> Put(int id, [FromBody]User userUpdateValue)
+    {
+      try
+      {
+        userUpdateValue.EntryTime = DateTime.Now;
+
+        var userToEdit = await _context.User
+          .AsNoTracking()
+          .SingleOrDefaultAsync(m => m.ID == id);
+
+        if (userToEdit == null)
+        {
+          return NotFound("Could not update user as it was not Found");
+        }
+        else
+        {
+          _context.Update(userUpdateValue);
+          await _context.SaveChangesAsync();
+          return Ok("Updated user - " + userUpdateValue.Name);
+        }
+      }
+      catch (DbUpdateException)
+      {
+        //Log the error (uncomment ex variable name and write a log.)
+        ModelState.AddModelError("", "Unable to save changes. " +
+            "Try again, and if the problem persists, " +
+            "see your system administrator.");
+        return NotFound("User not Found");
+      }
+    }
+
+    [HttpDelete("{id}")]
+    public async Task<IActionResult> Delete(int id)
+    {
+      var userToRemove = await _context.User
+          .AsNoTracking()
+      .SingleOrDefaultAsync(m => m.ID == id);
+      if (userToRemove == null)
+      {
+        return NotFound("Could not delete user as it was not Found");
+      }
+      else
+      {
+        _context.User.Remove(userToRemove);
+        await _context.SaveChangesAsync();
+        return Ok("Deleted user - " + userToRemove.Name);
+      }
+    }
+  }
+}