some cleanup and optimization

This commit is contained in:
collerek
2020-12-03 09:15:19 +01:00
parent 4e10ff03e2
commit b838fa1edf
7 changed files with 106 additions and 72 deletions

View File

@ -76,7 +76,7 @@ class RandomModel(ormar.Model):
@property
def full_name(self):
return ' '.join([self.first_name, self.last_name])
return " ".join([self.first_name, self.last_name])
class User(ormar.Model):
@ -199,7 +199,7 @@ def test_all_endpoints():
"first_name",
"last_name",
"created_date",
"full_name"
"full_name",
]
assert response.json().get("full_name") == "John Test"
@ -212,7 +212,7 @@ def test_all_endpoints():
"first_name",
"last_name",
"created_date",
"full_name"
"full_name",
]
RandomModel.Meta.include_props_in_dict = True
@ -224,5 +224,5 @@ def test_all_endpoints():
"first_name",
"last_name",
"created_date",
"full_name"
"full_name",
]

View File

@ -26,9 +26,9 @@ class Album(ormar.Model):
@property
def name10(self) -> str:
return self.name + '_10'
return self.name + "_10"
@validator('name')
@validator("name")
def test(cls, v):
return v
@ -46,30 +46,30 @@ def create_test_database():
async def test_pydantic_only_fields():
async with database:
async with database.transaction(force_rollback=True):
album = await Album.objects.create(name='Hitchcock')
album = await Album.objects.create(name="Hitchcock")
assert album.pk is not None
assert album.saved
assert album.timestamp is None
album = await Album.objects.exclude_fields('timestamp').get()
album = await Album.objects.exclude_fields("timestamp").get()
assert album.timestamp is None
album = await Album.objects.fields({'name', 'timestamp'}).get()
album = await Album.objects.fields({"name", "timestamp"}).get()
assert album.timestamp is None
test_dict = album.dict()
assert 'timestamp' in test_dict
assert test_dict['timestamp'] is None
assert "timestamp" in test_dict
assert test_dict["timestamp"] is None
album.timestamp = datetime.datetime.now()
test_dict = album.dict()
assert 'timestamp' in test_dict
assert test_dict['timestamp'] is not None
assert test_dict.get('name10') == 'Hitchcock_10'
assert "timestamp" in test_dict
assert test_dict["timestamp"] is not None
assert test_dict.get("name10") == "Hitchcock_10"
Album.Meta.include_props_in_dict = False
test_dict = album.dict()
assert 'timestamp' in test_dict
assert test_dict['timestamp'] is not None
assert "timestamp" in test_dict
assert test_dict["timestamp"] is not None
# key is still there as now it's a field
assert test_dict['name10'] is None
assert test_dict["name10"] is None