Skip to content

updates #17

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mikebdev merged 1 commit into from
Mar 4, 2026
Merged

updates #17

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
73 changes: 21 additions & 52 deletions MBDEVproAPI.API/Controllers/CustomerController.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ public async Task<ActionResult<Customer>> GetCustomerAsync(int CustomerID)



#region Add Customer
#region Create Customer
/// <summary>
/// Add Customer | CustomerViewModel | Create a new customer for a business from client web application using a CustomerViewModel.
/// </summary>
Expand All @@ -115,19 +115,22 @@ public async Task<ActionResult<Customer>> GetCustomerAsync(int CustomerID)
[HttpPost]
public async Task<IActionResult> CreateCustomerVMAsync([FromBody] CustomerViewModel vm)
{
return Ok(_customerService.CreateCustomerVMAsync(vm));
var result = await _customerService.CreateCustomerVMAsync(vm);
return Ok(result);
}


/// <summary>
/// Add Customer | CustomerModel | Create a new customer for a business.
/// TEST URL: https://localhost:7092/api/Customer/CreateCustomer
/// </summary>
/// <param name="model"></param>
/// <returns></returns>
[HttpPost]
public async Task<IActionResult> CreateCustomerAsync([FromBody] CustomerModel model)
{
return Ok(_customerService.CreateCustomerAsync(model));
var result = await _customerService.CreateCustomerAsync(model);
return Ok(result);
//return Ok("UNDER CONTRUCTION | CreateCustomerAsync([FromBody] Customer model)");
}
#endregion
Expand All @@ -142,27 +145,30 @@ public async Task<IActionResult> CreateCustomerAsync([FromBody] CustomerModel mo
/// "CustomerControllerEditCustomerVMAsync": "Customer/EditCustomerVMAsync",
/// </summary>
/// <param name="vm"></param>
/// <returns>CustomerViewModel</returns>
/// <returns>SaveViewModel</returns>
[HttpPost]
public async Task<IActionResult> EditCustomerVMAsync([FromBody] CustomerViewModel vm)
{
// if model is valid, then update, else return bad request with model state errors.
return Ok(_customerService.EditCustomerVMAsync(vm));
var result = await _customerService.EditCustomerVMAsync(vm);
return Ok(result);
//return Ok("UNDER CONTRUCTION | EditCustomer(int id, [FromBody] Customer model)");
}


/// <summary>
/// EDIT: Customer | CustomerModel | edit a customer for a business.
/// TEST URL: https://localhost:7092/api/Customer/EditCustomer?id=5
/// "CustomerControllerEditCustomer": "Customer/EditCustomer"
/// </summary>
/// <param name="model"></param>
/// <returns></returns>
[HttpPost]
public async Task<IActionResult> EditCustomer(int id, [FromBody] CustomerModel model)
public async Task<IActionResult> EditCustomer([FromBody] CustomerModel model)
{
// if model is valid, then update, else return bad request with model state errors.
return Ok(_customerService.EditCustomer(model));
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.
Expand All @@ -172,56 +178,19 @@ public async Task<IActionResult> EditCustomer(int id, [FromBody] CustomerModel m

#region Delete Customer
/// <summary>
/// DELET: Customer | CustomerModel | Delete a customer for a business.
/// "CustomerControllerDeleteCustomer": "Customer/DeleteCustomer"
/// DELETE: Customer | SaveViewModel | delete a customer for a business and return a SaveViewModel with the RefID of the deleted customer.
/// "CustomerControllerDeleteCustomerVMAsync": "Customer/DeleteCustomerVMAsync"
/// </summary>
/// <param name="id"></param>
/// <returns></returns>
[HttpDelete("{id:int}")]
public async Task<IActionResult> DeleteCustomer(int id)
/// <returns>SaveViewModel</returns>
[HttpDelete("{CustomerID:int}")]
public async Task<SaveViewModel> DeleteCustomerVMAsync(int CustomerID)
{
return Ok(_customerService.DeleteCustomer(id));
}
var result = await _customerService.DeleteCustomerVMAsync(CustomerID);
return result;
}
#endregion


//#region DELETE: Citation Type
///// <summary>
///// DELETE: Citation Type
///// "CitationTypeControllerDeleteCitationType": "CitationType/DeleteCitationType"
///// </summary>
///// <param name="CitationTypeID"></param>
///// <returns></returns>
//[HttpDelete("{CitationTypeID:int}")]
//public IActionResult DeleteCitationType(int CitationTypeID)
//{
// return Ok(_citationTypeService.DeleteCitationType(CitationTypeID));
//}
//#endregion

//// DELETE: api/Customer/5
//[HttpDelete("{id}")]
//public async Task<IActionResult> DeleteCustomer(int id)
//{
// var customer = await _context.Customers.FindAsync(id);
// if (customer == null)
// {
// return NotFound();
// }

// _context.Customers.Remove(customer);
// await _context.SaveChangesAsync();

// return NoContent();
//}

//private bool CustomerExists(int id)
//{
// return _context.Customers.Any(e => e.CustomerID == id);
//}

}

}


