Merge remote-tracking branch 'origin/develop' into develop

src/dashboard/android/local.properties

+flutter.sdk=/srv/flutter
\ No newline at end of file

src/dashboard/ios/Flutter/Generated.xcconfig

+// This is a generated file; do not edit or check into version control.
+FLUTTER_ROOT=/srv/flutter
+FLUTTER_APPLICATION_PATH=/local/home/manuel/smart/src/dashboard
+COCOAPODS_PARALLEL_CODE_SIGN=true
+FLUTTER_TARGET=lib/main.dart
+FLUTTER_BUILD_DIR=build
+SYMROOT=${SOURCE_ROOT}/../build/ios
+FLUTTER_BUILD_NAME=1.0.0
+FLUTTER_BUILD_NUMBER=1
+EXCLUDED_ARCHS[sdk=iphonesimulator*]=arm64 i386
+DART_OBFUSCATION=false
+TRACK_WIDGET_CREATION=false
+TREE_SHAKE_ICONS=false
+PACKAGE_CONFIG=.packages

src/dashboard/ios/Flutter/flutter_export_environment.sh

+#!/bin/sh
+# This is a generated file; do not edit or check into version control.
+export "FLUTTER_ROOT=/srv/flutter"
+export "FLUTTER_APPLICATION_PATH=/local/home/manuel/smart/src/dashboard"
+export "COCOAPODS_PARALLEL_CODE_SIGN=true"
+export "FLUTTER_TARGET=lib/main.dart"
+export "FLUTTER_BUILD_DIR=build"
+export "SYMROOT=${SOURCE_ROOT}/../build/ios"
+export "FLUTTER_BUILD_NAME=1.0.0"
+export "FLUTTER_BUILD_NUMBER=1"
+export "DART_OBFUSCATION=false"
+export "TRACK_WIDGET_CREATION=false"
+export "TREE_SHAKE_ICONS=false"
+export "PACKAGE_CONFIG=.packages"

src/dashboard/ios/Runner/GeneratedPluginRegistrant.h

+//
+//  Generated file. Do not edit.
+//
+
+#ifndef GeneratedPluginRegistrant_h
+#define GeneratedPluginRegistrant_h
+
+#import <Flutter/Flutter.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface GeneratedPluginRegistrant : NSObject
++ (void)registerWithRegistry:(NSObject<FlutterPluginRegistry>*)registry;
+@end
+
+NS_ASSUME_NONNULL_END
+#endif /* GeneratedPluginRegistrant_h */

src/dashboard/ios/Runner/GeneratedPluginRegistrant.m

+//
+//  Generated file. Do not edit.
+//
+
+#import "GeneratedPluginRegistrant.h"
+
+#if __has_include(<integration_test/IntegrationTestPlugin.h>)
+#import <integration_test/IntegrationTestPlugin.h>
+#else
+@import integration_test;
+#endif
+
+#if __has_include(<path_provider/FLTPathProviderPlugin.h>)
+#import <path_provider/FLTPathProviderPlugin.h>
+#else
+@import path_provider;
+#endif
+
+@implementation GeneratedPluginRegistrant
+
++ (void)registerWithRegistry:(NSObject<FlutterPluginRegistry>*)registry {
+  [IntegrationTestPlugin registerWithRegistrar:[registry registrarForPlugin:@"IntegrationTestPlugin"]];
+  [FLTPathProviderPlugin registerWithRegistrar:[registry registrarForPlugin:@"FLTPathProviderPlugin"]];
+}
+
+@end

src/data-hub/reputation-calculation-microservice/deployment/deployment.yml

@@ -73,7 +73,8 @@ spec:
     spec:
       containers:
       - name: reputation-calculation-db
-        image: mongo
+        image: mongo:4.2.16
+        imagePullPolicy: IfNotPresent
         env:
         - name: MONGO_INITDB_ROOT_USERNAME
           value: root
@@ -82,7 +83,10 @@ spec:
         ports:
         - containerPort: 27017
         volumeMounts:
-        - mountPath: /data/db
+        - mountPath: /data
           name: dbdata
       volumes:
         - name: dbdata
+          hostPath:
+            path: /srv/articonf/db/reputation-calculation
+            type: Directory

src/modules/security/token_manager.py

@@ -23,10 +23,11 @@ class TokenManager:
     def getToken(self, admin=False) -> str:
         if self._token == None:
             credentials_path = get_resources_path()
+            credentials_path = f"{credentials_path}/{'admin' if admin else 'regular'}_user_credentials.json"
             
