Merge pull request #16 from nnsnodnb/master

PositiveBigIntegerField
nnsnodnb · Jun 29, 2018 · b10c5e3 · b10c5e3
2 parents f0bb994 + ab16370
commit b10c5e3
Show file tree

Hide file tree

Showing 5 changed files with 67 additions and 13 deletions.
diff --git a/Makefile b/Makefile
@@ -8,4 +8,11 @@ publish:
 	@ pip install twine
 	@ twine upload dist/*
 	@ pip uninstall twine -y
-	@ rm -rf ./upload ./dist
+	@ rm -rf ./dist
+
+test_publish:
+	@ python setup.py sdist bdist_wheel
+	@ pip install twine
+	@ twine upload --repository=pypitest dist/*
+	@ pip uninstall twine -y
+	@ rm -rf ./dist
diff --git a/storekit/fields.py b/storekit/fields.py
@@ -0,0 +1,22 @@
+from django.db.models import BigIntegerField
+from django.utils.translation import gettext_lazy as _
+
+
+class PositiveBigIntegerField(BigIntegerField):
+
+    empty_strings_allowed = False
+    description = _('Big (8 byte) positive integer')
+
+    def db_type(self, connection):
+        return 'bigint UNSIGNED'
+
+    def get_internal_type(self):
+        return 'PositiveSmallIntegerField'
+
+    def formfield(self, **kwargs):
+        defaults = {
+            'min_value': 0,
+            'max_value': BigIntegerField.MAX_BIGINT
+        }
+        defaults.update(kwargs)
+        return super(PositiveBigIntegerField, self).formfield(**defaults)
diff --git a/storekit/migrations/0005_auto_20180609_1654.py b/storekit/migrations/0005_auto_20180609_1654.py
@@ -0,0 +1,24 @@
+# Generated by Django 2.0.4 on 2018-06-09 16:54
+
+from django.db import migrations
+import storekit.fields
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('storekit', '0004_auto_20180605_1629'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='inapp',
+            name='original_transaction_id',
+            field=storekit.fields.PositiveBigIntegerField(blank=True),
+        ),
+        migrations.AlterField(
+            model_name='inapp',
+            name='transaction_id',
+            field=storekit.fields.PositiveBigIntegerField(blank=True),
+        ),
+    ]
diff --git a/storekit/models.py b/storekit/models.py
@@ -1,11 +1,12 @@
 from django.db import models
+from .fields import PositiveBigIntegerField
 
 
 class InApp(models.Model):
     quantity = models.IntegerField(blank=True)
     product_id = models.CharField(blank=False, default='', max_length=255)
-    transaction_id = models.IntegerField(blank=True)
-    original_transaction_id = models.IntegerField(blank=True)
+    transaction_id = PositiveBigIntegerField(blank=True)
+    original_transaction_id = PositiveBigIntegerField(blank=True)
     purchase_date = models.CharField(blank=False, default='', max_length=255)
     purchase_date_ms = models.IntegerField(blank=True)
     purchase_date_pst = models.CharField(blank=False, default='', max_length=255)

diff --git a/storekit/tests/response.json b/storekit/tests/response.json
@@ -15,19 +15,19 @@
     "request_date": "2017-12-18 00:00:00 Etc/GMT",
     "request_date_ms": "0000000000000",
     "request_date_pst": "2017-12-16 16:00:00 America/Los_Angeles",
-    "original_purchase_date": "2017-12-12 00:00:00 Etc/GMT",
-    "original_purchase_date_ms": "0000000000000",
-    "original_purchase_date_pst": "2017-12-16 16:00:00 America/Los_Angeles",
+    "original_purchase_date": "2018-05-17 21:49:29 Etc/GMT",
+    "original_purchase_date_ms": 1526593769000,
+    "original_purchase_date_pst": "2018-05-17 14:49:29 America/Los_Angeles",
     "original_application_version": "1.0",
     "in_app": [
       {
         "quantity": "1",
         "product_id": "com.example.test.product_1",
-        "transaction_id": "000000000000000",
-        "original_transaction_id": "000000000000000",
-        "purchase_date": "2017-12-18 00:00:00 Etc/GMT",
-        "purchase_date_ms": "0000000000000",
-        "purchase_date_pst": "2017-12-16 16:00:00 America/Los_Angeles",
+        "transaction_id": 1000000399635972,
+        "original_transaction_id": 1000000399635972,
+        "purchase_date": "2018-05-17 21:49:27 Etc/GMT",
+        "purchase_date_ms": 1526593767000,
+        "purchase_date_pst": "2018-05-17 14:49:27 America/Los_Angeles",
         "original_purchase_date": "2017-12-18 00:00:00 Etc/GMT",
         "original_purchase_date_ms": "0000000000000",
         "original_purchase_date_pst": "2017-12-16 16:00:00 America/Los_Angeles",
@@ -36,8 +36,8 @@
       {
         "quantity": "1",
         "product_id": "com.example.test.product_2",
-        "transaction_id": "000000000000000",
-        "original_transaction_id": "000000000000000",
+        "transaction_id": 1000000399635972,
+        "original_transaction_id": 1000000399635972,
         "purchase_date": "2017-12-19 00:00:00 Etc/GMT",
         "purchase_date_ms": "0000000000000",
         "purchase_date_pst": "2017-12-16 16:00:00 America/Los_Angeles",