From 35e72e5b96af9cdff20e279817252bfce91fbf27 Mon Sep 17 00:00:00 2001 From: cpbenite Date: Tue, 12 Feb 2019 17:26:11 -0800 Subject: [PATCH 1/4] Added a new Transaction model --- web_server/Pipfile | 1 - web_server/Pipfile.lock | 15 ++++++--------- web_server/web_server/models/__init__.py | 1 + web_server/web_server/models/transaction.py | 7 +++++++ 4 files changed, 14 insertions(+), 10 deletions(-) create mode 100644 web_server/web_server/models/transaction.py diff --git a/web_server/Pipfile b/web_server/Pipfile index e8697e4..fa3f6ab 100644 --- a/web_server/Pipfile +++ b/web_server/Pipfile @@ -11,4 +11,3 @@ python-dotenv = "*" pygithub = "*" [requires] -python_version = "3.5" diff --git a/web_server/Pipfile.lock b/web_server/Pipfile.lock index d5d9c87..870a62e 100644 --- a/web_server/Pipfile.lock +++ b/web_server/Pipfile.lock @@ -1,12 +1,10 @@ { "_meta": { "hash": { - "sha256": "8925bc1d2138d78a31072ec3743d1d29c174968f82cd4ce86c686ff233ff0789" + "sha256": "47c6eee846a7988a67c2ba03c6fb9d7310e2d488a45e8af47746ac6c2c38ac0f" }, "pipfile-spec": 6, - "requires": { - "python_version": "3.5" - }, + "requires": {}, "sources": [ { "name": "pypi", @@ -39,11 +37,11 @@ }, "django": { "hashes": [ - "sha256:a32c22af23634e1d11425574dce756098e015a165be02e4690179889b207c7a8", - "sha256:d6393918da830530a9516bbbcbf7f1214c3d733738779f06b0f649f49cc698c3" + "sha256:275bec66fd2588dd517ada59b8bfb23d4a9abc5a362349139ddda3c7ff6f5ade", + "sha256:939652e9d34d7d53d74d5d8ef82a19e5f8bb2de75618f7e5360691b6e9667963" ], "index": "pypi", - "version": "==2.1.5" + "version": "==2.1.7" }, "idna": { "hashes": [ @@ -97,8 +95,7 @@ }, "wrapt": { "hashes": [ - "sha256:4aea003270831cceb8a90ff27c4031da6ead7ec1886023b80ce0dfe0adf61533", - "sha256:bd2751cd97c62c1d34ced93534512e610d469254efccc09c6f4c7e872951c39d" + "sha256:4aea003270831cceb8a90ff27c4031da6ead7ec1886023b80ce0dfe0adf61533" ], "version": "==1.11.1" } diff --git a/web_server/web_server/models/__init__.py b/web_server/web_server/models/__init__.py index 50c9444..d526eed 100644 --- a/web_server/web_server/models/__init__.py +++ b/web_server/web_server/models/__init__.py @@ -1,2 +1,3 @@ from .Doggo import Doggo from .Owner import Owner +from .transaction import transaction diff --git a/web_server/web_server/models/transaction.py b/web_server/web_server/models/transaction.py new file mode 100644 index 0000000..016033a --- /dev/null +++ b/web_server/web_server/models/transaction.py @@ -0,0 +1,7 @@ +from django.db import models + +class transaction(models.Model): + # do stuff + user_id = models.IntegerField() + user = models.IntegerField() + timestamp = models.DateField() From 7ddbc829e139c108939e74e59056194332882d83 Mon Sep 17 00:00:00 2001 From: cpbenite Date: Tue, 19 Feb 2019 16:29:56 -0800 Subject: [PATCH 2/4] added transaction model test --- web_server/web_server/models/transaction.py | 1 + .../tests/test_model_transaction.py | 21 +++++++++++++++++++ 2 files changed, 22 insertions(+) create mode 100644 web_server/web_server/tests/test_model_transaction.py diff --git a/web_server/web_server/models/transaction.py b/web_server/web_server/models/transaction.py index 016033a..b223663 100644 --- a/web_server/web_server/models/transaction.py +++ b/web_server/web_server/models/transaction.py @@ -5,3 +5,4 @@ class transaction(models.Model): user_id = models.IntegerField() user = models.IntegerField() timestamp = models.DateField() + # test diff --git a/web_server/web_server/tests/test_model_transaction.py b/web_server/web_server/tests/test_model_transaction.py new file mode 100644 index 0000000..05b74e5 --- /dev/null +++ b/web_server/web_server/tests/test_model_transaction.py @@ -0,0 +1,21 @@ +from django.test import TestCase +from web_server.models import transaction +import datetime + +class TransactionTest(TestCase): + + def create_transaction(self, user_id=12345678, user=1, timestamp=datetime.date.today): + return transaction.objects.create(user_id=user_id, user=user, timestamp=timestamp) + + def test_transaction_creation(self): + o1 = self.create_transaction() + o2 = self.create_transaction(user_id=10000000, user=2, timestamp=datetime.date.today) + + self.assertEqual(12345678, o1.user_id) + self.assertEqual(10000000, o2.user_id) + + self.assertEqual(1, o1.user) + self.assertEqual(2, o2.user) + + self.assertEqual(datetime.date.today, o1.timestamp) + self.assertEqual(datetime.date.today, o2.timestamp) From 7ca8db33977934eede36ba6c19ffd5f401a24af7 Mon Sep 17 00:00:00 2001 From: cpbenite Date: Tue, 19 Feb 2019 17:03:11 -0800 Subject: [PATCH 3/4] Updated Date field --- web_server/web_server/models/transaction.py | 3 ++- .../web_server/tests/test_model_transaction.py | 14 ++++++++------ 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/web_server/web_server/models/transaction.py b/web_server/web_server/models/transaction.py index b223663..e916283 100644 --- a/web_server/web_server/models/transaction.py +++ b/web_server/web_server/models/transaction.py @@ -1,8 +1,9 @@ from django.db import models +from django.utils import timezone class transaction(models.Model): # do stuff user_id = models.IntegerField() user = models.IntegerField() - timestamp = models.DateField() + timestamp = models.DateField(default=timezone.now()) # test diff --git a/web_server/web_server/tests/test_model_transaction.py b/web_server/web_server/tests/test_model_transaction.py index 05b74e5..dad9f29 100644 --- a/web_server/web_server/tests/test_model_transaction.py +++ b/web_server/web_server/tests/test_model_transaction.py @@ -1,15 +1,17 @@ from django.test import TestCase from web_server.models import transaction -import datetime +#import datetime +from django.utils import timezone class TransactionTest(TestCase): + x = timezone.now() - def create_transaction(self, user_id=12345678, user=1, timestamp=datetime.date.today): + def create_transaction(self, user_id=12345678, user=1, timestamp=x): return transaction.objects.create(user_id=user_id, user=user, timestamp=timestamp) - def test_transaction_creation(self): + def test_transaction_creation(self, x=x): o1 = self.create_transaction() - o2 = self.create_transaction(user_id=10000000, user=2, timestamp=datetime.date.today) + o2 = self.create_transaction(user_id=10000000, user=2) self.assertEqual(12345678, o1.user_id) self.assertEqual(10000000, o2.user_id) @@ -17,5 +19,5 @@ def test_transaction_creation(self): self.assertEqual(1, o1.user) self.assertEqual(2, o2.user) - self.assertEqual(datetime.date.today, o1.timestamp) - self.assertEqual(datetime.date.today, o2.timestamp) + self.assertEqual(x, o1.timestamp) + self.assertEqual(x, o2.timestamp) From 0648b3c664369d31cd7406f4dd01a448803ffd0a Mon Sep 17 00:00:00 2001 From: cpbenite Date: Tue, 19 Feb 2019 17:10:43 -0800 Subject: [PATCH 4/4] Updated --- web_server/web_server/tests/test_model_transaction.py | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/web_server/web_server/tests/test_model_transaction.py b/web_server/web_server/tests/test_model_transaction.py index dad9f29..1a9ffb7 100644 --- a/web_server/web_server/tests/test_model_transaction.py +++ b/web_server/web_server/tests/test_model_transaction.py @@ -4,12 +4,11 @@ from django.utils import timezone class TransactionTest(TestCase): - x = timezone.now() - def create_transaction(self, user_id=12345678, user=1, timestamp=x): - return transaction.objects.create(user_id=user_id, user=user, timestamp=timestamp) + def create_transaction(self, user_id=12345678, user=1): + return transaction.objects.create(user_id=user_id, user=user) - def test_transaction_creation(self, x=x): + def test_transaction_creation(self): o1 = self.create_transaction() o2 = self.create_transaction(user_id=10000000, user=2) @@ -18,6 +17,3 @@ def test_transaction_creation(self, x=x): self.assertEqual(1, o1.user) self.assertEqual(2, o2.user) - - self.assertEqual(x, o1.timestamp) - self.assertEqual(x, o2.timestamp)