refactor: Combine promo list and create endpoints, update tests

promo_code/business/serializers.py

@@ -12,7 +12,6 @@
 
 import business.constants
 import business.models
-import business.models as business_models
 import business.utils.auth
 import business.utils.tokens
 import business.validators
@@ -46,12 +45,12 @@ class CompanySignUpSerializer(rest_framework.serializers.ModelSerializer):
     )
 
     class Meta:
-        model = business_models.Company
+        model = business.models.Company
         fields = ('id', 'name', 'email', 'password')
 
     @django.db.transaction.atomic
     def create(self, validated_data):
-        company = business_models.Company.objects.create_company(
+        company = business.models.Company.objects.create_company(
             **validated_data,
         )
 
@@ -76,8 +75,8 @@ def validate(self, attrs):
             )
 
         try:
-            company = business_models.Company.objects.get(email=email)
-        except business_models.Company.DoesNotExist:
+            company = business.models.Company.objects.get(email=email)
+        except business.models.Company.DoesNotExist:
             raise rest_framework.serializers.ValidationError(
                 'Invalid credentials.',
             )
@@ -227,7 +226,7 @@ class PromoCreateSerializer(rest_framework.serializers.ModelSerializer):
     )
 
     class Meta:
-        model = business_models.Promo
+        model = business.models.Promo
         fields = (
             'url',
             'description',
@@ -251,7 +250,7 @@ def create(self, validated_data):
         promo_common = validated_data.pop('promo_common', None)
         promo_unique = validated_data.pop('promo_unique', None)
 
-        return business_models.Promo.objects.create_promo(
+        return business.models.Promo.objects.create_promo(
             user=self.context['request'].user,
             target_data=target_data,
             promo_common=promo_common,
@@ -418,7 +417,7 @@ class PromoReadOnlySerializer(rest_framework.serializers.ModelSerializer):
     )
 
     class Meta:
-        model = business_models.Promo
+        model = business.models.Promo
         fields = (
             'promo_id',
             'company_id',
@@ -484,7 +483,7 @@ class PromoDetailSerializer(rest_framework.serializers.ModelSerializer):
     )
 
     class Meta:
-        model = business_models.Promo
+        model = business.models.Promo
         fields = (
             'promo_id',
             'description',

promo_code/business/tests/promocodes/base.py

@@ -11,9 +11,8 @@ class BasePromoTestCase(rest_framework.test.APITestCase):
     def setUpTestData(cls):
         super().setUpTestData()
         cls.client = rest_framework.test.APIClient()
-        cls.promo_create_url = django.urls.reverse('api-business:promo-create')
-        cls.promo_list_url = django.urls.reverse(
-            'api-business:company-promo-list',
+        cls.promo_list_create_url = django.urls.reverse(
+            'api-business:promo-list-create',
         )
         cls.signup_url = django.urls.reverse('api-business:company-sign-up')
         cls.signin_url = django.urls.reverse('api-business:company-sign-in')

promo_code/business/tests/promocodes/operations/test_create.py

@@ -24,7 +24,7 @@ def test_successful_promo_creation_1(self):
             'promo_common': 'sale-10',
         }
         response = self.client.post(
-            self.promo_create_url,
+            self.promo_list_create_url,
             payload,
             format='json',
         )
@@ -44,7 +44,7 @@ def test_successful_promo_creation_2(self):
             'promo_common': 'sale-40',
         }
         response = self.client.post(
-            self.promo_create_url,
+            self.promo_list_create_url,
             payload,
             format='json',
         )
@@ -64,7 +64,7 @@ def test_successful_promo_creation_3(self):
             'promo_unique': ['uniq1', 'uniq2', 'uniq3'],
         }
         response = self.client.post(
-            self.promo_create_url,
+            self.promo_list_create_url,
             payload,
             format='json',
         )
@@ -83,7 +83,7 @@ def test_successful_promo_creation_4(self):
             'promo_unique': ['only_youuuu', 'not_only_you'],
         }
         response = self.client.post(
-            self.promo_create_url,
+            self.promo_list_create_url,
             payload,
             format='json',
         )
@@ -103,7 +103,7 @@ def test_successful_promo_creation_5(self):
             'promo_common': 'sale-10',
         }
         response = self.client.post(
-            self.promo_create_url,
+            self.promo_list_create_url,
             payload,
             format='json',
         )
