Subscriptions: use djstripe for products/features

readthedocs/api/v3/permissions.py

@@ -2,7 +2,7 @@
 
 from readthedocs.core.utils.extend import SettingsOverrideObject
 from readthedocs.subscriptions.constants import TYPE_EMBED_API
-from readthedocs.subscriptions.models import PlanFeature
+from readthedocs.subscriptions.products import get_feature
 
 
 class HasEmbedAPIAccess(BasePermission):
@@ -24,7 +24,7 @@ class HasEmbedAPIAccess(BasePermission):
     def has_permission(self, request, view):
         project = view._get_project()
         # The project is None when the is requesting a section from an external site.
-        if project and not PlanFeature.objects.has_feature(project, TYPE_EMBED_API):
+        if project and not get_feature(project, feature_type=TYPE_EMBED_API):
             return False
         return True
 

readthedocs/builds/tests/test_build_queryset.py

@@ -5,15 +5,16 @@
 from readthedocs.organizations.models import Organization
 from readthedocs.projects.models import Project
 from readthedocs.subscriptions.constants import TYPE_CONCURRENT_BUILDS
+from readthedocs.subscriptions.products import RTDProductFeature
 
 
 @pytest.mark.django_db
 class TestBuildQuerySet:
     @pytest.fixture(autouse=True)
     def setup_method(self, settings):
-        settings.RTD_DEFAULT_FEATURES = {
-            TYPE_CONCURRENT_BUILDS: 4,
-        }
+        settings.RTD_DEFAULT_FEATURES = dict(
+            [RTDProductFeature(type=TYPE_CONCURRENT_BUILDS, value=4).to_item()]
+        )
 
     def test_concurrent_builds(self):
         project = fixture.get(

readthedocs/core/resolver.py

@@ -8,7 +8,7 @@
 from readthedocs.core.utils.extend import SettingsOverrideObject
 from readthedocs.core.utils.url import unsafe_join_url_path
 from readthedocs.subscriptions.constants import TYPE_CNAME
-from readthedocs.subscriptions.models import PlanFeature
+from readthedocs.subscriptions.products import get_feature
 
 log = structlog.get_logger(__name__)
 
@@ -406,7 +406,7 @@ def _use_subdomain(self):
 
     def _use_cname(self, project):
         """Test if to allow direct serving for project on CNAME."""
-        return PlanFeature.objects.has_feature(project, type=TYPE_CNAME)
+        return bool(get_feature(project, feature_type=TYPE_CNAME))
 
 
 class Resolver(SettingsOverrideObject):

readthedocs/organizations/tests/test_views.py

@@ -17,6 +17,7 @@
 from readthedocs.projects.models import Project
 from readthedocs.rtd_tests.base import RequestFactoryTestMixin
 from readthedocs.subscriptions.constants import TYPE_AUDIT_LOGS
+from readthedocs.subscriptions.products import RTDProductFeature
 
 
 @override_settings(RTD_ALLOW_ORGANIZATIONS=True)
@@ -150,9 +151,9 @@ def test_add_owner(self):
 
 @override_settings(
     RTD_ALLOW_ORGANIZATIONS=True,
-    RTD_DEFAULT_FEATURES={
-        TYPE_AUDIT_LOGS: 90,
-    },
+    RTD_DEFAULT_FEATURES=dict(
+        [RTDProductFeature(type=TYPE_AUDIT_LOGS, value=90).to_item()]
+    ),
 )
 class OrganizationSecurityLogTests(TestCase):
 

readthedocs/organizations/views/private.py

@@ -28,7 +28,7 @@
 )
 from readthedocs.projects.utils import get_csv_file
 from readthedocs.subscriptions.constants import TYPE_AUDIT_LOGS
-from readthedocs.subscriptions.models import PlanFeature
+from readthedocs.subscriptions.products import get_feature
 
 
 # Organization views
@@ -236,8 +236,9 @@ def _get_csv_data(self):
     def get_context_data(self, **kwargs):
         organization = self.get_organization()
         context = super().get_context_data(**kwargs)
-        context["enabled"] = self._is_feature_enabled(organization)
-        context["days_limit"] = self._get_retention_days_limit(organization)
+        feature = self._get_feature(organization)
+        context["enabled"] = bool(feature)
+        context["days_limit"] = feature.value if feature else 0
         context["filter"] = self.filter
         context["AuditLog"] = AuditLog
         return context
@@ -246,18 +247,17 @@ def _get_start_date(self):
         """Get the date to show logs from."""
         organization = self.get_organization()
         creation_date = organization.pub_date.date()
