loafle/openapi-generator-original
3
0
Fork 1
mirror of https://github.com/OpenAPITools/openapi-generator.git synced 2025-12-18 21:47:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

[python-nextgen] Fix validation of list of enums (#14809)

Browse Source 
* [python-nextgen] check enum arrady values better

* [python-nextgen] re-generate exapmles for #14809
This commit is contained in:
Tomáš Karásek
2023-03-18 13:27:26 +01:00
committed by GitHub
parent e1719f2b7b
commit aa066ab6fa
18 changed files with 43 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/enum_arrays.py
View File

@@ -34,18 +34,17 @@ class EnumArrays(BaseModel):
def just_symbol_validate_enum(cls, v):
if v is None:
return v
if v not in ('>=', '$'):
raise ValueError("must validate the enum values ('>=', '$')")
raise ValueError("must be one of enum values ('>=', '$')")
return v
@validator('array_enum')
def array_enum_validate_enum(cls, v):
if v is None:
return v
if v not in ('fish', 'crab'):
raise ValueError("must validate the enum values ('fish', 'crab')")
for i in v:
if i not in ('fish', 'crab'):
raise ValueError("each list item must be one of ('fish', 'crab')")
return v
class Config:

14
samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/enum_test.py
View File

@@ -45,42 +45,38 @@ class EnumTest(BaseModel):
def enum_string_validate_enum(cls, v):
if v is None:
return v
if v not in ('UPPER', 'lower', ''):
raise ValueError("must validate the enum values ('UPPER', 'lower', '')")
raise ValueError("must be one of enum values ('UPPER', 'lower', '')")
return v
@validator('enum_string_required')
def enum_string_required_validate_enum(cls, v):
if v not in ('UPPER', 'lower', ''):
raise ValueError("must validate the enum values ('UPPER', 'lower', '')")
raise ValueError("must be one of enum values ('UPPER', 'lower', '')")
return v
@validator('enum_integer_default')
def enum_integer_default_validate_enum(cls, v):
if v is None:
return v
if v not in (1, 5, 14):
raise ValueError("must validate the enum values (1, 5, 14)")
raise ValueError("must be one of enum values (1, 5, 14)")
return v
@validator('enum_integer')
def enum_integer_validate_enum(cls, v):
if v is None:
return v
if v not in (1, -1):
raise ValueError("must validate the enum values (1, -1)")
raise ValueError("must be one of enum values (1, -1)")
return v
@validator('enum_number')
def enum_number_validate_enum(cls, v):
if v is None:
return v
if v not in (1.1, -1.2):
raise ValueError("must validate the enum values (1.1, -1.2)")
raise ValueError("must be one of enum values (1.1, -1.2)")
return v
class Config:

3
samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/map_test.py
View File

@@ -36,9 +36,8 @@ class MapTest(BaseModel):
def map_of_enum_string_validate_enum(cls, v):
if v is None:
return v
if v not in ('UPPER', 'lower'):
raise ValueError("must validate the enum values ('UPPER', 'lower')")
raise ValueError("must be one of enum values ('UPPER', 'lower')")
return v
class Config:

3
samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/order.py
View File

@@ -38,9 +38,8 @@ class Order(BaseModel):
def status_validate_enum(cls, v):
if v is None:
return v
if v not in ('placed', 'approved', 'delivered'):
raise ValueError("must validate the enum values ('placed', 'approved', 'delivered')")
raise ValueError("must be one of enum values ('placed', 'approved', 'delivered')")
return v
class Config:

3
samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/pet.py
View File

@@ -40,9 +40,8 @@ class Pet(BaseModel):
def status_validate_enum(cls, v):
if v is None:
return v
if v not in ('available', 'pending', 'sold'):
raise ValueError("must validate the enum values ('available', 'pending', 'sold')")
raise ValueError("must be one of enum values ('available', 'pending', 'sold')")
return v
class Config:

3
samples/openapi3/client/petstore/python-nextgen-aiohttp/petstore_api/models/special_name.py
View File

@@ -36,9 +36,8 @@ class SpecialName(BaseModel):
def var_schema_validate_enum(cls, v):
if v is None:
return v
if v not in ('available', 'pending', 'sold'):
raise ValueError("must validate the enum values ('available', 'pending', 'sold')")
raise ValueError("must be one of enum values ('available', 'pending', 'sold')")
return v
class Config:

2
samples/openapi3/client/petstore/python-nextgen-aiohttp/tests/test_model.py
View File

@@ -235,4 +235,4 @@ class ModelTests(unittest.TestCase):
self.pet.status = "error"
self.assertTrue(False) # this line shouldn't execute
except ValueError as e:
self.assertTrue("must validate the enum values ('available', 'pending', 'sold')" in str(e))
self.assertTrue("must be one of enum values ('available', 'pending', 'sold')" in str(e))