Djangocon coding

Pull contracts and invoices from fortnox, todo is local cache
Some more flows in the auth backend. Needs cleanup.

diff --git a/customerportal/admin.py b/customerportal/admin.py
index 8c38f3f3dad51e4585f3984282c2a4bec5349c1e..e2bdf1661dc71bcd76ce140c7bed6641dbb8e8fd 100644 (file)
--- a/customerportal/admin.py
+++ b/customerportal/admin.py
@@ -1,3 +1,29 @@
+"""Integrate with admin module."""
+

 from django.contrib import admin
 from django.contrib import admin

+from django.contrib.auth.admin import UserAdmin as DjangoUserAdmin
+from django.utils.translation import ugettext_lazy as _
+
+from .models import User
+
+
+@admin.register(User)
+class UserAdmin(DjangoUserAdmin):
+    """Define admin model for custom User model with no email field."""

 
 

-# Register your models here.
+    fieldsets = (
+        (None, {'fields': ('email', 'password')}),
+        (_('Personal info'), {'fields': ('first_name', 'last_name','fortnox_external_id')}),
+        (_('Permissions'), {'fields': ('is_active', 'is_staff', 'is_superuser',
+                                       'groups', 'user_permissions')}),
+        (_('Important dates'), {'fields': ('last_login', 'date_joined')}),
+    )
+    add_fieldsets = (
+        (None, {
+            'classes': ('wide',),
+            'fields': ('email', 'password1', 'password2'),
+        }),
+    )
+    list_display = ('email', 'first_name', 'last_name', 'is_staff')
+    search_fields = ('email', 'first_name', 'last_name')
+    ordering = ('email',)

diff --git a/customerportal/models.py b/customerportal/models.py
index 71a836239075aa6e6e4ecb700e9c42c95c022d91..9a36b9f3154d8924ee51d5db7b86d16671ddb1f0 100644 (file)
--- a/customerportal/models.py
+++ b/customerportal/models.py
@@ -1,3 +1,75 @@
 from django.db import models
 from django.db import models

