transaction model done,

mobile num added to account,

Author: Srinath Menon

project_template/accounts/migrations/0003_auto_20161117_0243.py

@@ -0,0 +1,38 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.6 on 2016-11-16 21:13
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+import django.utils.timezone
+import phonenumber_field.modelfields
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('accounts', '0002_bankaccount_grid'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='bankaccount',
+            name='balance',
+            field=models.DecimalField(decimal_places=2, default=0, max_digits=20),
+        ),
+        migrations.AddField(
+            model_name='bankaccount',
+            name='created_at',
+            field=models.DateTimeField(default=django.utils.timezone.now),
+        ),
+        migrations.AddField(
+            model_name='bankaccount',
+            name='mobile_num',
+            field=phonenumber_field.modelfields.PhoneNumberField(default='+919503668116', max_length=128),
+            preserve_default=False,
+        ),
+        migrations.AddField(
+            model_name='bankaccount',
+            name='updated_at',
+            field=models.DateTimeField(default=django.utils.timezone.now),
+        ),
+    ]

project_template/accounts/models.py

@@ -7,50 +7,41 @@
 
 
 from django.db.models import Max
+from django.utils import timezone
 
 import string
 import random
 
 from django.contrib.auth.models import User
 from django.db.models import signals
 import json
+
+from phonenumber_field.modelfields import PhoneNumberField
+
+from project_template.settings import BANK_ACCOUNT_NUMBER_SEED
 from .tasks import create_pdf
 # Create your models here.
 
 
 class BankAccount(models.Model):
   user = models.ForeignKey(User)
   number = models.CharField(max_length=12, unique=True)
+  mobile_num = PhoneNumberField()
+  balance = models.DecimalField(max_digits=20, decimal_places=2, default=0)
   password3d = models.CharField(max_length=128)
   grid = JSONField()
   cvv = models.CharField(max_length=3)
 
+  created_at = models.DateTimeField(default=timezone.now)
+  updated_at = models.DateTimeField(default=timezone.now)
+
   def save(self, force_insert=False, force_update=False, using=None,
-             update_fields=None):
+           update_fields=None):
     if self.pk is None:
-      #Account Number generation
-      prev_acc_num = BankAccount.objects.aggregate(max=Max('number'))['max']
-      if prev_acc_num == '':
-        prev_acc_num = 0
-      self.number = str(int(prev_acc_num) + 1).zfill(12)
-
-      #3dpassword generation
-      self._raw_password3d = ''.join(random.choice(string.digits) for _ in range(6))
-      self.set_password3d(self._raw_password3d)
-
-      #CVV Generation
-      self.cvv = ''.join(random.choice(string.digits) for _ in range(3))
-
-      #grid generation
-      key = 'A'
-      self._raw_grid = {}
-      self.grid = {}
-
-      for i in range(16):
-        rnd = ''.join(random.choice(string.digits) for _ in range(2))
-        self._raw_grid[key] = rnd
-        self.grid[key] = make_password(rnd)
-        key = chr(ord(key) + 1)
+      self.initialize_account()
+
+    # Update timestamp
+    self.updated_at = timezone.now()
 
     return super(BankAccount, self).save(
       force_insert=force_insert,
@@ -59,6 +50,31 @@ def save(self, force_insert=False, force_update=False, using=None,
       update_fields=update_fields
     )
 
+  def initialize_account(self):
+    # Account Number generation
+    prev_acc_num = BankAccount.objects.aggregate(max=Max('number'))['max']
+    if prev_acc_num == '':
+      prev_acc_num = BANK_ACCOUNT_NUMBER_SEED
+    self.number = str(int(prev_acc_num) + 1).zfill(12)
+
+    # 3dpassword generation
+    self._raw_password3d = ''.join(random.choice(string.digits) for _ in range(6))
+    self.set_password3d(self._raw_password3d)
+
+    # CVV Generation
+    self.cvv = ''.join(random.choice(string.digits) for _ in range(3))
+
+    # grid generation
+    key = 'A'
+    self._raw_grid = {}
+    self.grid = {}
+
+    for i in range(16):
+      rnd = ''.join(random.choice(string.digits) for _ in range(2))
+      self._raw_grid[key] = rnd
+      self.grid[key] = make_password(rnd)
+      key = chr(ord(key) + 1)
+
   def set_password3d(self, raw_password):
     self.password3d = make_password(raw_password)
 
@@ -80,9 +96,9 @@ def get_raw_grid(self):
 
 
 def create_bank_account(sender, instance, created, **kwargs):
-    if created:
-      acc = BankAccount(user=instance)
-      acc.save()
-      create_pdf(acc)
+  if created:
+    acc = BankAccount(user=instance)
+    acc.save()
+    create_pdf(acc)
 
 signals.post_save.connect(create_bank_account, sender=User)

project_template/project_template/settings.py

@@ -44,9 +44,11 @@
 
   # custom apps
   'accounts',
+  'transactions',
 
   # 3rd party apps
   'djcelery',
+  'phonenumber_field',
 
   'rest_framework',
   'rest_framework.authtoken',
@@ -186,3 +188,6 @@
 ACCOUNT_USERNAME_REQUIRED = False
 
 SITE_ID = 1
+
+# Custom Variables
+BANK_ACCOUNT_NUMBER_SEED = '500000000000'

project_template/requirements.txt

@@ -1,14 +1,17 @@
 amqp==1.4.9
 anyjson==0.3.3
+Babel==2.3.4
 billiard==3.3.0.23
 celery==3.1.0
 Django==1.9.6
 django-allauth==0.28.0
 django-celery==3.1.17
+django-phonenumber-field==1.1.0
 django-rest-auth==0.8.2
 djangorestframework==3.5.3
 kombu==3.0.37
 oauthlib==2.0.0
+phonenumberslite==7.7.4
 Pillow==3.4.2
 pkg-resources==0.0.0
 psycopg2==2.6.2

project_template/staticfiles/angular-src/myapps/auth/signup/controller.js

@@ -11,13 +11,14 @@
       var vm = this;
 
       vm.email = '';
+      vm.mobile_num = '';
       vm.password1 = '';
       vm.password2 = '';
 
       vm.signUp = signUp;
 
       function signUp() {
-        signUpFactory.signUp(vm.email, vm.password1, vm.password2)
+        signUpFactory.signUp(vm.email, vm.mobile_num, vm.password1, vm.password2)
           .then(function (response) {
 
           });

project_template/staticfiles/angular-src/myapps/auth/signup/services.js

@@ -13,13 +13,14 @@
 
     factory.signUp = signUp;
 
-    function signUp(email, password1, password2) {
+    function signUp(email, mobile_num, password1, password2) {
       var deferred = $q.defer();
       $http({
         url     : '/rest-auth/registration/',
         method  : 'POST',
         data    : {
           'email'     : email,
+          'mobile_num': mobile_num,
           'password1' : password1,
           'password2' : password2
         }

project_template/staticfiles/angular-src/myapps/auth/signup/signup.html

@@ -8,6 +8,10 @@ <h2 class="md-toolbar-tools"><span>Sign up</span></h2>
         <label>Email</label>
         <input ng-model="vm.email" type="email" required>
       </md-input-container>
+      <md-input-container>
+        <label>Mobile Number</label>
+        <input ng-model="vm.mobile_num" type="text" required>
+      </md-input-container>
       <md-input-container>
         <label>Password</label>
         <input name="password1" ng-model="vm.password1" type="password" required>

project_template/transactions/__init__.py

@@ -0,0 +1,3 @@
+from django.contrib import admin
+
+# Register your models here.

project_template/transactions/admin.py

@@ -0,0 +1,7 @@
+from __future__ import unicode_literals
+
+from django.apps import AppConfig
+
+
+class TransactionsConfig(AppConfig):
+    name = 'transactions'

project_template/transactions/apps.py

@@ -0,0 +1,29 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.6 on 2016-11-16 21:13
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+import django.utils.timezone
+
+
+class Migration(migrations.Migration):
+
+    initial = True
+
+    dependencies = [
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='Transaction',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('from_account_number', models.CharField(max_length=12)),
+                ('to_account_number', models.CharField(max_length=12)),
+                ('amount', models.DecimalField(decimal_places=2, max_digits=20)),
+                ('status', models.IntegerField(choices=[(0, 'Initiated'), (1, 'Declined'), (2, 'Aborted'), (3, 'Successful')], default=0)),
+                ('created_at', models.DateTimeField(default=django.utils.timezone.now)),
+                ('updated_at', models.DateTimeField(default=django.utils.timezone.now)),
+            ],
+        ),
+    ]

project_template/transactions/migrations/0001_initial.py

@@ -0,0 +1,72 @@
+from __future__ import unicode_literals
+
+from django.db import models
+
+
+# Create your models here.
+from django.utils import timezone
+
+from accounts.models import BankAccount
+
+TRANSACTION_STATUS = (
+  (0, 'Initiated'),
+  (1, 'Declined'),
+  (2, 'Aborted'),
+  (3, 'Successful'),
+)
+
+
+class Transaction(models.Model):
+  from_account_number = models.CharField(max_length=12)
+  to_account_number = models.CharField(max_length=12)
+  amount = models.DecimalField(max_digits=20, decimal_places=2)
+  status = models.IntegerField(choices=TRANSACTION_STATUS, default=0)
+
+  created_at = models.DateTimeField(default=timezone.now)
+  updated_at = models.DateTimeField(default=timezone.now)
+
+  def save(self, force_insert=False, force_update=False, using=None,
+           update_fields=None):
+
+    # Update timestamp
+    self.updated_at = timezone.now()
+
+    return super(Transaction, self).save(
+      force_insert=force_insert,
+      force_update=force_update,
+      using=using,
+      update_fields=update_fields
+    )
+
+  def abort(self):
+    self.status = 1
+    self.save()
+    return self
+
+  def transfer(self):
+    try:
+      from_acc = BankAccount.objects.get(number=self.from_account_number)
+    except models.Model.DoesNotExist:
+      from_acc = None
+
+    try:
+      to_acc = BankAccount.objects.get(number=self.to_account_number)
+    except models.Model.DoesNotExist:
+      to_acc = None
+
+    if from_acc:
+      if from_acc.balance < self.amount:
+        raise Exception('Insufficient Funds')
+      from_acc.balance = from_acc.balance - self.amount
+      from_acc.save()
+
+    if to_acc:
+      to_acc.balance = to_acc.balance + self.amount
+      to_acc.save()
+
+    self.status = 3
+    self.save()
+    return self
+
+
+

project_template/transactions/migrations/__init__.py

@@ -0,0 +1,3 @@
+from django.test import TestCase
+
+# Create your tests here.

project_template/transactions/models.py

@@ -0,0 +1,3 @@
+from django.shortcuts import render
+
+# Create your views here.