Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

🐛 PUT does upsert when ID not found #14

Merged
merged 2 commits into from
Oct 22, 2020
Merged
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
8 changes: 7 additions & 1 deletion fasteve/applications.py
Original file line number Diff line number Diff line change
Expand Up @@ -33,15 +33,16 @@ def __init__(

# set defaults
self.cors_origins = cors_origins

# validate user settings
self._validate_resources(resources)
self.resources = resources

self._validate_config(config)
self.config = config

self._register_resource_middleware()
self._register_CORS_middleware()

self._register_home_endpoint()

# connect to db
Expand Down Expand Up @@ -292,3 +293,8 @@ def _register_CORS_middleware(self) -> None:
def _validate_config(self, config: ModuleType) -> None:
# raise errors if config is invalid
pass

def _validate_resources(self, resources: List[Resource]) -> None:
# raise errors if resource is invalid
for resource in resources:
pass
4 changes: 4 additions & 0 deletions fasteve/core/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,10 @@ def validate(cls, v: ObjectId) -> ObjectId:
raise ValueError(f"Not a valid ObjectId: {v}")
return ObjectId(str(v))

@classmethod
def is_valid(cls, v: ObjectId) -> bool:
return ObjectId.is_valid(str(v))


test_type = NewType("test_type", str)

Expand Down
12 changes: 9 additions & 3 deletions fasteve/methods/put.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
from starlette.requests import Request
from datetime import datetime
from ..core import config
from fasteve.methods.post import post
from fasteve.methods.common import get_document
from typing import Union
Expand All @@ -9,12 +8,19 @@

async def put_item(request: Request, item_id: Union[ObjectID, str]) -> None:
orginal_document = await get_document(request, item_id)
print(orginal_document)
payload = getattr(request, "payload")

if not orginal_document:
# insert
document = await post(request)
if ObjectID.is_valid(item_id):
payload["_id"] = item_id
# if it is not valid must be an alt_id
setattr(request, "payload", payload)
await post(request)
return None

# replace
payload = getattr(request, "payload")
now = datetime.now()
payload["_created"] = orginal_document["_created"]
payload["_updated"] = now
Expand Down
18 changes: 18 additions & 0 deletions tests/test_aplications.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import pytest
from pytest import fixture
from fasteve.io.mongo import MongoClient
from bson import ObjectId


class People(BaseSchema):
Expand Down Expand Up @@ -168,3 +169,20 @@ def test_put_replace_item(test_client, path, data, expected_status):
item = response.json()[app.config.DATA][0]
assert item["name"] == data["name"]
assert item["_id"] == item_id


@pytest.mark.parametrize(
"path,data,expected_status",
[
("/people", {"name": "Lovelace"}, 204),
],
)
def test_put_insert_item(test_client, path, data, expected_status):
item_id = str(ObjectId())
response = test_client.put(path + f"/{item_id}", json=data)
assert response.status_code == expected_status
response = test_client.get(path + f"/{item_id}")
assert response.status_code == 200
item = response.json()[app.config.DATA][0]
assert item["name"] == data["name"]
assert item["_id"] == item_id