From a0210433859ed5d90b04ec9da77a3bc4370c7209 Mon Sep 17 00:00:00 2001
From: okalintu <ilkka.oks4nen@gmail.com>
Date: Sat, 10 Dec 2016 19:13:12 +0200
Subject: [PATCH] removed obsolete abbjobs model

(same content is now server by old webs json-api)
---
 infoscreen/management/commands/importabb.py | 46 ---------------------
 infoscreen/models.py                        | 15 -------
 infoscreen/views.py                         | 10 +----
 sikweb/urls.py                              |  2 -
 4 files changed, 1 insertion(+), 72 deletions(-)
 delete mode 100644 infoscreen/management/commands/importabb.py

diff --git a/infoscreen/management/commands/importabb.py b/infoscreen/management/commands/importabb.py
deleted file mode 100644
index 3db581c..0000000
--- a/infoscreen/management/commands/importabb.py
+++ /dev/null
@@ -1,46 +0,0 @@
-from django.core.management.base import BaseCommand, CommandError
-from django.db.models import Max
-from django.conf import settings
-from datetime import datetime, timedelta
-from pytz import utc
-from paramiko.client import SSHClient, AutoAddPolicy, RSAKey
-from infoscreen.models import ABBJob
-import qrcode
-
-class Command(BaseCommand):
-    help = 'import new abbjobs from oldish sikweb'
-
-    def add_arguments(self, parser):
-        parser.add_argument('keypath')
-
-    def handle(self, *args, **options):
-        last_id = ABBJob.objects.aggregate(Max('sw_id'))['sw_id__max'] or 0
-        client = SSHClient()
-        client.set_missing_host_key_policy(AutoAddPolicy())
-        key = RSAKey.from_private_key_file(options.get("keypath"))
-        client.connect("otax.ayy.fi", username="sik", pkey=key)
-        stdin, stdout, stderr = client.exec_command("./abbjobexport.sh {}".format(last_id))
-        errors = stderr.read()
-        if len(errors) > 0:
-            print(errors)
-            client.close()
-            return
-        data = stdout.read().decode("latin1").strip().split("\n") # shame on latin1 otax!!!
-        for row in data:
-            if not row:
-                continue
-            cols = row.split('\t',maxsplit=2)
-            qr_url = gen_qr(cols[0])
-            created = datetime.strptime(cols[1], "%Y-%m-%d %H:%M:%S").replace(tzinfo=utc) # todo parse to right timezone
-            ABBJob.objects.create(
-                sw_id=int(cols[0]),
-                created=created,
-                title=cols[2],
-                QR=qr_url)
-
-def gen_qr(sw_id):
-    img = qrcode.make("http://sahkoinsinoorikilta.fi/news/{}".format(sw_id))
-    imgname = "abbjobs_{}.png".format(sw_id)
-    imgurl = "{}qr/{}".format(settings.MEDIA_URL,imgname)
-    img.save("{}/qr/{}".format(settings.MEDIA_ROOT,imgname))
-    return imgurl
diff --git a/infoscreen/models.py b/infoscreen/models.py
index 6768560..6329734 100644
--- a/infoscreen/models.py
+++ b/infoscreen/models.py
@@ -193,21 +193,6 @@ class Rotation(models.Model):
     def __str__(self):
         return self.name
 
-class ABBJob(models.Model):
-    sw_id = models.IntegerField(default=-1)
-    title = models.CharField(max_length=255)
-    QR = models.CharField(max_length=255, default="")
-    created = models.DateTimeField(default=timezone.now)
-
-    def get_dict(self):
-        return {
-            "title": self.title,
-            "QR": self.QR,
-        }
-
-    def __str__(self):
-        return self.title
-
 class ImageUploadForm(forms.Form):
     '''
     Form used to handle imageuploads to
diff --git a/infoscreen/views.py b/infoscreen/views.py
index f1343ec..9d1bab5 100644
--- a/infoscreen/views.py
+++ b/infoscreen/views.py
@@ -6,7 +6,7 @@ from django.contrib.contenttypes.models import ContentType
 from django.contrib.auth.decorators import permission_required 
 from django.utils import timezone
 
-from infoscreen.models import ABBJob, Rotation, InfoItem, InfoInstance
+from infoscreen.models import Rotation, InfoItem, InfoInstance
 from infoscreen.models import ABBInfoItem, ExternalImageInfoItem, ImageInfoItem, SossoInfoItem
 from infoscreen.models import ImageUploadForm
 
@@ -27,14 +27,6 @@ def default(request,*args,**kwargs):
         first = 0
     return index(request,first ,*args, **kwargs)
 
-# send abb jobs which have been created less than month ago
-@require_http_methods(["GET"])
-def abb_job_list(request, *args, **kwargs):
-    limit = timezone.now() - timedelta(days=60)
-    jobs = ABBJob.objects.filter(created__gt=limit)
-    joblist = list(map(lambda j:j.get_dict(), jobs))
-    return HttpResponse(json.dumps(joblist))
-
 @require_http_methods(["GET"])
 def rotation(request, idx, *args, **kwargs):
     try:
diff --git a/sikweb/urls.py b/sikweb/urls.py
index 5ecd235..0e2b617 100644
--- a/sikweb/urls.py
+++ b/sikweb/urls.py
@@ -33,7 +33,6 @@ from members.views import export_csv as mem_csv_export
 #infoscreen
 from infoscreen.views import index as infoindex
 from infoscreen.views import default as infodefault
-from infoscreen.views import abb_job_list
 from infoscreen.views import rotation
 from infoscreen.views import rotations
 from infoscreen.views import infoItems
@@ -71,7 +70,6 @@ urlpatterns = [
     #infoscreen
     url(r'^infoscreen/$', infodefault),
     url(r'^infoscreen/(?P<idx>\d+)$', infoindex),
-    url(r'^infoscreen/abbjobs$', abb_job_list),
     url(r'^infoscreen/items$', infoItems),
     url(r'^infoscreen/rotation/(?P<idx>\d+)$', rotation),
     url(r'^infoscreen/rotations$', rotations),