Skip to content

Commit

Permalink
Use .Equals methods for all string comparsions instead of "==" operator
Browse files Browse the repository at this point in the history
  • Loading branch information
martinkyjac committed May 31, 2024
1 parent ac44b0e commit 94def35
Show file tree
Hide file tree
Showing 6 changed files with 11 additions and 11 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ public record ProductDetailViewModel
public static ProductDetailViewModel GetViewModel(ProductDetailPage page, string selectedVariantID, string country, string currency, string[] errorMessages)
{
var product = page.Product.First();
var selectedVariant = product.Variants.FirstOrDefault(x => x.ShopifyVariantID == selectedVariantID) ?? product.Variants.First();
var selectedVariant = product.Variants.FirstOrDefault(x => x.ShopifyVariantID.Equals(selectedVariantID, StringComparison.Ordinal)) ?? product.Variants.First();

var allImages = product.Images.Concat(product.Variants.Select(x => x.Image.FirstOrDefault()))
.Where(x => x != null)
Expand All @@ -48,7 +48,7 @@ public static ProductDetailViewModel GetViewModel(ProductDetailPage page, string
Images = allImages,
DescriptionHTML = product.Description,
ParametersSection = product.Parameters,
Variants = product.Variants.Select(x => new SelectListItem(x.Title, x.ShopifyVariantID, x.ShopifyVariantID == selectedVariant.ShopifyVariantID)).ToList(),
Variants = product.Variants.Select(x => new SelectListItem(x.Title, x.ShopifyVariantID, x.ShopifyVariantID.Equals(selectedVariant.ShopifyVariantID, StringComparison.Ordinal))).ToList(),
SelectedShopifyVariantId = selectedVariant.ShopifyVariantID,
ShopifyProductId = product.ShopifyProductID,
CountryCode = country,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ public ShopifyOrderService(

var result = await orderService.ListAsync(filter);

return result.Items.FirstOrDefault(x => x.SourceIdentifier == sourceId);
return result.Items.FirstOrDefault(x => x.SourceIdentifier.Equals(sourceId, StringComparison.Ordinal));
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ private async Task<IDictionary<string, ProductPriceModel>> GetProductsPriceInter
continue;
}

var prices = product.Variants.Select(x => x.PresentmentPrices.FirstOrDefault(x => x.Price.CurrencyCode == currency));
var prices = product.Variants.Select(x => x.PresentmentPrices.FirstOrDefault(x => x.Price.CurrencyCode.Equals(currency, StringComparison.Ordinal)));

dict.TryAdd(product.Id.Value.ToString(), new ProductPriceModel()
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ private async Task<Dictionary<string, ProductVariantListModel>> GetProductVarian
{
foreach (var variant in variants.Values)
{
var cartItem = cart.Items.FirstOrDefault(x => x.VariantGraphQLId == variant.MerchandiseID);
var cartItem = cart.Items.FirstOrDefault(x => x.VariantGraphQLId.Equals(variant.MerchandiseID, StringComparison.Ordinal));
variant.ItemsInCart = cartItem?.Quantity ?? 0;
}
}
Expand Down Expand Up @@ -163,7 +163,7 @@ private ListResultWrapper<ShopifyProductListModel> CreateResultModel(ListResult<
if (variants.Count() == 1)
{
var onlyVariant = variants.First();
var currencyPrice = onlyVariant.PresentmentPrices?.FirstOrDefault(x => x.Price.CurrencyCode == currency);
var currencyPrice = onlyVariant.PresentmentPrices?.FirstOrDefault(x => x.Price.CurrencyCode.Equals(currency, StringComparison.Ordinal));

return currencyPrice is { Price: not null } ?
(currencyPrice.Price.Amount, currencyPrice.CompareAtPrice?.Amount) : (null, null);
Expand All @@ -173,7 +173,7 @@ private ListResultWrapper<ShopifyProductListModel> CreateResultModel(ListResult<

foreach (var variant in variants)
{
var currencyPrice = variant.PresentmentPrices?.FirstOrDefault(x => x.Price.CurrencyCode == currency);
var currencyPrice = variant.PresentmentPrices?.FirstOrDefault(x => x.Price.CurrencyCode.Equals(currency, StringComparison.Ordinal));

if (currencyPrice?.Price.Amount != null)
{
Expand Down
6 changes: 3 additions & 3 deletions src/Kentico.Xperience.Shopify/ShoppingCart/ShoppingService.cs
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ public async Task<CartOperationResult> UpdateCartItem(ShoppingCartItemParameters
{
var cart = await GetCurrentShoppingCart();

var cartItemToUpdate = cart?.Items.FirstOrDefault(x => x.ShopifyCartItemId == parameters.ShoppingCartItemID);
var cartItemToUpdate = cart?.Items.FirstOrDefault(x => x.ShopifyCartItemId.Equals(parameters.ShoppingCartItemID, StringComparison.Ordinal));
if (cart == null || cartItemToUpdate == null)
{
return await AddItemToCart(parameters);
Expand Down Expand Up @@ -74,7 +74,7 @@ public async Task<CartOperationResult> RemoveProductVariantFromCart(string varia
return new CartOperationResult(null, true);
}

var shopifyCartLines = cart.Items.Where(x => x.VariantGraphQLId == variantGraphQLId);
var shopifyCartLines = cart.Items.Where(x => x.VariantGraphQLId.Equals(variantGraphQLId, StringComparison.Ordinal));
bool success = true;
CartOperationResult? result = null;

Expand Down Expand Up @@ -105,7 +105,7 @@ public async Task<CartOperationResult> RemoveCartItem(string cartItemId)
return new CartOperationResult(null, true);
}

var shopifyCartLine = cart.Items.FirstOrDefault(x => x.ShopifyCartItemId == cartItemId);
var shopifyCartLine = cart.Items.FirstOrDefault(x => x.ShopifyCartItemId.Equals(cartItemId, StringComparison.Ordinal));
if (shopifyCartLine == null)
{
return new CartOperationResult(cart, true);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ protected IEnumerable<Guid> OrderItemsByShopify(IEnumerable<IContentItemBase> co
{
foreach (var shopifyObject in shopifyObjects.Where(x => x.Id.HasValue))
{
var contentItem = contentItems.FirstOrDefault(x => x.ShopifyObjectID == (shopifyObject.Id?.ToString() ?? string.Empty));
var contentItem = contentItems.FirstOrDefault(x => x.ShopifyObjectID.Equals(shopifyObject.Id?.ToString() ?? string.Empty, StringComparison.Ordinal));
yield return contentItem?.SystemFields.ContentItemGUID ?? Guid.Empty;
}
}
Expand Down

0 comments on commit 94def35

Please sign in to comment.