Refactor backend for TCN compliance

.github/workflows/pythonapp.yml

@@ -49,8 +49,11 @@ jobs:
       - name: Check types statically
         run: poetry run mypy . --strict
 
+      - name: Install mongodb
+        run: sudo docker run --name mongo -d -p 27017:27017 mongo
+
       - name: Test with pytest
         run: poetry run pytest
         env:
-          MONGO_URI: ${{ secrets.MongoUri }}
+          MONGO_URI: mongodb://localhost:27017
           FLASK_ENV: testing

Dockerfile

@@ -0,0 +1,19 @@
+FROM python:3.8
+
+ARG INSTALL_PATH="/ito"
+
+ENV PIP_DISABLE_PIP_VERSION_CHECK=on
+ENV FLASK_ENV "development"
+ENV MONGO_URI "mongodb://localhost:27017"
+
+WORKDIR ${INSTALL_PATH}
+
+RUN pip install poetry
+
+COPY . ${INSTALL_PATH}/
+
+RUN mv config.py.example config.py && \ 
+    poetry config virtualenvs.create false && \
+    poetry install
+
+CMD poetry run flask run --host 0.0.0.0 --port=5001

app.py

@@ -1,4 +1,25 @@
 from flask import Flask
-from app import create_app
+import os
+import json
+from flask import Flask, Response, request
+from db.db import DBConnection
+from models.api import APIError
 
-app: Flask = create_app()
+app = Flask(__name__)
+dbConn = DBConnection(os.environ.get("MONGO_URI"))
+
+
+@app.route("/report", methods=["GET", "POST"])
+def report() -> Response:
+    if request.method == "GET":
+        return Response(
+            json.dumps(dbConn.get_reportsigs()), 200, mimetype="application/json"
+        )
+    else:
+        data = request.get_json()
+        if "reportsig" not in data or "timestamp" not in data:
+            return APIError(400, "Missing values in request").as_response()
+        reportsig = data["reportsig"]
+        timestamp = data["timestamp"]
+        dbConn.insert_reportsig(reportsig, timestamp)
+        return Response(None, 200)

conftest.py

@@ -1,10 +1,8 @@
 from flask import Flask
 import pytest  # type: ignore
-
-from app import create_app
+from app import app as theapp
 
 
 @pytest.fixture  # type: ignore
 def app() -> Flask:
-    app = create_app()
-    return app
+    return theapp

db/db.py

@@ -0,0 +1,23 @@
+from flask import Flask
+from pymongo import MongoClient  # type: ignore
+from typing import Optional, Dict, Any, Iterator, List
+from uuid import uuid4, UUID
+from datetime import datetime
+import time
+from random import randrange
+
+
+class DBConnection:
+    db: Any
+
+    def __init__(self, hostUri: Optional[str]):
+        if hostUri is None:
+            hostUri = "mongodb://localhost:27017"
+        client = MongoClient(hostUri)
+        self.db = client.ito
+
+    def insert_reportsig(self, reportsig: str, timestamp: datetime) -> None:
+        self.db.reportsigs.insert_one({"reportsig": reportsig, "timestamp": timestamp})
+
+    def get_reportsigs(self) -> List[str]:
+        return list(self.db.reportsigs.find({}, {"_id": False}))

docker-compose.yml

@@ -0,0 +1,27 @@
+version: "3.7"
+services:
+  mongodb:
+    image: mongo:latest
+    ports:
+      - 27017:27017
+    networks:
+      - ito-network
+
+  ito-upload:
+    build:
+      context: .
+      dockerfile: Dockerfile
+    environment:
+      - MONGO_URI=mongodb://mongodb:27017
+    ports:
+      - 5001:5001
+    networks:
+      - ito-network
+    depends_on:
+      - mongodb
+
+networks:
+  ito-network:
+
+volumes:
+  db-data:

models/__init__.py

@@ -0,0 +1 @@
+from .api import *

app/model/__init__.py → models/api.py

@@ -3,7 +3,7 @@
 from typing import Optional
 
 
-class ApiError:
+class APIError:
     code: int
     message: str