From 626c7799cf9af2d25bb2ca814b32ade5285821b7 Mon Sep 17 00:00:00 2001
From: Marcin Armacki <mararm@st.amu.edu.pl>
Date: Thu, 23 Apr 2020 20:09:28 +0200
Subject: [PATCH 1/2] Added XML check

---
 backend/webapp/prototype/filehandler/forms.py          |  2 +-
 backend/webapp/prototype/filehandler/functions.py      | 10 ++++++++++
 backend/webapp/prototype/filehandler/models.py         |  2 +-
 .../prototype/filehandler/templates/core/home.html     |  2 +-
 backend/webapp/prototype/filehandler/views.py          | 10 +++++++---
 5 files changed, 20 insertions(+), 6 deletions(-)
 create mode 100644 backend/webapp/prototype/filehandler/functions.py

diff --git a/backend/webapp/prototype/filehandler/forms.py b/backend/webapp/prototype/filehandler/forms.py
index 13a4c94..a8d8888 100644
--- a/backend/webapp/prototype/filehandler/forms.py
+++ b/backend/webapp/prototype/filehandler/forms.py
@@ -4,4 +4,4 @@ from prototype.filehandler.models import Document
 class DocumentForm(forms.ModelForm):
     class Meta:
         model = Document
-        fields = ('description', 'document', )
+        fields = ('description', 'file', )
diff --git a/backend/webapp/prototype/filehandler/functions.py b/backend/webapp/prototype/filehandler/functions.py
new file mode 100644
index 0000000..56301b7
--- /dev/null
+++ b/backend/webapp/prototype/filehandler/functions.py
@@ -0,0 +1,10 @@
+from xml.etree.ElementTree import parse
+
+def isValidXML(file):
+    try:
+        parse(file)
+    except:
+        return(False)
+    return(True)
+
+
diff --git a/backend/webapp/prototype/filehandler/models.py b/backend/webapp/prototype/filehandler/models.py
index 928e2d0..5ccb64b 100644
--- a/backend/webapp/prototype/filehandler/models.py
+++ b/backend/webapp/prototype/filehandler/models.py
@@ -3,5 +3,5 @@ from django.db import models
 
 class Document(models.Model):
     description = models.CharField(max_length=255, blank=True)
-    document = models.FileField(upload_to='documents/')
+    file = models.FileField(upload_to='documents/')
     uploaded_at = models.DateTimeField(auto_now_add=True)
diff --git a/backend/webapp/prototype/filehandler/templates/core/home.html b/backend/webapp/prototype/filehandler/templates/core/home.html
index 9d273a9..d37bff5 100644
--- a/backend/webapp/prototype/filehandler/templates/core/home.html
+++ b/backend/webapp/prototype/filehandler/templates/core/home.html
@@ -11,7 +11,7 @@
     <ul>
         {% for obj in documents %}
         <li>
-            <a href="{{ obj.document.url }}">{{ obj.document.name }}</a>
+            <a href="{{ obj.file.url }}">{{ obj.file.name }}</a>
             <small>(Wysłane: {{ obj.uploaded_at }}</small>
         </li>
         {% endfor %}
diff --git a/backend/webapp/prototype/filehandler/views.py b/backend/webapp/prototype/filehandler/views.py
index a099c62..485519b 100644
--- a/backend/webapp/prototype/filehandler/views.py
+++ b/backend/webapp/prototype/filehandler/views.py
@@ -2,12 +2,12 @@ from django.shortcuts import render, redirect
 from django.conf import settings
 from django.core.files.storage import FileSystemStorage
 from django.views.decorators.csrf import csrf_exempt
-from django.http import HttpResponseRedirect
-  
+from django.http import JsonResponse, HttpResponse
 
 from prototype.filehandler.models import Document
 from prototype.filehandler.forms import DocumentForm
 
+from prototype.filehandler.functions import isValidXML
 
 def home(request):
     documents = Document.objects.all()
@@ -16,10 +16,14 @@ def home(request):
 @csrf_exempt
 def model_form_upload(request):
     if request.method == 'POST':
+        if not isValidXML(request.FILES['file']):
+            return HttpResponse('Niepoprawny format XML', status=406)
+
         form = DocumentForm(request.POST, request.FILES)
         if form.is_valid():
             form.save()
-            return HttpResponseRedirect('sucess')
+            data = [{'name': 'Peter', 'email': 'peter@example.org'}, {'name': 'Julia', 'email': 'julia@example.org'}]
+            return JsonResponse(data, safe=False)
     else:
         form = DocumentForm()
     return render(request, 'core/model_form_upload.html', {

From 4c5ce996c968dd2a2b69ef8a339b00d9488743c0 Mon Sep 17 00:00:00 2001
From: Marcin Armacki <mararm@st.amu.edu.pl>
Date: Thu, 23 Apr 2020 21:13:53 +0200
Subject: [PATCH 2/2] Integrated parser with back-end

---
 backend/webapp/prototype/filehandler/views.py |  3 +-
 .../webapp/prototype/filehandler/xmlParser.py | 35 +++++++++++++++++++
 2 files changed, 37 insertions(+), 1 deletion(-)
 create mode 100644 backend/webapp/prototype/filehandler/xmlParser.py

diff --git a/backend/webapp/prototype/filehandler/views.py b/backend/webapp/prototype/filehandler/views.py
index 485519b..e4e14c0 100644
--- a/backend/webapp/prototype/filehandler/views.py
+++ b/backend/webapp/prototype/filehandler/views.py
@@ -8,6 +8,7 @@ from prototype.filehandler.models import Document
 from prototype.filehandler.forms import DocumentForm
 
 from prototype.filehandler.functions import isValidXML
+from prototype.filehandler.xmlParser import parseData
 
 def home(request):
     documents = Document.objects.all()
@@ -22,7 +23,7 @@ def model_form_upload(request):
         form = DocumentForm(request.POST, request.FILES)
         if form.is_valid():
             form.save()
-            data = [{'name': 'Peter', 'email': 'peter@example.org'}, {'name': 'Julia', 'email': 'julia@example.org'}]
+            data = parseData(request.FILES['file'])
             return JsonResponse(data, safe=False)
     else:
         form = DocumentForm()
diff --git a/backend/webapp/prototype/filehandler/xmlParser.py b/backend/webapp/prototype/filehandler/xmlParser.py
new file mode 100644
index 0000000..114160e
--- /dev/null
+++ b/backend/webapp/prototype/filehandler/xmlParser.py
@@ -0,0 +1,35 @@
+#!/usr/bin/env python3
+
+import argparse
+from bs4 import BeautifulSoup
+import json
+
+def parseData(file):
+    # arguments
+    parser = argparse.ArgumentParser(description='Process some xml files.')
+    parser.add_argument('filename', help='xml forum file')
+    args = parser.parse_args()
+    
+    # write file first
+    with open('temp.xml', 'wb+') as destination:
+        for chunk in file.chunks():
+            destination.write(chunk)
+
+    # make a soup:
+    with open('temp.xml') as forum:
+        soup = BeautifulSoup(forum, "xml")
+    
+    # put json together
+    out = {}
+    out['id'] = soup.forum.get('id')
+    out['name'] = soup.forum.find('name').text
+    out['discussions'] = []
+    for d in soup.forum.find_all('discussion'):
+        out['discussions'].append({
+        'id': d.get('id'),
+        'title': d.find('name').text,
+        'posts': [
+        {'id': p.get('id'), 'author': p.userid.text,
+        'message': p.message.get_text()} for p in d.find_all('post')]
+    })
+    return(out)