From 260501cdfb60573fd963147cc762d1b6ab1733f4 Mon Sep 17 00:00:00 2001 From: Nikita Zyl Date: Thu, 10 Feb 2022 10:26:54 +0300 Subject: [PATCH 1/5] Add short links --- admitad/items/__init__.py | 1 + admitad/items/short_links.py | 35 +++++++++++++++++++++++++++++++++++ 2 files changed, 36 insertions(+) create mode 100644 admitad/items/short_links.py diff --git a/admitad/items/__init__.py b/admitad/items/__init__.py index 2fd1467..ce089d6 100644 --- a/admitad/items/__init__.py +++ b/admitad/items/__init__.py @@ -17,3 +17,4 @@ from admitad.items.retag import * from admitad.items.broken_links import * from admitad.items.tickets import * +from admitad.items.short_links import * diff --git a/admitad/items/short_links.py b/admitad/items/short_links.py new file mode 100644 index 0000000..e797a89 --- /dev/null +++ b/admitad/items/short_links.py @@ -0,0 +1,35 @@ +# coding: utf-8 +from __future__ import unicode_literals + +from admitad.items.base import Item + + +__all__ = [ + 'ShortLinks' +] + + +class ShortLinks(Item): + + SCOPE = 'short_links' + + URL = Item.prepare_url('short_links') + SINGLE_URL = Item.prepare_url('shortlink/modify/') + + def get(self, **kwargs): + """ + Args: + link (str) + + """ + filtering = { + 'filter_by': kwargs, + 'available': { + 'link': lambda x: Item.sanitize_string_value(x, 'link', blank=True), + } + } + + return self.transport.get() \ + .set_pagination(**kwargs) \ + .set_filtering(filtering) \ + .request(url=self.URL) From 64dc6674e123f9df62c0c38a503aac7a54616a34 Mon Sep 17 00:00:00 2001 From: Nikita Zyl Date: Thu, 10 Feb 2022 16:09:03 +0300 Subject: [PATCH 2/5] Add short_links --- admitad/items/short_links.py | 23 +++++++++-------------- 1 file changed, 9 insertions(+), 14 deletions(-) diff --git a/admitad/items/short_links.py b/admitad/items/short_links.py index e797a89..37b5b27 100644 --- a/admitad/items/short_links.py +++ b/admitad/items/short_links.py @@ -13,23 +13,18 @@ class ShortLinks(Item): SCOPE = 'short_links' - URL = Item.prepare_url('short_links') - SINGLE_URL = Item.prepare_url('shortlink/modify/') + URL = Item.prepare_url('shortlink/modify/') - def get(self, **kwargs): + GET_FIELDS = { + 'link': lambda x: Item.sanitize_string_value(x, 'link'), + } + + def post(self, link, **kwargs): """ Args: link (str) """ - filtering = { - 'filter_by': kwargs, - 'available': { - 'link': lambda x: Item.sanitize_string_value(x, 'link', blank=True), - } - } - - return self.transport.get() \ - .set_pagination(**kwargs) \ - .set_filtering(filtering) \ - .request(url=self.URL) + data = Item.sanitize_fields(self.GET_FIELDS, link=link) + + return self.transport.post().set_data(data).request(url=self.URL) From d9c88eb61a74cd4442343fb48e3f77071270cc49 Mon Sep 17 00:00:00 2001 From: Nikita Zyl Date: Thu, 10 Feb 2022 16:13:21 +0300 Subject: [PATCH 3/5] SubID blank true --- admitad/items/deeplinks.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/admitad/items/deeplinks.py b/admitad/items/deeplinks.py index ecaa49c..eb34eeb 100644 --- a/admitad/items/deeplinks.py +++ b/admitad/items/deeplinks.py @@ -17,7 +17,7 @@ class DeeplinksManage(Item): CREATE_FIELDS = { 'ulp': lambda x: Item.sanitize_string_array(x, 'ulp'), - 'subid': lambda x: Item.sanitize_string_value(x, 'subid', max_length=30), + 'subid': lambda x: Item.sanitize_string_value(x, 'subid', max_length=30, blank=True), # todo: subid[1-4] } From 9cb2c6447d2ee0c6386959cf61b76f630f767146 Mon Sep 17 00:00:00 2001 From: Nikita Zyl Date: Tue, 15 Feb 2022 13:46:28 +0300 Subject: [PATCH 4/5] Add readme and search param to coupon --- README.md | 9 +++++++++ admitad/items/coupons.py | 3 +++ admitad/items/deeplinks.py | 2 +- 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 2c83f00..878c007 100644 --- a/README.md +++ b/README.md @@ -419,6 +419,15 @@ res = client.LandingsForWebsite.get(10, 22, limit=100) res = client.DeeplinksManage.create(22, 10, ulp='https://admitad.com/some/', subid='AS32djkd31') ``` +### ShortLinks ### + +###### Get short link ###### + +```python +res = client.ShortLinks.post(link='https://ad.admitad.com/g/some/') +res = client.DeeplinksManage.create(22, 10, ulp='https://admitad.com/some/', subid='AS32djkd31') +``` + ### Referrals ### ###### List of referrals ###### diff --git a/admitad/items/coupons.py b/admitad/items/coupons.py index 7f42f23..0590586 100644 --- a/admitad/items/coupons.py +++ b/admitad/items/coupons.py @@ -19,6 +19,7 @@ class CouponsBase(Item): 'campaign_category': lambda x: Item.sanitize_integer_array(x, 'campaign_category', blank=True), 'category': lambda x: Item.sanitize_integer_array(x, 'category', blank=True), 'type': lambda x: Item.sanitize_string_value(x, 'type', blank=True), + 'search': lambda x: Item.sanitize_string_value(x, 'search', blank=True), } @@ -39,6 +40,7 @@ def get(self, **kwargs): campaign (list of int) campaign_category (list of int) category (list of int) + search (str) type (str) limit (int) offset (int) @@ -95,6 +97,7 @@ def get(self, _id, **kwargs): campaign (list of int) campaign_category (list of int) category (list of int) + search (str) type (str) limit (int) offset (int) diff --git a/admitad/items/deeplinks.py b/admitad/items/deeplinks.py index eb34eeb..ecaa49c 100644 --- a/admitad/items/deeplinks.py +++ b/admitad/items/deeplinks.py @@ -17,7 +17,7 @@ class DeeplinksManage(Item): CREATE_FIELDS = { 'ulp': lambda x: Item.sanitize_string_array(x, 'ulp'), - 'subid': lambda x: Item.sanitize_string_value(x, 'subid', max_length=30, blank=True), + 'subid': lambda x: Item.sanitize_string_value(x, 'subid', max_length=30), # todo: subid[1-4] } From 2b10e470099a7e63236173e1fa1053413f293d1a Mon Sep 17 00:00:00 2001 From: Nikita Zyl Date: Tue, 15 Feb 2022 13:49:08 +0300 Subject: [PATCH 5/5] Fix readme --- README.md | 1 - 1 file changed, 1 deletion(-) diff --git a/README.md b/README.md index 878c007..c058c74 100644 --- a/README.md +++ b/README.md @@ -425,7 +425,6 @@ res = client.DeeplinksManage.create(22, 10, ulp='https://admitad.com/some/', sub ```python res = client.ShortLinks.post(link='https://ad.admitad.com/g/some/') -res = client.DeeplinksManage.create(22, 10, ulp='https://admitad.com/some/', subid='AS32djkd31') ``` ### Referrals ###