Expand Down
4 changes: 2 additions & 2 deletions MBDEVproAPI.BLL/Interfaces/ICustomerService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,8 @@ public interface ICustomerService : IBaseService<CustomerModel>


#region Delete Customer
Task<SaveViewModel> DeleteCustomerVM(int CustomerID);
SaveViewModel DeleteCustomer(int CustomerID);
Task<SaveViewModel> DeleteCustomerVMAsync(int CustomerID);
Task<CustomerModel> DeleteCustomer(int CustomerID);
#endregion
}
}
58 changes: 38 additions & 20 deletions MBDEVproAPI.BLL/Services/CustomerService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -289,7 +289,7 @@ public async Task<SaveViewModel> EditCustomerVMAsync(CustomerViewModel vm)
if (entity == null)
{
Log.Error("Customer API: CustomerService(EditCustomerVMAsync); (entity == null)");
return new SaveViewModel { IsSaved = false, ErrorMessage = "Please provide details to Edit the Customer." };
return new SaveViewModel { IsSaved = false, ErrorMessage = "Please provide details to Edit the Customer. (entity == null)" };
}
else
{
Expand Down Expand Up @@ -328,7 +328,7 @@ public async Task<SaveViewModel> EditCustomer(CustomerModel model)
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." };
return new SaveViewModel { IsSaved = false, ErrorMessage = "Please provide details to Edit the Customer. Null Values" };
}
else
{
Expand All @@ -341,11 +341,12 @@ public async Task<SaveViewModel> EditCustomer(CustomerModel model)
else
{
int? refID;
refID = entity.CustomerID;
using (TransactionScope scope = new TransactionScope())
{
Mapper.MapObject(model, entity);
_customerRepository.SaveChanges();
refID = entity.CustomerID;
//refID = entity.CustomerID;
scope.Complete();
}
return new SaveViewModel(refID);
Expand Down Expand Up @@ -374,14 +375,14 @@ public async Task<SaveViewModel> EditCustomer(CustomerModel model)
/// </summary>
/// <param name="id"></param>
/// <returns>SaveViewModel</returns>
public async Task<SaveViewModel> DeleteCustomerVM(int CustomerID)
public async Task<SaveViewModel> DeleteCustomerVMAsync(int CustomerID)
{
try
{
int? refID = null;
if (CustomerID == 0)
{
Log.Error("Customer API: CustomerService(DeleteCustomerVM); (CustomerID == 0)");
Log.Error("Customer API: CustomerService(DeleteCustomerVMAsync); (CustomerID == 0)");
return new SaveViewModel("Please provide details to delete the Customer.");
}
else
Expand All @@ -390,7 +391,7 @@ public async Task<SaveViewModel> DeleteCustomerVM(int CustomerID)

if (entity == null)
{
Log.Error("Customer API: CustomerService(DeleteCustomerVM); (entity == null)");
Log.Error("Customer API: CustomerService(DeleteCustomerVMAsync); (entity == null)");
return new SaveViewModel("Please provide details to delete the Customer.");
}
else
Expand All @@ -408,30 +409,47 @@ public async Task<SaveViewModel> DeleteCustomerVM(int CustomerID)
}
catch (Exception ex)
{
Log.Error("Customer API: CustomerService(EditCustomer) CustomerModel; (" + ex + ")" + " (" + ex.InnerException + ")");
return new SaveViewModel(ex.Message);
Log.Error("Customer API: CustomerService(DeleteCustomerVMAsync); (" + ex + ")" + " (" + ex.InnerException + ")");
return new SaveViewModel("Customer API: CustomerService(DeleteCustomerVMAsync); (" + ex + ")" + " (" + ex.InnerException + ") Message: " + ex.Message);
}
finally
{
}
return new SaveViewModel("Customer API: CustomerService(DeleteCustomer); (SaveViewModel) Not Yet Implemented.");
}

/// <summary>
/// DELETE: Customer | CustomerModel | delete a customer for a business and return a SaveViewModel with the RefID of the deleted customer.
/// "CustomerControllerDeleteCustomerVM": "Customer/DeleteCustomerVM"
/// DELETE: Customer | CustomerModel | delete a customer for a business.
/// "CustomerControllerDeleteCustomer": "Customer/DeleteCustomer"
/// </summary>
/// <param name="id"></param>
/// <returns>SaveViewModel</returns>
public CustomerModel DeleteCustomer(int CustomerID)
{
throw new NotImplementedException();
// return new SaveViewModel("Customer API: CustomerService(DeleteCustomer); (SaveViewModel) Not Yet Implemented.");
}

SaveViewModel ICustomerService.DeleteCustomer(int CustomerID)
{
throw new NotImplementedException();
public async Task<CustomerModel> 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

Expand Down