From 4e7248755819ee5a62cb4d688ec3751fe92d7c71 Mon Sep 17 00:00:00 2001 From: littlewolf Date: Thu, 14 Nov 2019 20:54:14 +0300 Subject: [PATCH 1/3] Add rating.views_count transfer --- apps/news/models.py | 3 +- apps/rating/migrations/0003_viewcount.py | 27 ++++++++++++++++++ apps/rating/models.py | 18 ++++++++++++ apps/rating/transfer_data.py | 28 +++++++++++++++++++ apps/transfer/management/commands/transfer.py | 1 + project/settings/local.py | 5 ++-- 6 files changed, 79 insertions(+), 3 deletions(-) create mode 100644 apps/rating/migrations/0003_viewcount.py create mode 100644 apps/rating/transfer_data.py diff --git a/apps/news/models.py b/apps/news/models.py index 93a2b7cd..d52d04b8 100644 --- a/apps/news/models.py +++ b/apps/news/models.py @@ -6,7 +6,7 @@ from django.utils import timezone from django.utils.translation import gettext_lazy as _ from rest_framework.reverse import reverse -from rating.models import Rating +from rating.models import Rating, ViewCount from utils.models import BaseAttributes, TJSONField, TranslatedFieldsMixin, ProjectBaseMixin from utils.querysets import TranslationQuerysetMixin @@ -182,6 +182,7 @@ class News(BaseAttributes, TranslatedFieldsMixin): tags = models.ManyToManyField('tag.Tag', related_name='news', verbose_name=_('Tags')) gallery = models.ManyToManyField('gallery.Image', through='news.NewsGallery') + views_count = generic.GenericRelation(ViewCount, blank=True, null=True) ratings = generic.GenericRelation(Rating) favorites = generic.GenericRelation(to='favorites.Favorites') agenda = models.ForeignKey('news.Agenda', blank=True, null=True, diff --git a/apps/rating/migrations/0003_viewcount.py b/apps/rating/migrations/0003_viewcount.py new file mode 100644 index 00000000..2a371371 --- /dev/null +++ b/apps/rating/migrations/0003_viewcount.py @@ -0,0 +1,27 @@ +# Generated by Django 2.2.4 on 2019-11-14 17:15 + +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + dependencies = [ + ('contenttypes', '0002_remove_content_type_name'), + ('rating', '0002_auto_20191004_0928'), + ] + + operations = [ + migrations.CreateModel( + name='ViewCount', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('object_id', models.PositiveIntegerField()), + ('count', models.IntegerField()), + ('content_type', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='contenttypes.ContentType')), + ], + options={ + 'unique_together': {('object_id', 'content_type')}, + }, + ), + ] diff --git a/apps/rating/models.py b/apps/rating/models.py index e1dcec86..7a49857e 100644 --- a/apps/rating/models.py +++ b/apps/rating/models.py @@ -20,3 +20,21 @@ class Rating(models.Model): return self.content_object.name if hasattr(self.content_object, 'title'): return self.content_object.title_translated + + +class ViewCount(models.Model): + content_type = models.ForeignKey(ContentType, on_delete=models.CASCADE) + object_id = models.PositiveIntegerField() + content_object = GenericForeignKey('content_type', 'object_id') + count = models.IntegerField() + + class Meta: + unique_together = ('object_id', 'content_type') + + @property + def name(self): + # Check if Generic obj has name or title + if hasattr(self.content_object, 'name'): + return self.content_object.name + if hasattr(self.content_object, 'title'): + return self.content_object.title_translated diff --git a/apps/rating/transfer_data.py b/apps/rating/transfer_data.py new file mode 100644 index 00000000..29d5ad83 --- /dev/null +++ b/apps/rating/transfer_data.py @@ -0,0 +1,28 @@ +from transfer.models import PageTexts, PageCounters +from news.models import News +from rating.models import ViewCount + + +def transfer_news_view_count(): + news_list = News.objects.filter(old_id__isnull=False) + views_count_list = {} + for news_object in news_list: + try: + mysql_page_text = PageTexts.objects.get(id=news_object.old_id) + except PageTexts.DoesNotExist: + continue + + if mysql_page_text.page_id not in views_count_list: + try: + mysql_views_count = PageCounters.objects.get(page_id=mysql_page_text.page_id) + except PageCounters.DoesNotExist: + continue + + views_count_list[mysql_page_text.page_id] = ViewCount.objects.create(count=mysql_views_count.count) + + news_object.views_count = views_count_list[mysql_page_text.page_id] + news_object.save() + +data_types = { + "rating_count": [transfer_news_view_count] +} diff --git a/apps/transfer/management/commands/transfer.py b/apps/transfer/management/commands/transfer.py index fc01f655..48e3b74d 100644 --- a/apps/transfer/management/commands/transfer.py +++ b/apps/transfer/management/commands/transfer.py @@ -36,6 +36,7 @@ class Command(BaseCommand): 'souvenir', 'establishment_note', 'assemblage', + 'rating_count' ] def handle(self, *args, **options): diff --git a/project/settings/local.py b/project/settings/local.py index 09cadd4b..f9a096fe 100644 --- a/project/settings/local.py +++ b/project/settings/local.py @@ -36,14 +36,15 @@ THUMBNAIL_DEBUG = True # ADDED TRANSFER APP -# INSTALLED_APPS.append('transfer.apps.TransferConfig') +INSTALLED_APPS.append('transfer.apps.TransferConfig') # DATABASES DATABASES.update({ 'legacy': { 'ENGINE': 'django.db.backends.mysql', - 'HOST': 'mysql_db', + 'HOST': '172.22.0.1', + # 'HOST': 'mysql_db', 'PORT': 3306, 'NAME': 'dev', 'USER': 'dev', From 75307dbf73f9fdaff50dd0da090505da73808c22 Mon Sep 17 00:00:00 2001 From: littlewolf Date: Thu, 14 Nov 2019 23:31:24 +0300 Subject: [PATCH 2/3] Fix view_count transfer --- apps/rating/transfer_data.py | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/apps/rating/transfer_data.py b/apps/rating/transfer_data.py index 29d5ad83..7ae4c289 100644 --- a/apps/rating/transfer_data.py +++ b/apps/rating/transfer_data.py @@ -5,23 +5,21 @@ from rating.models import ViewCount def transfer_news_view_count(): news_list = News.objects.filter(old_id__isnull=False) - views_count_list = {} for news_object in news_list: try: mysql_page_text = PageTexts.objects.get(id=news_object.old_id) except PageTexts.DoesNotExist: continue - if mysql_page_text.page_id not in views_count_list: - try: - mysql_views_count = PageCounters.objects.get(page_id=mysql_page_text.page_id) - except PageCounters.DoesNotExist: - continue + try: + mysql_views_count = PageCounters.objects.get(page_id=mysql_page_text.page_id) + except PageCounters.DoesNotExist: + continue - views_count_list[mysql_page_text.page_id] = ViewCount.objects.create(count=mysql_views_count.count) - - news_object.views_count = views_count_list[mysql_page_text.page_id] - news_object.save() + view_count = ViewCount.objects.create( + count=mysql_views_count.count, + content_object=news_object + ) data_types = { "rating_count": [transfer_news_view_count] From 726610d147e15c081b23597354f229993563a8dc Mon Sep 17 00:00:00 2001 From: littlewolf Date: Thu, 14 Nov 2019 23:44:49 +0300 Subject: [PATCH 3/3] Update to onetoone Update rating annotation Add migrations --- apps/news/migrations/0035_news_views_count.py | 20 +++++++++++++++ apps/news/models.py | 5 ++-- .../migrations/0004_auto_20191114_2041.py | 25 +++++++++++++++++++ apps/rating/models.py | 14 ----------- apps/rating/transfer_data.py | 7 ++++-- 5 files changed, 53 insertions(+), 18 deletions(-) create mode 100644 apps/news/migrations/0035_news_views_count.py create mode 100644 apps/rating/migrations/0004_auto_20191114_2041.py diff --git a/apps/news/migrations/0035_news_views_count.py b/apps/news/migrations/0035_news_views_count.py new file mode 100644 index 00000000..6b94f737 --- /dev/null +++ b/apps/news/migrations/0035_news_views_count.py @@ -0,0 +1,20 @@ +# Generated by Django 2.2.4 on 2019-11-14 20:43 + +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + dependencies = [ + ('rating', '0004_auto_20191114_2041'), + ('news', '0034_merge_20191030_1714'), + ] + + operations = [ + migrations.AddField( + model_name='news', + name='views_count', + field=models.OneToOneField(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='rating.ViewCount'), + ), + ] diff --git a/apps/news/models.py b/apps/news/models.py index d52d04b8..27152182 100644 --- a/apps/news/models.py +++ b/apps/news/models.py @@ -37,7 +37,8 @@ class NewsQuerySet(TranslationQuerysetMixin): return self.order_by('-start') def rating_value(self): - return self.annotate(rating=models.Count('ratings__ip', distinct=True)) + # return self.annotate(rating=models.Count('ratings__ip', distinct=True)) + return self.annotate(rating='views_count__count') # TODO: совместить новый и старый функционал def with_base_related(self): """Return qs with related objects.""" @@ -182,7 +183,7 @@ class News(BaseAttributes, TranslatedFieldsMixin): tags = models.ManyToManyField('tag.Tag', related_name='news', verbose_name=_('Tags')) gallery = models.ManyToManyField('gallery.Image', through='news.NewsGallery') - views_count = generic.GenericRelation(ViewCount, blank=True, null=True) + views_count = models.OneToOneField('rating.ViewCount', blank=True, null=True, on_delete=models.SET_NULL) ratings = generic.GenericRelation(Rating) favorites = generic.GenericRelation(to='favorites.Favorites') agenda = models.ForeignKey('news.Agenda', blank=True, null=True, diff --git a/apps/rating/migrations/0004_auto_20191114_2041.py b/apps/rating/migrations/0004_auto_20191114_2041.py new file mode 100644 index 00000000..c8af8c71 --- /dev/null +++ b/apps/rating/migrations/0004_auto_20191114_2041.py @@ -0,0 +1,25 @@ +# Generated by Django 2.2.4 on 2019-11-14 20:41 + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('rating', '0003_viewcount'), + ] + + operations = [ + migrations.AlterUniqueTogether( + name='viewcount', + unique_together=set(), + ), + migrations.RemoveField( + model_name='viewcount', + name='content_type', + ), + migrations.RemoveField( + model_name='viewcount', + name='object_id', + ), + ] diff --git a/apps/rating/models.py b/apps/rating/models.py index 7a49857e..5db8332e 100644 --- a/apps/rating/models.py +++ b/apps/rating/models.py @@ -23,18 +23,4 @@ class Rating(models.Model): class ViewCount(models.Model): - content_type = models.ForeignKey(ContentType, on_delete=models.CASCADE) - object_id = models.PositiveIntegerField() - content_object = GenericForeignKey('content_type', 'object_id') count = models.IntegerField() - - class Meta: - unique_together = ('object_id', 'content_type') - - @property - def name(self): - # Check if Generic obj has name or title - if hasattr(self.content_object, 'name'): - return self.content_object.name - if hasattr(self.content_object, 'title'): - return self.content_object.title_translated diff --git a/apps/rating/transfer_data.py b/apps/rating/transfer_data.py index 7ae4c289..f7875bfe 100644 --- a/apps/rating/transfer_data.py +++ b/apps/rating/transfer_data.py @@ -17,10 +17,13 @@ def transfer_news_view_count(): continue view_count = ViewCount.objects.create( - count=mysql_views_count.count, - content_object=news_object + count=mysql_views_count.count ) + news_object.views_count = view_count + news_object.save() + + data_types = { "rating_count": [transfer_news_view_count] }