Skip to content

Fixed pagination issue, added custom payload option in all methods an… #45

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sunil-lakshman merged 3 commits into from
Dec 8, 2023
Merged

Fixed pagination issue, added custom payload option in all methods an… #45

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b8bcc81
Fixed pagination issue, added custom payload option in all methods an…
sunil-lakshman Dec 7, 2023
7e2592e
Added urlencode method for parameter to avoid symbols
sunil-lakshman Dec 7, 2023
7231433
Removed duplicate line and changes test values
sunil-lakshman Dec 7, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions .talismanrc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -340,3 +340,17 @@ fileignoreconfig:
- filename: contentstack_management/content_types/content_type.py
checksum: 0a00803d139fef0b91ba6f2a38af41bd02e6a8a3390e74f9c8c2b85bf6162d9a
version: ""
fileignoreconfig:
- filename: contentstack_management/environments/environment.py
checksum: 46235166ac0e658ec22956cb4579609b0641dd42a711cc3858df2611f987c691
- filename: tests/unit/stack/test_stack.py
checksum: 3695817bbf4e5f1b664eb42087d1ac79a28ddea51ecb638fa9ed5608203648b7
version: ""
fileignoreconfig:
- filename: tests/unit/stack/test_stack.py
checksum: 8fd255a1f2272d225fba9b25b079ce5fde9233b8c5888cbb240174beab4a5c0c
version: ""
fileignoreconfig:
- filename: tests/unit/stack/test_stack.py
checksum: 43e5b5f95f3d6a3de3eafa70bd1c24bf448c4a21e0f23ac37ba483e5e19da049
version: ""
2 changes: 1 addition & 1 deletion contentstack_management/aliases/aliases.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ def assign(self, data):
"""
url = f"{_path}/{self.alias_uid}"
body = json.dumps(data)
return self.client.put(url, headers=self.client.headers, data=body)
return self.client.put(url, headers=self.client.headers, params=self.params, data=body)

def delete(self):
r"""
Expand Down
4 changes: 2 additions & 2 deletions contentstack_management/auditlogs/auditlog.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ def find(self):

-------------------------------
"""
return self.client.get(self.path, headers = self.client.headers)
return self.client.get(self.path, headers = self.client.headers, params = self.params)



Expand All @@ -56,7 +56,7 @@ def fetch(self):
"""
self.validate_uid()
url = f"{self.path}/{self.log_item_uid}"
return self.client.get(url, headers = self.client.headers)
return self.client.get(url, headers = self.client.headers, params = self.params)

def validate_uid(self):
if self.log_item_uid is None or '':
Expand Down
4 changes: 2 additions & 2 deletions contentstack_management/branches/branches.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ def fetch(self):
if self.branch_uid is None or '':
raise Exception('branch_uid is required field')
url = f"{_path}/{self.branch_uid}"
return self.client.get(url, headers=self.client.headers)
return self.client.get(url, headers=self.client.headers, params=self.params)

def create(self, data):
r"""
Expand All @@ -82,7 +82,7 @@ def create(self, data):
--------------------------------
"""
data = json.dumps(data)
return self.client.post(_path, headers=self.client.headers, data=data)
return self.client.post(_path, headers=self.client.headers, data=data, params=self.params)

def delete(self):
r"""
Expand Down
8 changes: 4 additions & 4 deletions contentstack_management/bulk_operations/bulk_operation.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ def publish(self, data: dict):
"""
url = f"{self.path}/publish"
data = json.dumps(data)
return self.client.post(url, headers = self.client.headers, data = data)
return self.client.post(url, headers = self.client.headers, data = data, params=self.params)

def unpublish(self, data: dict):
"""
Expand Down Expand Up @@ -136,7 +136,7 @@ def unpublish(self, data: dict):

url = f"{self.path}/unpublish"
data = json.dumps(data)
return self.client.post(url, headers = self.client.headers, data = data)
return self.client.post(url, headers = self.client.headers, data = data, params=self.params)

def delete(self, data: dict):
"""
Expand Down Expand Up @@ -173,7 +173,7 @@ def delete(self, data: dict):

