Merge branch 'master' into diego

This commit is contained in:
Diego Calvo
2021-03-16 15:03:46 +01:00
6 changed files with 1096 additions and 10 deletions

View File

@@ -13,7 +13,7 @@ from rest_framework import status
from companies.factories import CompanyFactory
from products.factories import ProductFactory, ActiveProductFactory
from products.models import Product
from products.models import Product, CategoryTag
from core.factories import CustomUserFactory
from core.utils import get_tokens_for_user
@@ -1258,3 +1258,37 @@ class PurchaseEmailTest(APITestCase):
payload = response.json()
self.assertTrue( 'email' in payload['error'])
class AllCategoriesTest(APITestCase):
def setUp(self):
"""Tests setup
"""
self.endpoint = '/api/v1/products/all_categories/'
# self.factory = ProductFactory
self.model = CategoryTag
# create user
self.email = f"user@mail.com"
self.password = ''.join(random.choices(string.ascii_uppercase, k = 10))
self.user = CustomUserFactory(email=self.email, is_active=True)
self.user.set_password(self.password)
self.user.save()
def test_get_all_categories(self):
# create instances
instances = [
self.model.objects.create(name='A'),
self.model.objects.create(name='B'),
self.model.objects.create(name='C'),
self.model.objects.create(name='D'),
self.model.objects.create(name='E'),
]
response = self.client.get(self.endpoint)
# assertions
self.assertEquals(response.status_code, 200)
payload = response.json()
self.assertEquals(len(instances), len(payload))

View File

@@ -307,7 +307,7 @@ def purchase_email(request):
email.send()
logging.info(f"Email sent to {company}")
# send confirmation email to user
user_message = render_to_string('purchase_contact_confirmation.html', {
user_message = render_to_string('purchase_contact_confirmation_v2.html', {
'company': company,
'product': product,
'company_message': company_message,
@@ -333,3 +333,13 @@ def purchase_email(request):
# response
return Response()
@api_view(['GET'])
@permission_classes([AllowAny,])
def all_categories(request):
all_categories = []
for instance in CategoryTag.objects.all():
all_categories.append(instance.label)
return Response(data=all_categories)