Skip to content

Commit ad0e84d

Browse files
FerCarrilloMFerCarrilloM
committed
Se ajustan UT
1 parent bd8eece commit ad0e84d

File tree

12 files changed

+163
-34
lines changed

12 files changed

+163
-34
lines changed

‎Balance/Balance.py‎

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,19 @@
22
from Utils.Services import Services
33

44
class Balance(Services):
5-
def __init__(self, url, token = None, user = None, password = None):
5+
urlApi = None
6+
def __init__(self, url, urlApi, token=None, user=None, password=None):
67
super(Balance, self).__init__(url, token, user, password)
8+
if urlApi:
9+
self.urlApi = urlApi
10+
else:
11+
print("Debe especificar la urlApi")
712

8-
def account_balance(self):
9-
return BalanceRequest.account_balance(self.get_url(), self.get_token())
13+
def get_balance(self):
14+
return BalanceRequest.account_balance(self.urlApi, self.get_token())
15+
16+
def add_stamps(self, userId, stamps, comment):
17+
return BalanceRequest.stamp_distribution(self.urlApi, self.get_token(), userId, stamps, comment,"Add")
18+
19+
def remove_stamps(self, userId, stamps, comment):
20+
return BalanceRequest.stamp_distribution(self.urlApi, self.get_token(), userId, stamps, comment,"Remove")

‎Balance/BalanceRequest.py‎

Lines changed: 18 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,23 @@
1-
from Balance.BalanceResponse import BalanceResponse
1+
from Balance.BalanceResponse import BalanceResponse,AccountBalanceResponse
22
from Utils.requestHelper import RequestHelper
33

44
class BalanceRequest:
55
@staticmethod
6-
def account_balance(url, token):
7-
endpoint = url + "/account/balance"
6+
def account_balance(urlApi, token):
7+
endpoint = urlApi + "/management/v2/api/users/balance"
88
response = RequestHelper.get_json_request(endpoint,token,None)
9-
return BalanceResponse(response)
9+
return BalanceResponse(response)
10+
11+
@staticmethod
12+
def stamp_distribution(urlApi, token, userId, stamps, comment,action):
13+
endpoint = f"{urlApi}/management/v2/api/dealers/users/{userId}/stamps"
14+
payload = {
15+
"stamps": stamps,
16+
"comment": comment
17+
}
18+
if action == "Add":
19+
response = RequestHelper.post_json_request(endpoint,token,payload)
20+
elif action == "Remove":
21+
response = RequestHelper.delete_json_request(endpoint, token, payload)
22+
return AccountBalanceResponse(response)
23+

‎Balance/BalanceResponse.py‎

Lines changed: 47 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,35 @@
22
import traceback
33
from Utils.response import Response
44

5+
class AccountBalanceResponse(Response):
6+
def __init__(self, response):
7+
try:
8+
self.status_code = response.status_code
9+
if bool(response.text and response.text.strip()):
10+
self.response = json.loads(response.text.encode().decode("utf8"))
11+
if self.status_code == 200:
12+
self.data = self.response["data"]
13+
self.status = self.response["status"]
14+
else:
15+
self.status = self.response["status"]
16+
self.message = self.response["message"]
17+
if "messageDetail" in self.response:
18+
self.messageDetail = self.response["messageDetail"]
19+
else:
20+
self.status = "error"
21+
self.message = response.reason
22+
self.messageDetail = response.request
23+
except Exception:
24+
traceback.print_exc()
25+
526
class BalanceResponse(Response):
627
def __init__(self, response):
728
try:
829
self.status_code = response.status_code
930
if(bool(response.text and response.text.strip())):
1031
self.response = json.loads(response.text.encode().decode('utf8'))
1132
if(self.status_code == 200):
12-
self.data = self.response["data"]
33+
self.data = Data(self.response["data"])
1334
self.status = self.response["status"]
1435
else:
1536
self.status = self.response["status"]
@@ -21,4 +42,28 @@ def __init__(self, response):
2142
self.message = response.reason
2243
self.messageDetail = response.request
2344
except:
24-
traceback.print_exc()
45+
traceback.print_exc()
46+
47+
class Data:
48+
def __init__(self, data):
49+
self.idUserBalance = data.get("idUserBalance", "")
50+
self.idUser = data.get("idUser", "")
51+
self.stampsBalance = data.get("stampsBalance", 0)
52+
self.stampsUsed = data.get("stampsUsed", 0)
53+
self.stampsAssigned = data.get("stampsAssigned", 0)
54+
self.unlimited = data.get("unlimited", False)
55+
self.expirationDate = data.get("expirationDate", "")
56+
self.lastTransaction = LastTransaction(data["lastTransaction"]) if "lastTransaction" in data else None
57+
58+
class LastTransaction:
59+
def __init__(self, transaction):
60+
self.folio = transaction.get("folio", 0)
61+
self.idUSer = transaction.get("idUSer", "")
62+
self.idUserReceiver = transaction.get("idUserReceiver", "")
63+
self.nameReceiver = transaction.get("nameReceiver", "")
64+
self.stampsIn = transaction.get("stampsIn", 0)
65+
self.stampsOut = transaction.get("stampsOut", None)
66+
self.stampsCurrent = transaction.get("stampsCurrent", 0)
67+
self.comment = transaction.get("comment", "")
68+
self.date = transaction.get("date", "")
69+
self.isEmailSent = transaction.get("isEmailSent", False)

