Skip to content

Commit 6f04cd1

Browse files
jsuarezruizjsuarezruiz
committed
Changes in services integration
1 parent c789f37 commit 6f04cd1

15 files changed

Lines changed: 118 additions & 81 deletions

File tree

‎src/Mobile/eShopOnContainers.Xamarin.Tests.sln‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -153,6 +153,7 @@ Global
153153
{6EEB23DC-7063-4444-9AF8-90DF24F549C0}.Debug|x64.ActiveCfg = Debug|iPhone
154154
{6EEB23DC-7063-4444-9AF8-90DF24F549C0}.Debug|x86.ActiveCfg = Debug|iPhone
155155
{6EEB23DC-7063-4444-9AF8-90DF24F549C0}.Release|Any CPU.ActiveCfg = Release|iPhone
156+
{6EEB23DC-7063-4444-9AF8-90DF24F549C0}.Release|Any CPU.Build.0 = Release|iPhone
156157
{6EEB23DC-7063-4444-9AF8-90DF24F549C0}.Release|ARM.ActiveCfg = Release|iPhone
157158
{6EEB23DC-7063-4444-9AF8-90DF24F549C0}.Release|iPhone.ActiveCfg = Release|iPhone
158159
{6EEB23DC-7063-4444-9AF8-90DF24F549C0}.Release|iPhone.Build.0 = Release|iPhone
@@ -263,6 +264,8 @@ Global
263264
{C3C1E2CF-B1F7-4654-BBDC-50143DB22E0B}.Debug|x86.Build.0 = Debug|x86
264265
{C3C1E2CF-B1F7-4654-BBDC-50143DB22E0B}.Debug|x86.Deploy.0 = Debug|x86
265266
{C3C1E2CF-B1F7-4654-BBDC-50143DB22E0B}.Release|Any CPU.ActiveCfg = Release|x86
267+
{C3C1E2CF-B1F7-4654-BBDC-50143DB22E0B}.Release|Any CPU.Build.0 = Release|x86
268+
{C3C1E2CF-B1F7-4654-BBDC-50143DB22E0B}.Release|Any CPU.Deploy.0 = Release|x86
266269
{C3C1E2CF-B1F7-4654-BBDC-50143DB22E0B}.Release|ARM.ActiveCfg = Release|ARM
267270
{C3C1E2CF-B1F7-4654-BBDC-50143DB22E0B}.Release|ARM.Build.0 = Release|ARM
268271
{C3C1E2CF-B1F7-4654-BBDC-50143DB22E0B}.Release|ARM.Deploy.0 = Release|ARM
@@ -420,6 +423,7 @@ Global
420423
{B68C2B56-7581-46AE-B55D-D25DDFD3BFE3}.Debug|x64.ActiveCfg = Debug|iPhone
421424
{B68C2B56-7581-46AE-B55D-D25DDFD3BFE3}.Debug|x86.ActiveCfg = Debug|iPhone
422425
{B68C2B56-7581-46AE-B55D-D25DDFD3BFE3}.Release|Any CPU.ActiveCfg = Release|iPhone
426+
{B68C2B56-7581-46AE-B55D-D25DDFD3BFE3}.Release|Any CPU.Build.0 = Release|iPhone
423427
{B68C2B56-7581-46AE-B55D-D25DDFD3BFE3}.Release|ARM.ActiveCfg = Release|iPhone
424428
{B68C2B56-7581-46AE-B55D-D25DDFD3BFE3}.Release|iPhone.ActiveCfg = Release|iPhone
425429
{B68C2B56-7581-46AE-B55D-D25DDFD3BFE3}.Release|iPhone.Build.0 = Release|iPhone
@@ -482,6 +486,7 @@ Global
482486
{02680C26-CA1D-4D9D-A7E3-D66AF5BE6F2F}.Debug|x86.Build.0 = Debug|x86
483487
{02680C26-CA1D-4D9D-A7E3-D66AF5BE6F2F}.Debug|x86.Deploy.0 = Debug|x86
484488
{02680C26-CA1D-4D9D-A7E3-D66AF5BE6F2F}.Release|Any CPU.ActiveCfg = Release|x86
489+
{02680C26-CA1D-4D9D-A7E3-D66AF5BE6F2F}.Release|Any CPU.Build.0 = Release|x86
485490
{02680C26-CA1D-4D9D-A7E3-D66AF5BE6F2F}.Release|ARM.ActiveCfg = Release|ARM
486491
{02680C26-CA1D-4D9D-A7E3-D66AF5BE6F2F}.Release|ARM.Build.0 = Release|ARM
487492
{02680C26-CA1D-4D9D-A7E3-D66AF5BE6F2F}.Release|ARM.Deploy.0 = Release|ARM

