1111TEST_ORGANIZATION_ID = 1
1212TEST_PROJECT_ID = 1
1313BASE_URL = "/api/v1/guardrails/ban-lists/"
14- DEFAULT_QUERY = f"?organization_id={ TEST_ORGANIZATION_ID } &project_id={ TEST_PROJECT_ID } "
1514DEFAULT_HEADERS = {
1615 "X-Org-Id" : str (TEST_ORGANIZATION_ID ),
1716 "X-Project-Id" : str (TEST_PROJECT_ID ),
@@ -71,33 +70,34 @@ def _headers(self, org=TEST_ORGANIZATION_ID, project=TEST_PROJECT_ID):
7170 def create (self , client , payload_key = "minimal" , ** kwargs ):
7271 payload = {** BAN_LIST_PAYLOADS [payload_key ], ** kwargs }
7372 return client .post (
74- f"{ BASE_URL } { DEFAULT_QUERY } " ,
73+ f"{ BASE_URL } " ,
7574 json = payload ,
7675 headers = self ._headers (),
7776 )
7877
7978 def list (self , client , org = TEST_ORGANIZATION_ID , project = TEST_PROJECT_ID , ** filters ):
80- params = f"?organization_id={ org } &project_id={ project } "
8179 if filters :
82- params += "&" + "&" .join (f"{ k } ={ v } " for k , v in filters .items ())
80+ params = "?" + "&" .join (f"{ k } ={ v } " for k , v in filters .items ())
81+ else :
82+ params = ""
8383 return client .get (f"{ BASE_URL } { params } " , headers = self ._headers (org , project ))
8484
8585 def get (self , client , id , org = TEST_ORGANIZATION_ID , project = TEST_PROJECT_ID ):
8686 return client .get (
87- f"{ BASE_URL } { id } /?organization_id= { org } &project_id= { project } " ,
87+ f"{ BASE_URL } { id } " ,
8888 headers = self ._headers (org , project ),
8989 )
9090
9191 def update (self , client , id , payload ):
9292 return client .patch (
93- f"{ BASE_URL } { id } / { DEFAULT_QUERY } " ,
93+ f"{ BASE_URL } { id } " ,
9494 json = payload ,
9595 headers = self ._headers (),
9696 )
9797
9898 def delete (self , client , id ):
9999 return client .delete (
100- f"{ BASE_URL } { id } / { DEFAULT_QUERY } " ,
100+ f"{ BASE_URL } { id } " ,
101101 headers = self ._headers (),
102102 )
103103
@@ -115,7 +115,7 @@ def test_create_success(self, integration_client, clear_database):
115115
116116 def test_create_validation_error (self , integration_client , clear_database ):
117117 response = integration_client .post (
118- f"{ BASE_URL } { DEFAULT_QUERY } " ,
118+ f"{ BASE_URL } " ,
119119 json = {"name" : "missing words" },
120120 headers = self ._headers (),
121121 )
@@ -244,7 +244,7 @@ def test_delete_wrong_owner(self, integration_client, clear_database):
244244 ban_id = create_resp .json ()["data" ]["id" ]
245245
246246 response = integration_client .delete (
247- f"{ BASE_URL } { ban_id } /?organization_id=999&project_id=999 " ,
247+ f"{ BASE_URL } { ban_id } " ,
248248 headers = self ._headers (999 , 999 ),
249249 )
250250
0 commit comments