diff --git a/MBDEVproAPI.API/Controllers/BaseController.cs b/MBDEVproAPI.API/Controllers/BaseController.cs index 066fa5d..ba87c06 100644 --- a/MBDEVproAPI.API/Controllers/BaseController.cs +++ b/MBDEVproAPI.API/Controllers/BaseController.cs @@ -1,9 +1,8 @@ -using Microsoft.AspNetCore.Mvc; - -namespace MBDEVproAPI.API.Controllers +namespace MBDEVproAPI.API.Controllers { [ApiController, AllowAnonymous, Route("api/[controller]/[action]")] + public class BaseController : Controller { diff --git a/MBDEVproAPI.API/Controllers/CustomerController.cs b/MBDEVproAPI.API/Controllers/CustomerController.cs index e2cf31c..df85ccd 100644 --- a/MBDEVproAPI.API/Controllers/CustomerController.cs +++ b/MBDEVproAPI.API/Controllers/CustomerController.cs @@ -1,100 +1,199 @@ - - -namespace MBDEVproAPI.API.Controllers +namespace MBDEVproAPI.API.Controllers { - [Route("api/[controller]")] - [ApiController] - public class CustomerController : ControllerBase + public class CustomerController : BaseController { - private readonly MBDEVproAPIDbContext _context; - public CustomerController(MBDEVproAPIDbContext context) - { - _context = context; - } + #region variables and constructors - // GET: api/Customer - [HttpGet] - public async Task>> GetCustomers() + private ICustomerService _customerService; + + public CustomerController(ICustomerService customerService) { - return await _context.Customers.ToListAsync(); + _customerService = customerService; } + #endregion - // GET: api/Customer/5 - [HttpGet("{id}")] - public async Task> GetCustomer(int id) - { - var customer = await _context.Customers.FindAsync(id); - if (customer == null) - { - return NotFound(); - } + #region + #endregion - return customer; - } - // PUT: api/Customer/5 - // To protect from overposting attacks, see https://go.microsoft.com/fwlink/?linkid=2123754 - [HttpPut("{id}")] - public async Task PutCustomer(int id, Customer customer) + #region Get All Customers + /// + /// GET: Get All Customers | CustomerViewModel | Gets all customers for a business in a VM for web UI. + /// TEST URL: https://localhost:7092/api/Customer/GetAllCustomers/52466 | https://localhost:7092/api/Customer/GetAllCustomers?BusinessID=52466 + /// "CustomerControllerGetAllCustomersVMAsync": "Customer/GetAllCustomersVMAsync", + /// + /// + /// + //[Route("GetAllCustomers")] + //[HttpGet("{BusinessID}")] + [HttpGet] + public async Task> GetAllCustomersVMAsync(int BusinessID) { - if (id != customer.CustomerID) + BusinessID = 52466; // temp hard code for testing, can remove later. + try { - return BadRequest(); - } + var customers = await _customerService.GetAllCustomersVMAsync(BusinessID); - _context.Entry(customer).State = EntityState.Modified; + if (customers == null) + { + return NotFound(); + } - try + return Ok(customers); + } + catch (Exception ex) { - await _context.SaveChangesAsync(); + return BadRequest("Customer API error: " + ex.Message + " | " + ex.InnerException); } - catch (DbUpdateConcurrencyException) + } + + + /// + /// GET: Get All Customers | CustomerModel | Gets all customers for a business. + /// TEST URL: https://localhost:7092/api/Customer/GetAllCustomers?BusinessID=52466 + /// "CustomerControllerGetAllCustomersAsync": "Customer/GetAllCustomersAsync", + /// + /// + /// + [HttpGet] + public async Task> GetAllCustomersAsync(int BusinessID) + { + BusinessID = 52466; // temp hard code for testing, can remove later. + try { - if (!CustomerExists(id)) + var customers = await _customerService.GetAllCustomersAsync(BusinessID); + if (customers == null) { return NotFound(); } - else - { - throw; - } + return Ok(customers); + } + catch (Exception ex) + { + return BadRequest("Customer API error: " + ex.Message + " | " + ex.InnerException); } - - return NoContent(); } + #endregion - // POST: api/Customer - // To protect from overposting attacks, see https://go.microsoft.com/fwlink/?linkid=2123754 - [HttpPost] - public async Task> PostCustomer(Customer customer) - { - _context.Customers.Add(customer); - await _context.SaveChangesAsync(); - return CreatedAtAction("GetCustomer", new { id = customer.CustomerID }, customer); - } - // DELETE: api/Customer/5 - [HttpDelete("{id}")] - public async Task DeleteCustomer(int id) + #region Get Customer + /// + /// GET: Get Customer | Customer | Gets a customer for a business. + /// TEST URL: https://localhost:7092/api/Customer/GetCustomer/3 | https://localhost:7092/api/Customer/GetCustomer?CustomerID=3 + /// "CustomerControllerGetCustomer": "Customer/GetCustomer", + /// + /// + /// + //[Route("GetCustomer")] + //[HttpGet("{CustomerID}")] + [HttpGet] + public async Task> GetCustomerAsync(int CustomerID) { - var customer = await _context.Customers.FindAsync(id); + var customer = await _customerService.GetCustomerAsync(CustomerID); + if (customer == null) { return NotFound(); } - _context.Customers.Remove(customer); - await _context.SaveChangesAsync(); + return customer; + } + #endregion + + + + + #region Create Customer + /// + /// Add Customer | CustomerViewModel | Create a new customer for a business from client web application using a CustomerViewModel. + /// + /// + /// + [HttpPost] + public async Task CreateCustomerVMAsync([FromBody] CustomerViewModel vm) + { + var result = await _customerService.CreateCustomerVMAsync(vm); + return Ok(result); + } + + + /// + /// Add Customer | CustomerModel | Create a new customer for a business. + /// TEST URL: https://localhost:7092/api/Customer/CreateCustomer + /// + /// + /// + [HttpPost] + public async Task CreateCustomerAsync([FromBody] CustomerModel model) + { + var result = await _customerService.CreateCustomerAsync(model); + return Ok(result); + //return Ok("UNDER CONTRUCTION | CreateCustomerAsync([FromBody] Customer model)"); + } + #endregion + - return NoContent(); + + + #region Edit Customer + /// + /// EDIT: Edit a Customer | CustomerViewModel | edit a customer for a business in a VM for web UI. + /// TEST URL: | + /// "CustomerControllerEditCustomerVMAsync": "Customer/EditCustomerVMAsync", + /// + /// + /// SaveViewModel + [HttpPost] + public async Task EditCustomerVMAsync([FromBody] CustomerViewModel vm) + { + // if model is valid, then update, else return bad request with model state errors. + var result = await _customerService.EditCustomerVMAsync(vm); + return Ok(result); + //return Ok("UNDER CONTRUCTION | EditCustomer(int id, [FromBody] Customer model)"); } - private bool CustomerExists(int id) + + /// + /// EDIT: Customer | CustomerModel | edit a customer for a business. + /// TEST URL: https://localhost:7092/api/Customer/EditCustomer?id=5 + /// "CustomerControllerEditCustomer": "Customer/EditCustomer" + /// + /// + /// + [HttpPost] + public async Task EditCustomer([FromBody] CustomerModel model) { - return _context.Customers.Any(e => e.CustomerID == id); + // if model is valid, then update, else return bad request with model state errors. + var result = await _customerService.EditCustomer(model); + return Ok(result); } + + // CustomerModel to just return a CustomerModel instead of a SaveViewModel with the RefID. We could do this for the VM as well. + #endregion + + + + #region Delete Customer + /// + /// DELETE: Customer | SaveViewModel | delete a customer for a business and return a SaveViewModel with the RefID of the deleted customer. + /// "CustomerControllerDeleteCustomerVMAsync": "Customer/DeleteCustomerVMAsync" + /// + /// + /// SaveViewModel + [HttpDelete("{CustomerID:int}")] + public async Task DeleteCustomerVMAsync(int CustomerID)// LOOK AT ALL THESE IN CONTROLLER COMPAARED TO LICENSE API, WE JUST USE ACTION RESULT HERE AND RETURN THE MODEL THAT IS IN THE SERVICE. + { + var result = await _customerService.DeleteCustomerVMAsync(CustomerID); + return Ok(result); + } + #endregion } } + + + + + diff --git a/MBDEVproAPI.API/GlobalUsings.cs b/MBDEVproAPI.API/GlobalUsings.cs index 482b018..ea436fa 100644 --- a/MBDEVproAPI.API/GlobalUsings.cs +++ b/MBDEVproAPI.API/GlobalUsings.cs @@ -4,8 +4,12 @@ //global using MBDEVproAPI.BLL.Services; global using MBDEVproAPI.Common.Models; global using MBDEVproAPI.Common.ViewModels; -//global using MBDEVproAPI.Repository.Interfaces; -//global using MBDEVproAPI.Repository.Repositories; +global using MBDEVproAPI.BLL.Interfaces; +global using MBDEVproAPI.BLL.Services; +global using MBDEVproAPI.DataModel; +global using MBDEVproAPI.DataModel.Entities; +global using MBDEVproAPI.Repository.Interfaces; +global using MBDEVproAPI.Repository.Repositories; global using Microsoft.AspNetCore.Authorization; global using Microsoft.AspNetCore.Builder; global using Microsoft.AspNetCore.Hosting; @@ -19,3 +23,6 @@ //global using Microsoft.OpenApi.Models; global using Serilog; global using Serilog.Formatting.Json; +global using Microsoft.OpenApi; +global using Scalar.AspNetCore; + diff --git a/MBDEVproAPI.API/MBDEVproAPI.API.csproj b/MBDEVproAPI.API/MBDEVproAPI.API.csproj index f2b34cb..ab80dc1 100644 --- a/MBDEVproAPI.API/MBDEVproAPI.API.csproj +++ b/MBDEVproAPI.API/MBDEVproAPI.API.csproj @@ -7,15 +7,15 @@ - - - - - + + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive - + @@ -23,8 +23,10 @@ - - + + + + diff --git a/MBDEVproAPI.API/MBDEVproAPI.API.http b/MBDEVproAPI.API/MBDEVproAPI.API.http index 0c11d52..cc413c5 100644 --- a/MBDEVproAPI.API/MBDEVproAPI.API.http +++ b/MBDEVproAPI.API/MBDEVproAPI.API.http @@ -1,6 +1,17 @@ -@MBDEVproAPI.API_HostAddress = http://localhost:5126 +@MBDEVproAPI.API_HostAddress = http://localhost:7092 GET {{MBDEVproAPI.API_HostAddress}}/weatherforecast/ Accept: application/json ### + +GET {{MBDEVproAPI.API_HostAddress}}/api/Customer/GetAllCustomers?BusinessID=52466 +Accept: application/json +// https://localhost:7092/api/Customer/GetAllCustomers/52466 +// https://localhost:7092/api/Customer/GetAllCustomers?BusinessID=52466 + +### + +GET {{MBDEVproAPI.API_HostAddress}}/api/Customer/GetCustomer/3 +Accept: application/json +// https://localhost:7092/api/Customer/GetCustomer?CustomerID=3 \ No newline at end of file diff --git a/MBDEVproAPI.API/Program.cs b/MBDEVproAPI.API/Program.cs index 7828818..c9b8cd6 100644 --- a/MBDEVproAPI.API/Program.cs +++ b/MBDEVproAPI.API/Program.cs @@ -1,31 +1,120 @@ -using MBDEVproAPI.DataModel; - var builder = WebApplication.CreateBuilder(args); +var logger = new LoggerConfiguration() + .ReadFrom.Configuration(builder.Configuration) + .Enrich.FromLogContext() + .CreateLogger(); +builder.Host.UseSerilog(logger); + + + -//Register services directly in Program.cs +//DATABASE CONNECTION builder.Services.AddDbContext(options => options.UseSqlServer(builder.Configuration.GetConnectionString("DefaultConnection"))); -//builder.Services.AddTransient(); -//builder.Services.AddScoped(); - +// SERVICES +builder.Services.AddTransient(); +// REPOSITORIES +builder.Services.AddTransient(); builder.Services.AddControllers(); // Learn more about configuring OpenAPI at https://aka.ms/aspnet/openapi builder.Services.AddOpenApi(); + +// Register the Swagger generator; custom details +builder.Services.AddSwaggerGen(c => +{ + c.SwaggerDoc("v1", new OpenApiInfo + { + Version = "v1", + Title = "MBDEVproAPI v1 | .NET CORE 10", + Description = "manages business customers", + TermsOfService = new Uri("https://images3.alphacoders.com/967/thumb-1920-96797.jpg"), + Contact = new OpenApiContact + { + Name = "MBDEVproAPI Administrator", + Email = "MBDEVproAPIAdministrator@encom.com", + Url = new Uri("https://m.media-amazon.com/images/I/71rVfyrUzPL._SL1101_.jpg"), + }, + License = new OpenApiLicense + { + Name = "No license", + Url = new Uri("https://example.com/license"), + } + }); +}); + +//ADD: API security and authentication (OAuth2, OpenID Connect, JWT) + var app = builder.Build(); +app.UseSerilogRequestLogging(); + + // Configure the HTTP request pipeline. if (app.Environment.IsDevelopment()) { + //app.MapOpenApi(); // Expose the OpenAPI JSON endpoint + //app.MapScalarApiReference(); // Map the Scalar UI endpoint + app.MapOpenApi(); + app.MapScalarApiReference(); + //app.MapScalarApiReference(options => + //{ + // options.Title = "MBDEVproAPI v1 .NET CORE 10"; + // options.WithTheme(ScalarTheme.Moon); // Use a specific theme + // options.ForceDarkMode(); // Force dark mode + //}); + + // Automatically redirect to Scalar documentation + //app.MapGet("/", () => Results.Redirect("/scalar")); + + Log.Information("MBDEVproAPI: (Development Environment)"); + app.UseDeveloperExceptionPage(); +} + + + +if (app.Environment.EnvironmentName == "Test") +{ + Log.Information("MBDEVproAPI: Test Environment)"); } +if (app.Environment.EnvironmentName == "Uat") +{ + Log.Information("MBDEVproAPI: Uat Environment)"); +} + +if (app.Environment.EnvironmentName == "Production") +{ + Log.Information("MBDEVproAPI: Production Environment)"); +} + +//if (app.Environment.IsDevelopment() || app.Environment.EnvironmentName == "Test") +//{ +// //app.UseSwagger(); +// //app.UseSwaggerUI(c => +// //{ +// // //c.SwaggerEndpoint("/MBDEVproAPI/swagger/v1/swagger.json", "MBDEVproAPI v1 .NET CORE 10"); +// // c.SwaggerEndpoint("../swagger/v1/swagger.json", "MBDEVproAPI v1 .NET CORE 10"); +// // // ENDPOINTS: https://localhost:7092/swagger/index.html +// // // JSON: https://localhost:7092/swagger/v1/swagger.json +// //}); +//} + +Log.Information("MBDEVproAPI: (Development Environment)"); + +app.UseSerilogRequestLogging(); // Add Serilog request logging middleware + +app.UseDeveloperExceptionPage(); // For local only, can change later for testing and production environments, can also add custom error handling middleware for production environment. + //Middleware app.UseHttpsRedirection(); +app.UseStaticFiles(); + app.UseAuthorization(); app.MapControllers(); diff --git a/MBDEVproAPI.API/Properties/launchSettings.json b/MBDEVproAPI.API/Properties/launchSettings.json index 95446b4..859c2db 100644 --- a/MBDEVproAPI.API/Properties/launchSettings.json +++ b/MBDEVproAPI.API/Properties/launchSettings.json @@ -1,23 +1,36 @@ -{ - "$schema": "https://json.schemastore.org/launchsettings.json", +{ "profiles": { "http": { "commandName": "Project", - "dotnetRunMessages": true, - "launchBrowser": false, - "applicationUrl": "http://localhost:5126", "environmentVariables": { "ASPNETCORE_ENVIRONMENT": "Development" - } + }, + "dotnetRunMessages": true, + "applicationUrl": "http://localhost:5126" }, "https": { "commandName": "Project", + "environmentVariables": { + "ASPNETCORE_ENVIRONMENT": "Development" + }, "dotnetRunMessages": true, - "launchBrowser": false, - "applicationUrl": "https://localhost:7092;http://localhost:5126", + "applicationUrl": "https://localhost:7092;http://localhost:5126" + }, + "IIS Express": { + "commandName": "IISExpress", + "launchBrowser": true, "environmentVariables": { "ASPNETCORE_ENVIRONMENT": "Development" } } + }, + "$schema": "https://json.schemastore.org/launchsettings.json", + "iisSettings": { + "windowsAuthentication": false, + "anonymousAuthentication": true, + "iisExpress": { + "applicationUrl": "http://localhost:65421/", + "sslPort": 44399 + } } -} +} \ No newline at end of file diff --git a/MBDEVproAPI.API/appsettings.Development.json b/MBDEVproAPI.API/appsettings.Development.json index 3453499..186a07e 100644 --- a/MBDEVproAPI.API/appsettings.Development.json +++ b/MBDEVproAPI.API/appsettings.Development.json @@ -1,13 +1,69 @@ { "ConnectionStrings": { - //"DefaultConnection": "Server=ComputerPro7.local;Database=MBDEVproDB;Trusted_Connection=True;MultipleActiveResultSets=true", - // Use Secrets if passwords and so on... - "DefaultConnection": "Server=COMPUTERPRO7\\MSSQLSERVER2025;Initial Catalog=MBDEVproDB;Integrated Security=True;Encrypt=False;Trust Server Certificate=True" + "DefaultConnection": "Server=COMPUTERPRO7\\MSSQLSERVER2025;Initial Catalog=MBDEVproDB;Integrated Security=True;Encrypt=False;Trust Server Certificate=True" }, + + "APISettings": { + //"APIUrl": "https://localhost:7092/api/Customer/", + //"AuthenticateUrl": "Account/Login", + //"BusinessID": "0", + //"IsUserExist": "Account/IsUserExist" + + }, + + "DefaultProjectSettings": { + "ProjectName": "MBDEVproAPI", + "Description": "MBDEVproAPI version .NET CORE 10", + "SomeKey": "xcxc", + "SessionTimeout": "900000", + "ApplicationURL": "https://www.google.com", + "JSReport_TimeOutValue": "200000000", + "LogInExpireTimeSpan": "40" + }, + "Logging": { "LogLevel": { "Default": "Information", - "Microsoft.AspNetCore": "Warning" + "Microsoft": "Warning", + "Microsoft.Hosting.Lifetime": "Information" + } + }, + "UserLogin": { + "AppShortName": "MBDEVproAPI", + "BaseUri": "https://localhost:7092/api/Customer/", + "ValidateTokenUri": "Auth/ValidateAppAccessToken" + }, + "HttpsRedirection": { + "Enabled": true, + "SSLPort": 443 + }, + "AllowedHosts": "*", + "Serilog": { + "Using": [ "Serilog.Exceptions" ], + "MinimumLevel": { + "Default": "Debug", + "Override": { + "Microsoft": "Warning", + "System": "Warning" + } + }, + "Enrich": [ "FromLogContext", "WithMachineName", "WithProcessId", "WithThreadId", "WithExceptionDetails" ], + "WriteTo": [ + { "Name": "Console" }, + { + "Name": "File", + "Args": { + "path": "X:\\Logs\\MBDEVpro\\MBDEVproAPI\\Development\\log.txt", + "outputTemplate": "{Timestamp:G} {Message}{NewLine:1}{Exception:1}" + } + }, + { + "Name": "File", + "Args": { + "path": "X:\\Logs\\MBDEVpro\\MBDEVproAPI\\Development\\log.json", + "formatter": "Serilog.Formatting.Json.JsonFormatter, Serilog" + } + } + ] } - } -} + } \ No newline at end of file diff --git a/MBDEVproAPI.API/appsettings.json b/MBDEVproAPI.API/appsettings.json index 10f68b8..8c3ffb4 100644 --- a/MBDEVproAPI.API/appsettings.json +++ b/MBDEVproAPI.API/appsettings.json @@ -5,5 +5,9 @@ "Microsoft.AspNetCore": "Warning" } }, + "HttpsRedirection": { + "Enabled": true, + "SSLPort": 443 + }, "AllowedHosts": "*" } diff --git a/MBDEVproAPI.API/dotnet-tools.json b/MBDEVproAPI.API/dotnet-tools.json new file mode 100644 index 0000000..b6f4c2f --- /dev/null +++ b/MBDEVproAPI.API/dotnet-tools.json @@ -0,0 +1,13 @@ +{ + "version": 1, + "isRoot": true, + "tools": { + "dotnet-ef": { + "version": "10.0.5", + "commands": [ + "dotnet-ef" + ], + "rollForward": false + } + } +} \ No newline at end of file diff --git a/MBDEVproAPI.API/serilogSettings.json b/MBDEVproAPI.API/serilogSettings.json new file mode 100644 index 0000000..1436674 --- /dev/null +++ b/MBDEVproAPI.API/serilogSettings.json @@ -0,0 +1,37 @@ +{ + "AllowedHosts": "*", + "Serilog": { + "Using": [ "Serilog.Exceptions" ], + "MinimumLevel": { + "Default": "Information", + "Override": { + "Microsoft": "Warning", + "System": "Warning" + } + }, + "Enrich": [ "FromLogContext", "WithMachineName", "WithProcessId", "WithThreadId", "WithExceptionDetails" ], + "WriteTo": [ + { "Name": "Console" }, + { + "Name": "File", + "Args": { + "path": "X:\\Logs\\MBDEVpro\\CustomerAPI\\Log.txt", + "outputTemplate": "{Timestamp:G} {Message}{NewLine:1}{Exception:1}" + } + }, + { + "Name": "File", + "Args": { + "path": "X:\\Logs\\MBDEVpro\\CustomerAPI\\log.json", + "formatter": "Serilog.Formatting.Json.JsonFormatter, Serilog" + } + }, + { + "Name": "Seq", + "Args": { + "serverUrl": "http://localhost:8081" + } + } + ] + } +} diff --git a/MBDEVproAPI.BLL/GlobalUsings.cs b/MBDEVproAPI.BLL/GlobalUsings.cs index bf01b9e..b00585a 100644 --- a/MBDEVproAPI.BLL/GlobalUsings.cs +++ b/MBDEVproAPI.BLL/GlobalUsings.cs @@ -4,13 +4,20 @@ global using System.Linq; global using System.Reflection; global using System.Transactions; -//global using MBDEVproAPI.BLL.Interfaces; -global using MBDEVproAPI.Common.Models; -global using MBDEVproAPI.Common.ViewModels; -//global using MBDEVproAPI.Common.ViewModels.Shared; -//global using MBDEVproAPI.Repository.Interfaces; +global using Microsoft.AspNetCore.Http.HttpResults; global using Microsoft.AspNetCore.Http; global using Microsoft.Extensions.Caching.Memory; global using Microsoft.Extensions.Configuration; global using Serilog; global using Serilog.Formatting.Json; +global using System.Threading.Tasks; +global using Microsoft.AspNetCore.Mvc; +global using MBDEVproAPI.Common.Models; +global using MBDEVproAPI.Common.ViewModels; +global using MBDEVproAPI.Repository; +global using MBDEVproAPI.BLL.Interfaces; +global using MBDEVproAPI.BLL.Services; +global using MBDEVproAPI.DataModel; +global using MBDEVproAPI.DataModel.Entities; +global using MBDEVproAPI.Repository.Interfaces; +global using MBDEVproAPI.Repository.Repositories; diff --git a/MBDEVproAPI.BLL/Interfaces/.gitkeep b/MBDEVproAPI.BLL/Interfaces/.gitkeep deleted file mode 100644 index 16e72ee..0000000 --- a/MBDEVproAPI.BLL/Interfaces/.gitkeep +++ /dev/null @@ -1,10 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Text; - -namespace MBDEVproAPI.BLL.Interfaces -{ - class _ - { - } -} diff --git a/MBDEVproAPI.BLL/Interfaces/IBaseService.cs b/MBDEVproAPI.BLL/Interfaces/IBaseService.cs new file mode 100644 index 0000000..81c7477 --- /dev/null +++ b/MBDEVproAPI.BLL/Interfaces/IBaseService.cs @@ -0,0 +1,9 @@ + +namespace MBDEVproAPI.BLL.Interfaces +{ + public interface IBaseService + { + + + } +} diff --git a/MBDEVproAPI.BLL/Interfaces/ICustomerService.cs b/MBDEVproAPI.BLL/Interfaces/ICustomerService.cs index 8782c89..f8a90a1 100644 --- a/MBDEVproAPI.BLL/Interfaces/ICustomerService.cs +++ b/MBDEVproAPI.BLL/Interfaces/ICustomerService.cs @@ -1,8 +1,50 @@  +using Microsoft.AspNetCore.Mvc; +using Microsoft.EntityFrameworkCore; + namespace MBDEVproAPI.BLL.Interfaces { - internal interface ICustomerService + public interface ICustomerService : IBaseService { + + + #region + #endregion + + + + #region Get All Customers + Task GetAllCustomersVMAsync(int BusinessID); + + Task> GetAllCustomersAsync(int BusinessID); + #endregion + + + #region Get Customer + Task GetCustomerAsync(int CustomerID); + #endregion + + + #region Add Customer + Task CreateCustomerVMAsync(CustomerViewModel vm); + + Task CreateCustomerAsync(CustomerModel model); + + SaveViewModel CreateCustomer(CustomerModel model); + #endregion + + + #region Edit Customer + Task EditCustomerVMAsync(CustomerViewModel vm); + + Task EditCustomer(CustomerModel model); + #endregion + + + #region Delete Customer + Task DeleteCustomerVMAsync(int CustomerID); + Task DeleteCustomer(int CustomerID); + #endregion } } diff --git a/MBDEVproAPI.BLL/MBDEVproAPI.BLL.csproj b/MBDEVproAPI.BLL/MBDEVproAPI.BLL.csproj index 9545335..de74504 100644 --- a/MBDEVproAPI.BLL/MBDEVproAPI.BLL.csproj +++ b/MBDEVproAPI.BLL/MBDEVproAPI.BLL.csproj @@ -7,6 +7,8 @@ + + @@ -14,6 +16,8 @@ + + diff --git a/MBDEVproAPI.BLL/Mapper/Mapper.cs b/MBDEVproAPI.BLL/Mapper/Mapper.cs new file mode 100644 index 0000000..3462c91 --- /dev/null +++ b/MBDEVproAPI.BLL/Mapper/Mapper.cs @@ -0,0 +1,54 @@ + + +namespace MBDEVproAPI.BLL +{ + + internal class Mapper + { + + /// + /// + /// + /// + /// + /// + /// + /// + internal static DestinationObject MapObject(object sourceObject, + DestinationObject destinationObject, + bool isPropertyTypeNeedsMatch = true) where DestinationObject : class + { + //Boundary Condition + if (sourceObject == null || destinationObject == null) + { + return destinationObject; + } + + PropertyInfo[] destinationPropList = destinationObject.GetType().GetProperties(); + + PropertyInfo[] sourcePropList = sourceObject.GetType().GetProperties(); + + foreach (PropertyInfo destinationPropInfo in destinationPropList) + { + foreach (PropertyInfo sourcePropInfo in sourcePropList) + { + if (sourcePropInfo.Name == destinationPropInfo.Name + && !sourcePropInfo.GetGetMethod().IsVirtual + && !destinationPropInfo.GetGetMethod().IsVirtual + && (!isPropertyTypeNeedsMatch || sourcePropInfo.PropertyType == destinationPropInfo.PropertyType) + ) + { + destinationPropInfo.SetValue(destinationObject, sourcePropInfo.GetValue(sourceObject, null), null); + break; + } + } + } + return destinationObject; + } + + + + } + + +} diff --git a/MBDEVproAPI.BLL/Services/.gitkeep b/MBDEVproAPI.BLL/Services/.gitkeep deleted file mode 100644 index 83f9acf..0000000 --- a/MBDEVproAPI.BLL/Services/.gitkeep +++ /dev/null @@ -1,10 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Text; - -namespace MBDEVproAPI.BLL.Services -{ - class _ - { - } -} diff --git a/MBDEVproAPI.BLL/Services/CustomerService.cs b/MBDEVproAPI.BLL/Services/CustomerService.cs index c846008..74028ca 100644 --- a/MBDEVproAPI.BLL/Services/CustomerService.cs +++ b/MBDEVproAPI.BLL/Services/CustomerService.cs @@ -1,8 +1,501 @@ - +namespace MBDEVproAPI.BLL.Services { -namespace MBDEVproAPI.BLL.Services -{ - internal class CustomerService + + public class CustomerService : ICustomerService { + + #region variables & constructors + private readonly MBDEVproAPIDbContext _context; + + //private IHttpContextAccessor _contextAccessor; + + /// + /// Base Repository + /// + private readonly ICustomerRepository _customerRepository; + + ///// + ///// memory cache + ///// + //private IMemoryCache _memoryCache; + + ///// + ///// configuration + ///// + //public IConfiguration _configuration { get; } + + + + + public CustomerService(MBDEVproAPIDbContext context, ICustomerRepository customerRepository) + { + _context = context; + _customerRepository = customerRepository; + } + #endregion + + + + #region + #endregion + + + + #region Get All Customers + /// + /// GET: Get All Customers | CustomerViewModel | Gets all customers for a business in a VM for web UI. + /// TEST URL: https://localhost:7092/api/Customer/GetAllCustomers/52466 | https://localhost:7092/api/Customer/GetAllCustomers?BusinessID=52466 + /// "CustomerControllerGetAllCustomersVMAsync": "Customer/GetAllCustomersVMAsync", + /// + /// + /// + public async Task GetAllCustomersVMAsync(int BusinessID) + { + try + { + if (BusinessID == 0) + { + Log.Error("Customer API: CustomerService(GetAllCustomersAsync); (BusinessID == 0)"); + return new CustomerViewModel(); + } + else + { + CustomerViewModel model = new CustomerViewModel(); + var customers = await _customerRepository.GetAllCustomersVMAsync(BusinessID); + if (customers == null) + { + Log.Error("Customer API: CustomerService(GetAllCustomersAsync); (customers == null)"); + return new CustomerViewModel(); + } + model.CustomerList = customers.Select(o => Mapper.MapObject(o, new CustomerModel())).ToList(); + return model; + } + } + catch (Exception ex) + { + Log.Error("Customer API: CustomerService(GetAllCustomersAsync); (" + ex + ")" + " (" + ex.InnerException + ")"); + return new CustomerViewModel(); + } + } + + /// + /// GET: Get All Customers | CustomerModel | Gets all customers for a business. + /// TEST URL: https://localhost:7092/api/Customer/GetAllCustomers?BusinessID=52466 + /// "CustomerControllerGetAllCustomersAsync": "Customer/GetAllCustomersAsync", + /// + /// + /// + public async Task> GetAllCustomersAsync(int BusinessID) + { + try + { + if (BusinessID == 0) + { + Log.Error("Customer API: CustomerService(GetAllCustomersAsync); (BusinessID == 0)"); + return new List(); + } + else + { + // Await the repository task first, then project the results. + var customers = await _customerRepository.GetAllCustomersAsync(BusinessID); + if (customers == null) + { + Log.Error("Customer API: CustomerService(GetAllCustomersAsync); (entities == null)"); + return new List(); + } + var entities = customers.Select(o => Mapper.MapObject(o, new CustomerModel())).ToList(); + return entities; + } + } + catch (Exception ex) + { + Log.Error("Customer API: CustomerService(GetAllCustomersAsync); (" + ex + ")" + " (" + ex.InnerException + ")"); + return new List(); + } + } + #endregion + + + #region Get Customer + /// + /// GET: Get Customer | Customer | Gets a customer for a business. + /// TEST URL: https://localhost:7092/api/Customer/GetCustomer/3 | https://localhost:7092/api/Customer/GetCustomer?CustomerID=3 + /// "CustomerControllerGetCustomer": "Customer/GetCustomer", + /// + /// + /// + + public async Task GetCustomerAsync(int CustomerID) // can jsut do Customer here instead of CustomerModel + { + try + { + if (CustomerID == 0) + { + Log.Error("Customer API: CustomerService(GetCustomerAsync); (CustomerID == 0)"); + return new Customer(); + } + else + { + var customer = await _customerRepository.GetCustomerAsync(CustomerID); + if (customer == null) + { + Log.Error("Customer API: CustomerService(GetCustomerAsync); (customer == null)"); + return new Customer(); + } + return customer; + } + } + catch (Exception ex) + { + Log.Error("Customer API: CustomerService(GetCustomerAsync); (" + ex + ")" + " (" + ex.InnerException + ")"); + return new Customer(); + } + } + #endregion + + + + #region Add Customer + /// + /// Add Customer | CustomerViewModel | Create a new customer for a business from client web application using a CustomerViewModel. + /// + /// + /// + [HttpPost] + public async Task CreateCustomerVMAsync(CustomerViewModel vm) + { + try + { + if (vm == null || vm.CustomerID != 0 || vm.BusinessID == 0)// we could check each condition here and log which is the issue. + { + Log.Error("Customer API: CustomerService(CreateCustomerVMAsync); (vm == null || vm.CustomerID != 0 || vm.BusinessID == 0"); + return new SaveViewModel { IsSaved = false, ErrorMessage = "Please provide details to Create the Customer." }; + } + else + { + var entity = new DataModel.Entities.Customer(); + if (entity == null) + { + Log.Error("Customer API: CustomerService(CreateCustomerVMAsync); (entity == null)"); + return new SaveViewModel { IsSaved = false, ErrorMessage = "Please provide details to Create the Customer." }; + } + else + { + int? refID; + using (TransactionScope scope = new TransactionScope()) + { + Mapper.MapObject(vm, entity); + _customerRepository.Add(entity); + _customerRepository.SaveChanges(); + refID = entity.CustomerID; + scope.Complete(); + } + return new SaveViewModel(refID); + } + } + } + catch (Exception ex) + { + Log.Error("Customer API: CustomerService(CreateCustomerVMAsync); (" + ex + ")" + " (" + ex.InnerException + ")"); + return new SaveViewModel(ex.Message); + } + finally + { + } + } + + /// + /// Add Customer | CustomerModel | Create a new customer for a business. + /// + /// + /// + public async Task CreateCustomerAsync(CustomerModel model) + { + try + { + if (model == null || model.CustomerID != 0 || model.BusinessID == 0)// we could check each condition here and log which is the issue. + { + Log.Error("Customer API: CustomerService(CreateCustomerAsync); (model == null || model.CustomerID != 0 || model.BusinessID == 0"); + return new SaveViewModel { IsSaved = false, ErrorMessage = "Please provide details to Create the Customer." }; + } + else + { + var entity = new DataModel.Entities.Customer(); + if (entity == null) + { + Log.Error("Customer API: CustomerService(CreateCustomerAsync); (entity == null)"); + return new SaveViewModel { IsSaved = false, ErrorMessage = "Please provide details to Create the Customer." }; + } + else + { + int? refID; + using (TransactionScope scope = new TransactionScope()) + { + Mapper.MapObject(model, entity); + _customerRepository.Add(entity); + _customerRepository.SaveChanges(); + refID = entity.CustomerID; + scope.Complete(); + } + return new SaveViewModel(refID); + } + } + } + catch (Exception ex) + { + Log.Error("Customer API: CustomerService(CreateCustomerAsync); (" + ex + ")" + " (" + ex.InnerException + ")"); + return new SaveViewModel(ex.Message); + } + finally + { + + } + } + + /// + /// CREATE: Customer + /// "CustomerControllerCreateCustomer": "Customer/CreateCustomer" + /// + /// + /// + public SaveViewModel CreateCustomer(CustomerModel model) + { + throw new NotImplementedException(); + } + #endregion + + + + #region Edit Customer + /// + /// EDIT: Edit a Customer | CustomerViewModel | edit a customer for a business in a VM for web UI. + /// TEST URL: | + /// "CustomerControllerEditCustomerVMAsync": "Customer/EditCustomerVMAsync", + /// + /// + /// SaveViewModel + public async Task EditCustomerVMAsync(CustomerViewModel vm) + { + try + { + if (vm == null || vm.CustomerID == 0 || vm.BusinessID == 0) + { + Log.Error("Customer API: CustomerService(EditCustomerVMAsync); (vm == null || vm.CustomerID == 0 || vm.BusinessID == 0)"); + return new SaveViewModel { IsSaved = false, ErrorMessage = "Please provide details to Edit the Customer." }; + } + else + { + var entity = await _customerRepository.GetCustomerAsync(vm.CustomerID); + if (entity == null) + { + Log.Error("Customer API: CustomerService(EditCustomerVMAsync); (entity == null)"); + return new SaveViewModel { IsSaved = false, ErrorMessage = "Please provide details to Edit the Customer. (entity == null)" }; + } + else + { + int? refID; + using (TransactionScope scope = new TransactionScope()) + { + Mapper.MapObject(vm, entity); + _customerRepository.SaveChanges(); + refID = entity.CustomerID; + scope.Complete(); + } + return new SaveViewModel(refID); + } + } + } + catch (Exception ex) + { + Log.Error("Customer API: CustomerService(EditCustomerVMAsync); (" + ex + ")" + " (" + ex.InnerException + ")"); + return new SaveViewModel(ex.Message); + } + finally + { + } + } + + /// + /// EDIT: Customer | CustomerModel | edit a customer for a business. + /// "CustomerControllerEditCustomer": "Customer/EditCustomer" + /// + /// + /// + public async Task EditCustomer(CustomerModel model) + { + try + { + if (model == null || model.CustomerID == 0 || model.BusinessID == 0) + { + Log.Error("Customer API: CustomerService(EditCustomer) CustomerModel; (model == null || model.CustomerID == 0 || model.BusinessID == 0)"); + return new SaveViewModel { IsSaved = false, ErrorMessage = "Please provide details to Edit the Customer. Null Values" }; + } + else + { + var entity = await _customerRepository.GetCustomerAsync(model.CustomerID); + if (entity == null) + { + Log.Error("Customer API: CustomerService(EditCustomer) CustomerModel; (entity == null)"); + return new SaveViewModel { IsSaved = false, ErrorMessage = "Please provide details to Edit the Customer." }; + } + else + { + int? refID; + refID = entity.CustomerID; + using (TransactionScope scope = new TransactionScope()) + { + Mapper.MapObject(model, entity); + _customerRepository.SaveChanges(); + //refID = entity.CustomerID; + scope.Complete(); + } + return new SaveViewModel(refID); + } + } + } + catch (Exception ex) + { + Log.Error("Customer API: CustomerService(EditCustomer) CustomerModel; (" + ex + ")" + " (" + ex.InnerException + ")"); + return new SaveViewModel(ex.Message); + } + finally + { + } + } + + // CustomerModel to just return a CustomerModel instead of a SaveViewModel with the RefID. We could do this for the VM as well. + #endregion + + + + #region Delete Customer + /// + /// DELETE: Customer | SaveViewModel | delete a customer for a business and return a SaveViewModel with the RefID of the deleted customer. + /// "CustomerControllerDeleteCustomerVM": "Customer/DeleteCustomerVM" + /// + /// + /// SaveViewModel + public async Task DeleteCustomerVMAsync(int CustomerID) + { + try + { + int? refID = null; + if (CustomerID == 0) + { + Log.Error("Customer API: CustomerService(DeleteCustomerVMAsync); (CustomerID == 0)"); + return new SaveViewModel("Please provide details to delete the Customer."); + } + else + { + var entity = await _customerRepository.GetCustomerAsync(CustomerID); + + if (entity == null) + { + Log.Error("Customer API: CustomerService(DeleteCustomerVMAsync); (entity == null)"); + return new SaveViewModel("Please provide details to delete the Customer."); + } + else + { + using (TransactionScope scope = new TransactionScope()) + { + _customerRepository.Remove(entity); + _customerRepository.SaveChanges(); + scope.Complete(); + refID = entity.CustomerID; + } + return new SaveViewModel(refID); + } + } + } + catch (Exception ex) + { + Log.Error("Customer API: CustomerService(DeleteCustomerVMAsync); (" + ex + ")" + " (" + ex.InnerException + ")"); + return new SaveViewModel("Customer API: CustomerService(DeleteCustomerVMAsync); (" + ex + ")" + " (" + ex.InnerException + ") Message: " + ex.Message); + } + finally + { + } + } + + /// + /// DELETE: Customer | CustomerModel | delete a customer for a business. + /// "CustomerControllerDeleteCustomer": "Customer/DeleteCustomer" + /// + /// + /// SaveViewModel + public async Task DeleteCustomer(int CustomerID) + { // More to do here + if (CustomerID == 0) + { + Log.Error("Customer API: CustomerService(DeleteCustomer); (CustomerID == 0)"); + return new CustomerModel(); + } + else { + var entity = await _customerRepository.GetCustomerAsync(CustomerID); + if (entity == null) + { + Log.Error("Customer API: CustomerService(DeleteCustomer); (entity == null)"); + return new CustomerModel(); + } + else + { + int? refID = null; + using (TransactionScope scope = new TransactionScope()) + { + _customerRepository.Remove(entity); + _customerRepository.SaveChanges(); + scope.Complete(); + refID = entity.CustomerID; + } + return Mapper.MapObject(entity, new CustomerModel()); + } + } + } + #endregion + + + + + + + + + + #region Other + #endregion } + } + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/MBDEVproAPI.Common/Models/CustomerModel.cs b/MBDEVproAPI.Common/Models/CustomerModel.cs index df3459e..3183f57 100644 --- a/MBDEVproAPI.Common/Models/CustomerModel.cs +++ b/MBDEVproAPI.Common/Models/CustomerModel.cs @@ -1,7 +1,7 @@  namespace MBDEVproAPI.Common.Models { - public class Customer : BaseModel + public class CustomerModel : BaseModel { [Key] @@ -9,21 +9,23 @@ public class Customer : BaseModel public int CustomerID { get; set; } - //[Required] - //[Display(Name = "User name")] - //public string Username { get; set; } + //[Required] + //[Display(Name = "User name")] + //public string Username { get; set; } - //[Required] - //[StringLength(100, ErrorMessage = "The {0} must be at least {2} characters long.", MinimumLength = 6)] - //[DataType(DataType.Password)] - //[Display(Name = "Password")] - //public string Password { get; set; } + //[Required] + //[StringLength(100, ErrorMessage = "The {0} must be at least {2} characters long.", MinimumLength = 6)] + //[DataType(DataType.Password)] + //[Display(Name = "Password")] + //public string Password { get; set; } - //[DataType(DataType.Password)] - //[Display(Name = "Confirm password")] - //[Compare("Password", ErrorMessage = "The password and confirmation password do not match.")] - //public string ConfirmPassword { get; set; } + //[DataType(DataType.Password)] + //[Display(Name = "Confirm password")] + //[Compare("Password", ErrorMessage = "The password and confirmation password do not match.")] + //public string ConfirmPassword { get; set; } + [Required] + public int BusinessID { get; set; } [StringLength(50)] [DataType(DataType.Text)] diff --git a/MBDEVproAPI.Common/ViewModels/CustomerViewModel.cs b/MBDEVproAPI.Common/ViewModels/CustomerViewModel.cs index 5d8709a..0666685 100644 --- a/MBDEVproAPI.Common/ViewModels/CustomerViewModel.cs +++ b/MBDEVproAPI.Common/ViewModels/CustomerViewModel.cs @@ -4,12 +4,108 @@ public class CustomerViewModel { public CustomerViewModel() { - //CustomerStatesList = new List(); - //CustomerSCountryList = new List(); - + CustomerList = new List(); } + // *** LISTS *** + public IEnumerable CustomerList { get; set; } + + [Required] + public int CustomerID { get; set; } + + //[Required] + //[Display(Name = "User name")] + //public string Username { get; set; } + + //[Required] + //[StringLength(100, ErrorMessage = "The {0} must be at least {2} characters long.", MinimumLength = 6)] + //[DataType(DataType.Password)] + //[Display(Name = "Password")] + //public string Password { get; set; } + + //[DataType(DataType.Password)] + //[Display(Name = "Confirm password")] + //[Compare("Password", ErrorMessage = "The password and confirmation password do not match.")] + //public string ConfirmPassword { get; set; } + + [Required] + public int BusinessID { get; set; } + + [StringLength(50)] + [DataType(DataType.Text)] + public string? Company { get; set; } + + [Required] + [StringLength(25)] + [DataType(DataType.Text)] + public string FirstName { get; set; } = String.Empty; + + [Required] + [StringLength(25)] + [DataType(DataType.Text)] + public string LastName { get; set; } = String.Empty; + + [Required] + [StringLength(75)] + [DataType(DataType.EmailAddress)] + public string Email { get; set; } = String.Empty; + + [StringLength(50)] + [DataType(DataType.Text)] + public string? Title { get; set; } + + [StringLength(25)] + [DataType(DataType.Text)] + public string? BPhone { get; set; } + + [StringLength(25)] + [DataType(DataType.Text)] + public string? HPhone { get; set; } + + [StringLength(25)] + [DataType(DataType.Text)] + public string? MPhone { get; set; } + + [StringLength(25)] + [DataType(DataType.Text)] + public string? Fax { get; set; } + + [Required] + [StringLength(75)] + [DataType(DataType.Text)] + public string Address { get; set; } = String.Empty; + + [StringLength(75)] + [DataType(DataType.Text)] + public string City { get; set; } = String.Empty; + + [StringLength(75)] + [DataType(DataType.Text)] + public string State { get; set; } = String.Empty; + + [StringLength(15)] + [DataType(DataType.Text)] + public string ZIPCode { get; set; } = String.Empty; + + [StringLength(30)] + [DataType(DataType.Text)] + public string Country { get; set; } = String.Empty; + + [StringLength(75)] + [DataType(DataType.Text)] + public string? WebPage { get; set; } + + [StringLength(4010)] + [DataType(DataType.MultilineText)] + public string? Notes { get; set; } + + [StringLength(75)] + [DataType(DataType.Text)] + public string? Photo { get; set; } + [StringLength(300)] + [DataType(DataType.Text)] + public string? Map { get; set; } diff --git a/MBDEVproAPI.DataModel/Entities/.gitkeep b/MBDEVproAPI.DataModel/Entities/.gitkeep deleted file mode 100644 index 7646948..0000000 --- a/MBDEVproAPI.DataModel/Entities/.gitkeep +++ /dev/null @@ -1,10 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Text; - -namespace MBDEVproAPI.DataModel.Entities -{ - class _ - { - } -} diff --git a/MBDEVproAPI.DataModel/Entities/Customer.cs b/MBDEVproAPI.DataModel/Entities/Customer.cs new file mode 100644 index 0000000..d8788f7 --- /dev/null +++ b/MBDEVproAPI.DataModel/Entities/Customer.cs @@ -0,0 +1,111 @@ + + +namespace MBDEVproAPI.DataModel.Entities +{ + /// + /// Customer Entity + /// + [Table("Customers")] + public partial class Customer : TrackHistoryTableAndTrigger + { + + [Key] + [DatabaseGeneratedAttribute(DatabaseGeneratedOption.Identity)] + public int CustomerID { get; set; } + + //[Required] + //[Display(Name = "User name")] + //public string Username { get; set; } + + //[Required] + //[StringLength(100, ErrorMessage = "The {0} must be at least {2} characters long.", MinimumLength = 6)] + //[DataType(DataType.Password)] + //[Display(Name = "Password")] + //public string Password { get; set; } + + //[DataType(DataType.Password)] + //[Display(Name = "Confirm password")] + //[Compare("Password", ErrorMessage = "The password and confirmation password do not match.")] + //public string ConfirmPassword { get; set; } + + [Required] + public int BusinessID { get; set; } + + [StringLength(50)] + [DataType(DataType.Text)] + public string? Company { get; set; } + + [Required] + [StringLength(25)] + [DataType(DataType.Text)] + public string FirstName { get; set; } = String.Empty; + + [Required] + [StringLength(25)] + [DataType(DataType.Text)] + public string LastName { get; set; } = String.Empty; + + [Required] + [StringLength(75)] + [DataType(DataType.EmailAddress)] + public string Email { get; set; } = String.Empty; + + [StringLength(50)] + [DataType(DataType.Text)] + public string? Title { get; set; } + + [StringLength(25)] + [DataType(DataType.Text)] + public string? BPhone { get; set; } + + [StringLength(25)] + [DataType(DataType.Text)] + public string? HPhone { get; set; } + + [StringLength(25)] + [DataType(DataType.Text)] + public string? MPhone { get; set; } + + [StringLength(25)] + [DataType(DataType.Text)] + public string? Fax { get; set; } + + [Required] + [StringLength(75)] + [DataType(DataType.Text)] + public string Address { get; set; } = String.Empty; + + [StringLength(75)] + [DataType(DataType.Text)] + public string City { get; set; } = String.Empty; + + [StringLength(75)] + [DataType(DataType.Text)] + public string State { get; set; } = String.Empty; + + [StringLength(15)] + [DataType(DataType.Text)] + public string ZIPCode { get; set; } = String.Empty; + + [StringLength(30)] + [DataType(DataType.Text)] + public string Country { get; set; } = String.Empty; + + [StringLength(75)] + [DataType(DataType.Text)] + public string? WebPage { get; set; } + + [StringLength(4010)] + [DataType(DataType.MultilineText)] + public string? Notes { get; set; } + + [StringLength(75)] + [DataType(DataType.Text)] + public string? Photo { get; set; } + + [StringLength(300)] + [DataType(DataType.Text)] + public string? Map { get; set; } + + } +} diff --git a/MBDEVproAPI.DataModel/Entities/TrackHistoryTableAndTrigger.cs b/MBDEVproAPI.DataModel/Entities/TrackHistoryTableAndTrigger.cs new file mode 100644 index 0000000..7019493 --- /dev/null +++ b/MBDEVproAPI.DataModel/Entities/TrackHistoryTableAndTrigger.cs @@ -0,0 +1,29 @@ +namespace MBDEVproAPI.DataModel.Entities +{ + public class TrackHistoryTableAndTrigger + { + /// + /// Created By for entities + /// + [StringLength(50), Required] + public string CreatedBy { get; set; } + + /// + /// Created Date for entities + /// + [Required] + public DateTime CreatedDate { get; set; } + + /// + /// Modified By for entities + /// + [StringLength(50), Required] + public string ModifiedBy { get; set; } + + /// + /// Modified Date for entities + /// + [Required] + public DateTime ModifiedDate { get; set; } + } +} diff --git a/MBDEVproAPI.DataModel/GlobalUsings.cs b/MBDEVproAPI.DataModel/GlobalUsings.cs index 395301d..a42f47f 100644 --- a/MBDEVproAPI.DataModel/GlobalUsings.cs +++ b/MBDEVproAPI.DataModel/GlobalUsings.cs @@ -4,7 +4,7 @@ global using System.Linq; global using MBDEVproAPI.Common; global using MBDEVproAPI.Common.Models; -//global using MBDEVproAPI.DataModel.Entities; +global using MBDEVproAPI.DataModel.Entities; global using Microsoft.AspNetCore.Http; global using Microsoft.EntityFrameworkCore; global using Microsoft.Extensions.Configuration; diff --git a/MBDEVproAPI.DataModel/MBDEVproAPI.DataModel.csproj b/MBDEVproAPI.DataModel/MBDEVproAPI.DataModel.csproj index b2b5ffa..399a629 100644 --- a/MBDEVproAPI.DataModel/MBDEVproAPI.DataModel.csproj +++ b/MBDEVproAPI.DataModel/MBDEVproAPI.DataModel.csproj @@ -34,5 +34,9 @@ + + + + diff --git a/MBDEVproAPI.DataModel/Migrations/20260216012226_CustomerTableInit.Designer.cs b/MBDEVproAPI.DataModel/Migrations/20260222220338_CustomersTable.Designer.cs similarity index 91% rename from MBDEVproAPI.DataModel/Migrations/20260216012226_CustomerTableInit.Designer.cs rename to MBDEVproAPI.DataModel/Migrations/20260222220338_CustomersTable.Designer.cs index c1d7657..ecfa286 100644 --- a/MBDEVproAPI.DataModel/Migrations/20260216012226_CustomerTableInit.Designer.cs +++ b/MBDEVproAPI.DataModel/Migrations/20260222220338_CustomersTable.Designer.cs @@ -12,8 +12,8 @@ namespace MBDEVproAPI.DataModel.Migrations { [DbContext(typeof(MBDEVproAPIDbContext))] - [Migration("20260216012226_CustomerTableInit")] - partial class CustomerTableInit + [Migration("20260222220338_CustomersTable")] + partial class CustomersTable { /// protected override void BuildTargetModel(ModelBuilder modelBuilder) @@ -25,7 +25,7 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder) SqlServerModelBuilderExtensions.UseIdentityColumns(modelBuilder); - modelBuilder.Entity("MBDEVproAPI.Common.Models.Customer", b => + modelBuilder.Entity("MBDEVproAPI.DataModel.Entities.Customer", b => { b.Property("CustomerID") .ValueGeneratedOnAdd() @@ -42,6 +42,9 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder) .HasMaxLength(25) .HasColumnType("nvarchar(25)"); + b.Property("BusinessID") + .HasColumnType("int"); + b.Property("City") .IsRequired() .HasMaxLength(75) @@ -57,10 +60,11 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder) .HasColumnType("nvarchar(30)"); b.Property("CreatedBy") + .IsRequired() .HasMaxLength(50) .HasColumnType("nvarchar(50)"); - b.Property("CreatedDate") + b.Property("CreatedDate") .HasColumnType("datetime2"); b.Property("Email") @@ -95,10 +99,11 @@ protected override void BuildTargetModel(ModelBuilder modelBuilder) .HasColumnType("nvarchar(300)"); b.Property("ModifiedBy") + .IsRequired() .HasMaxLength(50) .HasColumnType("nvarchar(50)"); - b.Property("ModifiedDate") + b.Property("ModifiedDate") .HasColumnType("datetime2"); b.Property("Notes") diff --git a/MBDEVproAPI.DataModel/Migrations/20260216012226_CustomerTableInit.cs b/MBDEVproAPI.DataModel/Migrations/20260222220338_CustomersTable.cs similarity index 91% rename from MBDEVproAPI.DataModel/Migrations/20260216012226_CustomerTableInit.cs rename to MBDEVproAPI.DataModel/Migrations/20260222220338_CustomersTable.cs index 8107da2..fb510f0 100644 --- a/MBDEVproAPI.DataModel/Migrations/20260216012226_CustomerTableInit.cs +++ b/MBDEVproAPI.DataModel/Migrations/20260222220338_CustomersTable.cs @@ -6,7 +6,7 @@ namespace MBDEVproAPI.DataModel.Migrations { /// - public partial class CustomerTableInit : Migration + public partial class CustomersTable : Migration { /// protected override void Up(MigrationBuilder migrationBuilder) @@ -17,6 +17,7 @@ protected override void Up(MigrationBuilder migrationBuilder) { CustomerID = table.Column(type: "int", nullable: false) .Annotation("SqlServer:Identity", "1, 1"), + BusinessID = table.Column(type: "int", nullable: false), Company = table.Column(type: "nvarchar(50)", maxLength: 50, nullable: true), FirstName = table.Column(type: "nvarchar(25)", maxLength: 25, nullable: false), LastName = table.Column(type: "nvarchar(25)", maxLength: 25, nullable: false), @@ -35,10 +36,10 @@ protected override void Up(MigrationBuilder migrationBuilder) Notes = table.Column(type: "nvarchar(max)", maxLength: 4010, nullable: true), Photo = table.Column(type: "nvarchar(75)", maxLength: 75, nullable: true), Map = table.Column(type: "nvarchar(300)", maxLength: 300, nullable: true), - CreatedBy = table.Column(type: "nvarchar(50)", maxLength: 50, nullable: true), - CreatedDate = table.Column(type: "datetime2", nullable: true), - ModifiedBy = table.Column(type: "nvarchar(50)", maxLength: 50, nullable: true), - ModifiedDate = table.Column(type: "datetime2", nullable: true) + CreatedBy = table.Column(type: "nvarchar(50)", maxLength: 50, nullable: false), + CreatedDate = table.Column(type: "datetime2", nullable: false), + ModifiedBy = table.Column(type: "nvarchar(50)", maxLength: 50, nullable: false), + ModifiedDate = table.Column(type: "datetime2", nullable: false) }, constraints: table => { diff --git a/MBDEVproAPI.DataModel/Migrations/MBDEVproAPIDbContextModelSnapshot.cs b/MBDEVproAPI.DataModel/Migrations/MBDEVproAPIDbContextModelSnapshot.cs index b658163..a1554fb 100644 --- a/MBDEVproAPI.DataModel/Migrations/MBDEVproAPIDbContextModelSnapshot.cs +++ b/MBDEVproAPI.DataModel/Migrations/MBDEVproAPIDbContextModelSnapshot.cs @@ -22,7 +22,7 @@ protected override void BuildModel(ModelBuilder modelBuilder) SqlServerModelBuilderExtensions.UseIdentityColumns(modelBuilder); - modelBuilder.Entity("MBDEVproAPI.Common.Models.Customer", b => + modelBuilder.Entity("MBDEVproAPI.DataModel.Entities.Customer", b => { b.Property("CustomerID") .ValueGeneratedOnAdd() @@ -39,6 +39,9 @@ protected override void BuildModel(ModelBuilder modelBuilder) .HasMaxLength(25) .HasColumnType("nvarchar(25)"); + b.Property("BusinessID") + .HasColumnType("int"); + b.Property("City") .IsRequired() .HasMaxLength(75) @@ -54,10 +57,11 @@ protected override void BuildModel(ModelBuilder modelBuilder) .HasColumnType("nvarchar(30)"); b.Property("CreatedBy") + .IsRequired() .HasMaxLength(50) .HasColumnType("nvarchar(50)"); - b.Property("CreatedDate") + b.Property("CreatedDate") .HasColumnType("datetime2"); b.Property("Email") @@ -92,10 +96,11 @@ protected override void BuildModel(ModelBuilder modelBuilder) .HasColumnType("nvarchar(300)"); b.Property("ModifiedBy") + .IsRequired() .HasMaxLength(50) .HasColumnType("nvarchar(50)"); - b.Property("ModifiedDate") + b.Property("ModifiedDate") .HasColumnType("datetime2"); b.Property("Notes") diff --git a/MBDEVproAPI.Repository/Class1.cs b/MBDEVproAPI.Repository/Class1.cs deleted file mode 100644 index ddcf26a..0000000 --- a/MBDEVproAPI.Repository/Class1.cs +++ /dev/null @@ -1,7 +0,0 @@ -namespace MBDEVproAPI.Repository -{ - public class Class1 - { - - } -} diff --git a/MBDEVproAPI.Repository/GlobalUsings.cs b/MBDEVproAPI.Repository/GlobalUsings.cs index 1bc8b37..46caab7 100644 --- a/MBDEVproAPI.Repository/GlobalUsings.cs +++ b/MBDEVproAPI.Repository/GlobalUsings.cs @@ -2,8 +2,11 @@ global using System.Collections.Generic; global using System.Data; global using System.Linq; -//global using MBDEVproAPI.DataModel.Entities; -//global using MBDEVproAPI.Repository.Interfaces; +global using MBDEVproAPI.DataModel.Entities; +global using MBDEVproAPI.Repository.Interfaces; global using Microsoft.Extensions.Configuration; global using Serilog; global using Serilog.Formatting.Json; +global using MBDEVproAPI.Common.Models; +global using MBDEVproAPI.Common.ViewModels; +global using System.Text; diff --git a/MBDEVproAPI.Repository/Interfaces/.gitkeep b/MBDEVproAPI.Repository/Interfaces/.gitkeep deleted file mode 100644 index 155a176..0000000 --- a/MBDEVproAPI.Repository/Interfaces/.gitkeep +++ /dev/null @@ -1,10 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Text; - -namespace MBDEVproAPI.Repository.Interfaces -{ - class _ - { - } -} diff --git a/MBDEVproAPI.Repository/Interfaces/IBaseRepository.cs b/MBDEVproAPI.Repository/Interfaces/IBaseRepository.cs new file mode 100644 index 0000000..5113e2d --- /dev/null +++ b/MBDEVproAPI.Repository/Interfaces/IBaseRepository.cs @@ -0,0 +1,41 @@ + +namespace MBDEVproAPI.Repository.Interfaces +{ + public interface IBaseRepository + { + + /// + /// + /// + /// + void Add(T obj); + + /// + /// + /// + /// + /// + void Remove(T obj); + + /// + /// + /// + /// + /// + /// + T GetByID(int BusinessID, int? id); + + /// + /// + /// + /// + /// + IEnumerable GetAll(int BusinessID); + + /// + /// + /// + void SaveChanges(); + + } +} diff --git a/MBDEVproAPI.Repository/Interfaces/ICustomerRepository.cs b/MBDEVproAPI.Repository/Interfaces/ICustomerRepository.cs new file mode 100644 index 0000000..659c22b --- /dev/null +++ b/MBDEVproAPI.Repository/Interfaces/ICustomerRepository.cs @@ -0,0 +1,43 @@ + + +namespace MBDEVproAPI.Repository.Interfaces +{ + public interface ICustomerRepository : IBaseRepository + { + + #region + #endregion + + + + #region Get All Customers + Task> GetAllCustomersVMAsync(int BusinessID); + + Task> GetAllCustomersAsync(int BusinessID); + #endregion + + + + #region Get Customer + Task GetCustomerAsync(int CustomerID); + #endregion + + + + #region Add Customer + #endregion + + + + #region Edit Customer + #endregion + + + + #region Delete Customer + public void DeleteCustomerVM(Customer obj); + + #endregion + + } +} diff --git a/MBDEVproAPI.Repository/MBDEVproAPI.Repository.csproj b/MBDEVproAPI.Repository/MBDEVproAPI.Repository.csproj index bf71976..080d955 100644 --- a/MBDEVproAPI.Repository/MBDEVproAPI.Repository.csproj +++ b/MBDEVproAPI.Repository/MBDEVproAPI.Repository.csproj @@ -24,6 +24,7 @@ + diff --git a/MBDEVproAPI.Repository/Repositories/.gitkeep b/MBDEVproAPI.Repository/Repositories/.gitkeep deleted file mode 100644 index 2f22f53..0000000 --- a/MBDEVproAPI.Repository/Repositories/.gitkeep +++ /dev/null @@ -1,10 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Text; - -namespace MBDEVproAPI.Repository.Repositories -{ - class _ - { - } -} diff --git a/MBDEVproAPI.Repository/Repositories/BaseRepository.cs b/MBDEVproAPI.Repository/Repositories/BaseRepository.cs new file mode 100644 index 0000000..257d5af --- /dev/null +++ b/MBDEVproAPI.Repository/Repositories/BaseRepository.cs @@ -0,0 +1,8 @@ + +namespace MBDEVproAPI.Repository.Repositories +{ + public abstract class BaseRepository + { + + } +} diff --git a/MBDEVproAPI.Repository/Repositories/CustomerRepository.cs b/MBDEVproAPI.Repository/Repositories/CustomerRepository.cs new file mode 100644 index 0000000..34cca35 --- /dev/null +++ b/MBDEVproAPI.Repository/Repositories/CustomerRepository.cs @@ -0,0 +1,135 @@ + +using MBDEVproAPI.Common.Models; +using MBDEVproAPI.Common.ViewModels; +using MBDEVproAPI.DataModel; +using Microsoft.AspNetCore.Mvc; +using Microsoft.EntityFrameworkCore; + +namespace MBDEVproAPI.Repository.Repositories +{ + public class CustomerRepository : BaseRepository, ICustomerRepository + { + + #region Private variables & constructors + + /// + /// Context + /// + private readonly MBDEVproAPIDbContext _context; + + /// + /// Default contructor + /// + /// + public CustomerRepository(MBDEVproAPIDbContext context) + { + _context = context; + } + #endregion + + + + #region + #endregion + + + + #region Get All Customers + /// + /// GET: Get All Customers | CustomerViewModel | Gets all customers for a business in a VM for web UI. + /// + /// + /// customers + public async Task> GetAllCustomersVMAsync(int BusinessID) + { + var customers = await _context.Customers.Where(O => O.BusinessID == BusinessID).ToListAsync(); + return customers; + } + + /// GET: Get All Customers | CustomerModel | Gets all customers for a business. + /// + /// + /// customer + public async Task> GetAllCustomersAsync(int BusinessID) + { + var customers = await _context.Customers.Where(O => O.BusinessID == BusinessID).ToListAsync(); + return customers; + } + #endregion + + + + #region Get Customer + /// + /// GET: Get Customer | Customer | Gets a customer for a business. + /// + /// + /// + public async Task GetCustomerAsync(int CustomerID) + { + var customer = await _context.Customers.Where(O => O.CustomerID == CustomerID).FirstOrDefaultAsync(); + if (customer == null) + { + Log.Error("Customer API: CustomerRepository(GetCustomerAsync); (customer == null)"); + return new Customer(); + } + else + { + return customer; + } + } + #endregion + + + + #region Add Customer + public void Add(Customer obj) + { + _context.Customers.Add(obj); + } + #endregion + + + + #region Edit Customer + #endregion + + + + #region Delete Customer + //Task DeleteCustomerVM(int CustomerID); + public void DeleteCustomerVM(Customer obj) + { + _context.Customers.Remove(obj); + } + + public void Remove(Customer obj) + { + _context.Customers.Remove(obj); + } + #endregion + + + #region Save Customer + public void SaveChanges() + { + _context.SaveChanges(); + } + #endregion + + + + #region Other + public Customer GetByID(int BusinessID, int? id) + { + throw new NotImplementedException(); + } + + public IEnumerable GetAll(int BusinessID) + { + throw new NotImplementedException(); + } + #endregion + + } +} diff --git a/MBDEVproAPI.Tests/CustomerTests.cs b/MBDEVproAPI.Tests/CustomerTests.cs new file mode 100644 index 0000000..fce719d --- /dev/null +++ b/MBDEVproAPI.Tests/CustomerTests.cs @@ -0,0 +1,147 @@ +using Microsoft.EntityFrameworkCore.Metadata.Internal; +using System.ComponentModel.DataAnnotations; +using System.ComponentModel.DataAnnotations.Schema; +using static Microsoft.EntityFrameworkCore.DbLoggerCategory; + +namespace MBDEVproAPI.Tests +{ + public class CustomerTests + { + + #region Variables and Constructors + + private ICustomerService _customerService; + + #endregion + + public CustomerTests(ICustomerService customerService) { + + _customerService = customerService; + + } + + + //using MBDEVproAPI.DataModel.Entities; + private static readonly List _customerListEntity = new() + { new Customer { CustomerID = 1, BusinessID = 52466, Company = "cheeseburger", FirstName = "Jeff", LastName = "Smith", Email = "Jeff@Smith.com", Address = "123 Test St" } + }; + + + //using MBDEVproAPI.Common.Models; + private static readonly List _customerListModel = new() + { new CustomerModel { CustomerID = 1, BusinessID = 52466, Company = "cheeseburger", FirstName = "Jeff", LastName = "Smith", Email = "Jeff@Smith.com", Address = "123 Test St" } + }; + + + #region commented out code + //public int CustomerID { get; set; } + //public int BusinessID { get; set; } + + //public string? Company { get; set; } + //public string FirstName { get; set; } = String.Empty; + //public string LastName { get; set; } = String.Empty; + + //public string Email { get; set; } = String.Empty; + + //public string? Title { get; set; } + //public string? BPhone { get; set; } + //public string? HPhone { get; set; } + //public string? MPhone { get; set; } + //public string? Fax { get; set; } + + //public string Address { get; set; } = String.Empty; + //public string City { get; set; } = String.Empty; + //public string State { get; set; } = String.Empty; + //public string ZIPCode { get; set; } = String.Empty; + //public string Country { get; set; } = String.Empty; + + //public string? WebPage { get; set; } + //public string? Notes { get; set; } + //public string? Photo { get; set; } + //public string? Map { get; set; } + + //public CustomerTests() + //{ + // var mock = new Mock(); + // mock.Setup(s => s.GetCustomerAsync(It.IsAny())) + // .ReturnsAsync((int id) => _customerListEntity.FirstOrDefault(c => c.CustomerID == id) ?? new Customer()); + // mock.Setup(s => s.GetAllCustomersVMAsync(It.IsAny())) + // .ReturnsAsync((int businessId) => new CustomerViewModel { CustomerList = _customerListEntity.Select(x => Mapper.MapObject(x, new CustomerModel())).ToList() }); + // _customerService = mock.Object; + //} + + + //public class CustomerTests + //{ + // private ICustomerService _customerService; + + // public CustomerTests() + // { + // _customerService = new TestCustomerService(); + // } + + // private static readonly List _customerListEntity = new() + // { + // new Customer { CustomerID = 1, BusinessID = 52466, Company = "cheeseburger", FirstName = "Jeff", LastName = "Smith", Email = "Jeff@Smith.com", Address = "123 Test St" } + // }; + + // // Simple test-only implementation + // private class TestCustomerService : ICustomerService + // { + // public Task GetCustomerAsync(int CustomerID) + // { + // var c = _customerListEntity.FirstOrDefault(x => x.CustomerID == CustomerID); + // return Task.FromResult(c ?? new Customer()); + // } + + // public Task GetAllCustomersVMAsync(int BusinessID) + // { + // var vm = new CustomerViewModel { CustomerList = _customerListEntity.Select(x => Mapper.MapObject(x, new CustomerModel())).ToList() }; + // return Task.FromResult(vm); + // } + + // // Implement other members of ICustomerService as no-op or throw NotImplementedException + // // ... + // } + + // // tests follow... + //} + #endregion + + + + #region Tests + + [Fact] + public async Task GetCustomerAsync() + { + var customer = await _customerService.GetCustomerAsync(3); + Assert.NotNull(customer); + } + + [Theory] + [InlineData(1)] + [InlineData(2)] + [InlineData(3)] + [InlineData(4)] + [InlineData(5)] + public async Task GetCustomerAsyncID(int id) + { + var customer = await _customerService.GetCustomerAsync(id); + Assert.NotNull(customer); + } + + + [Theory] + [InlineData(52466)] + public async Task GetAllCustomersVMAsyncTest(int id) + { + var customers = await _customerService.GetAllCustomersVMAsync(id); + Assert.NotNull(customers); + } + + #endregion + + + } +} diff --git a/MBDEVproAPI.Tests/GlobalUsings.cs b/MBDEVproAPI.Tests/GlobalUsings.cs new file mode 100644 index 0000000..7f3ce43 --- /dev/null +++ b/MBDEVproAPI.Tests/GlobalUsings.cs @@ -0,0 +1,27 @@ +global using System; +global using System.Collections.Generic; +//global using MBDEVproAPI.BLL.Interfaces; +//global using MBDEVproAPI.BLL.Services; +global using MBDEVproAPI.Common.Models; +global using MBDEVproAPI.Common.ViewModels; +global using MBDEVproAPI.BLL.Interfaces; +global using MBDEVproAPI.BLL.Services; +global using MBDEVproAPI.DataModel; +global using MBDEVproAPI.DataModel.Entities; +global using MBDEVproAPI.Repository.Interfaces; +global using MBDEVproAPI.Repository.Repositories; +global using Microsoft.AspNetCore.Authorization; +global using Microsoft.AspNetCore.Builder; +global using Microsoft.AspNetCore.Hosting; +global using Microsoft.AspNetCore.Http; +global using Microsoft.AspNetCore.Mvc; +global using Microsoft.AspNetCore.Mvc.Filters; +global using Microsoft.EntityFrameworkCore; +global using Microsoft.Extensions.Configuration; +global using Microsoft.Extensions.DependencyInjection; +global using Microsoft.Extensions.Hosting; +//global using Microsoft.OpenApi.Models; +global using Serilog; +global using Serilog.Formatting.Json; +global using Microsoft.OpenApi; +global using Scalar.AspNetCore; \ No newline at end of file diff --git a/MBDEVproAPI.Tests/MBDEVproAPI.Tests.csproj b/MBDEVproAPI.Tests/MBDEVproAPI.Tests.csproj new file mode 100644 index 0000000..cec5f9c --- /dev/null +++ b/MBDEVproAPI.Tests/MBDEVproAPI.Tests.csproj @@ -0,0 +1,33 @@ + + + + net10.0 + enable + enable + false + + + + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + + + + + + + + + + + + \ No newline at end of file diff --git a/MBDEVproAPI.slnx b/MBDEVproAPI.slnx index d8ff2b4..2839849 100644 --- a/MBDEVproAPI.slnx +++ b/MBDEVproAPI.slnx @@ -4,4 +4,7 @@ + + + diff --git a/README.md b/README.md index 4cde91b..4505254 100644 --- a/README.md +++ b/README.md @@ -1 +1,2 @@ -# MBDEVproAPI \ No newline at end of file +# MBDEVproAPI +A .NET CORE 10 web api using N-Tier Architecture and the Repository Pattern.