Skip to content
This repository was archived by the owner on Apr 20, 2020. It is now read-only.
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 1 addition & 6 deletions app/persistence/db.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,7 @@ def get_cases(
conditions["lat"] = lat
if lon is not None:
conditions["lon"] = lon
last_case = mongo.db.cases.find_one({"uuid": uuid})
if last_case is None:
conditions["upload_timestamp"] = {"$gte": random_time_in_the_past()}
else:
conditions["upload_timestamp"] = {"$gte": last_case["upload_timestamp"]}
return (case for case in mongo.db.cases.find(conditions))
return list(case for case in mongo.db.cases.find(conditions, {"_id": False}))


def random_time_in_the_past() -> datetime:
Expand Down
11 changes: 6 additions & 5 deletions app/routes/v0/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
from typing import Union, Optional, Generator
from app.persistence.db import get_cases, insert_random_cases
from app.model import ApiError
import json

cases = Blueprint("v0.cases", __name__, url_prefix="/v0/cases")

Expand All @@ -26,12 +27,12 @@ def index() -> Response:

cases = get_cases(uuid, lat=lat, lon=lon)

def generate() -> Generator[str, None, None]:
for case in cases:
case_uuid = str(case["uuid"])
yield case_uuid + ","
# def generate() -> Generator[str, None, None]:
# for case in cases:
# case_uuid = str(case["uuid"])
# yield case_uuid + ","

return Response(generate(), mimetype="application/octet-stream")
return Response(json.dumps(cases), mimetype="application/octet-stream")


@cases.route("/insert/<int:n>", methods=["POST"])
Expand Down
2 changes: 1 addition & 1 deletion poetry.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ python = "^3.8"
Flask = "^1.1.2"
Flask-PyMongo = "^2.3.0"
python-dateutil = "^2.8.1"
flask_pymongo = "^2.3.0"

[tool.poetry.dev-dependencies]
black = "^19.10b0"
Expand Down