Remove session unit credit cost field from Transaction

go/billing/migrations/0022_auto__add_field_transaction_session_unit_credits__add_field_transactio.py → go/billing/migrations/0022_auto__add_field_transaction_session_length_cost__add_field_transaction.py

@@ -8,11 +8,6 @@
 class Migration(SchemaMigration):
 
     def forwards(self, orm):
-        # Adding field 'Transaction.session_unit_credits'
-        db.add_column(u'billing_transaction', 'session_unit_credits',
-                      self.gf('django.db.models.fields.DecimalField')(default='0.0', null=True, max_digits=20, decimal_places=6),
-                      keep_default=False)
-
         # Adding field 'Transaction.session_length_cost'
         db.add_column(u'billing_transaction', 'session_length_cost',
                       self.gf('django.db.models.fields.DecimalField')(default='0.0', null=True, max_digits=10, decimal_places=3),
@@ -25,9 +20,6 @@ def forwards(self, orm):
 
 
     def backwards(self, orm):
-        # Deleting field 'Transaction.session_unit_credits'
-        db.delete_column(u'billing_transaction', 'session_unit_credits')
-
         # Deleting field 'Transaction.session_length_cost'
         db.delete_column(u'billing_transaction', 'session_length_cost')
 
@@ -146,7 +138,6 @@ def backwards(self, orm):
             'session_length_cost': ('django.db.models.fields.DecimalField', [], {'default': "'0.0'", 'null': 'True', 'max_digits': '10', 'decimal_places': '3'}),
             'session_length_credits': ('django.db.models.fields.DecimalField', [], {'default': "'0.0'", 'null': 'True', 'max_digits': '20', 'decimal_places': '6'}),
             'session_unit_cost': ('django.db.models.fields.DecimalField', [], {'default': "'0.0'", 'null': 'True', 'max_digits': '10', 'decimal_places': '3'}),
-            'session_unit_credits': ('django.db.models.fields.DecimalField', [], {'default': "'0.0'", 'null': 'True', 'max_digits': '20', 'decimal_places': '6'}),
             'session_unit_time': ('django.db.models.fields.DecimalField', [], {'default': "'0.0'", 'null': 'True', 'max_digits': '10', 'decimal_places': '3'}),
             'status': ('django.db.models.fields.CharField', [], {'default': "'Pending'", 'max_length': '20'}),
             'storage_cost': ('django.db.models.fields.DecimalField', [], {'default': "'0.0'", 'null': 'True', 'max_digits': '10', 'decimal_places': '3'}),

go/billing/models.py

@@ -240,12 +240,6 @@ def session_credit_cost(self):
         return self.calculate_session_credit_cost(
             self.session_cost, self.markup_percent)
 
-    @property
-    def session_unit_credit_cost(self):
-        """Return the calculated cost per unit of session time (in credits)."""
-        return self.calculate_session_unit_credit_cost(
-            self.session_unit_cost, self.markup_percent)
-
     def __unicode__(self):
         return u"%s (%s)" % (self.tag_pool, self.message_direction)
 
@@ -345,10 +339,6 @@ class Transaction(models.Model):
         null=True, max_digits=20, decimal_places=6, default=Decimal('0.0'),
         help_text=_("The session cost (in credits)."))
 
-    session_unit_credits = models.DecimalField(
-        null=True, max_digits=20, decimal_places=6, default=Decimal('0.0'),
-        help_text=_("The session unit cost (in credits)"))
-
     session_length_credits = models.DecimalField(
         null=True, max_digits=20, decimal_places=6, default=Decimal('0.0'),
         help_text=_("The session length cost (in credits)"))

go/billing/tests/helpers.py

@@ -90,8 +90,6 @@ def mk_transaction(account, tag_pool_name='pool1',
         message_credits=get_message_credits(message_cost, markup_percent),
         storage_credits=get_storage_credits(storage_cost, markup_percent),
         session_credits=get_session_credits(session_cost, markup_percent),
-        session_unit_credits=get_session_unit_credits(
-            session_unit_cost, markup_percent),
         session_length_credits=get_session_length_credits(
             session_length_cost, markup_percent),
         session_length=maybe_decimal(session_length),
@@ -169,14 +167,6 @@ def get_storage_credits(cost, markup):
             maybe_decimal(markup))
 
 
-def get_session_unit_credits(cost, markup):
-    if cost is None or markup is None:
-        return None
-    else:
-        return MessageCost.calculate_session_unit_credit_cost(
-            maybe_decimal(cost), maybe_decimal(markup))
-
-
 def get_session_length_credits(cost, markup):
     if cost is None or markup is None:
         return None

go/billing/tests/test_django_utils.py

@@ -7,7 +7,7 @@
 from go.billing.models import Account, Transaction
 from go.billing.tests.helpers import (
     mk_transaction, get_message_credits, get_storage_credits,
-    get_session_credits, get_session_unit_credits, get_session_length_credits)
+    get_session_credits, get_session_length_credits)
 
 from go.billing.django_utils import TransactionSerializer, load_account_credits
 
@@ -42,8 +42,6 @@ def test_to_json(self):
                 u'session_unit_cost': 10.0,
                 u'session_unit_time': 20.0,
                 u'session_length_cost': 10.0,
-                u'session_unit_credits':
-                    float(get_session_unit_credits(10, 10)),
                 u'session_length_credits':
                     float(get_session_length_credits(10, 10)),
                 u"message_credits": float(get_message_credits(100.0, 10.0)),

go/billing/tests/test_helpers.py

@@ -9,8 +9,7 @@
     get_billing_account, mk_tagpool, mk_message_cost, mk_transaction,
     mk_statement, get_session_length_cost,
     get_message_credits, get_session_credits,
-    get_storage_credits, get_session_unit_credits,
-    get_session_length_credits, get_line_items)
+    get_storage_credits, get_session_length_credits, get_line_items)
 
 
 class TestHelpers(GoDjangoTestCase):
@@ -131,7 +130,6 @@ def test_mk_transaction(self):
             message_credits=get_message_credits(0.1, 10.0),
             storage_credits=get_storage_credits(0.2, 10.0),
             session_credits=get_session_credits(0.3, 10.0),
-            session_unit_credits=get_session_unit_credits(0.4, 10.0),
             session_length_credits=get_session_length_credits(0.4, 10.0),
             markup_percent=Decimal('10.0'),
             credit_factor=Decimal('11.0'),
@@ -239,19 +237,6 @@ def test_get_session_credits_none_cost(self):
     def test_get_session_credits_none_markup(self):
         self.assertEqual(get_session_credits(None, 10.0), None)
 
-    def test_get_session_unit_credits(self):
-        self.assertEqual(
-            get_session_unit_credits(0.1, 10.0),
-            MessageCost.calculate_session_unit_credit_cost(
-                Decimal('0.1'),
-                Decimal('10.0')))
-
-    def test_get_session_unit_credits_none_cost(self):
-        self.assertEqual(get_session_unit_credits(0.1, None), None)
-
-    def test_get_session_unit_credits_none_markup(self):
-        self.assertEqual(get_session_unit_credits(None, 10.0), None)
-
     def test_get_session_length_credits(self):
         self.assertEqual(
             get_session_length_credits(0.1, 10.0),