-        retention_limit = self._get_retention_days_limit(organization)
-        if retention_limit in [None, -1]:
-            # Unlimited.
+        feature = self._get_feature(organization)
+        if feature.unlimited:
             return creation_date
-        start_date = timezone.now().date() - timezone.timedelta(days=retention_limit)
+        start_date = timezone.now().date() - timezone.timedelta(days=feature.value)
         # The max we can go back is to the creation of the organization.
         return max(start_date, creation_date)
 
     def _get_queryset(self):
         """Return the queryset without filters."""
         organization = self.get_organization()
-        if not self._is_feature_enabled(organization):
+        if not self._get_feature(organization):
             return AuditLog.objects.none()
         start_date = self._get_start_date()
         queryset = AuditLog.objects.filter(
@@ -286,15 +286,5 @@ def get_queryset(self):
         )
         return self.filter.qs
 
-    def _get_retention_days_limit(self, organization):
-        """From how many days we need to show data for this organization?"""
-        return PlanFeature.objects.get_feature_value(
-            organization,
-            type=self.feature_type,
-        )
-
-    def _is_feature_enabled(self, organization):
-        return PlanFeature.objects.has_feature(
-            organization,
-            type=self.feature_type,
-        )
+    def _get_feature(self, organization):
+        return get_feature(organization, self.feature_type)

readthedocs/projects/querysets.py

@@ -5,6 +5,7 @@
 from readthedocs.core.permissions import AdminPermission
 from readthedocs.core.utils.extend import SettingsOverrideObject
 from readthedocs.projects import constants
+from readthedocs.subscriptions.products import get_feature
 
 
 class ProjectQuerySetBase(models.QuerySet):