url = f"{self.path}/delete"
data = json.dumps(data)
return self.client.post(url, headers = self.client.headers, data = data)
return self.client.post(url, headers = self.client.headers, data = data, params=self.params)

def update(self, data: dict):
"""
Expand Down Expand Up @@ -225,6 +225,6 @@ def update(self, data: dict):

url = f"{self.path}/workflow"
data = json.dumps(data)
return self.client.post(url, headers = self.client.headers, data = data)
return self.client.post(url, headers = self.client.headers, data = data, params=self.params)


2 changes: 1 addition & 1 deletion contentstack_management/content_types/content_type.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -341,7 +341,7 @@ def imports(self, file_path):
files = {'content_type': open(f"{file_path}", 'rb')}
return self.client.post(url, headers=self.client.headers, params=self.params, files=files)

def entry(self, entry_uid=None):
def entry(self, entry_uid: str =None):
if self.content_type_uid is None:
raise Exception('Content type uid is required')
return entry.Entry(self.client, self.content_type_uid, entry_uid)
10 changes: 5 additions & 5 deletions contentstack_management/delivery_token/delivery_token.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ def find(self):

-------------------------------
"""
return self.client.get(self.path, headers = self.client.headers)
return self.client.get(self.path, headers = self.client.headers, params = self.params)

def fetch(self):
"""
Expand All @@ -54,7 +54,7 @@ def fetch(self):
"""
self.validate_uid()
url = f"{self.path}/{self.delivery_token_uid}"
return self.client.get(url, headers = self.client.headers)
return self.client.get(url, headers = self.client.headers, params = self.params)


def create(self, data: dict):
Expand Down Expand Up @@ -112,7 +112,7 @@ def create(self, data: dict):
"""

data = json.dumps(data)
return self.client.post(self.path, headers = self.client.headers, data=data)
return self.client.post(self.path, headers = self.client.headers, data=data, params=self.params)

def update(self, data: dict):
"""
Expand Down Expand Up @@ -168,7 +168,7 @@ def update(self, data: dict):
self.validate_uid()
url = f"{self.path}/{self.delivery_token_uid}"
data = json.dumps(data)
return self.client.put(url, headers = self.client.headers, data=data)
return self.client.put(url, headers = self.client.headers, data=data, params=self.params)


def delete(self):
Expand All @@ -188,7 +188,7 @@ def delete(self):
"""
self.validate_uid()
url = f"{self.path}/{self.delivery_token_uid}"
return self.client.delete(url, headers = self.client.headers)
return self.client.delete(url, headers = self.client.headers, params=self.params)

def validate_uid(self):
if self.delivery_token_uid is None or '':
Expand Down
40 changes: 20 additions & 20 deletions contentstack_management/entries/entry.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ def find(self):
"""

url = f"content_types/{self.content_type_uid}/entries"
return self.client.get(url, headers = self.client.headers)
return self.client.get(url, headers = self.client.headers, params = self.params)



Expand All @@ -60,7 +60,7 @@ def fetch(self):
if self.entry_uid is None:
raise Exception('Entry uid is required')
url = f"content_types/{self.content_type_uid}/entries/{self.entry_uid}"
return self.client.get(url, headers = self.client.headers)
return self.client.get(url, headers = self.client.headers, params = self.params)


def create(self, data, locale='en-us'):
Expand Down Expand Up @@ -93,9 +93,9 @@ def create(self, data, locale='en-us'):
"""

url = f"content_types/{self.content_type_uid}/entries"
params = {'locale': locale }
self.params['locale'] = locale
data = json.dumps(data)
return self.client.post(url, headers = self.client.headers, params = params, data=data)
return self.client.post(url, headers = self.client.headers, params = self.params, data=data)

def update(self, data, locale='en-us'):
"""
Expand Down Expand Up @@ -127,9 +127,9 @@ def update(self, data, locale='en-us'):
if self.entry_uid is None:
raise Exception('Entry uid is required')
url = url = f"content_types/{self.content_type_uid}/entries/{self.entry_uid}"
params = {'locale': locale }
self.params['locale'] = locale
data = json.dumps(data)
return self.client.put(url, headers = self.client.headers, params = params, data=data)
return self.client.put(url, headers = self.client.headers, params = self.params, data=data)


