Skip to content

Commit

Permalink
Диплом.После 1-го ревью
Browse files Browse the repository at this point in the history
  • Loading branch information
VitaliiCheremisov committed Jan 4, 2024
1 parent a270c53 commit e0c7a76
Show file tree
Hide file tree
Showing 10 changed files with 12 additions and 18 deletions.
2 changes: 1 addition & 1 deletion backend/favorite/migrations/0002_favorite_recipe.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Generated by Django 3.2.3 on 2024-01-01 10:09

from django.db import migrations, models
import django.db.models.deletion
from django.db import migrations, models


class Migration(migrations.Migration):
Expand Down
2 changes: 1 addition & 1 deletion backend/favorite/migrations/0003_initial.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# Generated by Django 3.2.3 on 2024-01-01 10:09

import django.db.models.deletion
from django.conf import settings
from django.db import migrations, models
import django.db.models.deletion


class Migration(migrations.Migration):
Expand Down
7 changes: 0 additions & 7 deletions backend/recipes/filters.py
Original file line number Diff line number Diff line change
@@ -1,11 +1,7 @@
from django.db.models import Q

import django_filters
from django_filters.rest_framework import FilterSet, filters
from rest_framework.filters import SearchFilter

from recipes.models import Recipe
from users.models import CustomUser


class IngredientSearchFilter(SearchFilter):
Expand All @@ -15,9 +11,6 @@ class IngredientSearchFilter(SearchFilter):

class RecipeFilter(FilterSet):
"""Фильтр для рецептов."""
# author = filters.ModelChoiceFilter(
# queryset=CustomUser.objects.all()
# )
tags = filters.AllValuesMultipleFilter(
field_name='tags__slug'
)
Expand Down
4 changes: 2 additions & 2 deletions backend/recipes/migrations/0002_initial.py
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
# Generated by Django 3.2.3 on 2024-01-01 10:09

from django.conf import settings
from django.db import migrations, models
import django.db.models.deletion
import django.db.models.expressions
from django.conf import settings
from django.db import migrations, models


class Migration(migrations.Migration):
Expand Down
6 changes: 3 additions & 3 deletions backend/recipes/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,17 +4,17 @@
from django_filters.rest_framework import DjangoFilterBackend
from rest_framework import status, viewsets
from rest_framework.decorators import action
from rest_framework.permissions import AllowAny, IsAuthenticated, SAFE_METHODS
from rest_framework.permissions import SAFE_METHODS, AllowAny, IsAuthenticated
from rest_framework.response import Response
from rest_framework.serializers import ValidationError

from foodgram.permissions import IsAuthorOrReadOnly
from users.models import CustomUser

from .filters import IngredientSearchFilter, RecipeFilter
from .models import Follow, Ingredient, Recipe, IngredientRecipes
from .models import Follow, Ingredient, IngredientRecipes, Recipe
from .serializers import (FollowSerializer, IngredientSerializer,
RecipeShowSerializer, RecipeCreateSerializer)
RecipeCreateSerializer, RecipeShowSerializer)
from .utils import calculate_shopping_cart


Expand Down
2 changes: 1 addition & 1 deletion backend/shopping_cart/migrations/0001_initial.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Generated by Django 3.2.3 on 2024-01-01 10:09

from django.db import migrations, models
import django.db.models.deletion
from django.db import migrations, models


class Migration(migrations.Migration):
Expand Down
2 changes: 1 addition & 1 deletion backend/shopping_cart/migrations/0002_initial.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
# Generated by Django 3.2.3 on 2024-01-01 10:09

import django.db.models.deletion
from django.conf import settings
from django.db import migrations, models
import django.db.models.deletion


class Migration(migrations.Migration):
Expand Down
1 change: 1 addition & 0 deletions backend/shopping_cart/serializers.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

from recipes.models import Recipe
from users.models import CustomUser

from .models import ShoppingCart


Expand Down
2 changes: 1 addition & 1 deletion backend/tags/views.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
from rest_framework import viewsets
from rest_framework.response import Response
from rest_framework.permissions import AllowAny
from rest_framework.response import Response

from .models import Tag
from .serializers import TagSerializer
Expand Down
2 changes: 1 addition & 1 deletion backend/users/migrations/0001_initial.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

import django.contrib.auth.models
import django.contrib.auth.validators
from django.db import migrations, models
import django.utils.timezone
from django.db import migrations, models


class Migration(migrations.Migration):
Expand Down

0 comments on commit e0c7a76

Please sign in to comment.