Update resources to be in-line with API representation

* Add `videos`, `images`, `categories` references to Dossiers * Add `flags` to Itinerary
gadventures · Sep 20, 2017 · 9daad54 · 9daad54
1 parent 78a6ebf
commit 9daad54
Show file tree

Hide file tree

Showing 6 changed files with 41 additions and 5 deletions.
diff --git a/gapipy/resources/dossier/accommodation_dossier.py b/gapipy/resources/dossier/accommodation_dossier.py
@@ -3,6 +3,8 @@
 
 from ..base import Resource
 from .details import DossierDetail, DossierDetailsMixin
+from ..tour.video import Video
+from ..tour.image import Image
 
 
 class AccommodationDossier(Resource, DossierDetailsMixin):
@@ -31,4 +33,6 @@ class AccommodationDossier(Resource, DossierDetailsMixin):
 
     _model_collection_fields = [
         ('details', DossierDetail),
+        ('images', Image),
+        ('videos', Video),
     ]
diff --git a/gapipy/resources/dossier/activity_dossier.py b/gapipy/resources/dossier/activity_dossier.py
@@ -3,6 +3,9 @@
 
 from ...utils import humanize_price, LocationLabelMixin, DurationLabelMixin, enforce_string_type
 from ..base import Resource
+from ..tour.image import Image
+from ..tour.tour_category import TourCategoryList
+from ..tour.video import Video
 from .details import DossierDetail, DossierDetailsMixin
 from .dossier_features import DossierFeature
 
@@ -39,6 +42,9 @@ class ActivityDossier(Resource, DossierDetailsMixin, DurationLabelMixin, Locatio
     _model_collection_fields = [
         ('details', DossierDetail),
         ('features', DossierFeature),
+        ('categories', TourCategoryList),
+        ('images', Image),
+        ('videos', Video),
     ]
 
     @enforce_string_type

diff --git a/gapipy/resources/dossier/place_dossier.py b/gapipy/resources/dossier/place_dossier.py
@@ -1,8 +1,9 @@
 # Python 2 and 3
 from __future__ import unicode_literals
 
-from ...models.base import BaseModel
 from ..base import Resource
+from ..tour.image import Image
+from ..tour.video import Video
 from .details import DossierDetail
 
 
@@ -21,5 +22,6 @@ class PlaceDossier(Resource):
 
     _model_collection_fields = [
         ('details', DossierDetail),
-        ('images', 'Image'),
+        ('images', Image),
+        ('videos', Video),
     ]
diff --git a/gapipy/resources/dossier/transport_dossier.py b/gapipy/resources/dossier/transport_dossier.py
@@ -2,6 +2,9 @@
 from __future__ import unicode_literals
 
 from ..base import Resource
+from ..tour.image import Image
+from ..tour.tour_category import TourCategoryList
+from ..tour.video import Video
 from .details import DossierDetail, DossierDetailsMixin
 from .dossier_features import DossierFeature
 
@@ -21,8 +24,11 @@ class TransportDossier(Resource, DossierDetailsMixin):
     ]
 
     _model_collection_fields = [
+        ('categories', TourCategoryList),
         ('details', DossierDetail),
         ('features', DossierFeature),
+        ('images', Image),
+        ('videos', Video),
     ]
 
     _date_time_fields_local = ['date_created', 'date_last_modified']
diff --git a/gapipy/resources/tour/itinerary.py b/gapipy/resources/tour/itinerary.py
@@ -145,8 +145,15 @@ class Itinerary(Resource):
     _is_parent_resource = True
 
     _as_is_fields = [
-        'id', 'href', 'name', 'duration', 'meals_included', 'meals_budget',
-        'packing_lists', 'variation_id',
+        'id',
+        'href',
+        'name',
+        'flags',
+        'duration',
+        'meals_included',
+        'meals_budget',
+        'packing_lists',
+        'variation_id',
     ]
     _resource_fields = [
         ('start_location', 'Place'),

diff --git a/gapipy/resources/tour/tour_category.py b/gapipy/resources/tour/tour_category.py
@@ -1,7 +1,18 @@
 # Python 2 and 3
 from __future__ import unicode_literals
 
-from ..base import Resource
+from ..base import Resource, BaseModel
+
+class TourCategoryList(BaseModel):
+    _as_is_fields = [
+        'id',
+        'href',
+        'name',
+    ]
+
+    _resource_fields = [
+        ('category_type', 'TourCategory'),
+    ]
 
 
 class TourCategory(Resource):