Revert "ENT-1052 Rename enterprise customer catalog uuid in queryparam to catalog"

This reverts commit 58174a6f.

ecommerce/enterprise/conditions.py

@@ -33,7 +33,7 @@ class EnterpriseCustomerCondition(ConditionWithoutRangeMixin, SingleItemConsumpt
         Determines if a user is eligible for an enterprise customer offer
         based on their association with the enterprise customer.
 
-        It also verifies the catalog `catalog` on the
+        It also verifies the catalog `enterprise_customer_catalog_uuid` on the
         offer with the catalog on the basket when provided.
 
         Args:
@@ -74,9 +74,9 @@ class EnterpriseCustomerCondition(ConditionWithoutRangeMixin, SingleItemConsumpt
 
         # Verify that the current conditional offer is related to the provided
         # enterprise catalog
-        catalog = self._get_enterprise_catalog_uuid_from_basket(basket)
-        if catalog:
-            if str(offer.condition.enterprise_customer_catalog_uuid) != catalog:
+        enterprise_customer_catalog_uuid = self._get_enterprise_catalog_uuid_from_basket(basket)
+        if enterprise_customer_catalog_uuid:
+            if str(offer.condition.enterprise_customer_catalog_uuid) != enterprise_customer_catalog_uuid:
                 return False
 
         if not catalog_contains_course_runs(basket.site, course_run_ids, self.enterprise_customer_uuid,
@@ -96,13 +96,15 @@ class EnterpriseCustomerCondition(ConditionWithoutRangeMixin, SingleItemConsumpt
              basket (Basket): The provided basket can be either temporary (just
              for calculating discounts) or an actual one to buy a product.
         """
-        # For temporary basket try to get `catalog` from request
-        catalog = basket.strategy.request.GET.get(
-            'catalog'
+        # For temporary basket try to get `enterprise_customer_catalog_uuid`
+        # from request
+        enterprise_customer_catalog_uuid = basket.strategy.request.GET.get(
+            'enterprise_customer_catalog_uuid'
         ) if basket.strategy.request else None
 
-        if not catalog:
-            # For actual baskets get `catalog` from basket attribute
+        if not enterprise_customer_catalog_uuid:
+            # For actual baskets get `enterprise_customer_catalog_uuid` from
+            # basket attribute
             enterprise_catalog_attribute, __ = BasketAttributeType.objects.get_or_create(
                 name=ENTERPRISE_CATALOG_ATTRIBUTE_TYPE
             )
@@ -111,6 +113,6 @@ class EnterpriseCustomerCondition(ConditionWithoutRangeMixin, SingleItemConsumpt
                 attribute_type=enterprise_catalog_attribute,
             ).first()
             if enterprise_customer_catalog:
-                catalog = enterprise_customer_catalog.value_text
+                enterprise_customer_catalog_uuid = enterprise_customer_catalog.value_text
 
-        return catalog
+        return enterprise_customer_catalog_uuid

ecommerce/enterprise/tests/test_conditions.py

@@ -78,7 +78,7 @@ class EnterpriseCustomerConditionTests(EnterpriseServiceMockMixin, DiscoveryTest
         enterprise_catalog_uuid = str(self.condition.enterprise_customer_catalog_uuid)
         basket = factories.BasketFactory(site=self.site, owner=self.user)
         basket.strategy.request = self.request
-        basket.strategy.request.GET = {'catalog': enterprise_catalog_uuid}
+        basket.strategy.request.GET = {'enterprise_customer_catalog_uuid': enterprise_catalog_uuid}
         self._check_condition_is_satisfied(offer, basket, is_satisfied=True)
 
     @httpretty.activate
@@ -89,7 +89,7 @@ class EnterpriseCustomerConditionTests(EnterpriseServiceMockMixin, DiscoveryTest
         offer = factories.EnterpriseOfferFactory(site=self.site, condition=self.condition)
         enterprise_catalog_uuid = str(self.condition.enterprise_customer_catalog_uuid)
         basket = factories.BasketFactory(site=self.site, owner=self.user)
-        request_data = {'catalog': enterprise_catalog_uuid}
+        request_data = {'enterprise_customer_catalog_uuid': enterprise_catalog_uuid}
         basket_add_enterprise_catalog_attribute(basket, request_data)
         self._check_condition_is_satisfied(offer, basket, is_satisfied=True)
 
@@ -103,7 +103,7 @@ class EnterpriseCustomerConditionTests(EnterpriseServiceMockMixin, DiscoveryTest
         invalid_enterprise_catalog_uuid = str(uuid4())
         basket = factories.BasketFactory(site=self.site, owner=self.user)
         basket.strategy.request = self.request
-        basket.strategy.request.GET = {'catalog': invalid_enterprise_catalog_uuid}
+        basket.strategy.request.GET = {'enterprise_customer_catalog_uuid': invalid_enterprise_catalog_uuid}
         self._check_condition_is_satisfied(offer, basket, is_satisfied=False)
         assert invalid_enterprise_catalog_uuid != offer.condition.enterprise_customer_catalog_uuid
 

ecommerce/extensions/basket/tests/test_utils.py

@@ -426,7 +426,7 @@ class BasketUtilsTests(DiscoveryTestMixin, BasketMixin, TestCase):
         product = ProductFactory()
         request = self.request
         expected_enterprise_catalog_uuid = str(uuid4())
-        request.GET = {'catalog': expected_enterprise_catalog_uuid}
+        request.GET = {'enterprise_customer_catalog_uuid': expected_enterprise_catalog_uuid}
         basket = prepare_basket(request, [product])
 
         # Verify that the enterprise catalog attribute exists for the basket

ecommerce/extensions/basket/utils.py

@@ -281,9 +281,9 @@ def basket_add_enterprise_catalog_attribute(basket, request_data):
         request_data (dict): HttpRequest data
 
     """
-    # Value of enterprise catalog UUID is being passed as `catalog` from
-    # basket page
-    enterprise_catalog_uuid = request_data.get('catalog') if request_data else None
+    # Value of enterprise catalog UUID is being passed as
+    # `enterprise_customer_catalog_uuid` from basket page
+    enterprise_catalog_uuid = request_data.get('enterprise_customer_catalog_uuid') if request_data else None
 
     if enterprise_catalog_uuid:
         enterprise_catalog_attribute, __ = BasketAttributeType.objects.get_or_create(