From ffa2954d1f6bff78de395a98cf5bbaf065d4de85 Mon Sep 17 00:00:00 2001
From: Martin Schett <e1633073@student.tuwien.ac.at>
Date: Wed, 9 Dec 2020 19:04:25 +0100
Subject: [PATCH] Fixes for Presentation 1

---
 iotclient/iot_client.py                      |  4 ++--
 middleware/app_be/services/data_factory.py   |  0
 middleware/app_be/services/minioservice.py   |  5 ++++-
 middleware/app_be/services/mongodbservice.py | 11 ++++++-----
 middleware/app_be/services/wrapperservice.py |  5 +++++
 5 files changed, 17 insertions(+), 8 deletions(-)
 delete mode 100644 middleware/app_be/services/data_factory.py

diff --git a/iotclient/iot_client.py b/iotclient/iot_client.py
index 076b745..8236670 100644
--- a/iotclient/iot_client.py
+++ b/iotclient/iot_client.py
@@ -226,7 +226,7 @@ while (command.lower() not in ["exit", "quit", "end"]):
         print("fetch - gets the next image from database if exists")
         print("fetchall - get all images")
         print("delete - delets the next image from db if exists")
-        print("delete - delets all images from the service")
+        print("deleteall - delets all images from the service")
         print("rapid <#amount> [<#time>] - next <amount> images in line are sent to backend in <time> (default: 5) second intervals")
         print("skip [<#amount>] - skips the next <amount> number of images in line or 1 if no <amount> is given")
         print("set <#index> - sets image on given <index> as next in line")
@@ -234,7 +234,7 @@ while (command.lower() not in ["exit", "quit", "end"]):
         print()
         print()
 
-    if command.lower() == "check":
+    if command.lower() == "check" or command.lower() == "health":
         check_system()
 
     if command.lower() == "dir":
diff --git a/middleware/app_be/services/data_factory.py b/middleware/app_be/services/data_factory.py
deleted file mode 100644
index e69de29..0000000
diff --git a/middleware/app_be/services/minioservice.py b/middleware/app_be/services/minioservice.py
index 97bc090..5d4afe3 100644
--- a/middleware/app_be/services/minioservice.py
+++ b/middleware/app_be/services/minioservice.py
@@ -85,9 +85,12 @@ class MinioService:
             r = requests.get(settings.AWS_HOST + "?list")
             root = ET.fromstring(r.content)
             list = []
+            cnt = 0
             for child in root.iter('{http://s3.amazonaws.com/doc/2006-03-01/}Contents'):
                 list.append(child.find('{http://s3.amazonaws.com/doc/2006-03-01/}Key').text)
-
+                cnt = cnt + 1
+            if cnt == 0:
+                return True
             body = "<Delete>"
             for key in list:
                 body += "<Object><Key>" + key + "</Key></Object>"
diff --git a/middleware/app_be/services/mongodbservice.py b/middleware/app_be/services/mongodbservice.py
index 325e7e0..b26d9c8 100644
--- a/middleware/app_be/services/mongodbservice.py
+++ b/middleware/app_be/services/mongodbservice.py
@@ -30,17 +30,18 @@ class MongoDBService:
 
     @staticmethod
     def getSingle(identifier):
-
-        instance = MongoManager.getInstance()
-
-        db = instance.AIC
-        col = db.metadata
         metadata = None
         try:
+            instance = MongoManager.getInstance()
+
+            db = instance.AIC
+            col = db.metadata
+            metadata = None
             resp = col.find({"identifier": identifier})
             metadata = resp[0]
         except:
             print("Could not find Metadata")
+
         if metadata is None:
             return None
         else:
diff --git a/middleware/app_be/services/wrapperservice.py b/middleware/app_be/services/wrapperservice.py
index 8bddd3a..8b03f29 100644
--- a/middleware/app_be/services/wrapperservice.py
+++ b/middleware/app_be/services/wrapperservice.py
@@ -6,6 +6,11 @@ class WrapperService:
     @staticmethod
     def wrap_file(file_bytes: bytes) -> str:
         file_encoded_b64 = base64.b64encode(file_bytes)
+        print('b64 gemacht')
+        print(file_encoded_b64)
+        print()
+        print('utf8- decodiert')
+        print(file_encoded_b64.decode())
         return file_encoded_b64.decode()
 
     @staticmethod