update queries and tests

app/models.py

@@ -60,11 +60,11 @@ class EventHostName(BaseModel):
 
 
 class EventAddress(BaseModel):
-    address: str | None
+    address: str | None = Field(default=None)
 
 
 class EventSchedule(BaseModel):
-    schedule: str | None
+    schedule: str | None = Field(default=None)
 
 
 class EventCreate(EventSchedule, EventAddress, EventHostName, EventName):

app/queries/create_event.edgeql

@@ -11,8 +11,7 @@ select (
             with u:= assert_single((select User filter .name = host_name)),
             select 
             if exists u then (u)
-            else if exists host_name then (insert User {name:= host_name})
-            else (<User>{})
+            else (insert User {name:= host_name})
         )
     }
-) {name, address, schedule, host: {name}};
+) {name, address, schedule, host_name:=.host.name};

app/queries/create_event_async_edgeql.py

@@ -31,13 +31,7 @@ class CreateEventResult(NoPydanticValidation):
     name: str
     address: str | None
     schedule: datetime.datetime | None
-    host: CreateEventResultHost
-
-
-@dataclasses.dataclass
-class CreateEventResultHost(NoPydanticValidation):
-    id: uuid.UUID
-    name: str
+    host_name: str
 
 
 async def create_event(
@@ -63,11 +57,10 @@ async def create_event(
                     with u:= assert_single((select User filter .name = host_name)),
                     select 
                     if exists u then (u)
-                    else if exists host_name then (insert User {name:= host_name})
-                    else (<User>{})
+                    else (insert User {name:= host_name})
                 )
             }
-        ) {name, address, schedule, host: {name}};\
+        ) {name, address, schedule, host_name:=.host.name};\
         """,
         name=name,
         address=address,

app/queries/delete_event.edgeql

@@ -1,3 +1,3 @@
 select (
     delete Event filter .name = <str>$name
-) {name, address, schedule, host : {name}};
+) {name, address, schedule, host_name:=.host.name};

app/queries/delete_event_async_edgeql.py

@@ -31,13 +31,7 @@ class DeleteEventResult(NoPydanticValidation):
     name: str
     address: str | None
     schedule: datetime.datetime | None
-    host: DeleteEventResultHost
-
-
-@dataclasses.dataclass
-class DeleteEventResultHost(NoPydanticValidation):
-    id: uuid.UUID
-    name: str
+    host_name: str
 
 
 async def delete_event(
@@ -49,7 +43,7 @@ async def delete_event(
         """\
         select (
             delete Event filter .name = <str>$name
-        ) {name, address, schedule, host : {name}};\
+        ) {name, address, schedule, host_name:=.host.name};\
         """,
         name=name,
     )

app/queries/get_event_by_name.edgeql

@@ -3,5 +3,5 @@ select Event {
     created_at,
     address,
     schedule,
-    host : {name}
+    host_name:=.host.name
 } filter .name=<str>$name;

app/queries/get_event_by_name_async_edgeql.py

@@ -32,13 +32,7 @@ class GetEventByNameResult(NoPydanticValidation):
     created_at: datetime.datetime
     address: str | None
     schedule: datetime.datetime | None
-    host: GetEventByNameResultHost
-
-
-@dataclasses.dataclass
-class GetEventByNameResultHost(NoPydanticValidation):
-    id: uuid.UUID
-    name: str
+    host_name: str
 
 
 async def get_event_by_name(
@@ -53,7 +47,7 @@ async def get_event_by_name(
             created_at,
             address,
             schedule,
-            host : {name}
+            host_name:=.host.name
         } filter .name=<str>$name;\
         """,
         name=name,

app/queries/get_events.edgeql

@@ -1 +1 @@
-select Event {name, created_at, address, schedule, host : {name}};
+select Event {name, created_at, address, schedule, host_name:=.host.name};

app/queries/get_events_async_edgeql.py

@@ -32,20 +32,14 @@ class GetEventsResult(NoPydanticValidation):
     created_at: datetime.datetime
     address: str | None
     schedule: datetime.datetime | None