+from django.contrib.auth.models import User
+from django.contrib.auth.models import AbstractUser
+from django.contrib.auth.models import AbstractUser, BaseUserManager ## A new class is imported. ##
+from django.db import models
+from django.utils.translation import ugettext_lazy as _
+
+
+class UserManager(BaseUserManager):
+    """Define a model manager for User model with no username field."""
+
+    use_in_migrations = True
+
+    def _create_user(self, email, password, **extra_fields):
+        """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):
+        """Create and save a regular User with the given email and password."""
+        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):
+        """Create and save a SuperUser with the given email and password."""
+        extra_fields.setdefault('is_staff', True)
+        extra_fields.setdefault('is_superuser', True)
+
+        if extra_fields.get('is_staff') is not True:
+            raise ValueError('Superuser must have is_staff=True.')
+        if extra_fields.get('is_superuser') is not True:
+            raise ValueError('Superuser must have is_superuser=True.')
+
+        return self._create_user(email, password, **extra_fields)
+
+
+class User(AbstractUser):
+    username           = None
+    fortnox_external_id = models.IntegerField()
+    gpg_public_key      = models.CharField(null=True, max_length=4096)
+    ssh_public_key      = models.CharField(null=True, max_length=4096)
+    last_login          = models.DateField(null=True)
+    cos_id              = models.CharField(null=True, max_length=4096)
+    cos_contractid      = models.CharField(null=True, max_length=4096)
+    cos_anlaggningsid   = models.CharField(null=True, max_length=4096)
+    USERNAME_FIELD = 'email'
+    REQUIRED_FIELDS = ['fortnox_external_id']
+    objects = UserManager() ## This is the new line in the User model. ##
+
+class vps(models.Model):
+    user = models.ForeignKey(to=User, on_delete=models.CASCADE)
+    uuid = models.CharField(max_length=4096)
+    
+class physical_server(models.Model):
+    user = models.ForeignKey(to=User, on_delete=models.CASCADE)
+    rack = models.CharField(max_length=4096)
+    unit = models.IntegerField()
+
+class IP(models.Model):
+    user = models.ForeignKey(to=User, on_delete=models.CASCADE)
+    cidr = models.CharField(max_length=4096)
+

 
 

-# Create your models here.
+# graph resources
+#  port on device (realtime) autodetect on description(Cust: fortnox_external_id)
+#  cpu
+#  memory
+#  disks
+#  

diff --git a/customerportal/templates/customerportal/landing.html b/customerportal/templates/customerportal/landing.html
index 7ac974baf33f4b823dc3109e06253613a5fa4b5b..f5f873b871efe799eaf45909c6bccd9d06dcb0ac 100644 (file)
--- a/customerportal/templates/customerportal/landing.html
+++ b/customerportal/templates/customerportal/landing.html
@@ -3,12 +3,13 @@
 {% block content %}
     <h1>Customer data</h1>
 
 {% block content %}
     <h1>Customer data</h1>
 

-    {% if bookinstance_list %}
+    {% if contracts %}

     <ul>
     <ul>

+      
+      {% for invoice in invoices %} 
+      <li class="{% if not invoice.FinalPayDate %}text-danger{% endif %}">

 
 

-      {% for bookinst in bookinstance_list %} 
-      <li class="{% if bookinst.is_overdue %}text-danger{% endif %}">
-        <a href="{% url 'book-detail' bookinst.book.pk %}">{{bookinst.book.title}}</a> ({{ bookinst.due_back }})        
+             Invoice date:{{invoice.InvoiceDate}} Due Date:{{invoice.DueDate}} Total:{{invoice.Total}} OCR:{{invoice.OCR}}

       </li>
       {% endfor %}
     </ul>
       </li>
       {% endfor %}
     </ul>

diff --git a/customerportal/views.py b/customerportal/views.py
index 3578d6a857d137fcc7e72c41ceb49b6d6a3d9380..182086e08fc0b52a9491edd0153876a8ab84d1a2 100644 (file)
--- a/customerportal/views.py
+++ b/customerportal/views.py
@@ -1,9 +1,24 @@
 from django.shortcuts import render
 from django.http import HttpResponse
 from django.contrib.auth.decorators import login_required
 from django.shortcuts import render
 from django.http import HttpResponse
 from django.contrib.auth.decorators import login_required

+from django.conf import settings
+try:
+    import requests
+except ModuleNotFoundError as e:
+    pass
+

 
 @login_required
 def index(request):
 
 @login_required
 def index(request):

-
-    return render(request, 'customerportal/landing.html')
+    headers = {"Access-Token":settings.FORTNOX_ACCESS_TOKEN,
+           "Client-Secret":settings.FORTNOX_CLIENT_SECRET,
+           "Content-Type":"application/json",
+           "Accept":"application/json" }
+    res = requests.get("https://api.fortnox.se/3/contracts/", headers=headers)
+    contracts=res.json()
+    contracts = [contract for contract in contracts['Contracts'] if int(contract['CustomerNumber']) == request.user.fortnox_external_id]
+    res = requests.get("https://api.fortnox.se/3/invoices/", headers=headers)
+    invoices = res.json()
+    invoices = [invoice for invoice in invoices['Invoices'] if int(invoice['CustomerNumber']) == request.user.fortnox_external_id]
+    return render(request, 'customerportal/landing.html',context={'contracts':contracts, 'invoices':invoices})

 
 

diff --git a/templates/base_generic.html b/templates/base_generic.html
index 76065ac4b0f70bbe645eb9fbaae9a1b3ff045c9c..5a88fa60b265bc78790eb60c8c4df237d651fd63 100644 (file)
--- a/templates/base_generic.html
+++ b/templates/base_generic.html
@@ -22,7 +22,7 @@
       <ul class="sidebar-nav">
           <li><a href="{% url 'index' %}">Home</a></li>
        {% if user.is_authenticated %}
       <ul class="sidebar-nav">
           <li><a href="{% url 'index' %}">Home</a></li>
        {% if user.is_authenticated %}

-         <li>User: {{ user.get_username }}</li>
+       <li>Welcome {{ user.first_name }} {{user.last_name}}</li>

          <li><a href="{% url 'logout'%}?next={{request.path}}">Logout</a></li>
        {% else %}
          <li><a href="{% url 'login'%}?next={{request.path}}">Login</a></li>
          <li><a href="{% url 'logout'%}?next={{request.path}}">Logout</a></li>
        {% else %}
          <li><a href="{% url 'login'%}?next={{request.path}}">Login</a></li>

diff --git a/tranquillity/auth_backend.py b/tranquillity/auth_backend.py
index e8c682a34b1bdb89b8be167278240f9d377c0320..de439920ca090b7ea88907bb432799fc5ad13da7 100644 (file)
--- a/tranquillity/auth_backend.py
+++ b/tranquillity/auth_backend.py
@@ -1,11 +1,14 @@
 from django.contrib.auth import get_user_model
 from django.contrib.auth.models import User
 from django.contrib.auth.backends import ModelBackend
 from django.contrib.auth import get_user_model
 from django.contrib.auth.models import User
 from django.contrib.auth.backends import ModelBackend

-import requests
+try:
+    import requests
+except ModuleNotFoundError as e:
+    pass

 from django.conf import settings
 
 class EmailBackend(ModelBackend):
 from django.conf import settings
 
 class EmailBackend(ModelBackend):

-    def fetch_fortnox(self):
+    def fetch_fortnox(self, customer_id=None):

         """ Fetch all active customers from Fortnox API. Return as dict keyed on email."""
         res = None
         customers = {}
         """ Fetch all active customers from Fortnox API. Return as dict keyed on email."""
         res = None
         customers = {}


@@ -13,9 +16,14 @@ class EmailBackend(ModelBackend):
            "Client-Secret":settings.FORTNOX_CLIENT_SECRET,
            "Content-Type":"application/json",
            "Accept":"application/json" }
            "Client-Secret":settings.FORTNOX_CLIENT_SECRET,
            "Content-Type":"application/json",
            "Accept":"application/json" }

-
-        res = requests.get("https://api.fortnox.se/3/customers?filter=active", headers=headers)
-        for customer in res.json()['Customers']:
+        if customer_id: #We already have id, use that to update info in local db
+            res = requests.get(f"https://api.fortnox.se/3/customers/{customer_id}?filter=active", headers=headers)
+            res = res.json()
+            res['Customer'] = [res['Customer']]
+        else:
+            res = requests.get("https://api.fortnox.se/3/customers?filter=active", headers=headers)
+        
+        for customer in res['Customer']:

             customers[customer['Email']] = customer
         return customers
 
             customers[customer['Email']] = customer
         return customers
 


@@ -25,22 +33,30 @@ class EmailBackend(ModelBackend):
             user = UserModel.objects.get(email=username)
         except UserModel.DoesNotExist:
             customers = self.fetch_fortnox()
             user = UserModel.objects.get(email=username)
         except UserModel.DoesNotExist:
             customers = self.fetch_fortnox()

+          #  import pdb;pdb.set_trace()

             if username in customers:
                 if ' ' in customers[username]['Name']:
                     (fname,lname) = customers[username]['Name'].split(' ',1)
             if username in customers:
                 if ' ' in customers[username]['Name']:
                     (fname,lname) = customers[username]['Name'].split(' ',1)

-                    user = User.objects.create_user(username=username,
-                                     email=username,
+                    user = User.objects.create_user(email=username,

                                      first_name=fname,
                                      first_name=fname,

-                                     last_name=lname)
+                                     last_name=lname,
+                                     fortnox_external_id=int(customers[username]['CustomerNumber']))

                     return user
                 else:
                     fname = customers[username]['Name']
                     user = User.objects.create_user(username=username,
                                  email=username,
                     return user
                 else:
                     fname = customers[username]['Name']
                     user = User.objects.create_user(username=username,
                                  email=username,

-                                 first_name=fname)
+                                 first_name=fname,
+                                 fortnox_external_id=int(customers[username]['CustomerNumber']))

                     return user
             return None
         else:
                     return user
             return None
         else:

+            customer = self.fetch_fortnox(customer_id=user.fortnox_external_id)
+            if not customer:
+                user.is_active=False
+                return None
+            user.first_name = customer[user.email]['Name'] #TODO synd more data
+            user.save()

             if user.check_password(password):
                 return user
         return None
             if user.check_password(password):
                 return user
         return None

diff --git a/tranquillity/settings.py b/tranquillity/settings.py
index b01cf5a885a5d7724f1743406b6c020ee14f2c92..fc78baba8a8fdd219ac69d347d166aaaddf6bfd4 100644 (file)
--- a/tranquillity/settings.py
+++ b/tranquillity/settings.py
@@ -128,3 +128,4 @@ STATIC_URL = '/static/'
 # Redirect to home URL after login (Default redirects to /accounts/profile/)
 LOGIN_REDIRECT_URL = '/'
 AUTHENTICATION_BACKENDS = ['tranquillity.auth_backend.EmailBackend']
 # Redirect to home URL after login (Default redirects to /accounts/profile/)
 LOGIN_REDIRECT_URL = '/'
 AUTHENTICATION_BACKENDS = ['tranquillity.auth_backend.EmailBackend']

+AUTH_USER_MODEL = 'customerportal.User'