def version_naming(self, version_number, data):
Expand Down Expand Up @@ -167,7 +167,7 @@ def version_naming(self, version_number, data):
raise Exception('Body is required')
url = f"content_types/{self.content_type_uid}/entries/{self.entry_uid}/versions/{version_number}/name"
data = json.dumps(data)
return self.client.post(url, headers = self.client.headers, data=data)
return self.client.post(url, headers = self.client.headers, data=data, params = self.params)

def references(self):
"""
Expand All @@ -186,7 +186,7 @@ def references(self):
if self.entry_uid is None:
raise Exception('Entry uid is required')
url = f"content_types/{self.content_type_uid}/entries/{self.entry_uid}/references"
return self.client.get(url, headers = self.client.headers)
return self.client.get(url, headers = self.client.headers, params = self.params)

def languages(self):
"""
Expand All @@ -205,7 +205,7 @@ def languages(self):
if self.entry_uid is None:
raise Exception('Entry uid is required')
url = f"content_types/{self.content_type_uid}/entries/{self.entry_uid}/locales"
return self.client.get(url, headers = self.client.headers)
return self.client.get(url, headers = self.client.headers, params = self.params)

def localize(self, data, locale='en-us'):
"""
Expand Down Expand Up @@ -250,9 +250,9 @@ def localize(self, data, locale='en-us'):
if data is None:
raise Exception('Body is required')
url = f"content_types/{self.content_type_uid}/entries/{self.entry_uid}"
params = {'locale': locale }
self.params['locale'] = locale
data = json.dumps(data)
return self.client.put(url, headers = self.client.headers, params = params, data = data)
return self.client.put(url, headers = self.client.headers, params = self.params, data = data)

def unlocalize(self, locale='en-us'):
"""
Expand All @@ -275,8 +275,8 @@ def unlocalize(self, locale='en-us'):
if self.entry_uid is None:
raise Exception('Entry uid is required')
url = f"content_types/{self.content_type_uid}/entries/{self.entry_uid}/unlocalize"
params = {'locale': locale }
return self.client.post(url, headers = self.client.headers, params = params)
self.params['locale'] = locale
return self.client.post(url, headers = self.client.headers, params = self.params)


def delete(self):
Expand All @@ -297,8 +297,8 @@ def delete(self):
if self.entry_uid is None:
raise Exception('Entry uid is required')
url = f"content_types/{self.content_type_uid}/entries/{self.entry_uid}"
params = {'force': True}
return self.client.delete(url, headers = self.client.headers, params = params)
self.params['force'] = True
return self.client.delete(url, headers = self.client.headers, params = self.params)

def imports(self, file_path, locale='en-us'):
"""
Expand Down Expand Up @@ -328,8 +328,8 @@ def imports(self, file_path, locale='en-us'):
url = f"content_types/{self.content_type_uid}/entries/import"
self.client.headers['Content-Type'] = "multipart/form-data"
files = {'entry': open(f"{file_path}",'rb')}
params = {'locale': locale }
return self.client.post(url, headers = self.client.headers, params = params, files = files)
self.params['locale'] = locale
return self.client.post(url, headers = self.client.headers, params = self.params, files = files)

def export(self):
"""
Expand All @@ -348,7 +348,7 @@ def export(self):
if self.entry_uid is None:
raise Exception('Entry uid is required')
url = f"content_types/{self.content_type_uid}/entries/{self.entry_uid}/export"
return self.client.get(url, headers = self.client.headers)
return self.client.get(url, headers = self.client.headers, params = self.params)