@@ -105,20 +106,18 @@ def max_concurrent_builds(self, project):
         :rtype: int
         """
         from readthedocs.subscriptions.constants import TYPE_CONCURRENT_BUILDS
-        from readthedocs.subscriptions.models import PlanFeature
 
         max_concurrent_organization = None
         organization = project.organizations.first()
         if organization:
             max_concurrent_organization = organization.max_concurrent_builds
 
+        feature = get_feature(project, feature_type=TYPE_CONCURRENT_BUILDS)
+        feature_value = feature.value if feature else 1
         return (
             project.max_concurrent_builds
             or max_concurrent_organization
-            or PlanFeature.objects.get_feature_value(
-                project,
-                type=TYPE_CONCURRENT_BUILDS,
-            )
+            or feature_value
         )
 
     def prefetch_latest_build(self):

readthedocs/projects/tests/test_domain_views.py

@@ -6,10 +6,13 @@
 from readthedocs.organizations.models import Organization
 from readthedocs.projects.models import Domain, Project
 from readthedocs.subscriptions.constants import TYPE_CNAME
-from readthedocs.subscriptions.models import Plan, PlanFeature, Subscription
+from readthedocs.subscriptions.products import RTDProductFeature
 
 
-@override_settings(RTD_ALLOW_ORGANIZATIONS=False)
+@override_settings(
+    RTD_ALLOW_ORGANIZATIONS=False,
+    RTD_DEFAULT_FEATURES=dict([RTDProductFeature(type=TYPE_CNAME).to_item()]),
+)
 class TestDomainViews(TestCase):
     def setUp(self):
         self.user = get(User, username="user")
@@ -103,17 +106,3 @@ def setUp(self):
         self.org = get(
             Organization, owners=[self.user], projects=[self.project, self.subproject]
         )
-        self.plan = get(
-            Plan,
-            published=True,
-        )
-        self.subscription = get(
-            Subscription,
-            plan=self.plan,
-            organization=self.org,
-        )
-        self.feature = get(
-            PlanFeature,
-            plan=self.plan,
-            feature_type=TYPE_CNAME,
-        )

readthedocs/projects/views/private.py

@@ -84,7 +84,7 @@
     TYPE_PAGEVIEW_ANALYTICS,
     TYPE_SEARCH_ANALYTICS,
 )
-from readthedocs.subscriptions.models import PlanFeature
+from readthedocs.subscriptions.products import get_feature
 
 log = structlog.get_logger(__name__)
 
@@ -769,10 +769,7 @@ def get_context_data(self, **kwargs):
         return context
 
     def _is_enabled(self, project):
-        return PlanFeature.objects.has_feature(
-            project,
-            type=self.feature_type,
-        )
+        return bool(get_feature(project, feature_type=self.feature_type))
 
 
 class DomainList(DomainMixin, ListViewWithForm):
@@ -1080,7 +1077,7 @@ def get(self, request, *args, **kwargs):
     def get_context_data(self, **kwargs):
         context = super().get_context_data(**kwargs)
         project = self.get_project()
-        enabled = self._is_enabled(project)
+        enabled = bool(self._get_feature(project))
         context.update({'enabled': enabled})
         if not enabled:
             return context
@@ -1115,28 +1112,27 @@ def _get_csv_data(self):
         """Generate raw csv data of search queries."""
         project = self.get_project()
         now = timezone.now().date()
-        retention_limit = self._get_retention_days_limit(project)
-        if retention_limit in [None, -1]:
-            # Unlimited.
+        feature = self._get_feature(project)
+        if not feature:
+            raise Http404
+        if feature.unlimited:
             days_ago = project.pub_date.date()
         else:
-            days_ago = now - timezone.timedelta(days=retention_limit)
+            days_ago = now - timezone.timedelta(days=feature.value)
 
         values = [
             ('Created Date', 'created'),
             ('Query', 'query'),
             ('Total Results', 'total_results'),
         ]
-        data = []
-        if self._is_enabled(project):
-            data = (
-                SearchQuery.objects.filter(
-                    project=project,
-                    created__date__gte=days_ago,
-                )
-                .order_by('-created')
-                .values_list(*[value for _, value in values])
+        data = (
+            SearchQuery.objects.filter(
+                project=project,
+                created__date__gte=days_ago,
             )
+            .order_by("-created")
+            .values_list(*[value for _, value in values])
+        )
 
         filename = 'readthedocs_search_analytics_{project_slug}_{start}_{end}.csv'.format(
             project_slug=project.slug,
@@ -1151,19 +1147,8 @@ def _get_csv_data(self):
         csv_data.insert(0, [header for header, _ in values])
         return get_csv_file(filename=filename, csv_data=csv_data)
 
-    def _get_retention_days_limit(self, project):
-        """From how many days we need to show data for this project?"""
-        return PlanFeature.objects.get_feature_value(
-            project,
-            type=self.feature_type,
-        )
-
-    def _is_enabled(self, project):
-        """Should we show search analytics for this project?"""
-        return PlanFeature.objects.has_feature(
-            project,
-            type=self.feature_type,
-        )
+    def _get_feature(self, project):
+        return get_feature(project, feature_type=self.feature_type)
 
 
 class TrafficAnalyticsView(ProjectAdminMixin, PrivateViewMixin, TemplateView):
@@ -1181,7 +1166,7 @@ def get(self, request, *args, **kwargs):
     def get_context_data(self, **kwargs):
         context = super().get_context_data(**kwargs)
         project = self.get_project()
-        enabled = self._is_enabled(project)
+        enabled = bool(self._get_feature(project))
         context.update({'enabled': enabled})
         if not enabled:
             return context
@@ -1217,30 +1202,29 @@ def get_context_data(self, **kwargs):
     def _get_csv_data(self):
         project = self.get_project()
         now = timezone.now().date()
-        retention_limit = self._get_retention_days_limit(project)
-        if retention_limit in [None, -1]:
-            # Unlimited.
+        feature = self._get_feature(project)
+        if not feature:
+            raise Http404
+        if feature.unlimited:
             days_ago = project.pub_date.date()
         else:
-            days_ago = now - timezone.timedelta(days=retention_limit)
+            days_ago = now - timezone.timedelta(days=feature.value)
 
         values = [
             ('Date', 'date'),
             ('Version', 'version__slug'),
             ('Path', 'path'),
             ('Views', 'view_count'),
         ]
-        data = []
-        if self._is_enabled(project):
-            data = (
-                PageView.objects.filter(
-                    project=project,
-                    date__gte=days_ago,
-                    status=200,
-                )
-                .order_by('-date')
-                .values_list(*[value for _, value in values])
+        data = (
+            PageView.objects.filter(
+                project=project,
+                date__gte=days_ago,
+                status=200,
             )
+            .order_by("-date")
+            .values_list(*[value for _, value in values])
+        )
 
         filename = 'readthedocs_traffic_analytics_{project_slug}_{start}_{end}.csv'.format(
             project_slug=project.slug,
@@ -1254,16 +1238,5 @@ def _get_csv_data(self):
         csv_data.insert(0, [header for header, _ in values])
         return get_csv_file(filename=filename, csv_data=csv_data)
 
-    def _get_retention_days_limit(self, project):
-        """From how many days we need to show data for this project?"""
-        return PlanFeature.objects.get_feature_value(
-            project,
-            type=self.feature_type,
-        )
-
-    def _is_enabled(self, project):
-        """Should we show traffic analytics for this project?"""
-        return PlanFeature.objects.has_feature(
-            project,
-            type=self.feature_type,
-        )
+    def _get_feature(self, project):
+        return get_feature(project, feature_type=self.feature_type)