From 485e8faf0394f1490862b922119a57fe17a3a7fa Mon Sep 17 00:00:00 2001 From: etomas Date: Mon, 6 Mar 2017 18:41:27 +0100 Subject: [PATCH] Removing pokemon catches. #75 --- .../Extensions/ObservableExtension.cs | 16 +-- .../Services/Basket/BasketService.cs | 38 ++---- .../Services/Catalog/CatalogService.cs | 88 ++++++-------- .../Services/Order/OrderService.cs | 21 ++-- .../Services/User/UserService.cs | 19 ++- .../Extensions/ObservableExtensions.cs | 18 +-- .../Services/CatalogService.cs | 110 +++++++----------- 7 files changed, 115 insertions(+), 195 deletions(-) diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Extensions/ObservableExtension.cs b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Extensions/ObservableExtension.cs index 5c8f5073a..ad10bd941 100644 --- a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Extensions/ObservableExtension.cs +++ b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Extensions/ObservableExtension.cs @@ -9,19 +9,13 @@ namespace eShopOnContainers.Core.Extensions { ObservableCollection collection = new ObservableCollection(); - try + foreach (T item in source) { - foreach (T item in source) - { - collection.Add(item); - } - - return collection; - } - catch - { - return collection; + collection.Add(item); } + + return collection; + } } } \ No newline at end of file diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/Basket/BasketService.cs b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/Basket/BasketService.cs index 34c6de466..ae7617115 100644 --- a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/Basket/BasketService.cs +++ b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/Basket/BasketService.cs @@ -17,35 +17,24 @@ namespace eShopOnContainers.Core.Services.Basket public async Task GetBasketAsync(string guidUser, string token) { - try - { - UriBuilder builder = new UriBuilder(GlobalSetting.Instance.BasketEndpoint); + + UriBuilder builder = new UriBuilder(GlobalSetting.Instance.BasketEndpoint); - builder.Path = guidUser; + builder.Path = guidUser; - string uri = builder.ToString(); + string uri = builder.ToString(); + + CustomerBasket basket = + await _requestProvider.GetAsync(uri, token); + + ServicesHelper.FixBasketItemPictureUri(basket?.Items); + + return basket; - CustomerBasket basket = - await _requestProvider.GetAsync(uri, token); - - ServicesHelper.FixBasketItemPictureUri(basket?.Items); - - return basket; - } - catch - { - return new CustomerBasket - { - BuyerId = guidUser, - Items = new System.Collections.Generic.List() - }; - } } public async Task UpdateBasketAsync(CustomerBasket customerBasket, string token) { - try - { UriBuilder builder = new UriBuilder(GlobalSetting.Instance.BasketEndpoint); string uri = builder.ToString(); @@ -53,11 +42,6 @@ namespace eShopOnContainers.Core.Services.Basket var result = await _requestProvider.PostAsync(uri, customerBasket, token); return result; - } - catch - { - return new CustomerBasket(); - } } public async Task ClearBasketAsync(string guidUser, string token) diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/Catalog/CatalogService.cs b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/Catalog/CatalogService.cs index a526469b6..bbed8a9ed 100644 --- a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/Catalog/CatalogService.cs +++ b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/Catalog/CatalogService.cs @@ -20,54 +20,44 @@ namespace eShopOnContainers.Core.Services.Catalog public async Task> FilterAsync(int catalogBrandId, int catalogTypeId) { - try - { - UriBuilder builder = new UriBuilder(GlobalSetting.Instance.CatalogEndpoint); - builder.Path = string.Format("api/v1/catalog/items/type/{0}/brand/{1}", catalogTypeId, catalogBrandId); + UriBuilder builder = new UriBuilder(GlobalSetting.Instance.CatalogEndpoint); - string uri = builder.ToString(); + builder.Path = string.Format("api/v1/catalog/items/type/{0}/brand/{1}", catalogTypeId, catalogBrandId); - CatalogRoot catalog = - await _requestProvider.GetAsync(uri); + string uri = builder.ToString(); - if (catalog?.Data != null) - return catalog?.Data.ToObservableCollection(); - else - return new ObservableCollection(); - } - catch - { + CatalogRoot catalog = + await _requestProvider.GetAsync(uri); + + if (catalog?.Data != null) + return catalog?.Data.ToObservableCollection(); + else return new ObservableCollection(); - } + } public async Task> GetCatalogAsync() { - try - { - UriBuilder builder = new UriBuilder(GlobalSetting.Instance.CatalogEndpoint); - builder.Path = "api/v1/catalog/items"; + UriBuilder builder = new UriBuilder(GlobalSetting.Instance.CatalogEndpoint); - string uri = builder.ToString(); + builder.Path = "api/v1/catalog/items"; - CatalogRoot catalog = - await _requestProvider.GetAsync(uri); + string uri = builder.ToString(); - if (catalog?.Data != null) - { - ServicesHelper.FixCatalogItemPictureUri(catalog?.Data); + CatalogRoot catalog = + await _requestProvider.GetAsync(uri); - return catalog?.Data.ToObservableCollection(); - } - else - return new ObservableCollection(); - } - catch + if (catalog?.Data != null) { - return new ObservableCollection(); + ServicesHelper.FixCatalogItemPictureUri(catalog?.Data); + + return catalog?.Data.ToObservableCollection(); } + else + return new ObservableCollection(); + } public Task GetCatalogItemAsync(string id) @@ -77,8 +67,7 @@ namespace eShopOnContainers.Core.Services.Catalog public async Task> GetCatalogBrandAsync() { - try - { + UriBuilder builder = new UriBuilder(GlobalSetting.Instance.CatalogEndpoint); builder.Path = "api/v1/catalog/catalogbrands"; @@ -92,35 +81,26 @@ namespace eShopOnContainers.Core.Services.Catalog return brands?.ToObservableCollection(); else return new ObservableCollection(); - } - catch - { - return new ObservableCollection(); - } + } public async Task> GetCatalogTypeAsync() { - try - { - UriBuilder builder = new UriBuilder(GlobalSetting.Instance.CatalogEndpoint); - builder.Path = "api/v1/catalog/catalogtypes"; + UriBuilder builder = new UriBuilder(GlobalSetting.Instance.CatalogEndpoint); - string uri = builder.ToString(); + builder.Path = "api/v1/catalog/catalogtypes"; - IEnumerable types = - await _requestProvider.GetAsync>(uri); + string uri = builder.ToString(); - if (types != null) - return types.ToObservableCollection(); - else - return new ObservableCollection(); - } - catch - { + IEnumerable types = + await _requestProvider.GetAsync>(uri); + + if (types != null) + return types.ToObservableCollection(); + else return new ObservableCollection(); - } + } } } diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/Order/OrderService.cs b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/Order/OrderService.cs index 3bae35401..0005bfd22 100644 --- a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/Order/OrderService.cs +++ b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/Order/OrderService.cs @@ -27,23 +27,18 @@ namespace eShopOnContainers.Core.Services.Order public async Task> GetOrdersAsync(string token) { - try - { - UriBuilder builder = new UriBuilder(GlobalSetting.Instance.OrdersEndpoint); + + UriBuilder builder = new UriBuilder(GlobalSetting.Instance.OrdersEndpoint); - builder.Path = "api/v1/orders"; + builder.Path = "api/v1/orders"; - string uri = builder.ToString(); + string uri = builder.ToString(); - ObservableCollection orders = - await _requestProvider.GetAsync>(uri, token); + ObservableCollection orders = + await _requestProvider.GetAsync>(uri, token); - return orders; - } - catch - { - return new ObservableCollection(); - } + return orders; + } public async Task GetOrderAsync(int orderId, string token) diff --git a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/User/UserService.cs b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/User/UserService.cs index 1c4bb7e83..87d41bd11 100644 --- a/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/User/UserService.cs +++ b/src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/User/UserService.cs @@ -16,21 +16,16 @@ namespace eShopOnContainers.Core.Services.User public async Task GetUserInfoAsync(string authToken) { - try - { - UriBuilder builder = new UriBuilder(GlobalSetting.Instance.UserInfoEndpoint); - string uri = builder.ToString(); + UriBuilder builder = new UriBuilder(GlobalSetting.Instance.UserInfoEndpoint); - var userInfo = - await _requestProvider.GetAsync(uri, authToken); + string uri = builder.ToString(); + + var userInfo = + await _requestProvider.GetAsync(uri, authToken); + + return userInfo; - return userInfo; - } - catch - { - return new UserInfo(); - } } } } \ No newline at end of file diff --git a/src/Web/Catalog.WebForms/Catalog.WebForms/Extensions/ObservableExtensions.cs b/src/Web/Catalog.WebForms/Catalog.WebForms/Extensions/ObservableExtensions.cs index b7a779094..7493133d2 100644 --- a/src/Web/Catalog.WebForms/Catalog.WebForms/Extensions/ObservableExtensions.cs +++ b/src/Web/Catalog.WebForms/Catalog.WebForms/Extensions/ObservableExtensions.cs @@ -7,22 +7,14 @@ namespace eShopOnContainers.Core.Extensions { public static ObservableCollection ToObservableCollection(this IEnumerable source) { - ObservableCollection collection = new ObservableCollection(); - try + foreach (T item in source) { - foreach (T item in source) - { - collection.Add(item); - } - - return collection; - } - // Really? - catch - { - return collection; + collection.Add(item); } + + return collection; + } } } \ No newline at end of file diff --git a/src/Web/Catalog.WebForms/Catalog.WebForms/Services/CatalogService.cs b/src/Web/Catalog.WebForms/Catalog.WebForms/Services/CatalogService.cs index 93a74eb83..f2ffc25d2 100644 --- a/src/Web/Catalog.WebForms/Catalog.WebForms/Services/CatalogService.cs +++ b/src/Web/Catalog.WebForms/Catalog.WebForms/Services/CatalogService.cs @@ -21,56 +21,47 @@ namespace eShopOnContainers.Core.Services.Catalog public async Task> FilterAsync(int catalogBrandId, int catalogTypeId) { - try - { + // TODO: - UriBuilder builder = new UriBuilder("" /* GlobalSetting.Instance.CatalogEndpoint */); + UriBuilder builder = new UriBuilder("" /* GlobalSetting.Instance.CatalogEndpoint */); - builder.Path = string.Format("api/v1/catalog/items/type/{0}/brand/{1}", catalogTypeId, catalogBrandId); + builder.Path = string.Format("api/v1/catalog/items/type/{0}/brand/{1}", catalogTypeId, catalogBrandId); - string uri = builder.ToString(); + string uri = builder.ToString(); - CatalogRoot catalog = - await _requestProvider.GetAsync(uri); + CatalogRoot catalog = + await _requestProvider.GetAsync(uri); - if (catalog?.Data != null) - return catalog?.Data.ToObservableCollection(); - else - return new ObservableCollection(); - } - catch - { + if (catalog?.Data != null) + return catalog?.Data.ToObservableCollection(); + else return new ObservableCollection(); - } + + } public async Task> GetCatalogAsync() { - try - { - // TODO: - UriBuilder builder = new UriBuilder("" /* GlobalSetting.Instance.CatalogEndpoint */); - builder.Path = "api/v1/catalog/items"; + // TODO: + UriBuilder builder = new UriBuilder("" /* GlobalSetting.Instance.CatalogEndpoint */); - string uri = builder.ToString(); + builder.Path = "api/v1/catalog/items"; - CatalogRoot catalog = - await _requestProvider.GetAsync(uri); + string uri = builder.ToString(); - if (catalog?.Data != null) - { - // TODO: ServicesHelper.FixCatalogItemPictureUri(catalog?.Data); + CatalogRoot catalog = + await _requestProvider.GetAsync(uri); - return catalog?.Data.ToObservableCollection(); - } - else - return new ObservableCollection(); - } - catch + if (catalog?.Data != null) { - return new ObservableCollection(); + // TODO: ServicesHelper.FixCatalogItemPictureUri(catalog?.Data); + + return catalog?.Data.ToObservableCollection(); } + else + return new ObservableCollection(); + } public Task GetCatalogItemAsync(string id) @@ -80,52 +71,41 @@ namespace eShopOnContainers.Core.Services.Catalog public async Task> GetCatalogBrandAsync() { - try - { - // TODO: - UriBuilder builder = new UriBuilder("" /* GlobalSetting.Instance.CatalogEndpoint */); + + // TODO: + UriBuilder builder = new UriBuilder("" /* GlobalSetting.Instance.CatalogEndpoint */); - builder.Path = "api/v1/catalog/catalogbrands"; + builder.Path = "api/v1/catalog/catalogbrands"; - string uri = builder.ToString(); + string uri = builder.ToString(); - IEnumerable brands = - await _requestProvider.GetAsync>(uri); + IEnumerable brands = + await _requestProvider.GetAsync>(uri); - if (brands != null) - return brands?.ToObservableCollection(); - else - return new ObservableCollection(); - } - catch - { + if (brands != null) + return brands?.ToObservableCollection(); + else return new ObservableCollection(); - } } public async Task> GetCatalogTypeAsync() { - try - { - // TODO: - UriBuilder builder = new UriBuilder("" /* GlobalSetting.Instance.CatalogEndpoint */); - builder.Path = "api/v1/catalog/catalogtypes"; + // TODO: + UriBuilder builder = new UriBuilder("" /* GlobalSetting.Instance.CatalogEndpoint */); - string uri = builder.ToString(); + builder.Path = "api/v1/catalog/catalogtypes"; - IEnumerable types = - await _requestProvider.GetAsync>(uri); + string uri = builder.ToString(); - if (types != null) - return types.ToObservableCollection(); - else - return new ObservableCollection(); - } - catch - { + IEnumerable types = + await _requestProvider.GetAsync>(uri); + + if (types != null) + return types.ToObservableCollection(); + else return new ObservableCollection(); - } + } } }