def publish(self, data):
"""
Expand Down Expand Up @@ -383,7 +383,7 @@ def publish(self, data):
raise Exception('Body is required')
url = f"content_types/{self.content_type_uid}/entries/{self.entry_uid}/publish"
data = json.dumps(data)
return self.client.post(url, headers = self.client.headers, data = data)
return self.client.post(url, headers = self.client.headers, data = data, params = self.params)

def unpublish(self, data):
"""
Expand Down Expand Up @@ -419,7 +419,7 @@ def unpublish(self, data):
raise Exception('Body is required')
url = f"content_types/{self.content_type_uid}/entries/{self.entry_uid}/unpublish"
data = json.dumps(data)
return self.client.post(url, headers = self.client.headers, data = data)
return self.client.post(url, headers = self.client.headers, data = data, params = self.params)



Expand Down
10 changes: 5 additions & 5 deletions contentstack_management/environments/environment.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ def find(self):

-------------------------------
"""
return self.client.get(self.path, headers = self.client.headers)
return self.client.get(self.path, headers = self.client.headers, params = self.params)



Expand All @@ -56,7 +56,7 @@ def fetch(self):
"""
self.validate_uid()
url = f"{self.path}/{self.environment_name}"
return self.client.get(url, headers = self.client.headers)
return self.client.get(url, headers = self.client.headers, params = self.params)


def create(self, data: dict):
Expand Down Expand Up @@ -85,7 +85,7 @@ def create(self, data: dict):
"""

data = json.dumps(data)
return self.client.post(self.path, headers = self.client.headers, data=data)
return self.client.post(self.path, headers = self.client.headers, data=data, params = self.params)

def update(self, data: dict):
"""
Expand Down Expand Up @@ -113,7 +113,7 @@ def update(self, data: dict):
self.validate_uid()
url = f"{self.path}/{self.environment_name}"
data = json.dumps(data)
return self.client.put(url, headers = self.client.headers, data=data)
return self.client.put(url, headers = self.client.headers, data=data, params = self.params)


def delete(self):
Expand All @@ -132,7 +132,7 @@ def delete(self):
"""
self.validate_uid()
url = f"{self.path}/{self.environment_name}"
return self.client.delete(url, headers = self.client.headers)
return self.client.delete(url, headers = self.client.headers, params = self.params)

def validate_uid(self):
if self.environment_name is None or '':
Expand Down
12 changes: 6 additions & 6 deletions contentstack_management/extensions/extension.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ def find(self):
>>> result = client.stack("api_key").extension().find().json()
-------------------------------
"""
return self.client.get(self.path, headers = self.client.headers)
return self.client.get(self.path, headers = self.client.headers, params = self.params)



Expand All @@ -53,7 +53,7 @@ def fetch(self):
"""
self.validate_uid()
url = f"{self.path}/{self.extension_uid}"
return self.client.get(url, headers = self.client.headers)
return self.client.get(url, headers = self.client.headers, params = self.params)


def upload(self, data: dict):
Expand Down Expand Up @@ -90,7 +90,7 @@ def upload(self, data: dict):
}
content_type, body = self.encode_multipart_formdata(fields)
self.client.headers['Content-Type'] = content_type
return self.client.post(self.path, headers = self.client.headers, data = body)
return self.client.post(self.path, headers = self.client.headers, data = body, params = self.params)

def create(self, data: dict):
"""
Expand Down Expand Up @@ -119,7 +119,7 @@ def create(self, data: dict):
-------------------------------
"""
data = json.dumps(data)
return self.client.post(self.path, headers = self.client.headers, data=data)
return self.client.post(self.path, headers = self.client.headers, data=data, params = self.params)

def update(self, data: dict):
"""
Expand Down Expand Up @@ -152,7 +152,7 @@ def update(self, data: dict):
self.validate_uid()
url = f"{self.path}/{self.extension_uid}"
data = json.dumps(data)
return self.client.put(url, headers = self.client.headers, data=data)
return self.client.put(url, headers = self.client.headers, data=data, params = self.params)


def delete(self):
Expand All @@ -169,7 +169,7 @@ def delete(self):
"""
self.validate_uid()
url = f"{self.path}/{self.extension_uid}"
return self.client.delete(url, headers = self.client.headers)
return self.client.delete(url, headers = self.client.headers, params = self.params)

def validate_uid(self):
if self.extension_uid is None or '':
Expand Down
Loading