Skip to content

Fix problem of wrong parent of friendly uuid and freiendly datetime. #13

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.

Sign up for GitHub

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

Open
tesilaaliset wants to merge 2 commits into
base: dev
Choose a base branch
from
Open

Fix problem of wrong parent of friendly uuid and freiendly datetime. #13

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dffdbf5
Fix problem of wrong parent of friendly uuid and freiendly datetime.
tesilaaliset Apr 17, 2025
322a5ab
Removed unused fields import
tesilaaliset Apr 17, 2025
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
10 changes: 5 additions & 5 deletions hiddifypanel/panel/commercial/restapi/v2/admin/schema.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import uuid
from apiflask.fields import String, Float, Enum, Date, Integer, Boolean, DateTime
from apiflask import Schema, fields
from apiflask.fields import String, Float, Enum, Date, Integer, Boolean, Field
from apiflask import Schema
from typing import Any, Mapping

from marshmallow import ValidationError
Expand All @@ -11,15 +11,15 @@
# region user api


class FriendlyDateTime(fields.Field):
class FriendlyDateTime(Field):
def _serialize(self, value: Any, attr: str | None, obj: Any, **kwargs):
return hutils.convert.time_to_json(value)

def _deserialize(self, value: Any, attr: str | None, data: Mapping[str, Any] | None, **kwargs):
return hutils.convert.json_to_time(value)


class FriendlyUUID(fields.Field):
class FriendlyUUID(Field):

def _serialize(self, value: Any, attr: str | None, obj: Any, **kwargs):
if value is None or not hutils.auth.is_uuid_valid(value):
Expand All @@ -32,7 +32,7 @@ def _deserialize(self, value: Any, attr: str | None, data: Mapping[str, Any] | N
try:
return str(uuid.UUID(value))
except ValueError:
self.fail('Invalid uuid')
return self.fail('Invalid uuid')

def _validated(self, value):
if not hutils.auth.is_uuid_valid(value):
Expand Down