Skip to content

Commit 485e8fa

Browse files
eiximeniseiximenis
committed
Removing pokemon catches. dotnet-architecture#75 
1 parent 12a7343 commit 485e8fa

7 files changed

Lines changed: 115 additions & 195 deletions

File tree

‎src/Mobile/eShopOnContainers/eShopOnContainers.Core/Extensions/ObservableExtension.cs‎

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -9,19 +9,13 @@ public static ObservableCollection<T> ToObservableCollection<T>(this IEnumerable
99
{
1010
ObservableCollection<T> collection = new ObservableCollection<T>();
1111

12-
try
12+
foreach (T item in source)
1313
{
14-
foreach (T item in source)
15-
{
16-
collection.Add(item);
17-
}
18-
19-
return collection;
20-
}
21-
catch
22-
{
23-
return collection;
14+
collection.Add(item);
2415
}
16+
17+
return collection;
18+
2519
}
2620
}
2721
}

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

Lines changed: 11 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -17,47 +17,31 @@ public BasketService(IRequestProvider requestProvider)
1717

1818
public async Task<CustomerBasket> GetBasketAsync(string guidUser, string token)
1919
{
20-
try
21-
{
22-
UriBuilder builder = new UriBuilder(GlobalSetting.Instance.BasketEndpoint);
20+
21+
UriBuilder builder = new UriBuilder(GlobalSetting.Instance.BasketEndpoint);
2322

24-
builder.Path = guidUser;
23+
builder.Path = guidUser;
2524

26-
string uri = builder.ToString();
25+
string uri = builder.ToString();
26+
27+
CustomerBasket basket =
28+
await _requestProvider.GetAsync<CustomerBasket>(uri, token);
29+
30+
ServicesHelper.FixBasketItemPictureUri(basket?.Items);
31+
32+
return basket;
2733

28-
CustomerBasket basket =
29-
await _requestProvider.GetAsync<CustomerBasket>(uri, token);
30-
31-
ServicesHelper.FixBasketItemPictureUri(basket?.Items);
32-
33-
return basket;
34-
}
35-
catch
36-
{
37-
return new CustomerBasket
38-
{
39-
BuyerId = guidUser,
40-
Items = new System.Collections.Generic.List<BasketItem>()
41-
};
42-
}
4334
}
4435

4536
public async Task<CustomerBasket> UpdateBasketAsync(CustomerBasket customerBasket, string token)
4637
{
47-
try
48-
{
4938
UriBuilder builder = new UriBuilder(GlobalSetting.Instance.BasketEndpoint);
5039

5140
string uri = builder.ToString();
5241

5342
var result = await _requestProvider.PostAsync(uri, customerBasket, token);
5443

5544
return result;
56-
}
57-
catch
58-
{
59-
return new CustomerBasket();
60-
}
6145
}
6246

6347
public async Task ClearBasketAsync(string guidUser, string token)

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

Lines changed: 34 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -20,54 +20,44 @@ public CatalogService(IRequestProvider requestProvider)
2020

2121
public async Task<ObservableCollection<CatalogItem>> FilterAsync(int catalogBrandId, int catalogTypeId)
2222
{
23-
try
24-
{
25-
UriBuilder builder = new UriBuilder(GlobalSetting.Instance.CatalogEndpoint);
2623

27-
builder.Path = string.Format("api/v1/catalog/items/type/{0}/brand/{1}", catalogTypeId, catalogBrandId);
24+
UriBuilder builder = new UriBuilder(GlobalSetting.Instance.CatalogEndpoint);
2825

29-
string uri = builder.ToString();
26+
builder.Path = string.Format("api/v1/catalog/items/type/{0}/brand/{1}", catalogTypeId, catalogBrandId);
3027

31-
CatalogRoot catalog =
32-
await _requestProvider.GetAsync<CatalogRoot>(uri);
28+
string uri = builder.ToString();
3329

34-
if (catalog?.Data != null)
35-
return catalog?.Data.ToObservableCollection();
36-
else
37-
return new ObservableCollection<CatalogItem>();
38-
}
39-
catch
40-
{
30+
CatalogRoot catalog =
31+
await _requestProvider.GetAsync<CatalogRoot>(uri);
32+
33+
if (catalog?.Data != null)
34+
return catalog?.Data.ToObservableCollection();
35+
else
4136
return new ObservableCollection<CatalogItem>();
42-
}
37+
4338
}
4439

4540
public async Task<ObservableCollection<CatalogItem>> GetCatalogAsync()
4641
{
47-
try
48-
{
49-
UriBuilder builder = new UriBuilder(GlobalSetting.Instance.CatalogEndpoint);
5042

51-
builder.Path = "api/v1/catalog/items";
43+
UriBuilder builder = new UriBuilder(GlobalSetting.Instance.CatalogEndpoint);
5244

53-
string uri = builder.ToString();
45+
builder.Path = "api/v1/catalog/items";
5446

55-
CatalogRoot catalog =
56-
await _requestProvider.GetAsync<CatalogRoot>(uri);
47+
string uri = builder.ToString();
5748

58-
if (catalog?.Data != null)
59-
{
60-
ServicesHelper.FixCatalogItemPictureUri(catalog?.Data);
49+
CatalogRoot catalog =
50+
await _requestProvider.GetAsync<CatalogRoot>(uri);
6151

62-
return catalog?.Data.ToObservableCollection();
63-
}
64-
else
65-
return new ObservableCollection<CatalogItem>();
66-
}
67-
catch
52+
if (catalog?.Data != null)
6853
{
69-
return new ObservableCollection<CatalogItem>();
54+
ServicesHelper.FixCatalogItemPictureUri(catalog?.Data);
55+
56+
return catalog?.Data.ToObservableCollection();
7057
}
58+
else
59+
return new ObservableCollection<CatalogItem>();
60+
7161
}
7262