-    host: GetEventsResultHost
-
-
-@dataclasses.dataclass
-class GetEventsResultHost(NoPydanticValidation):
-    id: uuid.UUID
-    name: str
+    host_name: str
 
 
 async def get_events(
     executor: edgedb.AsyncIOExecutor,
 ) -> list[GetEventsResult]:
     return await executor.query(
         """\
-        select Event {name, created_at, address, schedule, host : {name}};\
+        select Event {name, created_at, address, schedule, host_name:=.host.name};\
         """,
     )

app/queries/update_event.edgeql

@@ -18,8 +18,7 @@ select (
             with u:= assert_single((select detached User filter .name = host_name)),
             select 
             if exists u then (u)
-            else if exists host_name then (insert User {name:= host_name})
-            else (<User>{})
+            else (insert User {name:= host_name})
         )
     }
-) {name, address, schedule, host: {name}};
+) {name, address, schedule, host_name:=.host.name};

app/queries/update_event_async_edgeql.py

@@ -31,13 +31,7 @@ class UpdateEventResult(NoPydanticValidation):
     name: str
     address: str | None
     schedule: datetime.datetime | None
-    host: UpdateEventResultHost
-
-
-@dataclasses.dataclass
-class UpdateEventResultHost(NoPydanticValidation):
-    id: uuid.UUID
-    name: str
+    host_name: str
 
 
 async def update_event(
@@ -71,11 +65,10 @@ async def update_event(
                     with u:= assert_single((select detached User filter .name = host_name)),
                     select 
                     if exists u then (u)
-                    else if exists host_name then (insert User {name:= host_name})
-                    else (<User>{})
+                    else (insert User {name:= host_name})
                 )
             }
-        ) {name, address, schedule, host: {name}};\
+        ) {name, address, schedule, host_name:=.host.name};\
         """,
         name=name,
         new_name=new_name,

fastui_app/users.py

@@ -44,6 +44,7 @@ async def user_createview(
 ):
     client = await services.aget(BackendAsyncClient)
     resp = await client.post("/users", json=form.model_dump())
+
     # raised, but how to do a full page reload?
     # resp_json = _raise_for_status(resp, HTTPStatus.CREATED)
 

fastui_app/utils.py

@@ -22,16 +22,8 @@ def _form_user_repr(resp_json: dict[str, str]) -> UserRepr:
 
 def _form_event_repr(resp_json: dict[str, str | dict[str, str] | None]) -> EventRepr:
     """
-    `host_name = resp_json["host"]["name"]` works because host
-    is required in the schema. If the rendering issue for
-    `GoToEvent(url="/users/{host_name}/")` can be resolved,
-    then we can do:
-
-    host_name = None
-    if host := resp_json["host"]:
-        host_name = host.get("name")
+    Q: Why `host_name` is required in the schema?
+    A: Since there exists a rendering issue for
+    `GoToEvent(url="/users/{host_name}/")`.
     """
-    host_name = resp_json["host"]["name"]  # since host is required in the schema
-    resp_json.update(host_name=host_name)
-    del resp_json["host"]
     return EventRepr(**resp_json)

tests/conftest.py

@@ -1,5 +1,3 @@
-from __future__ import annotations
-
 from unittest.mock import Mock
 
 import pytest

tests/factories.py

@@ -1,5 +1,3 @@
-from __future__ import annotations
-
 import datetime
 import random
 
@@ -19,7 +17,7 @@ class TestAuditable(BaseModel):
 
 
 class TestUserData(TestAuditable):
-    name: str = Field(default_factory=faker.name)
+    name: str = Field(default_factory=faker.name, max_length=50)
 
 
 class TestUserDataWithnEvents(TestUserData):
@@ -34,3 +32,4 @@ class TestEventData(TestAuditable):
             microsecond=random.randint(0, 1000000)
         )
     )
+    host_name: str = Field(default_factory=faker.name, max_length=50)