diff --git a/upload_service/app.py b/upload_service/app.py
index 7f6de1099c918d8e37f4f82cd11f0b9ef9aaaa71..f8db6706b00e3e09d43f0c81e54317373d556a16 100644
--- a/upload_service/app.py
+++ b/upload_service/app.py
@@ -1,8 +1,8 @@
from flask import Flask
from flask import jsonify
from flask import request
-from flask import render_template
-from s3_provider import Provider as provider
+# from s3_provider import Provider
+from test_report_provider import Provider
from fake_model import LearningModel as Model
import uuid
@@ -18,13 +18,17 @@ VALID_EXTENSIONS = [
PREFIX = 'dpath'
-@app.route(f'/{PREFIX}/')
-def home():
- return render_template('home.html')
-
-@app.route(f'/{PREFIX}/report/<int:report_id>')
+@app.route(f'/{PREFIX}/report/<int:report_id>', methods=['GET'])
def get_report(report_id) :
- return jsonify(provider.get_report(report_id))
+ provider = Provider()
+ return jsonify(provider.get_report(report_id))
+
+@app.route(f'/{PREFIX}/report', methods=['GET'])
+def get_reports() :
+ provider = Provider()
+ response = jsonify(provider.get_reports())
+ response.status_code = 200
+ return response
@app.route(f'/{PREFIX}/report/image', methods=['POST'])
def upload_image():
@@ -32,7 +36,7 @@ def upload_image():
if response.status_code == 400:
return response
- provider = provider()
+ provider = Provider()
id = uuid.uuid1()
provider.save_binary(request.files['file'], id)
response = jsonify(Model(id).start())
diff --git a/upload_service/test_report_provider.py b/upload_service/test_report_provider.py
index 803a1e35fc47f07ccd77557629592cb3190272e2..a586cf23c9e89370f889d417088226266b66261f 100644
--- a/upload_service/test_report_provider.py
+++ b/upload_service/test_report_provider.py
@@ -1,12 +1,27 @@
from faker import Faker
+import uuid
+from fake_model import LearningModel
fake = Faker()
-def create_report(s3_path):
- report = {
- "id": id,
- "matchRate" : 75.89,
- "status": "Running",
- "runDate": fake.date_between(start_date='-30d', end_date='today')
- }
- return report
\ No newline at end of file
+class Provider:
+ def get_reports(self) :
+ i = 0
+ reports = []
+ while(i < 10):
+ reports.append(self.create_report(""))
+ i += 1
+ return reports
+
+ def create_report(self, s3_path):
+ id = uuid.uuid1()
+ report = LearningModel(id).start()
+ return {
+ "id": id,
+ "report": report
+ }
+
+ def get_report(self, id):
+ report = self.create_report("")
+ report.id = id
+ return report
\ No newline at end of file