@@ -122,7 +122,7 @@ def test_successful_promo_creation_6_country_lower(self):
             'promo_common': 'sale-10',
         }
         response = self.client.post(
-            self.promo_create_url,
+            self.promo_list_create_url,
             payload,
             format='json',
         )
@@ -141,7 +141,7 @@ def test_successful_promo_creation_6_country_upper(self):
             'promo_common': 'sale-10',
         }
         response = self.client.post(
-            self.promo_create_url,
+            self.promo_list_create_url,
             payload,
             format='json',
         )
@@ -160,7 +160,7 @@ def test_successful_promo_creation_7(self):
             'promo_common': 'sale-10',
         }
         response = self.client.post(
-            self.promo_create_url,
+            self.promo_list_create_url,
             payload,
             format='json',
         )

promo_code/business/tests/promocodes/operations/test_detail.py

@@ -22,7 +22,7 @@ def setUpTestData(cls):
             'promo_common': 'sale-10',
         }
         response1 = client.post(
-            cls.promo_create_url,
+            cls.promo_list_create_url,
             promo1_data,
             format='json',
         )
@@ -38,7 +38,7 @@ def setUpTestData(cls):
             'promo_unique': ['only_youuuu', 'not_only_you'],
         }
         response2 = client.post(
-            cls.promo_create_url,
+            cls.promo_list_create_url,
             promo2_data,
             format='json',
         )
@@ -269,7 +269,7 @@ def test_final_get_promo_company1(self):
             rest_framework.status.HTTP_200_OK,
         )
 
-        response = self.client.get(self.promo_list_url)
+        response = self.client.get(self.promo_list_create_url)
         self.assertEqual(
             response.status_code,
             rest_framework.status.HTTP_200_OK,

promo_code/business/tests/promocodes/operations/test_list.py

@@ -19,7 +19,7 @@ def _create_additional_promo(self):
             'promo_common': 'special-10',
         }
         response_create = self.client.post(
-            self.promo_create_url,
+            self.promo_list_create_url,
             self.__class__.promo5_data,
             format='json',
         )
@@ -99,7 +99,7 @@ def setUp(self):
         )
 
     def test_get_all_promos(self):