‎Test/test_acceptReject.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ def open_file(pathFile):
1515
out = open(pathFile, "r", encoding='ansi', errors='ignore').read()
1616
return out
1717

18-
def testAcceptRejectCsd_Auth(self):
18+
def testAcceptRejectCsd_auth(self):
1919
accept_reject = AcceptReject("http://services.test.sw.com.mx", None, os.environ["SDKTEST_USER"], os.environ["SDKTEST_PASSWORD"])
2020
uuids = [{"uuid":"baf029f3-93ea-4267-a76c-1958d69bd4d8", "action":"Rechazo"}]
2121
response = accept_reject.accept_reject_csd("EKU9003173C9",uuids,TestAcceptReject.open_file("Test/resources/b64CSD.txt"), TestAcceptReject.open_file("Test/resources/b64Key.txt"),"12345678a")
@@ -27,7 +27,7 @@ def testAcceptRejectCsd(self):
2727
response = accept_reject.accept_reject_csd("EKU9003173C9",uuids,TestAcceptReject.open_file("Test/resources/b64CSD.txt"), TestAcceptReject.open_file("Test/resources/b64Key.txt"),"12345678a")
2828
self.assertTrue(self.expected == response.get_status())
2929

30-
def testAcceptRejectXml_Auth(self):
30+
def testAcceptRejectXml_auth(self):
3131
accept_reject = AcceptReject("http://services.test.sw.com.mx", None, os.environ["SDKTEST_USER"], os.environ["SDKTEST_PASSWORD"])
3232
response = accept_reject.accept_reject_xml(TestAcceptReject.open_file("Test/resources/fileAcceptReject.xml"))
3333
self.assertTrue(self.expected == response.get_status())
@@ -37,7 +37,7 @@ def testAcceptRejectXml(self):
3737
response = accept_reject.accept_reject_xml(TestAcceptReject.open_file("Test/resources/fileAcceptReject.xml"))
3838
self.assertTrue(self.expected == response.get_status())
3939

40-
def testAcceptRejectPfx_Auth(self):
40+
def testAcceptRejectPfx_auth(self):
4141
accept_reject = AcceptReject("http://services.test.sw.com.mx", None, os.environ["SDKTEST_USER"], os.environ["SDKTEST_PASSWORD"])
4242
uuids = [{"uuid":"baf029f3-93ea-4267-a76c-1958d69bd4d8", "action":"Rechazo"}]
4343
response = accept_reject.accept_reject_pfx("EKU9003173C9",uuids,TestAcceptReject.open_file("Test/resources/b64PFX.txt"),"12345678a")
@@ -49,7 +49,7 @@ def testAcceptRejectPfx(self):
4949
response = accept_reject.accept_reject_pfx("EKU9003173C9",uuids,TestAcceptReject.open_file("Test/resources/b64PFX.txt"),"12345678a")
5050
self.assertTrue(self.expected == response.get_status())
5151

52-
def testAcceptRejectUuid_Autth(self):
52+
def testAcceptRejectUuid_autth(self):
5353
accept_reject = AcceptReject("http://services.test.sw.com.mx", None, os.environ["SDKTEST_USER"], os.environ["SDKTEST_PASSWORD"])
5454
response = accept_reject.accept_reject_uuid("EKU9003173C9","baf029f3-93ea-4267-a76c-1958d69bd4d8", "Rechazo")
5555
self.assertTrue(self.expected == response.get_status())

