From 07ce12ad252639c56b3b1d25c730431e4da9721c Mon Sep 17 00:00:00 2001
From: Jon Carlo Bibat <jonbibat@gmail.com>
Date: Tue, 12 Feb 2019 16:47:28 -0800
Subject: [PATCH 1/5] Update Pipfile

---
 web_server/Pipfile | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/web_server/Pipfile b/web_server/Pipfile
index e8697e4..f0b28f9 100644
--- a/web_server/Pipfile
+++ b/web_server/Pipfile
@@ -9,6 +9,3 @@ verify_ssl = true
 django = "*"
 python-dotenv = "*"
 pygithub = "*"
-
-[requires]
-python_version = "3.5"

From bbe9f00a497e3e5a64816ad68605b913a94232e0 Mon Sep 17 00:00:00 2001
From: Jon Carlo Bibat <jonbibat@gmail.com>
Date: Tue, 12 Feb 2019 16:48:41 -0800
Subject: [PATCH 2/5] Update Pipfile

---
 web_server/Pipfile | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/web_server/Pipfile b/web_server/Pipfile
index f0b28f9..fa3f6ab 100644
--- a/web_server/Pipfile
+++ b/web_server/Pipfile
@@ -9,3 +9,5 @@ verify_ssl = true
 django = "*"
 python-dotenv = "*"
 pygithub = "*"
+
+[requires]

From 6b3735f0ac807fdc70e7414ad02eaf3885581610 Mon Sep 17 00:00:00 2001
From: jcbibat <33525534+jcbibat@users.noreply.github.com>
Date: Tue, 12 Feb 2019 17:30:58 -0800
Subject: [PATCH 3/5] Added a new Transaction model

---
 web_server/Pipfile.lock                     | 15 ++++++---------
 web_server/web_server/models/Transaction.py |  6 ++++++
 web_server/web_server/models/__init__.py    |  1 +
 3 files changed, 13 insertions(+), 9 deletions(-)
 create mode 100644 web_server/web_server/models/Transaction.py

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/Transaction.py b/web_server/web_server/models/Transaction.py
new file mode 100644
index 0000000..5505b72
--- /dev/null
+++ b/web_server/web_server/models/Transaction.py
@@ -0,0 +1,6 @@
+from django.db import models
+
+class Transaction(models.Model):
+    id = models.IntegerField(primary_key = True)
+    User = models.CharField(max_length = 30)
+    timestamp = models.DateField()
diff --git a/web_server/web_server/models/__init__.py b/web_server/web_server/models/__init__.py
index 50c9444..1519117 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

From 5c765af333f92c05e78ccae499798b3aac3a1112 Mon Sep 17 00:00:00 2001
From: jcbibat <33525534+jcbibat@users.noreply.github.com>
Date: Tue, 12 Feb 2019 17:51:53 -0800
Subject: [PATCH 4/5] Changed IntegerField to IntFIeld in Transaction.py

---
 web_server/web_server/models/Transaction.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web_server/web_server/models/Transaction.py b/web_server/web_server/models/Transaction.py
index 5505b72..bbf193a 100644
--- a/web_server/web_server/models/Transaction.py
+++ b/web_server/web_server/models/Transaction.py
@@ -1,6 +1,6 @@
 from django.db import models
 
 class Transaction(models.Model):
-    id = models.IntegerField(primary_key = True)
+    id = models.IntField(primary_key = True)
     User = models.CharField(max_length = 30)
     timestamp = models.DateField()

From d2848124090b5fba6c5fb2e3291b0320bf909eb8 Mon Sep 17 00:00:00 2001
From: jcbibat <33525534+jcbibat@users.noreply.github.com>
Date: Tue, 12 Feb 2019 17:55:24 -0800
Subject: [PATCH 5/5] Changed IntField back to IntegerField in Transaction.py

---
 web_server/web_server/models/Transaction.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/web_server/web_server/models/Transaction.py b/web_server/web_server/models/Transaction.py
index bbf193a..5505b72 100644
--- a/web_server/web_server/models/Transaction.py
+++ b/web_server/web_server/models/Transaction.py
@@ -1,6 +1,6 @@
 from django.db import models
 
 class Transaction(models.Model):
-    id = models.IntField(primary_key = True)
+    id = models.IntegerField(primary_key = True)
     User = models.CharField(max_length = 30)
     timestamp = models.DateField()