‎src/Mobile/eShopOnContainers/eShopOnContainers.Core/GlobalSettings.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ public class GlobalSetting
77

88
public GlobalSetting()
99
{
10-
BaseEndpoint = "http://104.40.62.65";
10+
BaseEndpoint = "http://13.88.8.119";
1111
}
1212

1313
public static GlobalSetting Instance

‎src/Mobile/eShopOnContainers/eShopOnContainers.Core/Models/Orders/Order.cs‎

Lines changed: 36 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,42 +1,60 @@
1-
using eShopOnContainers.Core.Models.User;
2-
using System;
1+
using System;
32
using System.Collections.Generic;
43
using System.Linq;
4+
using Newtonsoft.Json;
55

66
namespace eShopOnContainers.Core.Models.Orders
77
{
88
public class Order
99
{
1010
public Order()
1111
{
12+
SequenceNumber = 1;
1213
OrderItems = new List<OrderItem>();
13-
ShippingAddress = new Address();
14-
PaymentInfo = new PaymentInfo();
1514
}
1615

17-
public string Id;
18-
public List<OrderItem> OrderItems { get; set; }
16+
public string BuyerId { get; set; }
1917

20-
public string OrderNumber
21-
{
22-
get
23-
{
24-
return string.Format("{0}/{1}-{2}", OrderDate.Year, OrderDate.Month, SequenceNumber);
25-
}
26-
}
2718
public int SequenceNumber { get; set; }
28-
public virtual string BuyerId { get; set; }
29-
public virtual Address ShippingAddress { get; set; }
30-
public virtual PaymentInfo PaymentInfo { get; set; }
31-
public virtual DateTime OrderDate { get; set; }
19+
20+
public DateTime OrderDate { get; set; }
21+
3222
public OrderState State { get; set; }
3323

24+
public string ShippingCity { get; set; }
25+
26+
public string ShippingStreet { get; set; }
27+
28+
public string ShippingState { get; set; }
29+
30+
public string ShippingCountry { get; set; }
31+
32+
public string CardType { get; set; }
33+
34+
public string CardNumber { get; set; }
35+
36+
public string CardHolderName { get; set; }
37+
38+
public DateTime CardExpiration { get; set; }
39+
40+
public string CardSecurityNumber { get; set; }
41+
42+
[JsonProperty("items")]
43+
public List<OrderItem> OrderItems { get; set; }
44+
3445
public decimal Total { get { return CalculateTotal(); } }
3546

47+
public string OrderNumber { get { return CalculateOrderNumber(); } }
48+
3649

37-
public decimal CalculateTotal()
50+
private decimal CalculateTotal()
3851
{
3952
return OrderItems.Sum(x => x.Quantity * x.UnitPrice);
4053
}
54+
55+
private string CalculateOrderNumber()
56+
{
57+
return string.Format("{0}/{1}-{2}", OrderDate.Year, OrderDate.Month, SequenceNumber);
58+
}
4159
}
4260
}