-        response = self.client.get(self.promo_list_url)
+        response = self.client.get(self.promo_list_create_url)
         self.assertEqual(
             response.status_code,
             rest_framework.status.HTTP_200_OK,
@@ -113,7 +113,7 @@ def test_get_all_promos(self):
         self.assertEqual(response.headers.get('X-Total-Count'), '3')
 
     def test_get_promos_with_pagination_offset_1(self):
-        response = self.client.get(self.promo_list_url, {'offset': 1})
+        response = self.client.get(self.promo_list_create_url, {'offset': 1})
         self.assertEqual(
             response.status_code,
             rest_framework.status.HTTP_200_OK,
@@ -127,7 +127,7 @@ def test_get_promos_with_pagination_offset_1(self):
 
     def test_get_promos_with_pagination_offset_1_limit_1(self):
         response = self.client.get(
-            self.promo_list_url,
+            self.promo_list_create_url,
             {'offset': 1, 'limit': 1},
         )
         self.assertEqual(
@@ -140,7 +140,7 @@ def test_get_promos_with_pagination_offset_1_limit_1(self):
         self.assertEqual(response.get('X-Total-Count'), '3')
 
     def test_get_promos_with_pagination_offset_100(self):
-        response = self.client.get(self.promo_list_url, {'offset': 100})
+        response = self.client.get(self.promo_list_create_url, {'offset': 100})
         self.assertEqual(
             response.status_code,
             rest_framework.status.HTTP_200_OK,
@@ -150,7 +150,10 @@ def test_get_promos_with_pagination_offset_100(self):
         self.assertEqual(response.get('X-Total-Count'), '3')
 
     def test_get_promos_filter_country_gb(self):
-        response = self.client.get(self.promo_list_url, {'country': 'gb'})
+        response = self.client.get(
+            self.promo_list_create_url,
+            {'country': 'gb'},
+        )
         self.assertEqual(
             response.status_code,
             rest_framework.status.HTTP_200_OK,
@@ -164,7 +167,7 @@ def test_get_promos_filter_country_gb(self):
 
     def test_get_promos_filter_country_gb_sort_active_until(self):
         response = self.client.get(
-            self.promo_list_url,
+            self.promo_list_create_url,
             {'country': 'gb', 'sort_by': 'active_until'},
         )
         self.assertEqual(
@@ -180,7 +183,7 @@ def test_get_promos_filter_country_gb_sort_active_until(self):
 
     def test_get_promos_filter_country_gb_fr_sort_active_from_limit_10(self):
         response = self.client.get(
-            self.promo_list_url,
+            self.promo_list_create_url,
             {'country': 'gb,FR', 'sort_by': 'active_from', 'limit': 10},
         )
         self.assertEqual(
@@ -199,7 +202,7 @@ def test_get_promos_filter_country_gb_fr_sort_active_from_limit_2_offset_2(
         self,
     ):
         response = self.client.get(
-            self.promo_list_url,
+            self.promo_list_create_url,
             {
                 'country': 'gb,FR',
                 'sort_by': 'active_from',
@@ -218,7 +221,7 @@ def test_get_promos_filter_country_gb_fr_sort_active_from_limit_2_offset_2(
 
     def test_get_promos_filter_country_gb_fr_us_sort_active_from_limit_2(self):
         response = self.client.get(
-            self.promo_list_url,
+            self.promo_list_create_url,
             {'country': 'gb,FR,us', 'sort_by': 'active_from', 'limit': 2},
         )
         self.assertEqual(
@@ -233,7 +236,7 @@ def test_get_promos_filter_country_gb_fr_us_sort_active_from_limit_2(self):
         self.assertEqual(response.get('X-Total-Count'), '3')
 
     def test_get_promos_limit_zero(self):
-        response = self.client.get(self.promo_list_url, {'limit': 0})
+        response = self.client.get(self.promo_list_create_url, {'limit': 0})
         self.assertEqual(
             response.status_code,
             rest_framework.status.HTTP_200_OK,
@@ -245,7 +248,7 @@ def test_create_and_get_promos(self):
         self._create_additional_promo()
 
         response_list = self.client.get(
-            self.promo_list_url,
+            self.promo_list_create_url,
             {'country': 'gb,FR,Kz', 'sort_by': 'active_from', 'limit': 10},
         )
         self.assertEqual(
@@ -260,7 +263,7 @@ def test_create_and_get_promos(self):
     def test_get_promos_filter_gb_kz_fr(self):
         self._create_additional_promo()
         response = self.client.get(
-            self.promo_list_url,
+            self.promo_list_create_url,
             {'country': 'gb,Kz,FR', 'sort_by': 'active_from', 'limit': 10},
         )
         self.assertEqual(
@@ -275,7 +278,7 @@ def test_get_promos_filter_gb_kz_fr(self):
     def test_get_promos_filter_kz_sort_active_until(self):
         self._create_additional_promo()
         response = self.client.get(
-            self.promo_list_url,
+            self.promo_list_create_url,
             {'country': 'Kz', 'sort_by': 'active_until', 'limit': 10},
         )
         self.assertEqual(
@@ -300,7 +303,7 @@ def test_country_parameter_formats(self, _, params, expected_count):
             'limit': 10,
         }
 
-        response = self.client.get(self.promo_list_url, full_params)
+        response = self.client.get(self.promo_list_create_url, full_params)
         self.assertEqual(
             response.status_code,
             rest_framework.status.HTTP_200_OK,

promo_code/business/tests/promocodes/test_permissions.py

@@ -38,7 +38,7 @@ def setUp(self):
     def create_promo(self, token, payload):
         self.client.credentials(HTTP_AUTHORIZATION='Bearer ' + token)
         response = self.client.post(
-            self.promo_create_url,
+            self.promo_list_create_url,
             payload,
             format='json',
         )
@@ -53,17 +53,17 @@ def tearDown(self):
         user.models.User.objects.all().delete()
 
     def test_has_permission_for_company_user(self):
-        request = self.factory.get(self.promo_create_url)
+        request = self.factory.get(self.promo_list_create_url)
         request.user = self.company1
         self.assertTrue(self.permission.has_permission(request, None))
 
     def test_has_permission_for_regular_user(self):
-        request = self.factory.get(self.promo_create_url)
+        request = self.factory.get(self.promo_list_create_url)
         request.user = self.regular_user
         self.assertFalse(self.permission.has_permission(request, None))
 
     def test_has_permission_for_anonymous_user(self):
-        request = self.factory.get(self.promo_create_url)
+        request = self.factory.get(self.promo_list_create_url)
         request.user = None
         self.assertFalse(self.permission.has_permission(request, None))