‎Test/test_auth.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,13 @@ class TestAuth(unittest.TestCase):
1111
expectedSucces = "success"
1212
expectedError = "error"
1313

14-
def testAuth_Success(self):
14+
def testAuth_success(self):
1515
auth = Auth("http://services.test.sw.com.mx", None , os.environ["SDKTEST_USER"], os.environ["SDKTEST_PASSWORD"])
1616
response = auth.authentication()
1717
self.assertTrue(self.expectedSucces == response.get_status())
1818
self.assertIsNotNone(response.get_token(),"El valor de token esta vacio")
1919

20-
def testAuth_EmailError(self):
20+
def testAuth_emailError(self):
2121
auth = Auth("http://services.test.sw.com.mx", None , os.environ["SDKTEST_USER"], "wrongPassword")
2222
response = auth.authentication()
2323
self.assertTrue(self.expectedError == response.get_status())

‎Test/test_balance.py‎

Lines changed: 48 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import unittest
22
import os
3-
import json
43
import sys
54

5+
#Función para poder importar módulos necesarios.
66
PROJECT_ROOT = os.path.abspath(os.path.join(os.path.dirname(__file__), os.pardir))
77
sys.path.append(PROJECT_ROOT)
88

@@ -11,17 +11,59 @@
1111
class TestBalance(unittest.TestCase):
1212
expected = "success"
1313

14-
def testBalance_Auth(self):
15-
balance = Balance("http://services.test.sw.com.mx", None, os.environ["SDKTEST_USER"], os.environ["SDKTEST_PASSWORD"])
16-
response = balance.account_balance()
14+
def testBalance_auth(self):
15+
balance = Balance("https://services.test.sw.com.mx","https://api.test.sw.com.mx", None, os.environ['SDKTEST_USER'], os.environ['SDKTEST_PASSWORD'])
16+
response = balance.get_balance()
1717
self.assertTrue(self.expected == response.get_status())
1818
self.assertIsNotNone(response.get_data())
19+
self.assertIsNotNone(response.data.idUser)
20+
self.assertIsNotNone(response.data.idUserBalance)
21+
self.assertIsNotNone(response.data.stampsAssigned)
22+
self.assertIsNotNone(response.data.stampsUsed)
23+
self.assertIsNotNone(response.data.stampsBalance)
1924

2025
def testBalance(self):
21-
balance = Balance("http://services.test.sw.com.mx", os.environ["SDKTEST_TOKEN"])
22-
response = balance.account_balance()
26+
balance = Balance("https://services.test.sw.com.mx","https://api.test.sw.com.mx", os.environ["SDKTEST_TOKEN"])
27+
response = balance.get_balance()
2328
self.assertTrue(self.expected == response.get_status())
2429
self.assertIsNotNone(response.get_data())
30+
self.assertIsNotNone(response.data.idUser)
31+
self.assertIsNotNone(response.data.idUserBalance)
32+
self.assertIsNotNone(response.data.stampsAssigned)
33+
self.assertIsNotNone(response.data.stampsUsed)
34+
self.assertIsNotNone(response.data.stampsBalance)
35+
36+
@unittest.skip("Evitar conflictos por temas de saldos")
37+
def testBalance_add_auth(self):
38+
balance = Balance("https://services.test.sw.com.mx","https://api.test.sw.com.mx",None, os.environ["SDKTEST_USER"], os.environ["SDKTEST_PASSWORD"])
39+
response = balance.add_stamps("32501CF2-DC62-4370-B47D-25024C44E131",1,"Prueba Pyhton")
40+
self.assertTrue(self.expected == response.get_status())
41+
self.assertIsNotNone(response.get_data())
42+
print(response.get_data())
43+
44+
@unittest.skip("Evitar conflictos por temas de saldos")
45+
def testBalance_add(self):
46+
balance = Balance("https://services.test.sw.com.mx","https://api.test.sw.com.mx", os.environ["SDKTEST_TOKEN"])
47+
response = balance.add_stamps("32501CF2-DC62-4370-B47D-25024C44E131",1,"Prueba Pyhton")
48+
self.assertTrue(self.expected == response.get_status())
49+
self.assertIsNotNone(response.get_data())
50+
print(response.get_data())
51+
52+
@unittest.skip("Evitar conflictos por temas de saldos")
53+
def testBalance_remove_auth(self):
54+
balance = Balance("https://services.test.sw.com.mx","https://api.test.sw.com.mx",None, os.environ["SDKTEST_USER"], os.environ["SDKTEST_PASSWORD"])
55+
response = balance.remove_stamps("32501CF2-DC62-4370-B47D-25024C44E131",1,"Prueba Pyhton")
56+
self.assertTrue(self.expected == response.get_status())
57+
self.assertIsNotNone(response.get_data())
58+
print(response.get_data())
59+
60+
@unittest.skip("Evitar conflictos por temas de saldos")
61+
def testBalance_remove(self):
62+
balance = Balance("https://services.test.sw.com.mx","https://api.test.sw.com.mx", os.environ["SDKTEST_TOKEN"])
63+
response = balance.remove_stamps("32501CF2-DC62-4370-B47D-25024C44E131",1,"Prueba Pyhton")
64+
self.assertTrue(self.expected == response.get_status())
65+
self.assertIsNotNone(response.get_data())
66+
print(response.get_data())
2567

