remove MKT_CUT (bug 825245)

Andy McKay · Andy McKay · commit e1f0bf725f0f · 2013-01-18T12:21:40.000-08:00
diff --git a/apps/constants/base.py b/apps/constants/base.py
@@ -467,9 +467,6 @@
     REVIEWED_REVIEW: 1,
 }
 
-# Percentage of what developers earn after Marketplace's cut.
-MKT_CUT = .70
-
 # Login credential source. We'll also include the site source in that.
 # All the old existing AMO users and anyone before we started tracking this.
 LOGIN_SOURCE_UNKNOWN = 0
diff --git a/mkt/__init__.py b/mkt/__init__.py
@@ -1,4 +1,2 @@
 from mkt.constants import platforms, ratingsbodies, regions
 from mkt.constants.submit import *
-
-MKT_CUT = .70
diff --git a/mkt/stats/search.py b/mkt/stats/search.py
@@ -6,7 +6,6 @@
 
 import amo
 from amo.utils import create_es_index_if_missing
-from mkt import MKT_CUT
 from mkt.inapp_pay.models import InappPayment
 from mkt.webapps.models import Installed
 from stats.models import Contribution
@@ -31,7 +30,7 @@ def get_finance_total(qs, addon, field=None, **kwargs):
     document = {
         'addon': addon,
         'count': sales[0]['sales'] if sales.count() else 0,
-        'revenue': cut(revenue[0]['revenue'] if revenue.count() else 0),
+        'revenue': revenue[0]['revenue'] if revenue.count() else 0,
         'refunds': refunds[0]['refunds'] if refunds.count() else 0,
     }
     if field:
@@ -43,7 +42,7 @@ def get_finance_total(qs, addon, field=None, **kwargs):
         # Non-USD-normalized revenue, calculated from currency's amount rather
         # than price tier.
         if field == 'currency':
-            document['revenue_non_normalized'] = cut(qs.values('addon')
+            document['revenue_non_normalized'] = (qs.values('addon')
                 .filter(q, refund=None, **kwargs)
                 .annotate(revenue=Sum('amount'))
                 [0]['revenue'] if revenue.count() else 0)
@@ -73,7 +72,7 @@ def get_finance_total_inapp(qs, addon, inapp_name='', field=None, **kwargs):
         'addon': addon,
         'inapp': inapp_name,
         'count': sales[0]['sales'] if sales.count() else 0,
-        'revenue': cut(revenue[0]['revenue'] if revenue.count() else 0),
+        'revenue': revenue[0]['revenue'] if revenue.count() else 0,
         'refunds': refunds[0]['refunds'] if refunds.count() else 0,
     }
     if field:
@@ -111,15 +110,15 @@ def get_finance_daily(contribution):
             created__month=date.month,
             created__day=date.day).count() or 0,
         # TODO: non-USD-normalized revenue (daily_by_currency)?
-        'revenue': cut(Contribution.objects.filter(
+        'revenue': Contribution.objects.filter(
             addon__id=addon_id,
             refund=None,
             type=amo.CONTRIB_PURCHASE,
             created__year=date.year,
             created__month=date.month,
             created__day=date.day)
             .aggregate(revenue=Sum('price_tier__price'))['revenue']
-            or 0),
+            or 0,
         'refunds': Contribution.objects.filter(
             addon__id=addon_id,
             refund__isnull=False,
@@ -149,15 +148,15 @@ def get_finance_daily_inapp(payment):
             created__month=date.month,
             created__day=date.day).count() or 0,
         # TODO: non-USD-normalized revenue (daily_inapp_by_currency)?
-        'revenue': cut(InappPayment.objects.filter(
+        'revenue': InappPayment.objects.filter(
             config__addon__id=addon_id,
             contribution__refund=None,
             contribution__type=amo.CONTRIB_PURCHASE,
             created__year=date.year,
             created__month=date.month,
             created__day=date.day)
             .aggregate(rev=Sum('contribution__price_tier__price'))['rev']
-            or 0),
+            or 0,
         'refunds': InappPayment.objects.filter(
             contribution__addon__id=addon_id,
             contribution__refund__isnull=False,
@@ -216,14 +215,6 @@ def setup_mkt_indexes(index=None, aliased=True):
         es.put_mapping(model._meta.db_table, mapping, index)
 
 
-def cut(revenue):
-    """
-    Takes away Marketplace's cut from developers' revenue.
-    """
-    return Decimal(str(round(Decimal(str(revenue)) *
-                   Decimal(str(MKT_CUT)), 2)))
-
-
 def handle_kwargs(q, field, kwargs, join_field=None):
     """
     Processes kwargs to combine '' and None values and make it ready for
diff --git a/mkt/stats/tests/test_views.py b/mkt/stats/tests/test_views.py
@@ -1,13 +1,11 @@
 import csv
 import datetime
+from decimal import Decimal
 import json
 import random
 
-from django.contrib.auth.models import AnonymousUser
-
 from nose.tools import eq_
 from test_utils import RequestFactory
-import waffle
 
 from access.models import Group, GroupUser
 import amo
@@ -20,7 +18,6 @@
 from mkt.webapps.models import Installed
 from mkt.site.fixtures import fixture
 from mkt.stats import search, tasks, views
-from mkt.stats.search import cut
 from mkt.stats.views import (FINANCE_SERIES, get_series_column,
                              get_series_line, pad_missing_stats)
 from stats.models import Contribution
@@ -335,7 +332,7 @@ def test_revenue(self):
                                      date__range=d_range))
 
         for stat, day in zip(stats, sorted(self.expected_days, reverse=True)):
-            expected_revenue = day * .99 * amo.MKT_CUT
+            expected_revenue = day * .99
             eq_(round(stat['count'], 2), round(expected_revenue, 2))
 
 
@@ -364,7 +361,7 @@ def setUp(self):
                                             amount=random.randint(0, 10),
                                             currency=expected['currency'],
                                             price_tier=price_tier)
-                expected['count'] += cut(price_tier.price)
+                expected['count'] += Decimal(price_tier.price)
             expected['count'] = int(expected['count'])
         tasks.index_finance_total_by_currency([self.app.pk])
         self.refresh(timesleep=1)

Original file line number	Diff line number	Diff line change
`@@ -467,9 +467,6 @@`
`467`	`467`	`REVIEWED_REVIEW: 1,`
`468`	`468`	`}`
`469`	`469`
`470`		`-# Percentage of what developers earn after Marketplace's cut.`
`471`		`-MKT_CUT = .70`
`472`		`-`
`473`	`470`	`# Login credential source. We'll also include the site source in that.`
`474`	`471`	`# All the old existing AMO users and anyone before we started tracking this.`
`475`	`472`	`LOGIN_SOURCE_UNKNOWN = 0`