7363
public Task<CatalogItem> GetCatalogItemAsync(string id)
@@ -77,8 +67,7 @@ public Task<CatalogItem> GetCatalogItemAsync(string id)
7767

7868
public async Task<ObservableCollection<CatalogBrand>> GetCatalogBrandAsync()
7969
{
80-
try
81-
{
70+
8271
UriBuilder builder = new UriBuilder(GlobalSetting.Instance.CatalogEndpoint);
8372

8473
builder.Path = "api/v1/catalog/catalogbrands";
@@ -92,35 +81,26 @@ public async Task<ObservableCollection<CatalogBrand>> GetCatalogBrandAsync()
9281
return brands?.ToObservableCollection();
9382
else
9483
return new ObservableCollection<CatalogBrand>();
95-
}
96-
catch
97-
{
98-
return new ObservableCollection<CatalogBrand>();
99-
}
84+
10085
}
10186

10287
public async Task<ObservableCollection<CatalogType>> GetCatalogTypeAsync()
10388
{
104-
try
105-
{
106-
UriBuilder builder = new UriBuilder(GlobalSetting.Instance.CatalogEndpoint);
10789

108-
builder.Path = "api/v1/catalog/catalogtypes";
90+
UriBuilder builder = new UriBuilder(GlobalSetting.Instance.CatalogEndpoint);
10991

110-
string uri = builder.ToString();
92+
builder.Path = "api/v1/catalog/catalogtypes";
11193

112-
IEnumerable<CatalogType> types =
113-
await _requestProvider.GetAsync<IEnumerable<CatalogType>>(uri);
94+
string uri = builder.ToString();
11495

115-
if (types != null)
116-
return types.ToObservableCollection();
117-
else
118-
return new ObservableCollection<CatalogType>();
119-
}
120-
catch
121-
{
96+
IEnumerable<CatalogType> types =
97+
await _requestProvider.GetAsync<IEnumerable<CatalogType>>(uri);
98+
99+
if (types != null)
100+
return types.ToObservableCollection();
101+
else
122102
return new ObservableCollection<CatalogType>();
123-
}
103+
124104
}
125105
}
126106
}

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

Lines changed: 8 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -27,23 +27,18 @@ public async Task CreateOrderAsync(Models.Orders.Order newOrder, string token)
2727

2828
public async Task<ObservableCollection<Models.Orders.Order>> GetOrdersAsync(string token)
2929
{
30-
try
31-
{
32-
UriBuilder builder = new UriBuilder(GlobalSetting.Instance.OrdersEndpoint);
30+
31+
UriBuilder builder = new UriBuilder(GlobalSetting.Instance.OrdersEndpoint);
3332

34-
builder.Path = "api/v1/orders";
33+
builder.Path = "api/v1/orders";
3534

36-
string uri = builder.ToString();
35+
string uri = builder.ToString();
3736

38-
ObservableCollection<Models.Orders.Order> orders =
39-
await _requestProvider.GetAsync<ObservableCollection<Models.Orders.Order>>(uri, token);
37+
ObservableCollection<Models.Orders.Order> orders =
38+
await _requestProvider.GetAsync<ObservableCollection<Models.Orders.Order>>(uri, token);
4039

41-
return orders;
42-
}
43-
catch
44-
{
45-
return new ObservableCollection<Models.Orders.Order>();
46-
}
40+
return orders;
41+
4742
}
4843

4944
public async Task<Models.Orders.Order> GetOrderAsync(int orderId, string token)

‎src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/User/UserService.cs‎

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -16,21 +16,16 @@ public UserService(IRequestProvider requestProvider)
1616

1717
public async Task<UserInfo> GetUserInfoAsync(string authToken)
1818
{
19-
try
20-
{
21-
UriBuilder builder = new UriBuilder(GlobalSetting.Instance.UserInfoEndpoint);
2219

23-
string uri = builder.ToString();
20+
UriBuilder builder = new UriBuilder(GlobalSetting.Instance.UserInfoEndpoint);
2421

25-
var userInfo =
26-
await _requestProvider.GetAsync<UserInfo>(uri, authToken);
22+
string uri = builder.ToString();
23+
24+
var userInfo =
25+
await _requestProvider.GetAsync<UserInfo>(uri, authToken);
26+
27+
return userInfo;
2728

28-
return userInfo;
29-
}
30-
catch
31-
{
32-
return new UserInfo();
33-
}
3429
}
3530
}
3631
}

‎src/Web/Catalog.WebForms/Catalog.WebForms/Extensions/ObservableExtensions.cs‎

Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -7,22 +7,14 @@ public static class ObservableExtension
77
{
88
public static ObservableCollection<T> ToObservableCollection<T>(this IEnumerable<T> source)
99
{
10-
ObservableCollection<T> collection = new ObservableCollection<T>();
1110

12-
try
11+
foreach (T item in source)
1312
{
14-
foreach (T item in source)
15-
{
16-
collection.Add(item);
17-
}
18-
19-
return collection;
20-
}
21-
// Really?
22-
catch
23-
{
24-
return collection;
13+
collection.Add(item);
2514
}
15+
16+
return collection;
17+
2618
}
2719
}
2820
}

0 commit comments

Comments
 (0)