‎src/Mobile/eShopOnContainers/eShopOnContainers.Core/Models/Orders/OrderItem.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ namespace eShopOnContainers.Core.Models.Orders
44
{
55
public class OrderItem
66
{
7-
public Guid ProductId { get; set; }
7+
public string ProductId { get; set; }
88
public Guid OrderId { get; set; }
99
public decimal UnitPrice { get; set; }
1010
public string ProductName { get; set; }

‎src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/Basket/BasketMockService.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ public class BasketMockService : IBasketService
1212
BuyerId = "9245fe4a-d402-451c-b9ed-9c1a04247482",
1313
Items = new List<BasketItem>
1414
{
15-
new BasketItem { Id = "1", PictureUrl = Device.OS != TargetPlatform.Windows ? "fake_product_01.png" : "Assets/fake_product_01.png", ProductId = Common.Common.MockCatalogItemId01.ToString(), ProductName = ".NET Bot Blue Sweatshirt (M)", Quantity = 1, UnitPrice = 19.50M },
16-
new BasketItem { Id = "2", PictureUrl = Device.OS != TargetPlatform.Windows ? "fake_product_04.png" : "Assets/fake_product_04.png", ProductId = Common.Common.MockCatalogItemId04.ToString(), ProductName = ".NET Black Cupt", Quantity = 1, UnitPrice = 17.00M }
15+
new BasketItem { Id = "1", PictureUrl = Device.OS != TargetPlatform.Windows ? "fake_product_01.png" : "Assets/fake_product_01.png", ProductId = Common.Common.MockCatalogItemId01, ProductName = ".NET Bot Blue Sweatshirt (M)", Quantity = 1, UnitPrice = 19.50M },
16+
new BasketItem { Id = "2", PictureUrl = Device.OS != TargetPlatform.Windows ? "fake_product_04.png" : "Assets/fake_product_04.png", ProductId = Common.Common.MockCatalogItemId04, ProductName = ".NET Black Cupt", Quantity = 1, UnitPrice = 17.00M }
1717
}
1818
};
1919

‎src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/Catalog/CatalogMockService.cs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,11 @@ public class CatalogMockService : ICatalogService
2424

2525
private ObservableCollection<CatalogItem> MockCatalog = new ObservableCollection<CatalogItem>
2626
{
27-
new CatalogItem { Id = Common.Common.MockCatalogItemId01.ToString(), PictureUri = Device.OS != TargetPlatform.Windows ? "fake_product_01.png" : "Assets/fake_product_01.png", Name = ".NET Bot Blue Sweatshirt (M)", Price = 19.50M, CatalogBrandId = 2, CatalogBrand = "Visual Studio", CatalogTypeId = 2, CatalogType = "T-Shirt" },
28-
new CatalogItem { Id = Common.Common.MockCatalogItemId02.ToString(), PictureUri = Device.OS != TargetPlatform.Windows ? "fake_product_02.png" : "Assets/fake_product_02.png", Name = ".NET Bot Purple Sweatshirt (M)", Price = 19.50M, CatalogBrandId = 2, CatalogBrand = "Visual Studio", CatalogTypeId = 2, CatalogType = "T-Shirt" },
29-
new CatalogItem { Id = Common.Common.MockCatalogItemId03.ToString(), PictureUri = Device.OS != TargetPlatform.Windows ? "fake_product_03.png" : "Assets/fake_product_03.png", Name = ".NET Bot Black Sweatshirt (M)", Price = 19.95M, CatalogBrandId = 2, CatalogBrand = "Visual Studio", CatalogTypeId = 2, CatalogType = "T-Shirt" },
30-
new CatalogItem { Id = Common.Common.MockCatalogItemId04.ToString(), PictureUri = Device.OS != TargetPlatform.Windows ? "fake_product_04.png" : "Assets/fake_product_04.png", Name = ".NET Black Cupt", Price = 17.00M, CatalogBrandId = 2, CatalogBrand = "Visual Studio", CatalogTypeId = 1, CatalogType = "Mug" },
31-
new CatalogItem { Id = Common.Common.MockCatalogItemId05.ToString(), PictureUri = Device.OS != TargetPlatform.Windows ? "fake_product_05.png" : "Assets/fake_product_05.png", Name = "Azure Black Sweatshirt (M)", Price = 19.50M, CatalogBrandId = 1, CatalogBrand = "Azure", CatalogTypeId = 2, CatalogType = "T-Shirt" }
27+
new CatalogItem { Id = Common.Common.MockCatalogItemId01, PictureUri = Device.OS != TargetPlatform.Windows ? "fake_product_01.png" : "Assets/fake_product_01.png", Name = ".NET Bot Blue Sweatshirt (M)", Price = 19.50M, CatalogBrandId = 2, CatalogBrand = "Visual Studio", CatalogTypeId = 2, CatalogType = "T-Shirt" },
28+
new CatalogItem { Id = Common.Common.MockCatalogItemId02, PictureUri = Device.OS != TargetPlatform.Windows ? "fake_product_02.png" : "Assets/fake_product_02.png", Name = ".NET Bot Purple Sweatshirt (M)", Price = 19.50M, CatalogBrandId = 2, CatalogBrand = "Visual Studio", CatalogTypeId = 2, CatalogType = "T-Shirt" },
29+
new CatalogItem { Id = Common.Common.MockCatalogItemId03, PictureUri = Device.OS != TargetPlatform.Windows ? "fake_product_03.png" : "Assets/fake_product_03.png", Name = ".NET Bot Black Sweatshirt (M)", Price = 19.95M, CatalogBrandId = 2, CatalogBrand = "Visual Studio", CatalogTypeId = 2, CatalogType = "T-Shirt" },
30+
new CatalogItem { Id = Common.Common.MockCatalogItemId04, PictureUri = Device.OS != TargetPlatform.Windows ? "fake_product_04.png" : "Assets/fake_product_04.png", Name = ".NET Black Cupt", Price = 17.00M, CatalogBrandId = 2, CatalogBrand = "Visual Studio", CatalogTypeId = 1, CatalogType = "Mug" },
31+
new CatalogItem { Id = Common.Common.MockCatalogItemId05, PictureUri = Device.OS != TargetPlatform.Windows ? "fake_product_05.png" : "Assets/fake_product_05.png", Name = "Azure Black Sweatshirt (M)", Price = 19.50M, CatalogBrandId = 1, CatalogBrand = "Azure", CatalogTypeId = 2, CatalogType = "T-Shirt" }
3232
};
3333

3434
public async Task<ObservableCollection<CatalogItem>> GetCatalogAsync()

‎src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/Common/Common.cs‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,11 @@
1-
using System;
2-
3-
namespace eShopOnContainers.Core.Services.Common
1+
namespace eShopOnContainers.Core.Services.Common
42
{
53
public static class Common
64
{
7-
public static Guid MockCatalogItemId01 = new Guid("0f8fad5b-d9cb-469f-a165-708677289501");
8-
public static Guid MockCatalogItemId02 = new Guid("0f8fad5b-d9cb-469f-a165-708677289502");
9-
public static Guid MockCatalogItemId03 = new Guid("0f8fad5b-d9cb-469f-a165-708677289503");
10-
public static Guid MockCatalogItemId04 = new Guid("0f8fad5b-d9cb-469f-a165-708677289504");
11-
public static Guid MockCatalogItemId05 = new Guid("0f8fad5b-d9cb-469f-a165-708677289505");
5+
public static string MockCatalogItemId01 = "1";
6+
public static string MockCatalogItemId02 = "2";
7+
public static string MockCatalogItemId03 = "3";
8+
public static string MockCatalogItemId04 = "4";
9+
public static string MockCatalogItemId05 = "5";
1210
}
1311
}

‎src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/Identity/IdentityService.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ public string CreateAuthorizeRequest()
1919
var dic = new Dictionary<string, string>();
2020
dic.Add("client_id", "xamarin");
2121
dic.Add("response_type", "id_token token");
22-
dic.Add("scope", "openid profile basket");
22+
dic.Add("scope", "openid profile basket orders");
2323

2424
dic.Add("redirect_uri", GlobalSetting.Instance.IdentityCallback);
2525
dic.Add("nonce", Guid.NewGuid().ToString("N"));

‎src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/Order/IOrderService.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ namespace eShopOnContainers.Core.Services.Order
55
{
66
public interface IOrderService
77
{
8-
Task CreateOrderAsync(Models.Orders.Order newOrder);
9-
Task<ObservableCollection<Models.Orders.Order>> GetOrdersAsync();
10-
Task<Models.Orders.Order> GetOrderAsync(int orderId);
11-
Task<ObservableCollection<Models.Orders.CardType>> GetCardTypesAsync();
8+
Task CreateOrderAsync(Models.Orders.Order newOrder, string token);
9+
Task<ObservableCollection<Models.Orders.Order>> GetOrdersAsync(string token);
10+
Task<Models.Orders.Order> GetOrderAsync(int orderId, string token);
11+
Task<ObservableCollection<Models.Orders.CardType>> GetCardTypesAsync(string token);
1212
}
1313
}

‎src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/Order/OrderMockService.cs‎

Lines changed: 24 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,9 @@ public class OrderMockService : IOrderService
4545

4646
private List<Models.Orders.Order> MockOrders = new List<Models.Orders.Order>()
4747
{
48-
new Models.Orders.Order { SequenceNumber = 123, OrderDate = DateTime.Now, State = OrderState.Delivered, OrderItems = MockOrderItems, PaymentInfo = MockPaymentInfo, ShippingAddress = MockAdress },
49-
new Models.Orders.Order { SequenceNumber = 132, OrderDate = DateTime.Now, State = OrderState.Delivered, OrderItems = MockOrderItems, PaymentInfo = MockPaymentInfo, ShippingAddress = MockAdress },
50-
new Models.Orders.Order { SequenceNumber = 231, OrderDate = DateTime.Now, State = OrderState.Delivered, OrderItems = MockOrderItems, PaymentInfo = MockPaymentInfo, ShippingAddress = MockAdress },
48+
new Models.Orders.Order { SequenceNumber = 123, OrderDate = DateTime.Now, State = OrderState.Delivered, OrderItems = MockOrderItems, CardType = MockPaymentInfo.CardType.ToString(), CardHolderName = MockPaymentInfo.CardHolderName, CardNumber = MockPaymentInfo.CardNumber, CardSecurityNumber = MockPaymentInfo.SecurityNumber, CardExpiration = new DateTime(MockPaymentInfo.ExpirationYear, MockPaymentInfo.ExpirationMonth, 1), ShippingCity = MockAdress.City, ShippingState = MockAdress.State, ShippingCountry = MockAdress.Country, ShippingStreet = MockAdress.Street },
49+
new Models.Orders.Order { SequenceNumber = 132, OrderDate = DateTime.Now, State = OrderState.Delivered, OrderItems = MockOrderItems, CardType = MockPaymentInfo.CardType.ToString(), CardHolderName = MockPaymentInfo.CardHolderName, CardNumber = MockPaymentInfo.CardNumber, CardSecurityNumber = MockPaymentInfo.SecurityNumber, CardExpiration = new DateTime(MockPaymentInfo.ExpirationYear, MockPaymentInfo.ExpirationMonth, 1), ShippingCity = MockAdress.City, ShippingState = MockAdress.State, ShippingCountry = MockAdress.Country, ShippingStreet = MockAdress.Street },
50+
new Models.Orders.Order { SequenceNumber = 231, OrderDate = DateTime.Now, State = OrderState.Delivered, OrderItems = MockOrderItems, CardType = MockPaymentInfo.CardType.ToString(), CardHolderName = MockPaymentInfo.CardHolderName, CardNumber = MockPaymentInfo.CardNumber, CardSecurityNumber = MockPaymentInfo.SecurityNumber, CardExpiration = new DateTime(MockPaymentInfo.ExpirationYear, MockPaymentInfo.ExpirationMonth, 1), ShippingCity = MockAdress.City, ShippingState = MockAdress.State, ShippingCountry = MockAdress.Country, ShippingStreet = MockAdress.Street },
5151
};
5252

5353
private static List<OrderItem> MockOrderItems = new List<OrderItem>()
@@ -62,33 +62,45 @@ public class OrderMockService : IOrderService
6262
new CardType { Id = 2, Name = "Visa" },
6363
new CardType { Id = 3, Name = "MasterCard" },
6464
};
65-
66-
public async Task CreateOrderAsync(Models.Orders.Order newOrder)
65+
66+
public async Task CreateOrderAsync(Models.Orders.Order newOrder, string token)
6767
{
6868
await Task.Delay(500);
6969

70-
MockOrders.Insert(0, newOrder);
70+
if (!string.IsNullOrEmpty(token))
71+
{
72+
MockOrders.Insert(0, newOrder);
73+
}
7174
}
7275

