fix some classes

src/edutap/wallet_google/modelbase.py

@@ -106,7 +106,9 @@ class GoogleWalletObjectModel(GoogleWalletWithIdModel):
     rotatingBarcode: RotatingBarcode | None = None
 
 
-class GoogleWalletObjectWithClassReferenceMixin(GoogleWalletModel):
+class GoogleWalletObjectWithClassReferenceMixin(
+    GoogleWalletModel, GoogleWalletWithIdModel
+):
     """
     Mixin for all Google Wallet Object with a classReferences attribute, that reflects the whole class data.
     """

src/edutap/wallet_google/modelcore.py

@@ -12,7 +12,7 @@ class GoogleWalletModel(BaseModel):
     """
 
     model_config = ConfigDict(
-        extra="forbid",
+        # extra="forbid",
         # extra="ignore",
         # use_enum_values=True,
     )

src/edutap/wallet_google/models/generic.py

@@ -1,4 +1,5 @@
 from ..modelbase import GoogleWalletClassModel
+from ..modelbase import GoogleWalletMessageableMixin
 from ..modelbase import GoogleWalletObjectModel
 from ..modelbase import GoogleWalletStyleableClassMixin
 from ..modelbase import GoogleWalletStyleableObjectMixin
@@ -40,14 +41,22 @@ class Notifications(GoogleWalletModel):
 @register_model(
     "GenericClass", url_part="genericClass", plural="genericClasses", can_disable=False
 )
-class GenericClass(GoogleWalletClassModel, GoogleWalletStyleableClassMixin):
+class GenericClass(
+    GoogleWalletClassModel,
+    GoogleWalletStyleableClassMixin,
+    GoogleWalletMessageableMixin,
+):
     """
     see: https://developers.google.com/wallet/generic/rest/v1/genericclass
     """
 
 
 @register_model("GenericObject", url_part="genericObject")
-class GenericObject(GoogleWalletObjectModel, GoogleWalletStyleableObjectMixin):
+class GenericObject(
+    GoogleWalletObjectModel,
+    GoogleWalletStyleableObjectMixin,
+    GoogleWalletMessageableMixin,
+):
     """
     see: https://developers.google.com/wallet/generic/rest/v1/genericobject
     """

src/edutap/wallet_google/models/primitives/message.py

@@ -1,23 +1,26 @@
 from ...modelcore import GoogleWalletModel
-from ...modelcore import GoogleWalletWithIdModel
+from ...modelcore import GoogleWalletWithKindMixin
 from .datetime import TimeInterval
 from .enums import MessageType
 from .localized_string import LocalizedString
 from pydantic import Field
 
 
 class Message(
-    GoogleWalletWithIdModel,
+    GoogleWalletModel,
+    GoogleWalletWithKindMixin,
 ):
     """
     see: https://developers.google.com/wallet/tickets/events/rest/v1/Message
     """
 
     kind: str | None = Field(
         description="deprecated",
+        deprecated=True,
         exclude=True,
         default="walletobjects#walletObjectMessage",
     )
+    id: str | None = None
     messageType: MessageType = MessageType.MESSAGE_TYPE_UNSPECIFIED
     displayInterval: TimeInterval | None = None
     header: str | None = None

src/edutap/wallet_google/models/retail.py

@@ -4,6 +4,7 @@
 from ..modelbase import GoogleWalletObjectWithClassReferenceMixin
 from ..modelbase import GoogleWalletStyleableClassMixin
 from ..modelbase import GoogleWalletStyleableObjectMixin
+from ..modelcore import GoogleWalletModel
 from ..modelcore import GoogleWalletWithIdModel
 from ..modelcore import GoogleWalletWithKindMixin
 from ..registry import register_model
@@ -30,7 +31,6 @@
 from .primitives.money import Money
 from .primitives.retail import DiscoverableProgram
 from .primitives.review import Review
-from pydantic import BaseModel
 from pydantic import Field
 from pydantic import model_validator
 
@@ -105,6 +105,7 @@ class GiftCardObject(
 )
 class LoyaltyClass(
     GoogleWalletClassModel,
+    GoogleWalletWithKindMixin,
     GoogleWalletMessageableMixin,
     GoogleWalletStyleableClassMixin,
 ):
@@ -170,7 +171,10 @@ class LoyaltyClass(
     )
 
 
-class LoyaltyPointsBalance(BaseModel):
+class LoyaltyPointsBalance(
+    GoogleWalletModel,
+    GoogleWalletWithKindMixin,
+):
     """
     data-type,
     see: https://developers.google.com/wallet/retail/loyalty-cards/rest/v1/loyaltyobject#LoyaltyPointsBalance
@@ -195,7 +199,10 @@ def check_one_of(self) -> "LoyaltyPointsBalance":
         return self
 
 
-class LoyaltyPoints(BaseModel):
+class LoyaltyPoints(
+    GoogleWalletModel,
+    GoogleWalletWithKindMixin,
+):
     """
     data-type,
     see: https://developers.google.com/wallet/retail/loyalty-cards/rest/v1/loyaltyobject#LoyaltyPoints
@@ -207,7 +214,11 @@ class LoyaltyPoints(BaseModel):
 
 
 @register_model("LoyaltyObject", url_part="loyaltyObject", plural="loyaltyObjects")
-class LoyaltyObject(GoogleWalletObjectModel, GoogleWalletObjectWithClassReferenceMixin):
+class LoyaltyObject(
+    GoogleWalletObjectModel,
+    GoogleWalletWithKindMixin,
+    GoogleWalletObjectWithClassReferenceMixin,
+):
     """
     data-type,
     see: https://developers.google.com/wallet/retail/loyalty-cards/rest/v1/loyaltyobject

src/edutap/wallet_google/models/tickets_and_transit.py

@@ -5,6 +5,7 @@
 from ..modelbase import GoogleWalletStyleableClassMixin
 from ..modelbase import GoogleWalletStyleableObjectMixin
 from ..modelcore import GoogleWalletModel
+from ..modelcore import GoogleWalletWithIdModel
 from ..modelcore import GoogleWalletWithKindMixin
 from ..registry import register_model
 from .primitives import Image
@@ -38,7 +39,7 @@
 import datetime
 
 
-class TicketAndTransitClassBaseModel(GoogleWalletClassModel):
+class TicketAndTransitClassBaseModel(GoogleWalletClassModel, GoogleWalletWithIdModel):
     """
     Common Fields for Classes in this Module
     """
@@ -120,6 +121,7 @@ class EventReservationInfo(GoogleWalletModel, GoogleWalletWithKindMixin):
 )
 class EventTicketClass(
     TicketAndTransitClassBaseModel,
+    GoogleWalletWithKindMixin,
     GoogleWalletMessageableMixin,
     GoogleWalletStyleableClassMixin,
 ):
@@ -129,6 +131,7 @@ class EventTicketClass(
 
     kind: str | None = Field(
         description="deprecated",
+        deprecated=True,
         exclude=True,
         default="walletobjects#eventTicketClass",
     )
@@ -166,6 +169,7 @@ class EventTicketClass(
 )
 class EventTicketObject(
     GoogleWalletObjectModel,
+    GoogleWalletWithKindMixin,
     GoogleWalletObjectWithClassReferenceMixin,
     GoogleWalletMessageableMixin,
     GoogleWalletStyleableObjectMixin,