improve resources

Author: Ilya Tumash

pyadmitad/items/announcements.py

@@ -25,19 +25,37 @@ def get(self, **kwargs):
         Args:
             limit (int)
             offset (int)
+            language (str)
 
         """
-        return self.transport.get().set_pagination(**kwargs).request(url=self.URL)
+        filtering = {
+            'filter_by': kwargs,
+            'available': {
+                'language': lambda x: Item.sanitize_string_value(x, 'language', 2, 2, True),
+            }
+        }
+        return self.transport.get() \
+            .set_pagination(**kwargs) \
+            .set_filtering(filtering) \
+            .request(url=self.URL)
 
     def getOne(self, _id, **kwargs):
         """
         Args:
             _id (int)
+            language (str)
 
         """
+        filtering = {
+            'filter_by': kwargs,
+            'available': {
+                'language': lambda x: Item.sanitize_string_value(x, 'language', 2, 2, True),
+            }
+        }
+
         request_data = {
             'url': self.SINGLE_URL,
             'announcement_id': Item.sanitize_id(_id)
         }
 
-        return self.transport.get().request(**request_data)
+        return self.transport.get().set_filtering(filtering).request(**request_data)

pyadmitad/items/deeplinks.py

@@ -16,7 +16,7 @@ class DeeplinksManage(Item):
     CREATE_URL = Item.prepare_url('deeplink/%(website_id)s/advcampaign/%(campaign_id)s')
 
     CREATE_FIELDS = {
-        'ulp': lambda x: Item.sanitize_string_value(x, 'ulp'),
+        'ulp': lambda x: Item.sanitize_string_array(x, 'ulp'),
         'subid': lambda x: Item.sanitize_string_value(x, 'subid', max_length=30),
         # todo: subid[1-4]
     }
@@ -26,7 +26,7 @@ def create(self, website_id, campaign_id, **kwargs):
         Args:
             website_id (int)
             campaign_id (int)
-            ulp (str)
+            ulp (list of str)
             subid (str)
 
         """

pyadmitad/items/news.py

@@ -25,19 +25,38 @@ def get(self, **kwargs):
         Args:
             limit (int)
             offset (int)
+            language (str)
 
         """
-        return self.transport.get().set_pagination(**kwargs).request(url=self.URL)
+        filtering = {
+            'filter_by': kwargs,
+            'available': {
+                'language': lambda x: Item.sanitize_string_value(x, 'language', 2, 2, True),
+            }
+        }
+
+        return self.transport.get() \
+            .set_pagination(**kwargs) \
+            .set_filtering(filtering) \
+            .request(url=self.URL)
 
-    def getOne(self, news_id):
+    def getOne(self, news_id, **kwargs):
         """
         Args:
             news_id (int)
+            language (str)
 
         """
-        data = {
+        request_data = {
             'url': self.SINGLE_URL,
             'news_id': self.sanitize_id(news_id)
         }
 
-        return self.transport.get().request(**data)
+        filtering = {
+            'filter_by': kwargs,
+            'available': {
+                'language': lambda x: Item.sanitize_string_value(x, 'language', 2, 2, True),
+            }
+        }
+
+        return self.transport.get().set_filtering(filtering).request(**request_data)

pyadmitad/items/websites.py

@@ -107,17 +107,15 @@ class WebsitesManage(Item):
             x, 'categories'),
         'regions': lambda x: Item.sanitize_string_array(
             x, 'regions', max_length=2),
-        'atnd_visits': lambda x: Item.sanitize_integer_value(
-            x, 'atnd_visits', blank=False),
-        'atnd_hits': lambda x: Item.sanitize_integer_value(
-            x, 'atnd_hits', blank=False),
         'mailing_targeting': lambda x: Item.sanitize_bool_integer_value(
             x, 'mailing_targeting', blank=True)
     }
 
     UPDATE_FIELDS = {
         'name': lambda x: Item.sanitize_string_value(
             x, 'name', max_length=200, blank=True),
+        'kind': lambda x: Item.sanitize_string_value(
+            x, 'kind', max_length=20, blank=True),
         'language': lambda x: Item.sanitize_string_value(
             x, 'language', max_length=2, blank=True),
         'adservice': lambda x: Item.sanitize_integer_value(
@@ -130,10 +128,6 @@ class WebsitesManage(Item):
             x, 'categories', blank=True),
         'regions': lambda x: Item.sanitize_string_array(
             x, 'regions', max_length=2, blank=True),
-        'atnd_visits': lambda x: Item.sanitize_integer_value(
-            x, 'atnd_visits', blank=True),
-        'atnd_hits': lambda x: Item.sanitize_integer_value(
-            x, 'atnd_hits', blank=True),
         'mailing_targeting': lambda x: Item.sanitize_bool_integer_value(
             x, 'mailing_targeting', blank=True)
     }
@@ -149,8 +143,6 @@ def create(self, **kwargs):
             description (str)
             categories (list of int)
             regions (list of str)
-            atnd_visits (int)
-            atnd_hits (int)
             mailing_targeting (bool)
 
         """
@@ -163,14 +155,13 @@ def update(self, _id, **kwargs):
         Args:
             _id (int)
             name (str)
+            kind (str)
             language (str)
             adservice (int)
             site_url (str)
             description (str)
             categories (list of int)
             regions (list of str)
-            atnd_visits (int)
-            atnd_hits (int)
             mailing_targeting (bool)
 
         """