fix: matching f-a-ecomms returns exactly (#185)

- Added settings for future formatting
- Updating local settings to use the provisioned key name, even though it fails the standard format by having an underscore
- Updating devstack to not use sqlite

commerce_coordinator/apps/commercetools/catalog_info/constants.py

@@ -23,6 +23,9 @@ class Languages:
 HIDE_CODE_FOR_CURRENCIES = ['USD', 'EUR', 'INR', 'JPY']
 """Currencies to hide the code on, so $12 isn't $12 USD."""
 
+SEND_MONEY_AS_DECIMAL_STRING = True
+"""Sends money values as decimal numbers only ('$123.99 AUD' becomes '123.99' when True)"""
+
 DEFAULT_ORDER_EXPANSION = (
  "state",
  "paymentInfo.payments[*]",

commerce_coordinator/apps/commercetools/catalog_info/utils.py

@@ -12,6 +12,7 @@
 from commerce_coordinator.apps.commercetools.catalog_info.constants import (
  HIDE_CODE_FOR_CURRENCIES,
  LS_OUT_PREFERENCES,
+ SEND_MONEY_AS_DECIMAL_STRING,
  Languages
 )
 
@@ -73,28 +74,30 @@ def un_ls(string_dict: LSLike, preferred_lang: Optional[str] = None):
  return string_dict[langs_available[0]]
 
 
-def price_to_string(price: CTPrice) -> str:
+def price_to_string(price: CTPrice, money_as_decimal_string=False) -> str:
  """
  Convert Commercetools price to a string.
 
  This only relies on its underlying TypedMoney representation
 
  Args:
  price (CTPrice): Price value
+ money_as_decimal_string (bool, optional): Should all money be returned as a decimal?
 
  Returns:
  string: A string representation
 
  """
- return typed_money_to_string(price.value)
+ return typed_money_to_string(price.value, money_as_decimal_string)
 
 
-def typed_money_to_string(money: CTTypedMoney) -> str:
+def typed_money_to_string(money: CTTypedMoney, money_as_decimal_string=False) -> str:
  """
  Convert Commercetools typed money to a string.
 
  Args:
  money (TypedMoney): The value of meny to be stringified in its native locale.
+ money_as_decimal_string (bool, optional): Should all money be returned as a decimal?
 
  Returns:
  string: A string representation
@@ -103,6 +106,10 @@ def typed_money_to_string(money: CTTypedMoney) -> str:
  cur = Currency(money.currency_code)
 
  def _format(cost):
+ if money_as_decimal_string: # pragma no cover
+ # This is used to support legacy ecomm mfe
+ return str(cost)
+
  if money.currency_code in HIDE_CODE_FOR_CURRENCIES:
  return cur.get_money_format(cost)
 

commerce_coordinator/apps/commercetools/data.py

@@ -11,7 +11,7 @@
 from commercetools.platform.models import PaymentInfo as CTPaymentInfo
 from django.conf import settings
 
-from commerce_coordinator.apps.commercetools.catalog_info.constants import EdXFieldNames
+from commerce_coordinator.apps.commercetools.catalog_info.constants import SEND_MONEY_AS_DECIMAL_STRING, EdXFieldNames
 from commerce_coordinator.apps.commercetools.catalog_info.utils import (
  attribute_dict,
  price_to_string,
@@ -54,8 +54,8 @@ def convert_line_item(li: CTLineItem) -> Line:
  course_organization="",
  description=un_ls(li.name),
  status="PAID",
- line_price_excl_tax=price_to_string(li.price),
- unit_price_excl_tax=price_to_string(li.price)
+ line_price_excl_tax=price_to_string(li.price, money_as_decimal_string=SEND_MONEY_AS_DECIMAL_STRING),
+ unit_price_excl_tax=price_to_string(li.price, money_as_decimal_string=SEND_MONEY_AS_DECIMAL_STRING)
  )
 
 
@@ -109,7 +109,7 @@ def order_from_commercetools(order: CTOrder, customer: CTCustomer) -> LegacyOrde
  lines=[convert_line_item(x) for x in order.line_items],
  billing_address=convert_address(order.billing_address),
  date_placed=order.last_modified_at,
- total_excl_tax=typed_money_to_string(order.total_price),
+ total_excl_tax=typed_money_to_string(order.total_price, money_as_decimal_string=SEND_MONEY_AS_DECIMAL_STRING),
  # in dev systems, this isn't set... so let's use UUID, otherwise, let's rely on order number
  number=order.id, # Long-term: this_or(order.order_number, order.id),
  currency=order.total_price.currency_code,
@@ -119,7 +119,8 @@ def order_from_commercetools(order: CTOrder, customer: CTCustomer) -> LegacyOrde
  order_product_ids=", ".join([convert_line_item_prod_id(x) for x in order.line_items]),
  basket_discounts=convert_direct_discount(order.direct_discounts),
  contains_credit_seat="True",
- discount=typed_money_to_string(order.discount_on_total_price.discounted_amount)
+ discount=typed_money_to_string(order.discount_on_total_price.discounted_amount,
+ money_as_decimal_string=SEND_MONEY_AS_DECIMAL_STRING)
  if order.discount_on_total_price else None, # NYI
  enable_hoist_order_history="False", # ?
  enterprise_learner_portal_url="about:blank",
@@ -131,7 +132,8 @@ def order_from_commercetools(order: CTOrder, customer: CTCustomer) -> LegacyOrde
  order.discount_on_total_price.discounted_amount if order.discount_on_total_price else None
  ),
  order.taxed_price.total_tax
- )
+ ),
+ money_as_decimal_string=SEND_MONEY_AS_DECIMAL_STRING
  ),
  vouchers=this_or(
  convert_discount_code_info(order.discount_codes),

commerce_coordinator/apps/commercetools/tests/test_data.py

@@ -21,7 +21,7 @@
 from commercetools.platform.models import ReferenceTypeId as CTReferenceTypeId
 from commercetools.platform.models import TypeReference as CTTypeReference
 
-from commerce_coordinator.apps.commercetools.catalog_info.constants import EdXFieldNames
+from commerce_coordinator.apps.commercetools.catalog_info.constants import SEND_MONEY_AS_DECIMAL_STRING, EdXFieldNames
 from commerce_coordinator.apps.commercetools.catalog_info.utils import attribute_dict, price_to_string, un_ls
 from commerce_coordinator.apps.commercetools.data import (
  convert_address,
@@ -127,8 +127,8 @@ def test_convert_line_item(self):
  course_organization="",
  description=un_ls(li.name),
  status="PAID",
- line_price_excl_tax=price_to_string(li.price),
- unit_price_excl_tax=price_to_string(li.price)
+ line_price_excl_tax=price_to_string(li.price, SEND_MONEY_AS_DECIMAL_STRING),
+ unit_price_excl_tax=price_to_string(li.price, SEND_MONEY_AS_DECIMAL_STRING)
  )
  )
 

commerce_coordinator/apps/frontend_app_ecommerce/tests/test_views.py

@@ -104,7 +104,7 @@ def test_view_returns_expected_ecommerce_response(self, _mock_ctorders, _mock_ec
  response = self.client.get(reverse('frontend_app_ecommerce:order_history'), ORDER_HISTORY_GET_PARAMETERS)
 
  # Check expected response
- self.assertEqual(response.json()[1], ECOMMERCE_REQUEST_EXPECTED_RESPONSE['results'][0])
+ self.assertEqual(response.json()['results'][1], ECOMMERCE_REQUEST_EXPECTED_RESPONSE['results'][0])
 
  def test_view_passes_username(self, _mock_ctorders, mock_ecommerce_client):
  """Check logged in user's username is passed to the ecommerce client."""

commerce_coordinator/apps/frontend_app_ecommerce/views.py

@@ -93,4 +93,11 @@ def get(self, request):
  for order_set in order_data:
  output_orders.extend(order_set['results'])
 
- return Response(sorted(output_orders, key=lambda item: date_conv(item["date_placed"]), reverse=True))
+ output = {
+ "count": request.query_params['page_size'], # This suppresses the ecomm mfe Order History Pagination ctrl
+ "next": None,
+ "previous": None,
+ "results": sorted(output_orders, key=lambda item: date_conv(item["date_placed"]), reverse=True)
+ }
+
+ return Response(output)

commerce_coordinator/settings/devstack.py

@@ -7,8 +7,8 @@
  'NAME': os.environ.get('DB_NAME', 'commerce_coordinator'),
  'USER': os.environ.get('DB_USER', 'root'),
  'PASSWORD': os.environ.get('DB_PASSWORD', ''),
- 'HOST': os.environ.get('DB_HOST', 'commerce_coordinator.db'),
- 'PORT': os.environ.get('DB_PORT', 3306),
+ 'HOST': os.environ.get('DB_HOST', '127.0.0.1'),
+ 'PORT': os.environ.get('DB_PORT', 3406),
  'ATOMIC_REQUESTS': False,
  'CONN_MAX_AGE': 60,
  }

commerce_coordinator/settings/local.py

@@ -78,11 +78,11 @@
 )
 BACKEND_SERVICE_EDX_OAUTH2_KEY = os.environ.get(
  'BACKEND_SERVICE_EDX_OAUTH2_KEY',
- 'commerce-coordinator-backend-service-key'
+ 'commerce_coordinator-backend-service-key'
 )
 BACKEND_SERVICE_EDX_OAUTH2_SECRET = os.environ.get(
  'BACKEND_SERVICE_EDX_OAUTH2_SECRET',
- 'commerce-coordinator-backend-service-secret'
+ 'commerce_coordinator-backend-service-secret'
 )
 
 JWT_AUTH.update({