Skip to content

Commit fff0f0f

Browse files
sunil-lakshmansunil-lakshman
authored
Fixed pagination issue, added custom payload option in all methods an… (#45)
* Fixed pagination issue, added custom payload option in all methods and added pagination testcases * Added urlencode method for parameter to avoid symbols * Removed duplicate line and changes test values
1 parent af471da commit fff0f0f

File tree

33 files changed

+198
-178
lines changed

33 files changed

+198
-178
lines changed

‎.talismanrc‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -340,3 +340,17 @@ fileignoreconfig:
340340
- filename: contentstack_management/content_types/content_type.py
341341
checksum: 0a00803d139fef0b91ba6f2a38af41bd02e6a8a3390e74f9c8c2b85bf6162d9a
342342
version: ""
343+
fileignoreconfig:
344+
- filename: contentstack_management/environments/environment.py
345+
checksum: 46235166ac0e658ec22956cb4579609b0641dd42a711cc3858df2611f987c691
346+
- filename: tests/unit/stack/test_stack.py
347+
checksum: 3695817bbf4e5f1b664eb42087d1ac79a28ddea51ecb638fa9ed5608203648b7
348+
version: ""
349+
fileignoreconfig:
350+
- filename: tests/unit/stack/test_stack.py
351+
checksum: 8fd255a1f2272d225fba9b25b079ce5fde9233b8c5888cbb240174beab4a5c0c
352+
version: ""
353+
fileignoreconfig:
354+
- filename: tests/unit/stack/test_stack.py
355+
checksum: 43e5b5f95f3d6a3de3eafa70bd1c24bf448c4a21e0f23ac37ba483e5e19da049
356+
version: ""

‎contentstack_management/aliases/aliases.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ def assign(self, data):
7373
"""
7474
url = f"{_path}/{self.alias_uid}"
7575
body = json.dumps(data)
76-
return self.client.put(url, headers=self.client.headers, data=body)
76+
return self.client.put(url, headers=self.client.headers, params=self.params, data=body)
7777

7878
def delete(self):
7979
r"""

‎contentstack_management/auditlogs/auditlog.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ def find(self):
3737
3838
-------------------------------
3939
"""
40-
return self.client.get(self.path, headers = self.client.headers)
40+
return self.client.get(self.path, headers = self.client.headers, params = self.params)
4141

4242

4343

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

6161
def validate_uid(self):
6262
if self.log_item_uid is None or '':

‎contentstack_management/branches/branches.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ def fetch(self):
5757
if self.branch_uid is None or '':
5858
raise Exception('branch_uid is required field')
5959
url = f"{_path}/{self.branch_uid}"
60-
return self.client.get(url, headers=self.client.headers)
60+
return self.client.get(url, headers=self.client.headers, params=self.params)
6161

6262
def create(self, data):
6363
r"""
@@ -82,7 +82,7 @@ def create(self, data):
8282
--------------------------------
8383
"""
8484
data = json.dumps(data)
85-
return self.client.post(_path, headers=self.client.headers, data=data)
85+
return self.client.post(_path, headers=self.client.headers, data=data, params=self.params)
8686

8787
def delete(self):
8888
r"""

‎contentstack_management/bulk_operations/bulk_operation.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ def publish(self, data: dict):
7373
"""
7474
url = f"{self.path}/publish"
7575
data = json.dumps(data)
76-
return self.client.post(url, headers = self.client.headers, data = data)
76+
return self.client.post(url, headers = self.client.headers, data = data, params=self.params)
7777

7878
def unpublish(self, data: dict):
7979
"""
@@ -136,7 +136,7 @@ def unpublish(self, data: dict):
136136

137137
url = f"{self.path}/unpublish"
138138
data = json.dumps(data)
139-
return self.client.post(url, headers = self.client.headers, data = data)
139+
return self.client.post(url, headers = self.client.headers, data = data, params=self.params)
140140

141141
def delete(self, data: dict):
142142
"""
@@ -173,7 +173,7 @@ def delete(self, data: dict):
173173

174174
url = f"{self.path}/delete"
175175
data = json.dumps(data)
176-
return self.client.post(url, headers = self.client.headers, data = data)
176+
return self.client.post(url, headers = self.client.headers, data = data, params=self.params)
177177

178178
def update(self, data: dict):
179179
"""
@@ -225,6 +225,6 @@ def update(self, data: dict):
225225

226226
url = f"{self.path}/workflow"
227227
data = json.dumps(data)
228-
return self.client.post(url, headers = self.client.headers, data = data)
228+
return self.client.post(url, headers = self.client.headers, data = data, params=self.params)
229229

230230

‎contentstack_management/content_types/content_type.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -341,7 +341,7 @@ def imports(self, file_path):
341341
files = {'content_type': open(f"{file_path}", 'rb')}
342342
return self.client.post(url, headers=self.client.headers, params=self.params, files=files)
343343

344-
def entry(self, entry_uid=None):
344+
def entry(self, entry_uid: str =None):
345345
if self.content_type_uid is None:
346346
raise Exception('Content type uid is required')
347347
return entry.Entry(self.client, self.content_type_uid, entry_uid)

‎contentstack_management/delivery_token/delivery_token.py‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ def find(self):
3737
3838
-------------------------------
3939
"""
40-
return self.client.get(self.path, headers = self.client.headers)
40+
return self.client.get(self.path, headers = self.client.headers, params = self.params)
4141

4242
def fetch(self):
4343
"""
@@ -54,7 +54,7 @@ def fetch(self):
5454
"""
5555
self.validate_uid()
5656
url = f"{self.path}/{self.delivery_token_uid}"
57-
return self.client.get(url, headers = self.client.headers)
57+
return self.client.get(url, headers = self.client.headers, params = self.params)
5858

5959

6060
def create(self, data: dict):
@@ -112,7 +112,7 @@ def create(self, data: dict):
112112
"""
113113

114114
data = json.dumps(data)
115-
return self.client.post(self.path, headers = self.client.headers, data=data)
115+
return self.client.post(self.path, headers = self.client.headers, data=data, params=self.params)
116116

117117
def update(self, data: dict):
118118
"""
@@ -168,7 +168,7 @@ def update(self, data: dict):
168168
self.validate_uid()
169169
url = f"{self.path}/{self.delivery_token_uid}"
170170
data = json.dumps(data)
171-
return self.client.put(url, headers = self.client.headers, data=data)
171+
return self.client.put(url, headers = self.client.headers, data=data, params=self.params)
172172

173173

174174
def delete(self):
@@ -188,7 +188,7 @@ def delete(self):
188188
"""
189189
self.validate_uid()
190190
url = f"{self.path}/{self.delivery_token_uid}"
191-
return self.client.delete(url, headers = self.client.headers)
191+
return self.client.delete(url, headers = self.client.headers, params=self.params)
192192

193193
def validate_uid(self):
194194
if self.delivery_token_uid is None or '':

‎contentstack_management/entries/entry.py‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ def find(self):
3939
"""
4040

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

4444

4545

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

6565

6666
def create(self, data, locale='en-us'):
@@ -93,9 +93,9 @@ def create(self, data, locale='en-us'):
9393
"""
9494

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

100100
def update(self, data, locale='en-us'):
101101
"""
@@ -127,9 +127,9 @@ def update(self, data, locale='en-us'):
127127
if self.entry_uid is None:
128128
raise Exception('Entry uid is required')
129129
url = url = f"content_types/{self.content_type_uid}/entries/{self.entry_uid}"
130-
params = {'locale': locale }
130+
self.params['locale'] = locale
131131
data = json.dumps(data)
132-
return self.client.put(url, headers = self.client.headers, params = params, data=data)
132+
return self.client.put(url, headers = self.client.headers, params = self.params, data=data)
133133

134134

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

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

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

210210
def localize(self, data, locale='en-us'):
211211
"""
@@ -250,9 +250,9 @@ def localize(self, data, locale='en-us'):
250250
if data is None:
251251
raise Exception('Body is required')
252252
url = f"content_types/{self.content_type_uid}/entries/{self.entry_uid}"
253-
params = {'locale': locale }
253+
self.params['locale'] = locale
254254
data = json.dumps(data)
255-
return self.client.put(url, headers = self.client.headers, params = params, data = data)
255+
return self.client.put(url, headers = self.client.headers, params = self.params, data = data)
256256

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

281281

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

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

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

353353
def publish(self, data):
354354
"""
@@ -383,7 +383,7 @@ def publish(self, data):
383383
raise Exception('Body is required')
384384
url = f"content_types/{self.content_type_uid}/entries/{self.entry_uid}/publish"
385385
data = json.dumps(data)
386-
return self.client.post(url, headers = self.client.headers, data = data)
386+
return self.client.post(url, headers = self.client.headers, data = data, params = self.params)
387387

388388
def unpublish(self, data):
389389
"""
@@ -419,7 +419,7 @@ def unpublish(self, data):
419419
raise Exception('Body is required')
420420
url = f"content_types/{self.content_type_uid}/entries/{self.entry_uid}/unpublish"
421421
data = json.dumps(data)
422-
return self.client.post(url, headers = self.client.headers, data = data)
422+
return self.client.post(url, headers = self.client.headers, data = data, params = self.params)
423423

424424

425425

‎contentstack_management/environments/environment.py‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ def find(self):
3737
3838
-------------------------------
3939
"""
40-
return self.client.get(self.path, headers = self.client.headers)
40+
return self.client.get(self.path, headers = self.client.headers, params = self.params)
4141

4242

4343

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

6161

6262
def create(self, data: dict):
@@ -85,7 +85,7 @@ def create(self, data: dict):
8585
"""
8686

8787
data = json.dumps(data)
88-
return self.client.post(self.path, headers = self.client.headers, data=data)
88+
return self.client.post(self.path, headers = self.client.headers, data=data, params = self.params)
8989

9090
def update(self, data: dict):
9191
"""
@@ -113,7 +113,7 @@ def update(self, data: dict):
113113
self.validate_uid()
114114
url = f"{self.path}/{self.environment_name}"
115115
data = json.dumps(data)
116-
return self.client.put(url, headers = self.client.headers, data=data)
116+
return self.client.put(url, headers = self.client.headers, data=data, params = self.params)
117117

118118

119119
def delete(self):
@@ -132,7 +132,7 @@ def delete(self):
132132
"""
133133
self.validate_uid()
134134
url = f"{self.path}/{self.environment_name}"
135-
return self.client.delete(url, headers = self.client.headers)
135+
return self.client.delete(url, headers = self.client.headers, params = self.params)
136136

137137
def validate_uid(self):
138138
if self.environment_name is None or '':

‎contentstack_management/extensions/extension.py‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ def find(self):
3636
>>> result = client.stack("api_key").extension().find().json()
3737
-------------------------------
3838
"""
39-
return self.client.get(self.path, headers = self.client.headers)
39+
return self.client.get(self.path, headers = self.client.headers, params = self.params)
4040

4141

4242

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

5858

5959
def upload(self, data: dict):
@@ -90,7 +90,7 @@ def upload(self, data: dict):
9090
}
9191
content_type, body = self.encode_multipart_formdata(fields)
9292
self.client.headers['Content-Type'] = content_type
93-
return self.client.post(self.path, headers = self.client.headers, data = body)
93+
return self.client.post(self.path, headers = self.client.headers, data = body, params = self.params)
9494

9595
def create(self, data: dict):
9696
"""
@@ -119,7 +119,7 @@ def create(self, data: dict):
119119
-------------------------------
120120
"""
121121
data = json.dumps(data)
122-
return self.client.post(self.path, headers = self.client.headers, data=data)
122+
return self.client.post(self.path, headers = self.client.headers, data=data, params = self.params)
123123

124124
def update(self, data: dict):
125125
"""
@@ -152,7 +152,7 @@ def update(self, data: dict):
152152
self.validate_uid()
153153
url = f"{self.path}/{self.extension_uid}"
154154
data = json.dumps(data)
155-
return self.client.put(url, headers = self.client.headers, data=data)
155+
return self.client.put(url, headers = self.client.headers, data=data, params = self.params)
156156

157157

158158
def delete(self):
@@ -169,7 +169,7 @@ def delete(self):
169169
"""
170170
self.validate_uid()
171171
url = f"{self.path}/{self.extension_uid}"
172-
return self.client.delete(url, headers = self.client.headers)
172+
return self.client.delete(url, headers = self.client.headers, params = self.params)
173173

174174
def validate_uid(self):
175175
if self.extension_uid is None or '':

0 commit comments

Comments
 (0)