ayan.poddar/eShopOnContainers
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Removing pokemon catches. #75

Browse Source
This commit is contained in:
etomas 2017-03-06 18:41:27 +01:00
parent 12a734380c
commit 485e8faf03
7 changed files with 119 additions and 199 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/Mobile/eShopOnContainers/eShopOnContainers.Core/Extensions/ObservableExtension.cs
View File

@ -9,19 +9,13 @@ namespace eShopOnContainers.Core.Extensions
{
ObservableCollection<T> collection = new ObservableCollection<T>();
try
foreach (T item in source)
{
foreach (T item in source)
{
collection.Add(item);
}
collection.Add(item);
}
return collection;
return collection;
}
catch
{
return collection;
}
}
}
}

34
src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/Basket/BasketService.cs
View File

@ -17,35 +17,24 @@ namespace eShopOnContainers.Core.Services.Basket
public async Task<CustomerBasket> 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<CustomerBasket>(uri, token);
CustomerBasket basket =
await _requestProvider.GetAsync<CustomerBasket>(uri, token);
ServicesHelper.FixBasketItemPictureUri(basket?.Items);
ServicesHelper.FixBasketItemPictureUri(basket?.Items);
return basket;
return basket;
}
catch
{
return new CustomerBasket
{
BuyerId = guidUser,
Items = new System.Collections.Generic.List<BasketItem>()
};
}
}
public async Task<CustomerBasket> 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)

94
src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/Catalog/CatalogService.cs
View File

@ -20,54 +20,44 @@ namespace eShopOnContainers.Core.Services.Catalog
public async Task<ObservableCollection<CatalogItem>> 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<CatalogRoot>(uri);
string uri = builder.ToString();
if (catalog?.Data != null)
return catalog?.Data.ToObservableCollection();
else
return new ObservableCollection<CatalogItem>();
}
catch
{
CatalogRoot catalog =
await _requestProvider.GetAsync<CatalogRoot>(uri);
if (catalog?.Data != null)
return catalog?.Data.ToObservableCollection();
else
return new ObservableCollection<CatalogItem>();
}
}
public async Task<ObservableCollection<CatalogItem>> GetCatalogAsync()
{
try
UriBuilder builder = new UriBuilder(GlobalSetting.Instance.CatalogEndpoint);
builder.Path = "api/v1/catalog/items";
string uri = builder.ToString();
CatalogRoot catalog =
await _requestProvider.GetAsync<CatalogRoot>(uri);
if (catalog?.Data != null)
{
UriBuilder builder = new UriBuilder(GlobalSetting.Instance.CatalogEndpoint);
ServicesHelper.FixCatalogItemPictureUri(catalog?.Data);
builder.Path = "api/v1/catalog/items";
string uri = builder.ToString();
CatalogRoot catalog =
await _requestProvider.GetAsync<CatalogRoot>(uri);
if (catalog?.Data != null)
{
ServicesHelper.FixCatalogItemPictureUri(catalog?.Data);
return catalog?.Data.ToObservableCollection();
}
else
return new ObservableCollection<CatalogItem>();
return catalog?.Data.ToObservableCollection();
}
catch
{
else
return new ObservableCollection<CatalogItem>();
}
}
public Task<CatalogItem> GetCatalogItemAsync(string id)
@ -77,8 +67,7 @@ namespace eShopOnContainers.Core.Services.Catalog
public async Task<ObservableCollection<CatalogBrand>> 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<CatalogBrand>();
}
catch
{
return new ObservableCollection<CatalogBrand>();
}
}
public async Task<ObservableCollection<CatalogType>> 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<CatalogType> types =
await _requestProvider.GetAsync<IEnumerable<CatalogType>>(uri);
string uri = builder.ToString();
if (types != null)
return types.ToObservableCollection();
else
return new ObservableCollection<CatalogType>();
}
catch
{
IEnumerable<CatalogType> types =
await _requestProvider.GetAsync<IEnumerable<CatalogType>>(uri);
if (types != null)
return types.ToObservableCollection();
else
return new ObservableCollection<CatalogType>();
}
}
}
}

21
src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/Order/OrderService.cs
View File

@ -27,23 +27,18 @@ namespace eShopOnContainers.Core.Services.Order
public async Task<ObservableCollection<Models.Orders.Order>> 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<Models.Orders.Order> orders =
await _requestProvider.GetAsync<ObservableCollection<Models.Orders.Order>>(uri, token);
ObservableCollection<Models.Orders.Order> orders =
await _requestProvider.GetAsync<ObservableCollection<Models.Orders.Order>>(uri, token);
return orders;
}
catch
{
return new ObservableCollection<Models.Orders.Order>();
}
return orders;
}
public async Task<Models.Orders.Order> GetOrderAsync(int orderId, string token)

