From b65ce11c3be8634bef705bda412030b5a247fd60 Mon Sep 17 00:00:00 2001
From: Bradlee Speice <bradlee@speice.io>
Date: Fri, 10 Sep 2021 22:11:03 -0400
Subject: [PATCH] Test that label playlists are working

---
 spotify_model/__init__.py |  3 ++-
 spotify_model/track.py    | 18 ++++++++++++++++--
 spotify_model/user.py     |  4 ++--
 3 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/spotify_model/__init__.py b/spotify_model/__init__.py
index 65e48d3..3eae198 100644
--- a/spotify_model/__init__.py
+++ b/spotify_model/__init__.py
@@ -6,11 +6,12 @@ from .album import SearchAlbum, SimplifiedAlbum
 from .extra import ReleaseDatePrecision
 from .paging import Paging
 from .playlist import SimplifiedPlaylist
-from .track import SimplifiedTrack, Track
+from .track import PlaylistTrack, SimplifiedTrack, Track
 from .user import PrivateUser, PublicUser
 
 __all__ = [
     "Paging",
+    "PlaylistTrack",
     "PrivateUser",
     "PublicUser",
     "ReleaseDatePrecision",
diff --git a/spotify_model/track.py b/spotify_model/track.py
index a12479d..8e8d99a 100644
--- a/spotify_model/track.py
+++ b/spotify_model/track.py
@@ -1,11 +1,13 @@
 """
 Classes designed to manage track-like objects
 """
+from datetime import datetime
 from typing import Dict, List, Optional, Union
 
 from pydantic import BaseModel, Field
 
-from .album import SimplifiedAlbum
+from .album import SearchAlbum
+from .user import PublicUser
 
 
 class SimplifiedTrack(BaseModel):
@@ -41,6 +43,18 @@ class Track(SimplifiedTrack):
     https://developer.spotify.com/documentation/web-api/reference/#object-trackobject
     """
 
-    album: SimplifiedAlbum
+    album: SearchAlbum
     external_ids: Dict[str, str]
     popularity: int
+
+
+class PlaylistTrack(BaseModel):
+    """
+    Track as returned from a playlist
+    """
+
+    added_at: datetime
+    added_by: PublicUser
+    is_local: bool
+    primary_color: Optional[str]
+    track: Track
diff --git a/spotify_model/user.py b/spotify_model/user.py
index d71f233..8ae25e7 100644
--- a/spotify_model/user.py
+++ b/spotify_model/user.py
@@ -1,7 +1,7 @@
 """
 Classes for managing users
 """
-from typing import Any, Dict, List
+from typing import Any, Dict, List, Optional
 
 from pydantic import BaseModel, Field
 
@@ -13,7 +13,7 @@ class PublicUser(BaseModel):
     https://developer.spotify.com/documentation/web-api/reference/#object-publicuserobject
     """
 
-    display_name: str
+    display_name: Optional[str]
     external_urls: Dict[str, str]
     href: str
     spotify_id: str = Field(alias="id")