2668
suite = unittest.TestLoader().loadTestsFromTestCase(TestBalance)
2769
unittest.TextTestRunner(verbosity=2).run(suite)

‎Test/test_cancelation.py‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,14 @@
88

99
from Cancelation.Cancelation import Cancelation
1010

11-
1211
class TestCancelation(unittest.TestCase):
1312
expected = "success"
1413
@staticmethod
1514
def open_file(pathFile):
1615
out = open(pathFile, "r", encoding='ansi', errors='ignore').read()
1716
return out
1817

19-
def testCancelXml_Auth(self):
18+
def testCancelXml_auth(self):
2019
cancel = Cancelation("http://services.test.sw.com.mx", None, os.environ["SDKTEST_USER"], os.environ["SDKTEST_PASSWORD"])
2120
response = cancel.CancelXml(TestCancelation.open_file("Test/resources/cancelByXml.xml"))
2221
self.assertTrue(self.expected == response.get_status())
@@ -26,7 +25,7 @@ def testCancelXml(self):
2625
response = cancel.CancelXml(TestCancelation.open_file("Test/resources/cancelByXml.xml"))
2726
self.assertTrue(self.expected == response.get_status())
2827

29-
def testCancelCsd_Auth(self):
28+
def testCancelCsd_auth(self):
3029
cancel = Cancelation("http://services.test.sw.com.mx", None, os.environ["SDKTEST_USER"], os.environ["SDKTEST_PASSWORD"])
3130
response = cancel.CancelCsd("3dda215e-4c77-4923-94a1-627e0a04378c", "EKU9003173C9", TestCancelation.open_file("Test/resources/b64CSD.txt"), TestCancelation.open_file("Test/resources/b64Key.txt"),"12345678a", "02", "")
3231
self.assertTrue(self.expected == response.get_status())
@@ -36,7 +35,7 @@ def testCancelCsd(self):
3635
response = cancel.CancelCsd("3dda215e-4c77-4923-94a1-627e0a04378c", "EKU9003173C9", TestCancelation.open_file("Test/resources/b64CSD.txt"), TestCancelation.open_file("Test/resources/b64Key.txt"),"12345678a", "02", "")
3736
self.assertTrue(self.expected == response.get_status())
3837

39-
def testCancelPfx_Auth(self):
38+
def testCancelPfx_auth(self):
4039
cancel = Cancelation("http://services.test.sw.com.mx", None, os.environ["SDKTEST_USER"], os.environ["SDKTEST_PASSWORD"])
4140
response = cancel.CancelPfx("3dda215e-4c77-4923-94a1-627e0a04378c", "EKU9003173C9", TestCancelation.open_file("Test/resources/b64PFX.txt"), "12345678a", "02", "")
4241
self.assertTrue(self.expected == response.get_status())
@@ -46,7 +45,7 @@ def testCancelPfx(self):
4645
response = cancel.CancelPfx("3dda215e-4c77-4923-94a1-627e0a04378c", "EKU9003173C9", TestCancelation.open_file("Test/resources/b64PFX.txt"), "12345678a", "02", "")
4746
self.assertTrue(self.expected == response.get_status())
4847