19
src/Mobile/eShopOnContainers/eShopOnContainers.Core/Services/User/UserService.cs
View File

@ -16,21 +16,16 @@ namespace eShopOnContainers.Core.Services.User
public async Task<UserInfo> 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<UserInfo>(uri, authToken);
string uri = builder.ToString();
var userInfo =
await _requestProvider.GetAsync<UserInfo>(uri, authToken);
return userInfo;
return userInfo;
}
catch
{
return new UserInfo();
}
}
}
}

18
src/Web/Catalog.WebForms/Catalog.WebForms/Extensions/ObservableExtensions.cs
View File

@ -7,22 +7,14 @@ namespace eShopOnContainers.Core.Extensions
{
public static ObservableCollection<T> ToObservableCollection<T>(this IEnumerable<T> source)
{
ObservableCollection<T> collection = new ObservableCollection<T>();
try
foreach (T item in source)
{
foreach (T item in source)
{
collection.Add(item);
}
collection.Add(item);
}
return collection;
return collection;
}
// Really?
catch
{
return collection;
}
}
}
}

116
src/Web/Catalog.WebForms/Catalog.WebForms/Services/CatalogService.cs
View File

@ -21,56 +21,47 @@ namespace eShopOnContainers.Core.Services.Catalog
public async Task<ObservableCollection<CatalogItem>> 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<CatalogRoot>(uri);
CatalogRoot catalog =
await _requestProvider.GetAsync<CatalogRoot>(uri);
if (catalog?.Data != null)
return catalog?.Data.ToObservableCollection();
else
return new ObservableCollection<CatalogItem>();
}
catch
{
if (catalog?.Data != null)
return catalog?.Data.ToObservableCollection();
else
return new ObservableCollection<CatalogItem>();
}
}
public async Task<ObservableCollection<CatalogItem>> GetCatalogAsync()
{
try
// TODO:
UriBuilder builder = new UriBuilder("" /* GlobalSetting.Instance.CatalogEndpoint */);
builder.Path = "api/v1/catalog/items";
string uri = builder.ToString();
CatalogRoot catalog =
await _requestProvider.GetAsync<CatalogRoot>(uri);
if (catalog?.Data != null)
{
// TODO:
UriBuilder builder = new UriBuilder("" /* GlobalSetting.Instance.CatalogEndpoint */);
// TODO: ServicesHelper.FixCatalogItemPictureUri(catalog?.Data);
builder.Path = "api/v1/catalog/items";
string uri = builder.ToString();
CatalogRoot catalog =
await _requestProvider.GetAsync<CatalogRoot>(uri);
if (catalog?.Data != null)
{
// TODO: ServicesHelper.FixCatalogItemPictureUri(catalog?.Data);
return catalog?.Data.ToObservableCollection();
}
else
return new ObservableCollection<CatalogItem>();
return catalog?.Data.ToObservableCollection();
}
catch
{
else
return new ObservableCollection<CatalogItem>();
}
}
public Task<CatalogItem> GetCatalogItemAsync(string id)
@ -80,52 +71,41 @@ namespace eShopOnContainers.Core.Services.Catalog
public async Task<ObservableCollection<CatalogBrand>> 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<CatalogBrand> brands =
await _requestProvider.GetAsync<IEnumerable<CatalogBrand>>(uri);
IEnumerable<CatalogBrand> brands =
await _requestProvider.GetAsync<IEnumerable<CatalogBrand>>(uri);
if (brands != null)
return brands?.ToObservableCollection();
else
return new ObservableCollection<CatalogBrand>();
}
catch
{
if (brands != null)
return brands?.ToObservableCollection();
else
return new ObservableCollection<CatalogBrand>();
}
}
public async Task<ObservableCollection<CatalogType>> 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<CatalogType> types =
await _requestProvider.GetAsync<IEnumerable<CatalogType>>(uri);
string uri = builder.ToString();
if (types != null)
return types.ToObservableCollection();
else
return new ObservableCollection<CatalogType>();
}
catch
{
IEnumerable<CatalogType> types =
await _requestProvider.GetAsync<IEnumerable<CatalogType>>(uri);
if (types != null)
return types.ToObservableCollection();
else
return new ObservableCollection<CatalogType>();
}
}
}
}