-            print("Looking for credentials at ... "+str(credentials_path))
+            print(f"Looking for credentials at '{credentials_path}'")
 
-            with open(f"{credentials_path}/{'admin' if admin else 'regular'}_user_credentials.json") as file_handler:
+            with open(credentials_path) as file_handler:
                 credentials = json.loads(file_handler.read())
             
             url = f'https://{network_constants.REST_GATEWAY_HOSTNAME}:{network_constants.REST_GATEWAY_REST_PORT}/api/tokens'

src/participation-hub/business-logic-microservice/app/_add_use_case_scripts/bank-app/add_bank_app_schema.py

@@ -15,7 +15,7 @@ import tables.add_bank_app as add_bank_app
 
 
 def add_use_case(use_case: str):
-    jwt = TokenManager.getInstance().getToken()
+    jwt = TokenManager.getInstance().getToken(admin=True)
     url = f"https://articonf1.itec.aau.at:30420/api/use-cases"
     response = requests.post(
             url,

src/participation-hub/business-logic-microservice/app/_add_use_case_scripts/bank-app/tables/add_bank_app.py

@@ -21,6 +21,7 @@ def add_table(use_case: str, table_name: str):
     
     columns = { c : c for c in columns }
     columns["UniqueID"] = "Transaction_ID+Timestamp"
+    columns["Transaction_Type"] = "enum(Transaction_Type)"
     
     url = f"https://articonf1.itec.aau.at:30420/api/use-cases/{use_case}/tables"
 

src/participation-hub/business-logic-microservice/app/_add_use_case_scripts/car_sharing/add_carsharing_schema.py

@@ -9,17 +9,8 @@ for modules_path in modules_paths:
     if os.path.exists(modules_path):
         sys.path.insert(1, modules_path)
 
-# import _add_use_case_scripts.car_sharing.tables.add_user as user
-
 from _add_use_case_scripts.car_sharing.tables import  add_car, add_hash, add_offer, add_publication, add_travel, add_user
 
-# import _add_use_case_scripts.car_sharing.tables.add_user as user
-# from _add_use_case_scripts.car_sharing.tables import add_car
-# from _add_use_case_scripts.car_sharing.tables import add_hash
-# from _add_use_case_scripts.car_sharing.tables import add_publication
-# from _add_use_case_scripts.car_sharing.tables import add_offer
-# from _add_use_case_scripts.car_sharing.tables import add_travel
-
 import network_constants as nc
 from security.token_manager import TokenManager
 
@@ -28,7 +19,7 @@ from security.token_manager import TokenManager
 def add_use_case(use_case: str):
     use_case = "car-sharing"
 
-    jwt = TokenManager.getInstance().getToken()
+    jwt = TokenManager.getInstance().getToken(admin=True)
     url = f"https://articonf1.itec.aau.at:30420/api/use-cases"
     response = requests.post(
             url,

src/participation-hub/business-logic-microservice/app/_add_use_case_scripts/car_sharing_official/add_carsharingofficial_schema.py

@@ -22,7 +22,7 @@ from security.token_manager import TokenManager
 def add_use_case(use_case: str):
     use_case = "car-sharing-official"
 
-    jwt = TokenManager.getInstance().getToken()
+    jwt = TokenManager.getInstance().getToken(admin=True)
     url = f"https://articonf1.itec.aau.at:30420/api/use-cases"
     response = requests.post(
             url,

src/participation-hub/business-logic-microservice/app/_add_use_case_scripts/community-prediction/taxi/add_schema.py

@@ -14,7 +14,7 @@ from security.token_manager import TokenManager
 import tables.add_table as add_table
 
 def add_use_case(use_case: str):
-    jwt = TokenManager.getInstance().getToken()
+    jwt = TokenManager.getInstance().getToken(admin=True)
     url = f"https://articonf1.itec.aau.at:30420/api/use-cases"
     response = requests.post(
             url,

src/participation-hub/business-logic-microservice/app/_add_use_case_scripts/community-prediction/youtube/add_schema.py

@@ -14,7 +14,7 @@ from security.token_manager import TokenManager
 import tables.add_table as add_table
 
 def add_use_case(use_case: str):
-    jwt = TokenManager.getInstance().getToken()
+    jwt = TokenManager.getInstance().getToken(admin=True)
     url = f"https://articonf1.itec.aau.at:30420/api/use-cases"
     response = requests.post(
             url,

src/participation-hub/business-logic-microservice/app/_add_use_case_scripts/crowd_journalism/add_crowdjournalism_schema.py

@@ -16,7 +16,7 @@ from security.token_manager import TokenManager
 
 def add_use_case(use_case: str):
 
-    jwt = TokenManager.getInstance().getToken()
+    jwt = TokenManager.getInstance().getToken(admin=True)
     url = f"https://articonf1.itec.aau.at:30420/api/use-cases"
     response = requests.post(
             url,
@@ -26,7 +26,7 @@ def add_use_case(use_case: str):
             json = {"name": use_case}
         )
     
-    print(url+": "+str(response.content))     
+    print(url+": "+str(response.content))
 
 if __name__ == "__main__":
     use_case = "crowd-journalism-enum"

src/participation-hub/business-logic-microservice/app/_add_use_case_scripts/crowd_journalism/tables/add_event.py

@@ -53,7 +53,7 @@ def add_layers(use_case:str, table_name: str):
                 "UniqueID",
                 "objecttype",
                 "eventid",
-                "evenEpicenter",
+                "eventEpicenter",
                 "range",
                 "firstTag"
             ],
@@ -69,7 +69,7 @@ def add_layers(use_case:str, table_name: str):
                 "UniqueID",
                 "objecttype",
                 "eventid",
-                "evenEpicenter",
+                "eventEpicenter",
                 "range",
                 "firstTag"
             ],

src/participation-hub/business-logic-microservice/app/_add_use_case_scripts/debug/add_debug_schema.py

@@ -14,7 +14,7 @@ from security.token_manager import TokenManager
 import tables.add_pizza_table as pizza
 
 def add_use_case(use_case: str):
-    jwt = TokenManager.getInstance().getToken()
+    jwt = TokenManager.getInstance().getToken(admin=True)
     url = f"https://articonf1.itec.aau.at:30420/api/use-cases"
     response = requests.post(
             url,

src/participation-hub/business-logic-microservice/app/_add_use_case_scripts/reddit/add_smart_reddit_schema.py

@@ -14,7 +14,7 @@ from security.token_manager import TokenManager
 import tables.add_reddit as reddit
 
 def add_use_case(use_case: str):
-    jwt = TokenManager.getInstance().getToken()
+    jwt = TokenManager.getInstance().getToken(admin=True)
     url = f"https://articonf1.itec.aau.at:30420/api/use-cases"
     response = requests.post(
             url,

src/participation-hub/business-logic-microservice/app/_add_use_case_scripts/smart-energy/add_smart_energy_schema.py

@@ -14,7 +14,7 @@ from security.token_manager import TokenManager
 import tables.add_smart_energy as smart_energy
 
 def add_use_case(use_case: str):
-    jwt = TokenManager.getInstance().getToken()
+    jwt = TokenManager.getInstance().getToken(admin=True)
     url = f"https://articonf1.itec.aau.at:30420/api/use-cases"
     response = requests.post(
             url,

src/participation-hub/business-logic-microservice/deployment/deployment.yml

@@ -72,7 +72,8 @@ spec:
     spec:
       containers:
       - name: business-logic-db
-        image: mongo
+        image: mongo:4.2.16
+        imagePullPolicy: IfNotPresent
         env:
         - name: MONGO_INITDB_ROOT_USERNAME
           value: root
@@ -81,7 +82,10 @@ spec:
         ports:
         - containerPort: 27017
         volumeMounts:
-        - mountPath: /data/db
+        - mountPath: /data
           name: dbdata
       volumes:
-        - name: dbdata
+        - name: dbdata
\ No newline at end of file
+          hostPath:
+            path: /srv/articonf/db/business-logic
+            type: Directory

src/rest-gateway/app/configs/routes.yml

@@ -197,6 +197,8 @@ definitions:
         format: "date-time"
       ApplicationType:
         type: "string"
+      docType:
+        type: "string"
       TransactionFrom:
         type: "string"
         format: "uuid"

src/rest-gateway/deployment/deployment.yml

@@ -73,7 +73,8 @@ spec:
     spec:
       containers:
       - name: rest-gateway-db
-        image: mongo
+        image: mongo:4.2.16
+        imagePullPolicy: IfNotPresent
         env:
         - name: MONGO_INITDB_ROOT_USERNAME
           value: root
@@ -82,7 +83,13 @@ spec:
         ports:
         - containerPort: 27017
         volumeMounts:
-        - mountPath: /data/db
+        - mountPath: /data
           name: dbdata
       volumes:
-        - name: dbdata
+        - name: dbdata
\ No newline at end of file
+          hostPath: 
+            path: /srv/articonf/db/rest-gateway
+            type: Directory
+
+
+