Merge pull request #9 from dotnet-architecture/dev

PR to merge into skynode dev branch

docker-compose.yml

@@ -115,8 +115,9 @@ services:
     image: redis
     ports:
       - "6379:6379"
-
+      
   rabbitmq:
-    image: rabbitmq
+    image: rabbitmq:3-management
     ports:
+      - "15672:15672"
       - "5672:5672"

src/BuildingBlocks/HealthChecks/src/Microsoft.Extensions.HealthChecks.AzureStorage/AzureHealthCheckBuilderExtensions.cs

@@ -70,7 +70,7 @@ namespace Microsoft.Extensions.HealthChecks
 
                     var properties = await tableClient.GetServicePropertiesAsync().ConfigureAwait(false);
 
-                    if (String.IsNullOrWhiteSpace(tableName))
+                    if (!String.IsNullOrWhiteSpace(tableName))
                     {
                         var table = tableClient.GetTableReference(tableName);
 
@@ -150,7 +150,7 @@ namespace Microsoft.Extensions.HealthChecks
 
                     var properties = await queueClient.GetServicePropertiesAsync().ConfigureAwait(false);
 
-                    if (String.IsNullOrWhiteSpace(queueName))
+                    if (!String.IsNullOrWhiteSpace(queueName))
                     {
                         var queue = queueClient.GetQueueReference(queueName);
 

src/Services/Basket/Basket.API/Infrastructure/Filters/HttpGlobalExceptionFilter.cs

@@ -8,7 +8,7 @@ using System.Net;
 
 namespace Basket.API.Infrastructure.Filters
 {
-    public class HttpGlobalExceptionFilter : IExceptionFilter
+    public partial class HttpGlobalExceptionFilter : IExceptionFilter
     {
         private readonly IHostingEnvironment env;
         private readonly ILogger<HttpGlobalExceptionFilter> logger;
@@ -52,12 +52,5 @@ namespace Basket.API.Infrastructure.Filters
             }
             context.ExceptionHandled = true;
         }
-
-        private class JsonErrorResponse
-        {
-            public string[] Messages { get; set; }
-
-            public object DeveloperMessage { get; set; }
-        }
     }
 }

src/Services/Basket/Basket.API/Infrastructure/Filters/JsonErrorResponse.cs

@@ -0,0 +1,9 @@
+namespace Basket.API.Infrastructure.Filters
+{
+    public class JsonErrorResponse
+    {
+        public string[] Messages { get; set; }
+
+        public object DeveloperMessage { get; set; }
+    }
+}

src/Services/Basket/Basket.API/Infrastructure/Filters/ValidateModelStateFilter.cs

@@ -0,0 +1,30 @@
+using System.Linq;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc.Filters;
+
+namespace Basket.API.Infrastructure.Filters
+{
+    public class ValidateModelStateFilter : ActionFilterAttribute
+    {
+        public override void OnActionExecuting(ActionExecutingContext context)
+        {
+            if (context.ModelState.IsValid)
+            {
+                return;
+            }
+
+            var validationErrors = context.ModelState
+                .Keys
+                .SelectMany(k => context.ModelState[k].Errors)
+                .Select(e => e.ErrorMessage)
+                .ToArray();
+
+            var json = new JsonErrorResponse
+            {
+                Messages = validationErrors
+            };
+
+            context.Result = new BadRequestObjectResult(json);
+        }
+    }
+}

src/Services/Basket/Basket.API/Model/BasketItem.cs

@@ -1,6 +1,9 @@
-namespace Microsoft.eShopOnContainers.Services.Basket.API.Model
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+
+namespace Microsoft.eShopOnContainers.Services.Basket.API.Model
 {
-    public class BasketItem
+    public class BasketItem : IValidatableObject
     {
         public string Id { get; set; }
         public string ProductId { get; set; }
@@ -9,5 +12,16 @@
         public decimal OldUnitPrice { get; set; }
         public int Quantity { get; set; }
         public string PictureUrl { get; set; }
+        public IEnumerable<ValidationResult> Validate(ValidationContext validationContext)
+        {
+            var results = new List<ValidationResult>();
+
+            if (Quantity < 1)
+            {
+                results.Add(new ValidationResult("Invalid number of units", new []{ "Quantity" }));
+            }
+
+            return results;
+        }
     }
 }

src/Services/Basket/Basket.API/Startup.cs

