Skip to content
This repository was archived by the owner on May 12, 2023. It is now read-only.

BeyzaaKoroglu - Homework 4 #101

Open
BeyzaaKoroglu wants to merge 5 commits into
base: main
Choose a base branch
from
Open

BeyzaaKoroglu - Homework 4 #101

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
73f5b5d
added register endpoint
BeyzaaKoroglu Dec 17, 2021
e677a75
added add_product action
BeyzaaKoroglu Dec 18, 2021
fcd88b9
added permissions
BeyzaaKoroglu Dec 18, 2021
8bf001d
added permissions
BeyzaaKoroglu Dec 18, 2021
7d280de
Merge branch 'homework-four' of https://github.com/BeyzaaKoroglu/boot…
BeyzaaKoroglu Dec 19, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions ecommerce/baskets/serializers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ class Meta:


class BasketSerializer(serializers.ModelSerializer):
customer = serializers.HiddenField(default=serializers.CurrentUserDefault())

class Meta:
model = Basket
Expand Down
27 changes: 25 additions & 2 deletions ecommerce/baskets/views.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,11 @@
from rest_framework import viewsets
from rest_framework import viewsets, status
from rest_framework.decorators import action
from rest_framework.response import Response

from baskets.filters import BasketItemFilter, BasketFilter
from baskets.models import BasketItem, Basket
from baskets.serializers import BasketItemSerializer, BasketSerializer, BasketItemDetailedSerializer, BasketDetailedSerializer
from baskets.serializers import BasketItemSerializer, BasketSerializer, BasketItemDetailedSerializer, \
BasketDetailedSerializer
from core.mixins import DetailedViewSetMixin


Expand All @@ -13,8 +16,23 @@ class BasketItemViewSet(DetailedViewSetMixin, viewsets.ModelViewSet):
serializer_action_classes = {
"detailed_list": BasketItemDetailedSerializer,
"detailed": BasketItemDetailedSerializer,
"add_product": BasketItemDetailedSerializer,
}

def get_queryset(self):
queryset = super().get_queryset()
user = self.request.user
Copy link
Owner

@upy upy Jan 12, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

login olmamis bir customer varsa sanki problem var.

return queryset.filter(basket__customer=user)

@action(detail=True, methods=['post'], http_method_names=['post'])
Copy link
Owner

@upy upy Jan 12, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

bu viewset icinde detail=True olmamali sanki? cunku zaten create etmeye calisiyoruz.

def add_product(self, request):
serializer = BasketItemSerializer(data=request.data)
Copy link
Owner

@upy upy Jan 12, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

price bilgisini kullanicidan almak guzel gozukmuyor.


if serializer.is_valid():
serializer.save()
return Response(serializer.data, status=status.HTTP_201_CREATED)
return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)


class BasketViewSet(DetailedViewSetMixin, viewsets.ModelViewSet):
queryset = Basket.objects.all()
Expand All @@ -24,3 +42,8 @@ class BasketViewSet(DetailedViewSetMixin, viewsets.ModelViewSet):
"detailed_list": BasketDetailedSerializer,
"detailed": BasketDetailedSerializer,
}

def get_queryset(self):
queryset = super().get_queryset()
user = self.request.user
Copy link
Owner

@upy upy Jan 12, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

login olmamis bir customer varsa sanki problem var.

return queryset.filter(customer=user)
7 changes: 7 additions & 0 deletions ecommerce/core/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
from django.core.validators import RegexValidator
from django.utils.translation import gettext_lazy as _
from rest_framework import permissions
from rest_framework.permissions import BasePermission


Expand Down Expand Up @@ -32,3 +33,9 @@ class IsStaffUserAuthenticated(BasePermission):

def has_permission(self, request, view):
return bool(request.user and request.user.is_authenticated and request.user.is_staff)


class IsNotAuthenticated(BasePermission):

