@@ -29,9 +29,7 @@ public CustomerController(IMapper mapper, ICustomerService customerService, ICus
2929 [ HttpGet ]
3030 public async Task < ActionResult > Get ( )
3131 {
32-
3332 var result = await _customerRepository . GetAllCustomersAsync ( ) ;
34-
3533 var mappedResult = _mapper . Map < IEnumerable < Customer > > ( result ) ;
3634 return Ok ( mappedResult ) ;
3735 }
@@ -42,55 +40,39 @@ public async Task<ActionResult> Get()
4240 [ Route ( "{customerName}" , Name = "GetCustomer" ) ]
4341 public async Task < ActionResult > Get ( string customerName , bool includeOrders = false )
4442 {
45- try
46- {
47- var result = await _customerRepository . GetCustomerAsync ( customerName , includeOrders ) ;
48-
49- if ( result == null )
50- {
51- return NotFound ( ) ;
52- }
53- return Ok ( _mapper . Map < CustomerModel > ( result ) ) ;
54- }
55- catch ( Exception ex )
43+ var result = await _customerRepository . GetCustomerAsync ( customerName , includeOrders ) ;
44+ if ( result == null )
5645 {
57- // TODO Add logging
58- return StatusCode ( StatusCodes . Status500InternalServerError , ex . Message ) ;
46+ return NotFound ( ) ;
5947 }
48+ return Ok ( _mapper . Map < CustomerModel > ( result ) ) ;
6049 }
6150
6251 [ Route ( "" ) ]
6352 [ HttpPost ]
6453 public async Task < ActionResult < CustomerModel > > Post ( [ FromBody ] CustomerModel model )
6554 {
66- try
55+
56+ if ( await _customerRepository . GetCustomerAsync ( model . CustomerName ) != null )
6757 {
68- if ( await _customerRepository . GetCustomerAsync ( model . CustomerName ) != null )
69- {
70- ModelState . AddModelError ( "CustomerName" , "Customer Name in use" ) ;
71- }
58+ ModelState . AddModelError ( "CustomerName" , "Customer Name in use" ) ;
59+ }
7260
73- if ( ModelState . IsValid )
74- {
75- var customer = _mapper . Map < Customer > ( model ) ;
61+ if ( ModelState . IsValid )
62+ {
63+ var customer = _mapper . Map < Customer > ( model ) ;
7664
77- _customerService . AddCustomer ( customer ) ;
65+ _customerService . AddCustomer ( customer ) ;
7866
79- if ( _customerService . SaveChangesAsync ( ) )
80- {
81- // Get the inserted CustomerModel
82- var newModel = _mapper . Map < CustomerModel > ( customer ) ;
67+ if ( _customerService . SaveChangesAsync ( ) )
68+ {
69+ // Get the inserted CustomerModel
70+ var newModel = _mapper . Map < CustomerModel > ( customer ) ;
8371
84- return CreatedAtRoute ( "GetCustomer" ,
85- new { newModel . CustomerName } , newModel ) ;
86- }
72+ return CreatedAtRoute ( "GetCustomer" ,
73+ new { newModel . CustomerName } , newModel ) ;
8774 }
8875 }
89- catch ( Exception ex )
90- {
91- // TODO Add logging
92- return StatusCode ( StatusCodes . Status500InternalServerError , ex . Message ) ;
93- }
9476 return BadRequest ( ModelState ) ;
9577 }
9678
0 commit comments