@@ -54,6 +54,7 @@ namespace Microsoft.eShopOnContainers.Services.Basket.API
             services.AddMvc(options =>
             {
                 options.Filters.Add(typeof(HttpGlobalExceptionFilter));
+                options.Filters.Add(typeof(ValidateModelStateFilter));
             }).AddControllersAsServices();
 
             services.AddHealthChecks(checks =>

src/Services/Ordering/Ordering.Domain/AggregatesModel/OrderAggregate/Order.cs

@@ -72,8 +72,9 @@ namespace Microsoft.eShopOnContainers.Services.Ordering.Domain.AggregatesModel.O
                 if (discount > existingOrderForProduct.GetCurrentDiscount())
                 {
                     existingOrderForProduct.SetNewDiscount(discount);
-                    existingOrderForProduct.AddUnits(units);
                 }
+
+                existingOrderForProduct.AddUnits(units);
             }
             else
             {
@@ -187,6 +188,11 @@ namespace Microsoft.eShopOnContainers.Services.Ordering.Domain.AggregatesModel.O
         {
             throw new OrderingDomainException($"Not possible to change order status from {OrderStatus.Name} to {orderStatusToChange.Name}.");
         }
+
+        public decimal GetTotal()
+        {
+            return _orderItems.Sum(o => o.GetUnits() * o.GetUnitPrice());
+        }
     }
 }
 

src/Services/Ordering/Ordering.Domain/AggregatesModel/OrderAggregate/OrderItem.cs

@@ -59,6 +59,11 @@ namespace Microsoft.eShopOnContainers.Services.Ordering.Domain.AggregatesModel.O
             return _units;
         }
 
+        public decimal GetUnitPrice()
+        {
+            return _unitPrice;
+        }
+
         public string GetOrderItemProductName() => _productName;
 
         public void SetNewDiscount(decimal discount)

src/Web/WebSPA/Client/modules/basket/basket.component.html

@@ -1,7 +1,13 @@
 <div class="esh-basket">
     <esh-header url="/catalog">Back to catalog</esh-header>
-
+    
     <div class="container">
+        <div *ngFor="let errorMessage of errorMessages">
+            <div class="esh-basket-items-margin-left1 row">
+                <div class="alert alert-warning" role="alert">&nbsp;{{errorMessage}}</div>
+            </div>
+        </div>
+ 
         <article class="esh-basket-titles row">
             <section class="esh-basket-title col-xs-3">Product</section>
             <section class="esh-basket-title col-xs-3 hidden-lg-down"></section>
@@ -14,16 +20,17 @@
             <article class="esh-basket-items row">
 
                 <section class="esh-basket-item esh-basket-item--middle col-lg-3 hidden-lg-down">
-                    <img class="esh-basket-image" src="{{item.pictureUrl}}" />
+                    <img class="esh-basket-image" src="{{item.pictureUrl}}"/>
                 </section>
                 <section class="esh-basket-item esh-basket-item--middle col-xs-3">{{item.productName}}</section>
                 <section class="esh-basket-item esh-basket-item--middle col-xs-2">$ {{item.unitPrice | number:'.2-2'}}</section>
                 <section class="esh-basket-item esh-basket-item--middle col-xs-2">
-                    <input class="esh-basket-input"
+                    <input id="quantity"
+                           class="esh-basket-input"
                            type="number"
                            min="1"
                            [(ngModel)]="item.quantity"
-                           (change)="itemQuantityChanged(item)" />
+                           (change)="itemQuantityChanged(item)"/>
                 </section>
                 <section class="esh-basket-item esh-basket-item--middle esh-basket-item--mark col-xs-2">$ {{(item.unitPrice * item.quantity) | number:'.2-2'}}</section>
             </article>

src/Web/WebSPA/Client/modules/basket/basket.component.ts

@@ -1,9 +1,13 @@
-import { Component, OnInit }    from '@angular/core';
-import { Router }               from '@angular/router';
+import { Component, OnInit } from '@angular/core';
+import { Router } from '@angular/router';
 
