From 78dd18e84943d7b7fb86e43c0afd9410afda4e97 Mon Sep 17 00:00:00 2001 From: Dani Hodovic Date: Wed, 6 Mar 2024 23:20:44 -0300 Subject: [PATCH] feat: add button to sort trending by popular weekly, monthly, yearly --- django_wtf/conftest.py | 10 +++++ django_wtf/core/factories.py | 5 +++ django_wtf/core/queries.py | 12 ++--- django_wtf/core/views/index_view.py | 2 +- .../views/test_trending_repositories_view.py | 30 +++++++++++++ .../core/views/trending_repositories_view.py | 27 ++++++++++- .../templates/core/trending_repositories.html | 18 ++++++-- poetry.lock | 45 ++++++++++++++++++- pyproject.toml | 1 + 9 files changed, 137 insertions(+), 13 deletions(-) create mode 100644 django_wtf/core/views/test_trending_repositories_view.py diff --git a/django_wtf/conftest.py b/django_wtf/conftest.py index 596d2af..e71e7ae 100644 --- a/django_wtf/conftest.py +++ b/django_wtf/conftest.py @@ -1,10 +1,20 @@ # pylint: disable=redefined-outer-name import pytest import responses +from pytest_factoryboy import register +from django_wtf.core.factories import ( + RepositoryFactory, + RepositoryStarsFactory, + ValidRepositoryFactory, +) from django_wtf.users.models import User from django_wtf.users.tests.factories import UserFactory +register(RepositoryFactory) +register(ValidRepositoryFactory) +register(RepositoryStarsFactory) + @pytest.fixture(autouse=True) def media_storage(settings, tmpdir): # pylint: disable=redefined-outer-name diff --git a/django_wtf/core/factories.py b/django_wtf/core/factories.py index 4cbb1cc..76d0881 100644 --- a/django_wtf/core/factories.py +++ b/django_wtf/core/factories.py @@ -49,6 +49,11 @@ def categories(self, create, extracted, **kwargs): self.categories.add(category) +class ValidRepositoryFactory(RepositoryFactory): + type = RepositoryType.APP + stars = 100 + + class RepositoryStarsFactory(DjangoModelFactory): class Meta: model = RepositoryStars diff --git a/django_wtf/core/queries.py b/django_wtf/core/queries.py index a4fc19c..6c714de 100644 --- a/django_wtf/core/queries.py +++ b/django_wtf/core/queries.py @@ -8,14 +8,16 @@ one_week_ago = datetime.today().date() - timedelta(days=7) +cache_time = 60 * 60 * 24 +# TODO: Make this dynamic +# cache_time = 1 -@cached_as(RepositoryStars, Constance, timeout=60 * 60 * 24) -def trending_repositories(**filters): + +@cached_as(RepositoryStars, Constance, timeout=cache_time) +def trending_repositories(days_since, **filters): trending = [] for repo in Repository.valid.filter(stars__gte=20, **filters): - stars_in_the_last_week = repo.stars_since( - timedelta(days=config.DAYS_SINCE_TRENDING) - ) + stars_in_the_last_week = repo.stars_since(timedelta(days=days_since)) if stars_in_the_last_week > 0: setattr(repo, "stars_lately", stars_in_the_last_week) setattr(repo, "stars_quota", repo.stars_lately / repo.stars) # type: ignore diff --git a/django_wtf/core/views/index_view.py b/django_wtf/core/views/index_view.py index 200a6e5..00431bb 100644 --- a/django_wtf/core/views/index_view.py +++ b/django_wtf/core/views/index_view.py @@ -36,7 +36,7 @@ class IndexView(MetadataMixin, TemplateView): def get_context_data(self, **kwargs): context = super().get_context_data(**kwargs) context["categories"] = self.categories_ordered_by_total_repositories() - context["trending_apps"] = trending_repositories()[0:5] + context["trending_apps"] = trending_repositories(days_since=14)[0:5] context["trending_developers"] = trending_profiles()[0:5] context["social_news"] = SocialNews.objects.filter( created_at__gt=one_week_ago diff --git a/django_wtf/core/views/test_trending_repositories_view.py b/django_wtf/core/views/test_trending_repositories_view.py new file mode 100644 index 0000000..1196a30 --- /dev/null +++ b/django_wtf/core/views/test_trending_repositories_view.py @@ -0,0 +1,30 @@ +from datetime import datetime, timedelta + +import pytest +from django.urls import reverse + +pytestmark = pytest.mark.django_db + + +def test_trending_by_week( + valid_repository_factory, repository_stars_factory, user_client +): + now = datetime.now() + seven_days_ago = now - timedelta(days=7) + url = reverse("core:trending-repositories") + more_popular = valid_repository_factory(stars=32) + less_popular = valid_repository_factory(stars=40) + repository_stars_factory( + repository=more_popular, created_at=seven_days_ago, stars=2 + ) + repository_stars_factory( + repository=less_popular, created_at=seven_days_ago, stars=10 + ) + + res = user_client.get(url + "?trending=7") + assert res.context["object_list"][0] == more_popular + assert res.context["object_list"][1] == less_popular + assert res.context["object_list"][0].stars_lately == 30 + assert res.context["object_list"][0].stars_quota == 0.9375 + assert res.context["object_list"][1].stars_lately == 30 + assert res.context["object_list"][1].stars_quota == 0.75 diff --git a/django_wtf/core/views/trending_repositories_view.py b/django_wtf/core/views/trending_repositories_view.py index ac12bc0..18148be 100644 --- a/django_wtf/core/views/trending_repositories_view.py +++ b/django_wtf/core/views/trending_repositories_view.py @@ -1,3 +1,5 @@ +from collections import OrderedDict + from constance import config from django.views.generic import ListView from meta.views import MetadataMixin @@ -10,9 +12,32 @@ class TrendingRepositoriesView(MetadataMixin, ListView): title = "Trending Django projects" description = "Trending Django projects in the past week" template_name = "core/trending_repositories.html" + periods = OrderedDict( + [ + (7, "7 days"), + (14, "14 days"), + (30, "30 days"), + (90, "3 months"), + (365, "1 year"), + ] + ) def get_queryset(self): - return trending_repositories() + trending = trending_repositories(self.get_period_value()) + return trending + + def get_period_value(self): + period_q = self.request.GET.get("trending", 14) + valid_value = period_q in [str(k) for k in self.periods.keys()] + return int(period_q) if valid_value else 14 + + def get_context_data(self, **kwargs): + context = super().get_context_data(**kwargs) + context["periods"] = self.periods.items() + current_period_label = self.periods.get(self.get_period_value()) + context["current_period"] = self.get_period_value() + context["current_period_label"] = current_period_label + return context def get_meta_description(self, context=None): return f"Trending Django projects in the past {config.DAYS_SINCE_TRENDING} days" diff --git a/django_wtf/templates/core/trending_repositories.html b/django_wtf/templates/core/trending_repositories.html index 00ae978..befb311 100644 --- a/django_wtf/templates/core/trending_repositories.html +++ b/django_wtf/templates/core/trending_repositories.html @@ -1,19 +1,29 @@ {% extends "core/base.html" %} {% load humanize user_agents wtf_tags %} {% block content %} -
-
+
+
Trending repositories
{% if request|is_mobile or request|is_tablet %}
Repositories with the most stars
{% else %}
Repositories with proportionally largest increase in stars for the last - {{ config.DAYS_SINCE_TRENDING | apnumber }} days + {{ current_period | apnumber }} days
{% endif %}
- +
+ Trending: {{ current_period_label }} + +
+
diff --git a/poetry.lock b/poetry.lock index b3d9965..89ff88d 100644 --- a/poetry.lock +++ b/poetry.lock @@ -1,4 +1,4 @@ -# This file is automatically @generated by Poetry 1.7.1 and should not be changed by hand. +# This file is automatically @generated by Poetry 1.5.1 and should not be changed by hand. [[package]] name = "amqp" @@ -2358,6 +2358,16 @@ files = [ {file = "MarkupSafe-2.1.3-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:5bbe06f8eeafd38e5d0a4894ffec89378b6c6a625ff57e3028921f8ff59318ac"}, {file = "MarkupSafe-2.1.3-cp311-cp311-win32.whl", hash = "sha256:dd15ff04ffd7e05ffcb7fe79f1b98041b8ea30ae9234aed2a9168b5797c3effb"}, {file = "MarkupSafe-2.1.3-cp311-cp311-win_amd64.whl", hash = "sha256:134da1eca9ec0ae528110ccc9e48041e0828d79f24121a1a146161103c76e686"}, + {file = "MarkupSafe-2.1.3-cp312-cp312-macosx_10_9_universal2.whl", hash = "sha256:f698de3fd0c4e6972b92290a45bd9b1536bffe8c6759c62471efaa8acb4c37bc"}, + {file = "MarkupSafe-2.1.3-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:aa57bd9cf8ae831a362185ee444e15a93ecb2e344c8e52e4d721ea3ab6ef1823"}, + {file = "MarkupSafe-2.1.3-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:ffcc3f7c66b5f5b7931a5aa68fc9cecc51e685ef90282f4a82f0f5e9b704ad11"}, + {file = "MarkupSafe-2.1.3-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:47d4f1c5f80fc62fdd7777d0d40a2e9dda0a05883ab11374334f6c4de38adffd"}, + {file = "MarkupSafe-2.1.3-cp312-cp312-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:1f67c7038d560d92149c060157d623c542173016c4babc0c1913cca0564b9939"}, + {file = "MarkupSafe-2.1.3-cp312-cp312-musllinux_1_1_aarch64.whl", hash = "sha256:9aad3c1755095ce347e26488214ef77e0485a3c34a50c5a5e2471dff60b9dd9c"}, + {file = "MarkupSafe-2.1.3-cp312-cp312-musllinux_1_1_i686.whl", hash = "sha256:14ff806850827afd6b07a5f32bd917fb7f45b046ba40c57abdb636674a8b559c"}, + {file = "MarkupSafe-2.1.3-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:8f9293864fe09b8149f0cc42ce56e3f0e54de883a9de90cd427f191c346eb2e1"}, + {file = "MarkupSafe-2.1.3-cp312-cp312-win32.whl", hash = "sha256:715d3562f79d540f251b99ebd6d8baa547118974341db04f5ad06d5ea3eb8007"}, + {file = "MarkupSafe-2.1.3-cp312-cp312-win_amd64.whl", hash = "sha256:1b8dd8c3fd14349433c79fa8abeb573a55fc0fdd769133baac1f5e07abf54aeb"}, {file = "MarkupSafe-2.1.3-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:8e254ae696c88d98da6555f5ace2279cf7cd5b3f52be2b5cf97feafe883b58d2"}, {file = "MarkupSafe-2.1.3-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:cb0932dc158471523c9637e807d9bfb93e06a95cbf010f1a38b98623b929ef2b"}, {file = "MarkupSafe-2.1.3-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:9402b03f1a1b4dc4c19845e5c749e3ab82d5078d16a2a4c2cd2df62d57bb0707"}, @@ -2886,6 +2896,8 @@ files = [ {file = "psycopg2-2.9.9-cp310-cp310-win_amd64.whl", hash = "sha256:426f9f29bde126913a20a96ff8ce7d73fd8a216cfb323b1f04da402d452853c3"}, {file = "psycopg2-2.9.9-cp311-cp311-win32.whl", hash = "sha256:ade01303ccf7ae12c356a5e10911c9e1c51136003a9a1d92f7aa9d010fb98372"}, {file = "psycopg2-2.9.9-cp311-cp311-win_amd64.whl", hash = "sha256:121081ea2e76729acfb0673ff33755e8703d45e926e416cb59bae3a86c6a4981"}, + {file = "psycopg2-2.9.9-cp312-cp312-win32.whl", hash = "sha256:d735786acc7dd25815e89cc4ad529a43af779db2e25aa7c626de864127e5a024"}, + {file = "psycopg2-2.9.9-cp312-cp312-win_amd64.whl", hash = "sha256:a7653d00b732afb6fc597e29c50ad28087dcb4fbfb28e86092277a559ae4e693"}, {file = "psycopg2-2.9.9-cp37-cp37m-win32.whl", hash = "sha256:5e0d98cade4f0e0304d7d6f25bbfbc5bd186e07b38eac65379309c4ca3193efa"}, {file = "psycopg2-2.9.9-cp37-cp37m-win_amd64.whl", hash = "sha256:7e2dacf8b009a1c1e843b5213a87f7c544b2b042476ed7755be813eaf4e8347a"}, {file = "psycopg2-2.9.9-cp38-cp38-win32.whl", hash = "sha256:ff432630e510709564c01dafdbe996cb552e0b9f3f065eb89bdce5bd31fabf4c"}, @@ -3210,6 +3222,24 @@ pytest = ">=5.4.0" docs = ["sphinx", "sphinx-rtd-theme"] testing = ["Django", "django-configurations (>=2.0)"] +[[package]] +name = "pytest-factoryboy" +version = "2.7.0" +description = "Factory Boy support for pytest." +optional = false +python-versions = ">=3.8" +files = [ + {file = "pytest_factoryboy-2.7.0-py3-none-any.whl", hash = "sha256:bf3222db22d954fbf46f4bff902a0a8d82f3fc3594a47c04bbdc0546ff4c59a6"}, + {file = "pytest_factoryboy-2.7.0.tar.gz", hash = "sha256:67fc54ec8669a3feb8ac60094dd57cd71eb0b20b2c319d2957873674c776a77b"}, +] + +[package.dependencies] +factory_boy = ">=2.10.0" +inflection = "*" +packaging = "*" +pytest = ">=6.2" +typing_extensions = "*" + [[package]] name = "python-crontab" version = "3.0.0" @@ -3297,6 +3327,7 @@ files = [ {file = "PyYAML-6.0.1-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:69b023b2b4daa7548bcfbd4aa3da05b3a74b772db9e23b982788168117739938"}, {file = "PyYAML-6.0.1-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:81e0b275a9ecc9c0c0c07b4b90ba548307583c125f54d5b6946cfee6360c733d"}, {file = "PyYAML-6.0.1-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:ba336e390cd8e4d1739f42dfe9bb83a3cc2e80f567d8805e11b46f4a943f5515"}, + {file = "PyYAML-6.0.1-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:326c013efe8048858a6d312ddd31d56e468118ad4cdeda36c719bf5bb6192290"}, {file = "PyYAML-6.0.1-cp310-cp310-win32.whl", hash = "sha256:bd4af7373a854424dabd882decdc5579653d7868b8fb26dc7d0e99f823aa5924"}, {file = "PyYAML-6.0.1-cp310-cp310-win_amd64.whl", hash = "sha256:fd1592b3fdf65fff2ad0004b5e363300ef59ced41c2e6b3a99d4089fa8c5435d"}, {file = "PyYAML-6.0.1-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:6965a7bc3cf88e5a1c3bd2e0b5c22f8d677dc88a455344035f03399034eb3007"}, @@ -3304,8 +3335,16 @@ files = [ {file = "PyYAML-6.0.1-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:42f8152b8dbc4fe7d96729ec2b99c7097d656dc1213a3229ca5383f973a5ed6d"}, {file = "PyYAML-6.0.1-cp311-cp311-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:062582fca9fabdd2c8b54a3ef1c978d786e0f6b3a1510e0ac93ef59e0ddae2bc"}, {file = "PyYAML-6.0.1-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:d2b04aac4d386b172d5b9692e2d2da8de7bfb6c387fa4f801fbf6fb2e6ba4673"}, + {file = "PyYAML-6.0.1-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:e7d73685e87afe9f3b36c799222440d6cf362062f78be1013661b00c5c6f678b"}, {file = "PyYAML-6.0.1-cp311-cp311-win32.whl", hash = "sha256:1635fd110e8d85d55237ab316b5b011de701ea0f29d07611174a1b42f1444741"}, {file = "PyYAML-6.0.1-cp311-cp311-win_amd64.whl", hash = "sha256:bf07ee2fef7014951eeb99f56f39c9bb4af143d8aa3c21b1677805985307da34"}, + {file = "PyYAML-6.0.1-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:855fb52b0dc35af121542a76b9a84f8d1cd886ea97c84703eaa6d88e37a2ad28"}, + {file = "PyYAML-6.0.1-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:40df9b996c2b73138957fe23a16a4f0ba614f4c0efce1e9406a184b6d07fa3a9"}, + {file = "PyYAML-6.0.1-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:a08c6f0fe150303c1c6b71ebcd7213c2858041a7e01975da3a99aed1e7a378ef"}, + {file = "PyYAML-6.0.1-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:6c22bec3fbe2524cde73d7ada88f6566758a8f7227bfbf93a408a9d86bcc12a0"}, + {file = "PyYAML-6.0.1-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:8d4e9c88387b0f5c7d5f281e55304de64cf7f9c0021a3525bd3b1c542da3b0e4"}, + {file = "PyYAML-6.0.1-cp312-cp312-win32.whl", hash = "sha256:d483d2cdf104e7c9fa60c544d92981f12ad66a457afae824d146093b8c294c54"}, + {file = "PyYAML-6.0.1-cp312-cp312-win_amd64.whl", hash = "sha256:0d3304d8c0adc42be59c5f8a4d9e3d7379e6955ad754aa9d6ab7a398b59dd1df"}, {file = "PyYAML-6.0.1-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:50550eb667afee136e9a77d6dc71ae76a44df8b3e51e41b77f6de2932bfe0f47"}, {file = "PyYAML-6.0.1-cp36-cp36m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:1fe35611261b29bd1de0070f0b2f47cb6ff71fa6595c077e42bd0c419fa27b98"}, {file = "PyYAML-6.0.1-cp36-cp36m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:704219a11b772aea0d8ecd7058d0082713c3562b4e271b849ad7dc4a5c90c13c"}, @@ -3322,6 +3361,7 @@ files = [ {file = "PyYAML-6.0.1-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:a0cd17c15d3bb3fa06978b4e8958dcdc6e0174ccea823003a106c7d4d7899ac5"}, {file = "PyYAML-6.0.1-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:28c119d996beec18c05208a8bd78cbe4007878c6dd15091efb73a30e90539696"}, {file = "PyYAML-6.0.1-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:7e07cbde391ba96ab58e532ff4803f79c4129397514e1413a7dc761ccd755735"}, + {file = "PyYAML-6.0.1-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:49a183be227561de579b4a36efbb21b3eab9651dd81b1858589f796549873dd6"}, {file = "PyYAML-6.0.1-cp38-cp38-win32.whl", hash = "sha256:184c5108a2aca3c5b3d3bf9395d50893a7ab82a38004c8f61c258d4428e80206"}, {file = "PyYAML-6.0.1-cp38-cp38-win_amd64.whl", hash = "sha256:1e2722cc9fbb45d9b87631ac70924c11d3a401b2d7f410cc0e3bbf249f2dca62"}, {file = "PyYAML-6.0.1-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:9eb6caa9a297fc2c2fb8862bc5370d0303ddba53ba97e71f08023b6cd73d16a8"}, @@ -3329,6 +3369,7 @@ files = [ {file = "PyYAML-6.0.1-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:5773183b6446b2c99bb77e77595dd486303b4faab2b086e7b17bc6bef28865f6"}, {file = "PyYAML-6.0.1-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:b786eecbdf8499b9ca1d697215862083bd6d2a99965554781d0d8d1ad31e13a0"}, {file = "PyYAML-6.0.1-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:bc1bf2925a1ecd43da378f4db9e4f799775d6367bdb94671027b73b393a7c42c"}, + {file = "PyYAML-6.0.1-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:04ac92ad1925b2cff1db0cfebffb6ffc43457495c9b3c39d3fcae417d7125dc5"}, {file = "PyYAML-6.0.1-cp39-cp39-win32.whl", hash = "sha256:faca3bdcf85b2fc05d06ff3fbc1f83e1391b3e724afa3feba7d13eeab355484c"}, {file = "PyYAML-6.0.1-cp39-cp39-win_amd64.whl", hash = "sha256:510c9deebc5c0225e8c96813043e62b680ba2f9c50a08d3724c7f28a747d1486"}, {file = "PyYAML-6.0.1.tar.gz", hash = "sha256:bfdf460b1736c775f2ba9f6a92bca30bc2095067b8a9d77876d1fad6cc3b4a43"}, @@ -4568,4 +4609,4 @@ testing = ["coverage (>=5.0.3)", "zope.event", "zope.testing"] [metadata] lock-version = "2.0" python-versions = "^3.11" -content-hash = "a3f520d82a91b28ba79f79b0ddcae3f8ae2e7c7a36833df16af6dc65c30e11b8" +content-hash = "8359b8c185ad966ecf9a90fd0ec751f73f1a49abad93ae0c7d63fb66020054b7" diff --git a/pyproject.toml b/pyproject.toml index f2d1082..9a3c21b 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -78,6 +78,7 @@ types-Markdown = "^3.3.27" pyupgrade = "^3.15.0" django-upgrade = "^1.15.0" djlint = "^1.34.1" +pytest-factoryboy = "^2.7.0" [build-system] requires = ["poetry>=0.12"]