Skip to content

Commit 6909572

Browse files
committed
🏷️ [#236] feat: Fix annotations
Sets not nullable types to UNSET Doing those completely according to the OAS spec, breaks a lot...
1 parent 2963f44 commit 6909572

File tree

2 files changed

+38
-23
lines changed

2 files changed

+38
-23
lines changed

backend/src/openbeheer/types/_open_beheer.py

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@
4343
from .ztc import (
4444
BesluitType,
4545
Eigenschap,
46+
FormaatEnum,
4647
InformatieObjectType,
4748
ResultaatType,
4849
RolType,
@@ -641,6 +642,13 @@ class ResultaatTypeWithUUID(UUIDMixin, ResultaatType):
641642

642643
class EigenschapWithUUID(UUIDMixin, Eigenschap):
643644
uuid: UUID | UnsetType = UNSET
645+
# format is actually a property from specificatie
646+
# set here because front end doesn't support nested structures.
647+
formaat: FormaatEnum | UnsetType = UNSET
648+
649+
def __post_init__(self):
650+
super().__post_init__()
651+
self.formaat = self.specificatie.formaat
644652

645653

646654
class InformatieObjectTypeWithUUID(UUIDMixin, InformatieObjectType):

backend/src/openbeheer/types/ztc.py

Lines changed: 30 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
from enum import Enum
99
from typing import Annotated, List
1010

11-
from msgspec import Meta, Struct, field
11+
from msgspec import UNSET, Meta, Struct, UnsetType, field
1212

1313

1414
class AardRelatieEnum(Enum):
@@ -2517,8 +2517,8 @@ class PatchedEigenschapRequest(Struct, kw_only=True):
25172517
str,
25182518
Meta(description="De naam van de EIGENSCHAP", max_length=20, min_length=1),
25192519
]
2520-
| None
2521-
) = None
2520+
| UnsetType
2521+
) = UNSET
25222522
definitie: (
25232523
Annotated[
25242524
str,
@@ -2528,9 +2528,9 @@ class PatchedEigenschapRequest(Struct, kw_only=True):
25282528
min_length=1,
25292529
),
25302530
]
2531-
| None
2532-
) = None
2533-
specificatie: EigenschapSpecificatieRequest | None = None
2531+
| UnsetType
2532+
) = UNSET
2533+
specificatie: EigenschapSpecificatieRequest | UnsetType = UNSET
25342534
toelichting: (
25352535
Annotated[
25362536
str,
@@ -2539,8 +2539,8 @@ class PatchedEigenschapRequest(Struct, kw_only=True):
25392539
max_length=1000,
25402540
),
25412541
]
2542-
| None
2543-
) = None
2542+
| UnsetType
2543+
) = UNSET
25442544
zaaktype: (
25452545
Annotated[
25462546
str,
@@ -2550,8 +2550,8 @@ class PatchedEigenschapRequest(Struct, kw_only=True):
25502550
min_length=1,
25512551
),
25522552
]
2553-
| None
2554-
) = None
2553+
| UnsetType
2554+
) = UNSET
25552555
statustype: (
25562556
Annotated[
25572557
str,
@@ -2561,14 +2561,16 @@ class PatchedEigenschapRequest(Struct, kw_only=True):
25612561
min_length=1,
25622562
),
25632563
]
2564-
| None
2565-
) = None
2564+
| UnsetType
2565+
) = UNSET
25662566
begin_geldigheid: (
2567-
Annotated[date, Meta(description="De datum waarop het is ontstaan.")] | None
2568-
) = field(name="beginGeldigheid", default=None)
2567+
Annotated[date, Meta(description="De datum waarop het is ontstaan.")]
2568+
| UnsetType
2569+
) = field(name="beginGeldigheid", default=UNSET)
25692570
einde_geldigheid: (
2570-
Annotated[date, Meta(description="De datum waarop het is opgeheven.")] | None
2571-
) = field(name="eindeGeldigheid", default=None)
2571+
Annotated[date, Meta(description="De datum waarop het is opgeheven.")]
2572+
| UnsetType
2573+
) = field(name="eindeGeldigheid", default=UNSET)
25722574

25732575

25742576
class PatchedInformatieObjectTypeRequest(Struct, kw_only=True):
@@ -4157,8 +4159,8 @@ class EigenschapRequest(Struct, kw_only=True):
41574159
max_length=1000,
41584160
),
41594161
]
4160-
| None
4161-
) = None
4162+
| UnsetType
4163+
) = UNSET
41624164
statustype: (
41634165
Annotated[
41644166
str,
@@ -4169,13 +4171,18 @@ class EigenschapRequest(Struct, kw_only=True):
41694171
),
41704172
]
41714173
| None
4172-
) = None
4174+
| UnsetType
4175+
) = UNSET
41734176
begin_geldigheid: (
4174-
Annotated[date, Meta(description="De datum waarop het is ontstaan.")] | None
4175-
) = field(name="beginGeldigheid", default=None)
4177+
Annotated[date, Meta(description="De datum waarop het is ontstaan.")]
4178+
| None
4179+
| UnsetType
4180+
) = field(name="beginGeldigheid", default=UNSET)
41764181
einde_geldigheid: (
4177-
Annotated[date, Meta(description="De datum waarop het is opgeheven.")] | None
4178-
) = field(name="eindeGeldigheid", default=None)
4182+
Annotated[date, Meta(description="De datum waarop het is opgeheven.")]
4183+
| None
4184+
| UnsetType
4185+
) = field(name="eindeGeldigheid", default=UNSET)
41794186

41804187

41814188
class PaginatedEigenschapList(Struct, kw_only=True):

0 commit comments

Comments
 (0)