-import { BasketService }        from './basket.service';
-import { IBasket }              from '../shared/models/basket.model';
-import { IBasketItem }          from '../shared/models/basketItem.model';
+import 'rxjs/Rx';
+import { Observable } from 'rxjs/Observable';
+import 'rxjs/add/observable/throw';
+
+import { BasketService } from './basket.service';
+import { IBasket } from '../shared/models/basket.model';
+import { IBasketItem } from '../shared/models/basketItem.model';
 import { BasketWrapperService } from '../shared/services/basket.wrapper.service';
 
 @Component({
@@ -12,6 +16,7 @@ import { BasketWrapperService } from '../shared/services/basket.wrapper.service'
     templateUrl: './basket.component.html'
 })
 export class BasketComponent implements OnInit {
+    errorMessages: any;
     basket: IBasket;
     totalPrice: number = 0;
 
@@ -29,13 +34,27 @@ export class BasketComponent implements OnInit {
         this.service.setBasket(this.basket).subscribe(x => console.log('basket updated: ' + x));
     }
 
-    update(event: any) {
-        this.service.setBasket(this.basket).subscribe(x => console.log('basket updated: ' + x));
+    update(event: any): Observable<boolean> {
+        let setBasketObservable = this.service.setBasket(this.basket);
+        setBasketObservable
+            .subscribe(
+            x => {
+                this.errorMessages = [];
+                console.log('basket updated: ' + x);
+            },
+            errMessage => this.errorMessages = errMessage.messages);
+        return setBasketObservable;
     }
 
     checkOut(event: any) {
-        this.basketwrapper.basket = this.basket;
-        this.router.navigate(['order']);
+        this.update(event)
+            .subscribe(
+                x => {
+                    this.errorMessages = [];
+                    this.basketwrapper.basket = this.basket;
+                    this.router.navigate(['order'],
+                errMessage => this.errorMessages = errMessage.messages);
+        });
     }
 
     private calculateTotalPrice() {

src/Web/WebSPA/Client/modules/orders/orders.component.ts

@@ -20,7 +20,7 @@ export class OrdersComponent implements OnInit {
 
     ngOnInit() {
         if (this.configurationService.isReady) {
-            this.getOrders()
+            this.getOrders();
         } else {
             this.configurationService.settingsLoaded$.subscribe(x => {
                 this.getOrders();
@@ -31,7 +31,7 @@ export class OrdersComponent implements OnInit {
         this.interval = setTimeout(() => {
             this.service.getOrders().subscribe(orders => {
                 this.orders = orders;
-                if (this.orders.length != this.oldOrders.length) {
+                if (this.orders.length !== this.oldOrders.length) {
                     clearInterval(this.interval);
                 }
             });

src/Web/WebSPA/Client/modules/shared/services/basket.wrapper.service.ts

@@ -4,7 +4,8 @@ import { Subject }          from 'rxjs/Subject';
 import { ICatalogItem }     from '../models/catalogItem.model';
 import { IBasketItem }      from '../models/basketItem.model';
 import { IBasket }          from '../models/basket.model';
-import { SecurityService }  from '../services/security.service';
+import { SecurityService } from '../services/security.service';
+import { Guid } from '../../../guid';
 
 @Injectable()
 export class BasketWrapperService {
@@ -27,7 +28,7 @@ export class BasketWrapperService {
                 productName: item.name,
                 quantity: 1,
                 unitPrice: item.price,
-                id: '',
+                id: Guid.newGuid(),
                 oldUnitPrice: 0
             };
 

src/Web/WebSPA/Client/modules/shared/services/data.service.ts

@@ -102,7 +102,7 @@ export class DataService {
         if (error instanceof Response) {
             let errMessage = '';
             try {
-                errMessage = error.json().error;
+                errMessage = error.json();
             } catch (err) {
                 errMessage = error.statusText;
             }

test/Services/UnitTest/Ordering/Builders.cs

@@ -0,0 +1,47 @@
+using System;
+using Microsoft.eShopOnContainers.Services.Ordering.Domain.AggregatesModel.OrderAggregate;
+
+namespace UnitTest.Ordering
+{
+    public class AddressBuilder
+    {
+        public Address Build()
+        {
+            return new Address("street", "city", "state", "country", "zipcode");
+        }
+    }
+
+    public class OrderBuilder
+    {
+        private readonly Order order;
+
+        public OrderBuilder(Address address)
+        {
+            order = new Order(
+                "userId",
+                address,
+                cardTypeId:5,
+                cardNumber:"12",
+                cardSecurityNumber:"123",
+                cardHolderName:"name",
+                cardExpiration:DateTime.UtcNow);
+        }
+
+        public OrderBuilder AddOne(
+            int productId,
+            string productName,
+            decimal unitPrice,
+            decimal discount,
+            string pictureUrl,
+            int units = 1)
+        {
+            order.AddOrderItem(productId, productName, unitPrice, discount, pictureUrl, units);
+            return this;
+        }
+
+        public Order Build()
+        {
+            return order;
+        }
+    }
+}

test/Services/UnitTest/Ordering/Domain/OrderAggregateTest.cs

@@ -2,6 +2,8 @@
 using Ordering.Domain.Events;
 using Ordering.Domain.Exceptions;
 using System;
+using System.Linq;
+using UnitTest.Ordering;
 using Xunit;
 
 public class OrderAggregateTest
@@ -93,6 +95,18 @@ public class OrderAggregateTest
         Assert.Throws<OrderingDomainException>(() => fakeOrderItem.AddUnits(-1));
     }
 
+    [Fact]
+    public void when_add_two_times_on_the_same_item_then_the_total_of_order_should_be_the_sum_of_the_two_items()
+    {
+        var address = new AddressBuilder().Build();
+        var order = new OrderBuilder(address)
+            .AddOne(1,"cup",10.0m,0,string.Empty)
+            .AddOne(1,"cup",10.0m,0,string.Empty)
+            .Build();
+
+        Assert.Equal(20.0m, order.GetTotal());
+    }
+
     [Fact]
     public void Add_new_Order_raises_new_event()
     {