def has_permission(self, request, view):
return not bool(request.user and request.user.is_authenticated)
28 changes: 28 additions & 0 deletions ecommerce/customers/serializers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
from django.contrib.auth.password_validation import validate_password
from django.core.validators import EmailValidator
from django.utils.translation import gettext_lazy as _
from django.db.transaction import atomic
from rest_framework import serializers
from rest_framework.exceptions import ValidationError
from rest_framework.validators import UniqueValidator

from customers.models import Customer, Address, City, Country

Expand All @@ -20,6 +23,31 @@ class Meta:
fields = ("first_name", "last_name", "email")


class RegisterSerializer(serializers.ModelSerializer):
email = serializers.EmailField(write_only=True, required=True, validators=[EmailValidator(),
UniqueValidator(queryset=Customer.objects.all())])
password = serializers.CharField(write_only=True, required=True, validators=[validate_password])
password_repeat = serializers.CharField(write_only=True, required=True)

class Meta:
model = Customer
fields = fields = ("id", "email", "password", "password_repeat", "first_name", "last_name")

def validate(self, attrs):
if attrs["password"] != attrs["password_repeat"]:
raise ValidationError(_("Passwords are not same"))
return attrs

def create(self, validated_data):
customer = Customer.objects.create_user(
first_name=validated_data["first_name"],
last_name=validated_data["last_name"],
email=validated_data["email"],
password=validated_data["password"]
)
return customer


class CountrySerializer(serializers.ModelSerializer):
class Meta:
model = Country
Expand Down
11 changes: 9 additions & 2 deletions ecommerce/customers/views.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@
from rest_framework.viewsets import GenericViewSet

from core.mixins import DetailedViewSetMixin
from core.utils import IsStaffUserAuthenticated
from core.utils import IsStaffUserAuthenticated, IsNotAuthenticated
from customers.filters import CustomerFilter, AddressFilter, CountryFilter, CityFilter
from customers.models import Customer, Address, City, Country
from customers.serializers import CustomerSerializer, AddressSerializer, CitySerializer, \
CountrySerializer, \
AddressDetailedSerializer, CityDetailedSerializer, ProfileSerializer
AddressDetailedSerializer, CityDetailedSerializer, ProfileSerializer, RegisterSerializer


class AdminCustomerViewSet(viewsets.ModelViewSet):
Expand All @@ -32,6 +32,12 @@ def get_object(self):
return obj


class RegisterViewSet(mixins.CreateModelMixin, GenericViewSet):
permission_classes = (IsNotAuthenticated,)
queryset = Customer.objects.all()
serializer_class = RegisterSerializer


class CountryViewSet(viewsets.ModelViewSet):
permission_classes = ()
queryset = Country.objects.all()
Expand All @@ -51,6 +57,7 @@ class CityViewSet(DetailedViewSetMixin, viewsets.ModelViewSet):


class AddressViewSet(DetailedViewSetMixin, viewsets.ModelViewSet):
permission_classes = (permissions.IsAuthenticated,)
queryset = Address.objects.all()
serializer_class = AddressSerializer
filterset_class = AddressFilter
Expand Down
3 changes: 2 additions & 1 deletion ecommerce/ecommerce/urls.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
from baskets.views import BasketItemViewSet, BasketViewSet
from core.views import APITokenObtainPairView
from customers.views import AddressViewSet, CityViewSet, \
CountryViewSet, AdminCustomerViewSet, MyProfileViewSet
CountryViewSet, AdminCustomerViewSet, MyProfileViewSet, RegisterViewSet
from ecommerce.router import router
from orders.views import OrderItemViewSet, OrderViewSet, BillingAddressViewSet, ShippingAddressViewSet, \
OrderBankAccountViewSet
Expand Down Expand Up @@ -55,6 +55,7 @@
path('api/token/refresh/', TokenRefreshView.as_view(), name='token_refresh'),
path('api/profile/', MyProfileViewSet.as_view(
{"get": "retrieve", "put": "update", "patch": "partial_update"}), name='profile'),
path('api/register/', RegisterViewSet.as_view({"post": "create"}), name='register'),
]