73-
public async Task<ObservableCollection<Models.Orders.Order>> GetOrdersAsync()
76+
public async Task<ObservableCollection<Models.Orders.Order>> GetOrdersAsync(string token)
7477
{
7578
await Task.Delay(500);
7679

77-
return MockOrders.ToObservableCollection();
80+
if (!string.IsNullOrEmpty(token))
81+
return MockOrders.ToObservableCollection();
82+
else
83+
return new ObservableCollection<Models.Orders.Order>();
7884
}
7985

80-
public async Task<Models.Orders.Order> GetOrderAsync(int orderId)
86+
public async Task<Models.Orders.Order> GetOrderAsync(int orderId, string token)
8187
{
8288
await Task.Delay(500);
8389

84-
return MockOrders.FirstOrDefault(o => o.SequenceNumber == orderId);
90+
if (!string.IsNullOrEmpty(token))
91+
return MockOrders.FirstOrDefault(o => o.SequenceNumber == orderId);
92+
else
93+
return new Models.Orders.Order();
8594
}
8695

87-
public async Task<ObservableCollection<CardType>> GetCardTypesAsync()
96+
public async Task<ObservableCollection<CardType>> GetCardTypesAsync(string token)
8897
{
8998
await Task.Delay(500);
9099

91-
return MockCardTypes.ToObservableCollection();
100+
if (!string.IsNullOrEmpty(token))
101+
return MockCardTypes.ToObservableCollection();
102+
else
103+
return new ObservableCollection<CardType>();
92104
}
93105
}
94106
}

0 commit comments

Comments
 (0)