Refactor data layer, add business layer

WebAPI/Controllers/NotFoundController.cs

@@ -0,0 +1,16 @@
+using Microsoft.AspNetCore.Mvc;
+
+namespace WebAPI.Controllers
+{
+    [ApiController]
+    [ApiExplorerSettings(IgnoreApi = true)]
+    [Route("error")]                 // ← required
+    public class NotFoundController : ControllerBase
+    {
+        [HttpGet("404")]             // ← required
+        public IActionResult Handle404()
+        {
+            return NotFound(new { message = "Route not found." });
+        }
+    }
+}

WebAPI/Controllers/UsersController.cs

@@ -1,5 +1,5 @@
-using DataAccessLayer;
 using DataAccessLayer.Entities;
+using BusinessLayer.Services;
 using Microsoft.AspNetCore.Mvc;
 
 namespace WebAPI.Controllers
@@ -8,40 +8,57 @@ namespace WebAPI.Controllers
     [Route("api/users")]
     public class UsersController : ControllerBase
     {
-        private readonly IUserAccountRepository _userAccountRepository;
+        private readonly IUserService _userService;
 
-        public UsersController()
+        public UsersController(IUserService userService)
         {
-            _userAccountRepository = new UserAccountRepository();
+            _userService = userService;
         }
 
         // all users
         [HttpGet]
-        [HttpGet("users")]
-        public IActionResult GetAllUsers()
+        public IActionResult GetAllUsers(
+            [FromQuery] int? limit,
+            [FromQuery] int? offset
+        )
         {
-            var users = _userAccountRepository.GetAll();
+            if (offset.HasValue && !limit.HasValue)
+            {
+                return BadRequest("Limit is required when offset is provided.");
+            }
+
+            if (limit.HasValue && limit <= 0)
+            {
+                return BadRequest("Limit must be greater than zero.");
+            }
+
+            if (offset.HasValue && offset < 0)
+            {
+                return BadRequest("Offset cannot be negative.");
+            }
+
+            var users = _userService.GetAll(limit, offset);
             return Ok(users);
         }
 
         [HttpGet("{id:guid}")]
         public IActionResult GetUserById(Guid id)
         {
-            var user = _userAccountRepository.GetById(id);
+            var user = _userService.GetById(id);
             return user is null ? NotFound() : Ok(user);
         }
 
-        [HttpGet("by-username/{username}")]
+        [HttpGet("username/{username}")]
         public IActionResult GetUserByUsername(string username)
         {
-            var user = _userAccountRepository.GetByUsername(username);
+            var user = _userService.GetByUsername(username);
             return user is null ? NotFound() : Ok(user);
         }
 
-        [HttpGet("by-email/{email}")]
+        [HttpGet("email/{email}")]
         public IActionResult GetUserByEmail(string email)
         {
-            var user = _userAccountRepository.GetByEmail(email);
+            var user = _userService.GetByEmail(email);
             return user is null ? NotFound() : Ok(user);
         }
 
@@ -53,7 +70,7 @@ namespace WebAPI.Controllers
                 userAccount.UserAccountID = Guid.NewGuid();
             }
 
-            _userAccountRepository.Add(userAccount);
+            _userService.Add(userAccount);
             return CreatedAtAction(
                 nameof(GetUserById),
                 new { id = userAccount.UserAccountID },
@@ -70,14 +87,14 @@ namespace WebAPI.Controllers
             }
 
             userAccount.UserAccountID = id;
-            _userAccountRepository.Update(userAccount);
+            _userService.Update(userAccount);
             return NoContent();
         }
 
         [HttpDelete("{id:guid}")]
         public IActionResult DeleteUser(Guid id)
         {
-            _userAccountRepository.Delete(id);
+            _userService.Delete(id);
             return NoContent();
         }
     }

WebAPI/Program.cs

@@ -1,9 +1,14 @@
-var builder = WebApplication.CreateBuilder(args);
+using BusinessLayer.Services;
+using DataAccessLayer;
+
+var builder = WebApplication.CreateBuilder(args);
 
-builder.Services.AddControllers();
-builder.Services.AddEndpointsApiExplorer();
-builder.Services.AddSwaggerGen();
-builder.Services.AddOpenApi();
+builder.Services.AddControllers();
+builder.Services.AddEndpointsApiExplorer();
+builder.Services.AddSwaggerGen();
+builder.Services.AddOpenApi();
+builder.Services.AddScoped<IUserAccountRepository, UserAccountRepository>();
+builder.Services.AddScoped<IUserService, UserService>();
 
 var app = builder.Build();
 
@@ -14,7 +19,8 @@ if (app.Environment.IsDevelopment())
     app.MapOpenApi();
 }
 
-app.UseHttpsRedirection();
-app.MapControllers();
-app.Run();
+app.UseHttpsRedirection();
+app.MapControllers();
+app.MapFallbackToController("Handle404", "NotFound");
+app.Run();
 

WebAPI/WebAPI.csproj

@@ -1,16 +1,16 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
-  <PropertyGroup>
-    <TargetFramework>net10.0</TargetFramework>
-    <Nullable>enable</Nullable>
-    <ImplicitUsings>enable</ImplicitUsings>
-  </PropertyGroup>
-
+<Project Sdk="Microsoft.NET.Sdk.Web">
+  <PropertyGroup>
+    <TargetFramework>net10.0</TargetFramework>
+    <Nullable>enable</Nullable>
+    <ImplicitUsings>enable</ImplicitUsings>
+  </PropertyGroup>
+
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="9.0.11" />
     <PackageReference Include="Swashbuckle.AspNetCore" Version="6.6.2" />
   </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="../DataAccessLayer/DataAccessLayer.csproj" />
-  </ItemGroup>
-</Project>
+
+  <ItemGroup>
+    <ProjectReference Include="../BusinessLayer/BusinessLayer.csproj" />
+  </ItemGroup>
+</Project>