Merge pull request #9 from saadmk11/v2.0

Adding new version

Author: saadmk11

.gitignore

@@ -4,11 +4,19 @@ bin/
 include/
 pip-selfcheck.json
 
-db.sqlite3
+course_import.py
 .idea/
+dist/
+.vscode/
+db.json
+htmlcov/
 media/
-celerybeat-schedule.db
+db.sqlite3
+staticfiles/
+.env
+.coverage
 celerybeat.pid
+celerybeat-schedule
 
 # Byte-compiled / optimized / DLL files
 __pycache__/
@@ -23,7 +31,6 @@ __pycache__/
 env/
 build/
 develop-eggs/
-dist/
 downloads/
 eggs/
 .eggs/

README.md

@@ -1,33 +1,37 @@
-# Online Banking System
+# Online Banking System V2.0
 
 This is a Online Banking Concept created using Django Web Framework.
 
 ## Features
 
 * Create Bank Account.
-* Load account Details Using Account Number & password.
-* Deposit & Withdraw Money.
-* Transaction Detail Page.
-* Count Monthly Interest Using Celery.
+* Deposit & Withdraw Money
+* Bank Account Type Support
+* Interest calculation depending on the Account type
+* Transaction report with a date range filter and balance after every transaction
+* Count Monthly Interest Using Celery
+* More efficient and accurate interest calculation and balance update
+* Ability to add Minimum and Maximum Transaction amount restriction
+* Modern UI with Tailwind CSS
+
 
 ## Prerequisites
 
 Be sure you have the following installed on your development machine:
 
-+ Python >= 3.6.3
++ Python >= 3.7
 + Redis Server
-+ Git 
++ Git
 + pip
 + Virtualenv (virtualenvwrapper is recommended)
 
 ## Requirements
 
-+ celery==4.1.0
-+ Django==1.11.20
-+ django-celery-beat==1.0.1
-+ django-crispy-forms==1.6.1
-+ Pillow==4.2.1
-+ redis==2.10.6
++ celery==4.4.7
++ Django==3.1
++ django-celery-beat==2.0.0
++ python-dateutil==2.8.1
++ redis==3.5.3
 
 ## Install Redis Server
 
@@ -84,14 +88,12 @@ python manage.py createsuperuser
 Run Celery
 (Different Terminal Window with Virtual Environment Activated)
 ```bash
-celery -A bankingsystem worker -l info
+celery -A banking_system worker -l info
 
-celery -A bankingsystem beat -l info
+celery -A banking_system beat -l info
 ```
 
 ## Images:
-![alt text](https://i.imgur.com/QZwaEHX.png)
-#
-![alt text](https://i.imgur.com/HTcqWcw.png)
+![alt text](https://i.imgur.com/FvgmEJL.png)
 #
-![alt text](https://i.imgur.com/HHsmJVD.png)
+![alt text](https://i.imgur.com/aWzj44Y.png)

accounts/__init__.py

@@ -1 +0,0 @@
-default_app_config = 'accounts.apps.AccountsConfig'

accounts/admin.py

@@ -1,8 +1,9 @@
 from django.contrib import admin
 
-from .models import User, AccountDetails, UserAddress
+from .models import BankAccountType, User, UserAddress, UserBankAccount
 
 
+admin.site.register(BankAccountType)
 admin.site.register(User)
-admin.site.register(AccountDetails)
 admin.site.register(UserAddress)
+admin.site.register(UserBankAccount)

accounts/apps.py

@@ -3,6 +3,3 @@
 
 class AccountsConfig(AppConfig):
     name = 'accounts'
-
-    def ready(self):
-        import accounts.signals

accounts/backends.py

@@ -0,0 +1,7 @@
+MALE = 'M'
+FEMALE = 'F'
+
+GENDER_CHOICE = (
+    (MALE, "Male"),
+    (FEMALE, "Female"),
+)

accounts/constants.py

@@ -1,63 +1,86 @@
-import datetime
 from django import forms
-from django.contrib.auth import authenticate
+from django.conf import settings
 from django.contrib.auth.forms import UserCreationForm
+from django.db import transaction
 
-from .models import User, AccountDetails, UserAddress
+from .models import User, BankAccountType, UserBankAccount, UserAddress
+from .constants import GENDER_CHOICE
 
 
-class UserRegistrationForm(UserCreationForm):
+class UserAddressForm(forms.ModelForm):
 
     class Meta:
-        model = User
+        model = UserAddress
         fields = [
-            "first_name",
-            "last_name",
-            "email",
-            "contact_no",
-            "password1",
-            "password2"
+            'street_address',
+            'city',
+            'postal_code',
+            'country'
         ]
 
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
 
-class AccountDetailsForm(forms.ModelForm):
+        for field in self.fields:
+            self.fields[field].widget.attrs.update({
+                'class': (
+                    'appearance-none block w-full bg-gray-200 '
+                    'text-gray-700 border border-gray-200 rounded '
+                    'py-3 px-4 leading-tight focus:outline-none '
+                    'focus:bg-white focus:border-gray-500'
+                )
+            })
 
-    class Meta:
-        model = AccountDetails
-        fields = [
-            'gender',
-            'birth_date',
-            'picture'
-        ]
 
-
-class UserAddressForm(forms.ModelForm):
+class UserRegistrationForm(UserCreationForm):
+    account_type = forms.ModelChoiceField(
+        queryset=BankAccountType.objects.all()
+    )
+    gender = forms.ChoiceField(choices=GENDER_CHOICE)
+    birth_date = forms.DateField()
 
     class Meta:
-        model = UserAddress
+        model = User
         fields = [
-            'street_address',
-            'city',
-            'postal_code',
-            'country'
+            'first_name',
+            'last_name',
+            'email',
+            'password1',
+            'password2',
         ]
 
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
 
-class UserLoginForm(forms.Form):
-    account_no = forms.IntegerField(label="Account Number")
-    password = forms.CharField(widget=forms.PasswordInput)
-
-    def clean(self, *args, **kwargs):
-        account_no = self.cleaned_data.get("account_no")
-        password = self.cleaned_data.get("password")
+        for field in self.fields:
+            self.fields[field].widget.attrs.update({
+                'class': (
+                    'appearance-none block w-full bg-gray-200 '
+                    'text-gray-700 border border-gray-200 '
+                    'rounded py-3 px-4 leading-tight '
+                    'focus:outline-none focus:bg-white '
+                    'focus:border-gray-500'
+                )
+            })
 
-        if account_no and password:
-            user = authenticate(account_no=account_no, password=password)
-            if not user:
-                raise forms.ValidationError("Account Does Not Exist.")
-            if not user.check_password(password):
-                raise forms.ValidationError("Password Does not Match.")
-            if not user.is_active:
-                raise forms.ValidationError("Account is not Active.")
+    @transaction.atomic
+    def save(self, commit=True):
+        user = super().save(commit=False)
+        user.set_password(self.cleaned_data["password1"])
+        if commit:
+            user.save()
+            account_type = self.cleaned_data.get('account_type')
+            gender = self.cleaned_data.get('gender')
+            birth_date = self.cleaned_data.get('birth_date')
 
-        return super(UserLoginForm, self).clean(*args, **kwargs)
+            UserBankAccount.objects.create(
+                user=user,
+                gender=gender,
+                birth_date=birth_date,
+                account_type=account_type,
+                account_no=(
+                    user.id +
+                    settings.ACCOUNT_NUMBER_START_FROM
+                )
+            )
+        return user

accounts/forms.py

@@ -1,3 +1,4 @@
+from django.contrib import auth
 from django.contrib.auth.base_user import BaseUserManager
 
 
@@ -6,19 +7,22 @@ class UserManager(BaseUserManager):
 
     def _create_user(self, email, password, **extra_fields):
         """
-        Create and save a user with the given account_no and password.
+        Create and save a user with the given email, and password.
         """
+        if not email:
+            raise ValueError('The given email must be set')
+        email = self.normalize_email(email)
         user = self.model(email=email, **extra_fields)
         user.set_password(password)
         user.save(using=self._db)
         return user
 
-    def create_user(self, email, password=None, **extra_fields):
+    def create_user(self, email=None, password=None, **extra_fields):
         extra_fields.setdefault('is_staff', False)
         extra_fields.setdefault('is_superuser', False)
         return self._create_user(email, password, **extra_fields)
 
-    def create_superuser(self, email, password, **extra_fields):
+    def create_superuser(self, email, password=None, **extra_fields):
         extra_fields.setdefault('is_staff', True)
         extra_fields.setdefault('is_superuser', True)
 
@@ -28,3 +32,29 @@ def create_superuser(self, email, password, **extra_fields):
             raise ValueError('Superuser must have is_superuser=True.')
 
         return self._create_user(email, password, **extra_fields)
+
+    def with_perm(self, perm, is_active=True, include_superusers=True, backend=None, obj=None):
+        if backend is None:
+            backends = auth._get_backends(return_tuples=True)
+            if len(backends) == 1:
+                backend, _ = backends[0]
+            else:
+                raise ValueError(
+                    'You have multiple authentication backends configured and '
+                    'therefore must provide the `backend` argument.'
+                )
+        elif not isinstance(backend, str):
+            raise TypeError(
+                'backend must be a dotted import path string (got %r).'
+                % backend
+            )
+        else:
+            backend = auth.load_backend(backend)
+        if hasattr(backend, 'with_perm'):
+            return backend.with_perm(
+                perm,
+                is_active=is_active,
+                include_superusers=include_superusers,
+                obj=obj,
+            )
+        return self.none()