From ee92c98f34d5cedc996ed6b956396915e4e6f77e Mon Sep 17 00:00:00 2001 From: abutalib-kiwi Date: Tue, 1 Aug 2023 13:12:37 +0530 Subject: [PATCH] article list api changes, changed related name for survey_options to options --- .../0004_alter_surveyoption_survey.py | 19 +++++++++++++++++++ web_admin/models.py | 2 +- web_admin/views/article.py | 2 +- 3 files changed, 21 insertions(+), 2 deletions(-) create mode 100644 web_admin/migrations/0004_alter_surveyoption_survey.py diff --git a/web_admin/migrations/0004_alter_surveyoption_survey.py b/web_admin/migrations/0004_alter_surveyoption_survey.py new file mode 100644 index 0000000..8d28957 --- /dev/null +++ b/web_admin/migrations/0004_alter_surveyoption_survey.py @@ -0,0 +1,19 @@ +# Generated by Django 4.2.2 on 2023-08-01 07:35 + +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + dependencies = [ + ('web_admin', '0003_defaultarticlecardimage_and_more'), + ] + + operations = [ + migrations.AlterField( + model_name='surveyoption', + name='survey', + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='options', to='web_admin.articlesurvey'), + ), + ] diff --git a/web_admin/models.py b/web_admin/models.py index 950eec6..8a3bb16 100644 --- a/web_admin/models.py +++ b/web_admin/models.py @@ -56,7 +56,7 @@ class SurveyOption(models.Model): """ Survey Options model """ - survey = models.ForeignKey(ArticleSurvey, on_delete=models.CASCADE, related_name='survey_options') + survey = models.ForeignKey(ArticleSurvey, on_delete=models.CASCADE, related_name='options') option = models.CharField(max_length=255) is_answer = models.BooleanField(default=False) created_at = models.DateTimeField(auto_now_add=True) diff --git a/web_admin/views/article.py b/web_admin/views/article.py index 5aa88b3..5b0ca92 100644 --- a/web_admin/views/article.py +++ b/web_admin/views/article.py @@ -36,7 +36,7 @@ class ArticleViewSet(GenericViewSet, mixins.CreateModelMixin, mixins.UpdateModel def get_queryset(self): article = self.queryset.objects.filter(is_deleted=False).prefetch_related( - 'article_cards', 'article_survey', 'article_survey__survey_options' + 'article_cards', 'article_survey', 'article_survey__options' ).order_by('-created_at') queryset = self.filter_queryset(article) return queryset