diff --git a/MBDEVproAPI.API/Controllers/CustomerController.cs b/MBDEVproAPI.API/Controllers/CustomerController.cs index 5f56de9..df85ccd 100644 --- a/MBDEVproAPI.API/Controllers/CustomerController.cs +++ b/MBDEVproAPI.API/Controllers/CustomerController.cs @@ -184,10 +184,10 @@ public async Task EditCustomer([FromBody] CustomerModel model) /// /// SaveViewModel [HttpDelete("{CustomerID:int}")] - public async Task DeleteCustomerVMAsync(int CustomerID) + 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 result; + return Ok(result); } #endregion } diff --git a/MBDEVproAPI.API/MBDEVproAPI.API.csproj b/MBDEVproAPI.API/MBDEVproAPI.API.csproj index 75ed335..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 - + @@ -25,8 +25,8 @@ - - + + diff --git a/MBDEVproAPI.API/Program.cs b/MBDEVproAPI.API/Program.cs index 55a50a9..c9b8cd6 100644 --- a/MBDEVproAPI.API/Program.cs +++ b/MBDEVproAPI.API/Program.cs @@ -52,16 +52,31 @@ 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)"); @@ -77,44 +92,19 @@ 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 - //}); -} - - - -//DEMO so can test with swagger and scalar UI, can remove later -app.MapOpenApi(); // Expose the OpenAPI JSON endpoint -app.MapScalarApiReference(); // Map the Scalar UI endpoint +//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.UseDeveloperExceptionPage(); // For local only, can change later for testing and production environments, can also add custom error handling middleware for production environment. - -app.MapScalarApiReference(options => -{ - options.Title = "MBDEVproAPI v1 .NET CORE 10"; - options.WithTheme(ScalarTheme.Moon); // Use a specific theme - options.ForceDarkMode(); // Force dark mode -}); - - -//DEMO so can test with swagger and scalar UI, can remove later -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 -}); app.UseSerilogRequestLogging(); // Add Serilog request logging middleware 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.BLL/MBDEVproAPI.BLL.csproj b/MBDEVproAPI.BLL/MBDEVproAPI.BLL.csproj index 407cd5d..de74504 100644 --- a/MBDEVproAPI.BLL/MBDEVproAPI.BLL.csproj +++ b/MBDEVproAPI.BLL/MBDEVproAPI.BLL.csproj @@ -7,7 +7,7 @@ - + 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.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 index b6e61fc..cec5f9c 100644 --- a/MBDEVproAPI.Tests/MBDEVproAPI.Tests.csproj +++ b/MBDEVproAPI.Tests/MBDEVproAPI.Tests.csproj @@ -8,10 +8,18 @@ - - - - + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + diff --git a/MBDEVproAPI.Tests/UnitTest1.cs b/MBDEVproAPI.Tests/UnitTest1.cs deleted file mode 100644 index dc26341..0000000 --- a/MBDEVproAPI.Tests/UnitTest1.cs +++ /dev/null @@ -1,11 +0,0 @@ -namespace MBDEVproAPI.Tests -{ - public class UnitTest1 - { - [Fact] - public void Test1() - { - - } - } -}