Remove color in post model, optimize queryset
This commit is contained in:
parent
ba4f4db462
commit
ffbb40e7d9
@ -13,7 +13,6 @@ admin.site.register(Image)
|
|||||||
class PostAdmin(admin.ModelAdmin):
|
class PostAdmin(admin.ModelAdmin):
|
||||||
list_display = (
|
list_display = (
|
||||||
"product",
|
"product",
|
||||||
"color",
|
|
||||||
"storage",
|
"storage",
|
||||||
"price",
|
"price",
|
||||||
"text",
|
"text",
|
||||||
|
@ -43,7 +43,6 @@ class Post(models.Model):
|
|||||||
product = models.ForeignKey(
|
product = models.ForeignKey(
|
||||||
Product, on_delete=models.CASCADE, related_name="posts"
|
Product, on_delete=models.CASCADE, related_name="posts"
|
||||||
)
|
)
|
||||||
color = models.CharField(max_length=20)
|
|
||||||
storage = models.ForeignKey(ProductStorage, on_delete=models.CASCADE)
|
storage = models.ForeignKey(ProductStorage, on_delete=models.CASCADE)
|
||||||
price = models.IntegerField()
|
price = models.IntegerField()
|
||||||
text = models.TextField()
|
text = models.TextField()
|
||||||
|
@ -4,38 +4,38 @@ from rest_framework.serializers import ModelSerializer
|
|||||||
from market.models import (
|
from market.models import (
|
||||||
Brand,
|
Brand,
|
||||||
Product,
|
Product,
|
||||||
ProductStorage,
|
|
||||||
Post,
|
Post,
|
||||||
Image,
|
Image,
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
class BrandSerializer(ModelSerializer):
|
|
||||||
class Meta:
|
|
||||||
model = Brand
|
|
||||||
fields = "__all__"
|
|
||||||
|
|
||||||
|
|
||||||
class ProductStorageSerializer(ModelSerializer):
|
|
||||||
class Meta:
|
|
||||||
model = ProductStorage
|
|
||||||
fields = ("storage",)
|
|
||||||
|
|
||||||
|
|
||||||
class ProductSerializer(ModelSerializer):
|
class ProductSerializer(ModelSerializer):
|
||||||
storage = ProductStorageSerializer(many=True, read_only=True)
|
storage = serializers.StringRelatedField(many=True)
|
||||||
|
|
||||||
class Meta:
|
class Meta:
|
||||||
model = Product
|
model = Product
|
||||||
fields = ("id", "name", "brand", "storage")
|
fields = ("id", "name", "brand", "storage")
|
||||||
|
depth = 1
|
||||||
|
|
||||||
|
|
||||||
class ProductListSerializer(ModelSerializer):
|
class ProductListSerializer(ModelSerializer):
|
||||||
brand = serializers.CharField(source="brand.name")
|
|
||||||
|
|
||||||
class Meta:
|
class Meta:
|
||||||
model = Product
|
model = Product
|
||||||
fields = ("id", "name", "brand")
|
fields = ("id", "name")
|
||||||
|
|
||||||
|
|
||||||
|
class BrandSerializer(ModelSerializer):
|
||||||
|
products = ProductListSerializer(many=True, read_only=True)
|
||||||
|
|
||||||
|
class Meta:
|
||||||
|
model = Brand
|
||||||
|
fields = ["id", "name", "products"]
|
||||||
|
|
||||||
|
|
||||||
|
class BrandListSerializer(ModelSerializer):
|
||||||
|
class Meta:
|
||||||
|
model = Brand
|
||||||
|
fields = "__all__"
|
||||||
|
|
||||||
|
|
||||||
class ImageSerializer(ModelSerializer):
|
class ImageSerializer(ModelSerializer):
|
||||||
@ -48,15 +48,14 @@ class PostSerializer(ModelSerializer):
|
|||||||
product = ProductListSerializer(read_only=True)
|
product = ProductListSerializer(read_only=True)
|
||||||
nickname = serializers.CharField(source="author.nickname")
|
nickname = serializers.CharField(source="author.nickname")
|
||||||
images = ImageSerializer(many=True, read_only=True)
|
images = ImageSerializer(many=True, read_only=True)
|
||||||
# storage = serializers.CharField(source="storage.storage")
|
storage = serializers.CharField(source="storage.storage")
|
||||||
|
|
||||||
class Meta:
|
class Meta:
|
||||||
model = Post
|
model = Post
|
||||||
fields = (
|
fields = (
|
||||||
"id",
|
"id",
|
||||||
"product",
|
"product",
|
||||||
"color",
|
"storage",
|
||||||
"storage__storage",
|
|
||||||
"price",
|
"price",
|
||||||
"text",
|
"text",
|
||||||
"nickname",
|
"nickname",
|
||||||
|
@ -30,7 +30,11 @@ class BrandViewset(ActionBasedMixin, ModelViewSet):
|
|||||||
|
|
||||||
|
|
||||||
class ProductViewset(ActionBasedMixin, ModelViewSet):
|
class ProductViewset(ActionBasedMixin, ModelViewSet):
|
||||||
queryset = Product.objects.all()
|
queryset = (
|
||||||
|
Product.objects.all()
|
||||||
|
.select_related("brand")
|
||||||
|
.prefetch_related("storage")
|
||||||
|
)
|
||||||
serializer_class = ProductSerializer
|
serializer_class = ProductSerializer
|
||||||
serializer_class_map = {
|
serializer_class_map = {
|
||||||
"posts": PostSerializer,
|
"posts": PostSerializer,
|
||||||
@ -52,11 +56,10 @@ class ProductViewset(ActionBasedMixin, ModelViewSet):
|
|||||||
|
|
||||||
|
|
||||||
class PostViewset(ActionBasedMixin, ModelViewSet):
|
class PostViewset(ActionBasedMixin, ModelViewSet):
|
||||||
queryset = Post.objects.all().select_related(
|
queryset = (
|
||||||
"storage",
|
Post.objects.all()
|
||||||
"product",
|
.select_related("storage", "product", "author", "product__brand")
|
||||||
"author",
|
.prefetch_related("images")
|
||||||
"product__brand",
|
|
||||||
)
|
)
|
||||||
serializer_class = PostSerializer
|
serializer_class = PostSerializer
|
||||||
permission_classes = [IsAuthenticated, IsAuthorOrReadOnly]
|
permission_classes = [IsAuthenticated, IsAuthorOrReadOnly]
|
||||||
|
Loading…
Reference in New Issue
Block a user