Experimental

README.md

@@ -1,6 +1,20 @@
-# TODO
-Fill out docker-compose.yml
+# Report Microservice Microservice
 
-Fill out GitHub Action workflow
+## Explanations 
+### Routes
+/ticket <br>
+/ticket/delete/id <br>
+/ticket/list <br>
+/ticket/id/edit <br>
+/ticket/id/answer 
 
-Fill out README!
+## Documents
+[Drafts & Documentation](https://github.com/E-Edu/draft-documents)<br>
+[Git Workflow (German)](https://github.com/E-Edu/general/blob/master/guides/conventions.md)<br>
+[Code Style (German)](https://github.com/E-Edu/general/blob/master/guides/conventions.md#code-style)
+
+
+## License
+
+This project is licensed under the `GNU General Public License v3.0`<br>
+See `LICENSE` for more information

docker-compose.yml

@@ -1,32 +1,32 @@
 version: '3.7'
 
 report_database:
-    image: mariadb:latest
-    volumes:
-      - /var/data/mariadb:/var/lib/mysql    # to save the mariadb content
-    ports:
-      - 3306:3306   #debug
-    environment:
-      - MYSQL_ROOT_PASSWORD=da7tnqw79e5v6nbqw3v5rtwev57mtwm5vrftw75vfnm275v2
-      - MYSQL_USER=report
-      - MYSQL_PASSWORD=TuqWuRdjLbSPTRqBnnEU24ZSsqAy9b6LbXA8ZuQg
-      - MYSQL_DATABASE=report
-    restart: unless-stopped
-    container_name: report_database
-    hostname: report_database
+  image: mariadb:latest
+  volumes:
+    - /var/data/mariadb:/var/lib/mysql    # to save the mariadb content
+  ports:
+    - 3306:3306   #debug
+  environment:
+    - MYSQL_ROOT_PASSWORD=da7tnqw79e5v6nbqw3v5rtwev57mtwm5vrftw75vfnm275v2
+    - MYSQL_USER=report
+    - MYSQL_PASSWORD=TuqWuRdjLbSPTRqBnnEU24ZSsqAy9b6LbXA8ZuQg
+    - MYSQL_DATABASE=report
+  restart: unless-stopped
+  container_name: report_database
+  hostname: report_database
 
 report_microservice:
-    image: eedu/reportms
-    ports: 
-        - 5000:5000
-    environment: 
-        - DATABASE_HOSTNAME=
-        - DATABASE_PORT=
-        - DATABASE_USERNAME=
-        - DATABASE_PASSWORD=
-        - DATABASE_DATABASE=
-        - JWT_SECRET=
-        - SERVICE_SECRET=
-    restart: unless-stopped
-    container_name: report_microservice
+  image: eedu/reportms
+  ports:
+    - 80:80
+  environment:
+    - DATABASE_HOSTNAME=
+    - DATABASE_PORT=
+    - DATABASE_USERNAME=
+    - DATABASE_PASSWORD=
+    - DATABASE_DATABASE=
+    - JWT_SECRET=
+    - SERVICE_SECRET=
+  restart: unless-stopped
+  container_name: report_microservice
 

report/Blueprints/error_handler.py

@@ -1,12 +1,13 @@
-from flask import Blueprint, render_template, abort,request, jsonify
+from flask import Blueprint, jsonify
 
+app_error = Blueprint('error-handler', __name__)
 
-app_error = Blueprint('error-handler',__name__)
 
 @app_error.app_errorhandler(404)
 def handle_404_error(e):
-    return jsonify({'error':'Page not found'}),404
+    return jsonify({'error': 'Page not found'}), 404
+
 
 @app_error.app_errorhandler(405)
 def handle_405_error(e):
-    return jsonify({'error':'Method not allowed'}),405
+    return jsonify({'error': 'Method not allowed'}), 405

report/Blueprints/routes.py

@@ -1,7 +1,5 @@
-import json
-import os
-
 import jwt
+import os
 from flask import Blueprint, request, jsonify
 
 from report import db
@@ -24,7 +22,7 @@ def ticked_create():
         print(e)
         return jsonify({'error': 'INVALID_SESSION'}), 400
 
-    if userdata.get("status") == 4: # Status 4 == User Banned
+    if userdata.get("status") == 4:  # Status 4 == User Banned
         return jsonify({}), 200
 
     user_id = userdata.get("id")

report/__init__.py

@@ -7,7 +7,6 @@
 
 app = Flask(__name__)
 
-
 try:
     db_path = "mysql+pymysql://" + os.environ.get("DATABASE_USERNAME") + ":" + os.environ.get(
         "DATABASE_PASSWORD") + "@" + os.environ.get("DATABASE_HOSTNAME") + ":" + os.environ.get(

report/database.py

@@ -10,7 +10,7 @@ class Ticket(db.Model):
     TicketType = db.Column(db.String(10))
     role = db.Column(db.String(3))
     user_id = db.Column(db.String(1000))  # ! change when >1000 user
-    isSloved = db.Column(db.Boolean(), default=False) 
+    isSloved = db.Column(db.Boolean(), default=False)
 
     def __init__(self, taskId, title, body, TicketType, user_id):
         self.taskId = taskId
@@ -28,4 +28,3 @@ class Meta:
 ticketSchema = TicketSchema()
 ticketSchema_many = TicketSchema(many=True)
 db.create_all()
-

test.py

@@ -1,4 +1,5 @@
 import jwt
+
 asd = jwt.encode({'some': 'payload'}, 'secret', algorithm='HS256')
 
-jwt.decode(asd, 'secret123', algorithms=['HS256'])
+jwt.decode(asd, 'secret123', algorithms=['HS256'])

wsgi.py

@@ -1,3 +1,3 @@
 from report import app
 
-application = app
+application = app