49-
def testCancelUuid_Auth(self):
48+
def testCancelUuid_auth(self):
5049
cancel = Cancelation("http://services.test.sw.com.mx", None, os.environ["SDKTEST_USER"], os.environ["SDKTEST_PASSWORD"])
5150
response = cancel.CancelUuid("3dda215e-4c77-4923-94a1-627e0a04378c", "EKU9003173C9", "02", "")
5251
self.assertTrue(self.expected == response.get_status())

‎Test/test_csd.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ def open_file(pathFile):
1515
out = open(pathFile, "r", encoding='ansi', errors='ignore').read()
1616
return out
1717

18-
def testUploadCsd_Auth(self):
18+
def testUploadCsd_auth(self):
1919
csd_obj = Csd("http://services.test.sw.com.mx", None, os.environ["SDKTEST_USER"], os.environ["SDKTEST_PASSWORD"])
2020
response = csd_obj.upload_csd("stamp", TestCsd.open_file("Test/resources/b64CSD.txt"), TestCsd.open_file("Test/resources/b64Key.txt"),"12345678a")
2121
self.assertTrue(self.expected == response.get_status())

‎Test/test_pendings.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ def open_file(pathFile):
1515
out = open(pathFile, "r", encoding='ansi', errors='ignore').read()
1616
return out
1717

18-
def testPendings_Auth(self):
18+
def testPendings_auth(self):
1919
pendings = Pendings("http://services.test.sw.com.mx", None, os.environ["SDKTEST_USER"], os.environ["SDKTEST_PASSWORD"])
2020
response = pendings.pendings("EKU9003173C9")
2121
self.assertTrue(self.expected == response.get_status())

‎Test/test_relations.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ def open_file(pathFile):
1414
out = open(pathFile, "r", encoding='ansi', errors='ignore').read()
1515
return out
1616

17-
def testRelationsCsd_Auth(self):
17+
def testRelationsCsd_auth(self):
1818
relations = Relations("http://services.test.sw.com.mx", None, os.environ["SDKTEST_USER"], os.environ["SDKTEST_PASSWORD"])
1919
response = relations.relations_csd("EKU9003173C9","316dff4d-6a5a-40d5-8558-c8f45244aa90",TestRelations.open_file("Test/resources/b64CSD.txt"), TestRelations.open_file("Test/resources/b64Key.txt"),"12345678a")
2020
self.assertTrue(self.expected == response.get_status())
@@ -24,7 +24,7 @@ def testRelationsCsd(self):
2424
response = relations.relations_csd("EKU9003173C9","316dff4d-6a5a-40d5-8558-c8f45244aa90",TestRelations.open_file("Test/resources/b64CSD.txt"), TestRelations.open_file("Test/resources/b64Key.txt"),"12345678a")
2525
self.assertTrue(self.expected == response.get_status())
2626

27-
def testRelationsPfx_Auth(self):
27+
def testRelationsPfx_auth(self):
2828
relations = Relations("http://services.test.sw.com.mx", None, os.environ["SDKTEST_USER"], os.environ["SDKTEST_PASSWORD"])
2929
response = relations.relations_pfx("EKU9003173C9","316dff4d-6a5a-40d5-8558-c8f45244aa90",TestRelations.open_file("Test/resources/b64PFX.txt"),"12345678a")
3030
self.assertTrue(self.expected == response.get_status())
@@ -34,7 +34,7 @@ def testRelationsPfx(self):
3434
response = relations.relations_pfx("EKU9003173C9","316dff4d-6a5a-40d5-8558-c8f45244aa90",TestRelations.open_file("Test/resources/b64PFX.txt"),"12345678a")
3535
self.assertTrue(self.expected == response.get_status())
3636

37-
def testRelationsUuid_Auth(self):
37+
def testRelationsUuid_auth(self):
3838
relations = Relations("http://services.test.sw.com.mx", None, os.environ["SDKTEST_USER"], os.environ["SDKTEST_PASSWORD"])
3939
response = relations.relations_uuid("EKU9003173C9","316dff4d-6a5a-40d5-8558-c8f45244aa90")
4040
self.assertTrue(self.expected == response.get_status())

0 commit comments

Comments
 (0)