tonym/spoolman2
1
0
Fork 0
Code Issues 19 Pull Requests Actions 1 Packages Projects Releases Wiki Activity

No longer need to specify entity_type in body

Browse Source
This commit is contained in:
Donkie
2024-01-06 17:16:15 +01:00
parent 77ac9d6a5c
commit 06e3849862
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spoolman/api/v1/field.py
View File

@@ -59,7 +59,7 @@ async def update(
key: Annotated[str, Path(min_length=1, max_length=64, regex="^[a-z0-9_]+$")], key: Annotated[str, Path(min_length=1, max_length=64, regex="^[a-z0-9_]+$")],
body: ExtraFieldParameters, body: ExtraFieldParameters,
) -> Union[list[ExtraField], JSONResponse]: ) -> Union[list[ExtraField], JSONResponse]:
body_with_key = ExtraField.parse_obj(body.copy(update={"key": key})) body_with_key = ExtraField.parse_obj(body.copy(update={"key": key, "entity_type": entity_type}))
try: try:
await add_or_update_extra_field(db, entity_type, body_with_key) await add_or_update_extra_field(db, entity_type, body_with_key)

2
spoolman/extra_fields.py
View File

@@ -36,7 +36,6 @@ class ExtraFieldType(Enum):
class ExtraFieldParameters(BaseModel): class ExtraFieldParameters(BaseModel):
name: str = Field(description="Nice name", min_length=1, max_length=128) name: str = Field(description="Nice name", min_length=1, max_length=128)
unit: Optional[str] = Field(None, description="Unit of the value", min_length=1, max_length=16) unit: Optional[str] = Field(None, description="Unit of the value", min_length=1, max_length=16)
entity_type: EntityType = Field(description="Entity type this field is for")
field_type: ExtraFieldType = Field(description="Type of the field") field_type: ExtraFieldType = Field(description="Type of the field")
default_value: Optional[str] = Field(None, description="Default value of the field") default_value: Optional[str] = Field(None, description="Default value of the field")
choices: Optional[list[str]] = Field(None, description="Choices for the field, only for field type choice") choices: Optional[list[str]] = Field(None, description="Choices for the field, only for field type choice")
@@ -45,6 +44,7 @@ class ExtraFieldParameters(BaseModel):
class ExtraField(ExtraFieldParameters): class ExtraField(ExtraFieldParameters):
key: str = Field(description="Unique key", regex="^[a-z0-9_]+$", min_length=1, max_length=64) key: str = Field(description="Unique key", regex="^[a-z0-9_]+$", min_length=1, max_length=64)
entity_type: EntityType = Field(description="Entity type this field is for")
def validate_extra_field_value(field: ExtraFieldParameters, value: str) -> None: # noqa: C901, PLR0912 def validate_extra_field_value(field: ExtraFieldParameters, value: str) -> None: # noqa: C901, PLR0912