This repository was archived by the owner on May 12, 2023. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 30
Ahmetbahadircol HW3 #75
Open
ahmetbahadircol
wants to merge
2
commits into
upy:main
Choose a base branch
from
ahmetbahadircol:ahmetbahadircol_HW3
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,26 @@ | ||
| from django.db.models import Q | ||
| from django_filters import rest_framework as filters | ||
| from django.utils.translation import gettext_lazy as _ | ||
|
|
||
| from baskets.models import Basket, BasketItem | ||
|
|
||
|
|
||
| class BasketFilter(filters.FilterSet): | ||
| customer = filters.CharFilter(label=_("Customer"), method="filter_name") | ||
|
|
||
| class Meta: | ||
| model = Basket | ||
| fields = ("customer", "status") | ||
|
|
||
| @staticmethod | ||
| def filter_name(self, qs, name, value): | ||
| return qs.filter(customer__first_name__icontains=value) | ||
|
|
||
|
|
||
| class BasketItemFilter(filters.FilterSet): | ||
| product = filters.CharFilter(label=_("Product"), method="filter_name") | ||
|
|
||
| class Meta: | ||
| model = BasketItem | ||
| fields = ("basket", "product", "quantity", "price") | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,17 @@ | ||
| from django.db import models | ||
|
|
||
|
|
||
| class BasketQuerySet(models.QuerySet): | ||
| def banner_products(self): | ||
| """ | ||
| BasketItem can not be less then 10 and quantity greater or equal to 100 | ||
| """ | ||
| return self.filter(basketitem__quantity__gte=10, basketitem__quantity__lt=100) | ||
|
|
||
| def basket_status(self): | ||
| """ | ||
| Basket Status can not be submitted | ||
| """ | ||
| return self.filter.exclude(basket__status="submitted") | ||
|
|
||
|
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,4 @@ | ||
| # Generated by Django 3.2.9 on 2021-12-03 17:37 | ||
|
Owner
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. migration dosyalarinin iceriklerini ozel durumlar haricinde degistirmememiz gerekir. |
||
| # Generated by Django 3.2.9 on 2021-12-08 12:41 | ||
|
|
||
| from django.conf import settings | ||
| from django.db import migrations, models | ||
|
|
@@ -10,7 +10,7 @@ class Migration(migrations.Migration): | |
| initial = True | ||
|
|
||
| dependencies = [ | ||
| ('products', '0003_auto_20211203_1919'), | ||
| ('products', '__first__'), | ||
| migrations.swappable_dependency(settings.AUTH_USER_MODEL), | ||
| ] | ||
|
|
||
|
|
@@ -21,8 +21,8 @@ class Migration(migrations.Migration): | |
| ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), | ||
| ('created_at', models.DateTimeField(auto_now_add=True, verbose_name='Created at')), | ||
| ('modified_at', models.DateTimeField(auto_now=True, verbose_name='Modified at')), | ||
| ('status', models.CharField(choices=[('open', 'Open'), ('submitted', 'Submitted'), ('merged', 'Merged')], max_length=10, verbose_name='Basket Status')), | ||
| ('customer', models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, to=settings.AUTH_USER_MODEL, verbose_name='Customer')), | ||
| ('status', models.CharField(choices=[('open', 'Open'), ('submitted', 'Submitted'), ('merged', 'Merged')], default='open', max_length=10, verbose_name='Basket Status')), | ||
| ('customer', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to=settings.AUTH_USER_MODEL, verbose_name='Customer')), | ||
| ], | ||
| options={ | ||
| 'verbose_name': 'Basket', | ||
|
|
@@ -37,8 +37,8 @@ class Migration(migrations.Migration): | |
| ('modified_at', models.DateTimeField(auto_now=True, verbose_name='Modified at')), | ||
| ('quantity', models.PositiveIntegerField(verbose_name='Quantity')), | ||
| ('price', models.DecimalField(decimal_places=2, max_digits=10, verbose_name='Price')), | ||
| ('basket', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='baskets.basket', verbose_name='Basket')), | ||
| ('product', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='products.product', verbose_name='Product')), | ||
| ('basket', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='baskets.basket', verbose_name='Basket')), | ||
| ('product', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='products.product', verbose_name='Product')), | ||
| ], | ||
| options={ | ||
| 'verbose_name': 'Basket item', | ||
|
|
||
This file was deleted.
Oops, something went wrong.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,45 @@ | ||
| from rest_framework import serializers | ||
| from baskets.models import Basket, BasketItem | ||
| from customers.serializers import CustomerSerializer | ||
| from products.serializers import ProductSerializer | ||
|
|
||
|
|
||
| class BasketSerializer(serializers.ModelSerializer): | ||
| """ | ||
| Basket Serializer | ||
| """ | ||
| class Meta: | ||
| model = Basket | ||
| fields = ["customer", "status"] | ||
|
|
||
|
|
||
| class BasketItemSerializer(serializers.ModelSerializer): | ||
| """ | ||
| Basket Item Serializer | ||
| """ | ||
| class Meta: | ||
| model = BasketItem | ||
| fields = ["basket", "product", "quantity", "price"] | ||
|
|
||
|
|
||
| class BasketDetailedSerializer(serializers.ModelSerializer): | ||
| """ | ||
| Basket Detailed Serializer for Customer | ||
| """ | ||
| customer = CustomerSerializer() # TODO: Add Customer Serializer! | ||
|
|
||
| class Meta: | ||
| model = Basket | ||
| fields = ["customer", "status"] | ||
|
|
||
|
|
||
| class BasketItemDetailedSerializer(serializers.ModelSerializer): | ||
| """ | ||
| Basket Item Detailed Serializer for Product and Basket | ||
| """ | ||
| basket = BasketSerializer() | ||
| product = ProductSerializer() | ||
|
|
||
| class Meta: | ||
| model = BasketItem | ||
| fields = ["basket", "product", "quantity", "price"] |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,31 @@ | ||
| from django.shortcuts import render | ||
| from rest_framework import viewsets | ||
|
|
||
| # Create your views here. | ||
| from baskets.filters import BasketFilter | ||
| from core.mixins import DetailedViewSetMixin | ||
| from baskets.serializers import * | ||
|
|
||
|
|
||
| class BasketViewSet(DetailedViewSetMixin, viewsets.ModelViewSet): | ||
| """ | ||
| Detailed ViewSet for Basket | ||
| """ | ||
| queryset = Basket.objects.all() | ||
| serializer_class = BasketSerializer | ||
| filterset_class = BasketFilter # TODO: basket için filter ekle | ||
| serializer_action_classes = { | ||
| "detailed_list": BasketDetailedSerializer, | ||
| "detailed": BasketDetailedSerializer, | ||
| } | ||
|
|
||
|
|
||
| class BasketItemViewSet(DetailedViewSetMixin, viewsets.ModelViewSet): | ||
| """ | ||
| Detailed ViewSet for BasketItem | ||
| """ | ||
| queryset = BasketItem.objects.all() | ||
| serializer_class = BasketItemSerializer | ||
| filterset_class = BasketFilter # TODO: basketitem için filter ekle | ||
| serializer_action_classes = { | ||
| "detailed_list": BasketItemDetailedSerializer, | ||
| "detailed": BasketItemDetailedSerializer, | ||
| } |
Empty file.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,17 @@ | ||
| from django.db.models import Q | ||
| from django_filters import rest_framework as filters | ||
| from django.utils.translation import gettext_lazy as _ | ||
|
|
||
| from customers.models import Customer | ||
|
|
||
|
|
||
| class CustomerFilter(filters.FilterSet): | ||
| name = filters.CharFilter(label=_("First Name"), method="filter_name") | ||
|
|
||
| class Meta: | ||
| model = Customer | ||
| fields = ("first_name", "last_name", "email") | ||
|
|
||
| def filter_name(self, qs, name, value): | ||
| replaced_value = value.replace("Ş", "ş") | ||
| return qs.filter(Q(first_name__icontains=replaced_value) | Q(first_name__icontains=value)) |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
static yapince self eklenmemesi tercih edilir.