if settings.DEBUG:
Expand Down
7 changes: 6 additions & 1 deletion ecommerce/orders/views.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from rest_framework import viewsets
from rest_framework import viewsets, permissions

from core.mixins import DetailedViewSetMixin
from orders.filters import OrderItemFilter, OrderFilter, BillingAddressFilter, ShippingAddressFilter, \
Expand All @@ -10,6 +10,7 @@


class OrderItemViewSet(DetailedViewSetMixin, viewsets.ModelViewSet):
permission_classes = (permissions.IsAuthenticated,)
queryset = OrderItem.objects.all()
serializer_class = OrderItemSerializer
filterset_class = OrderItemFilter
Expand All @@ -20,6 +21,7 @@ class OrderItemViewSet(DetailedViewSetMixin, viewsets.ModelViewSet):


class OrderViewSet(DetailedViewSetMixin, viewsets.ModelViewSet):
permission_classes = (permissions.IsAuthenticated,)
queryset = Order.objects.all()
serializer_class = OrderSerializer
filterset_class = OrderFilter
Expand All @@ -30,6 +32,7 @@ class OrderViewSet(DetailedViewSetMixin, viewsets.ModelViewSet):


class BillingAddressViewSet(DetailedViewSetMixin, viewsets.ModelViewSet):
permission_classes = (permissions.IsAuthenticated,)
queryset = BillingAddress.objects.all()
serializer_class = BillingAddressSerializer
filterset_class = BillingAddressFilter
Expand All @@ -40,6 +43,7 @@ class BillingAddressViewSet(DetailedViewSetMixin, viewsets.ModelViewSet):


class ShippingAddressViewSet(DetailedViewSetMixin, viewsets.ModelViewSet):
permission_classes = (permissions.IsAuthenticated,)
queryset = ShippingAddress.objects.all()
serializer_class = ShippingAddressSerializer
filterset_class = ShippingAddressFilter
Expand All @@ -50,6 +54,7 @@ class ShippingAddressViewSet(DetailedViewSetMixin, viewsets.ModelViewSet):


class OrderBankAccountViewSet(DetailedViewSetMixin, viewsets.ModelViewSet):
permission_classes = (permissions.IsAuthenticated,)
queryset = OrderBankAccount.objects.all()
serializer_class = OrderBankAccountSerializer
filterset_class = OrderBankAccountFilter
Expand Down
4 changes: 3 additions & 1 deletion ecommerce/payments/views.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from rest_framework import viewsets
from rest_framework import viewsets, permissions

from core.mixins import DetailedViewSetMixin
from payments.filters import BankAccountFilter, BankFilter
Expand All @@ -7,6 +7,7 @@


class BankAccountViewSet(DetailedViewSetMixin, viewsets.ModelViewSet):
permission_classes = (permissions.IsAuthenticated,)
queryset = BankAccount.objects.all()
serializer_class = BankAccountSerializer
filterset_class = BankAccountFilter
Expand All @@ -17,6 +18,7 @@ class BankAccountViewSet(DetailedViewSetMixin, viewsets.ModelViewSet):


class BankViewSet(viewsets.ModelViewSet):
permission_classes = ()
queryset = Bank.objects.all()
serializer_class = BankSerializer
filterset_class = BankFilter
Expand Down
2 changes: 2 additions & 0 deletions ecommerce/products/views.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,12 +37,14 @@ class AdminProductViewSet(DetailedViewSetMixin, viewsets.ModelViewSet):


class CategoryViewSet(viewsets.ModelViewSet):
permission_classes = ()
http_method_names = ["get"]
queryset = Category.objects.all()
serializer_class = CategorySerializer


class PriceViewSet(viewsets.ModelViewSet):
permission_classes = ()
http_method_names = ["get"]
queryset = Price.objects.all()
filterset_class = PriceFilter
Expand Down