New update for create() forbidding (#6)

* new version to forbid create(), fixes and refactoring

* --

* --

* v0.6.1

* v0.6.1 - create() for Invoice only + fixes

* Create invoice test

Author: nuhamozaini

moyasar/actions/create.py

@@ -4,9 +4,6 @@
 
 
 class Create(Constructor):
-    def __init__(self, data):
-        super().__init__(**data)
-
 
     @classmethod
     def create_url(cls):
@@ -16,4 +13,4 @@ def create_url(cls):
     def create(cls, data):
         response = moyasar.request('POST', cls.create_url(), data)
         response = json.loads(response.text)
-        return cls(response)
+        return cls(response)

moyasar/actions/fetch.py

@@ -4,8 +4,6 @@
 
 
 class Fetch(Constructor):
-    def __init__(self, data):
-        super().__init__(data)
 
     @classmethod
     def fetch_url(cls, id):

moyasar/actions/list.py

@@ -4,8 +4,6 @@
 
 
 class List(Constructor):
-    def __init__(self, data):
-        super().__init__(data)
 
     @classmethod
     def list_url(cls):

moyasar/constructor.py

@@ -1,5 +1,5 @@
 class Constructor:
 
-    def __init__(self, **kwargs):
-        for key in kwargs:
-            setattr(self, key, kwargs[key])
+    def __init__(self, data):
+        for key in data:
+            setattr(self, key, data[key])

moyasar/invoice.py

@@ -1,6 +1,7 @@
+from moyasar.actions.create import Create
 from moyasar.resource import Resource
 from moyasar.actions.cancel import Cancel
 
 
-class Invoice(Resource, Cancel):
+class Invoice(Resource, Cancel, Create):
     pass

moyasar/payment.py

@@ -4,8 +4,8 @@
 
 
 class Source(Constructor):
-    def __init__(self, **kwargs):
-        super().__init__(**kwargs)
+    def __init__(self, data):
+        super().__init__(data)
 
     @classmethod
     def build(cls, source):
@@ -18,12 +18,12 @@ def build(cls, source):
     @classmethod
     def source_to_creditcard(cls, data):
         data.pop('type')
-        return CreditCard(**data)
+        return CreditCard(data)
 
     @classmethod
     def source_to_sadad(cls, data):
         data.pop('type')
-        return Sadad(**data)
+        return Sadad(data)
 
 
 class CreditCard(Source):
@@ -42,4 +42,4 @@ def __init__(self, data):
     def refund(self, amount=None):
         super().refund(amount)
         self.source = Source.build(self.source)
-        return self
+        return self

moyasar/resource.py

@@ -1,8 +1,7 @@
 from moyasar.actions.fetch import Fetch
 from moyasar.actions.list import List
-from moyasar.actions.create import Create
 from moyasar.actions.update import Update
 
 
-class Resource(Fetch, List, Create, Update):
-    pass
+class Resource(Fetch, List, Update):
+    pass

setup.py

@@ -4,7 +4,7 @@
     long_description = fh.read()
 setuptools.setup(
     name="moyasar",
-    version="0.6.0",
+    version="0.6.1",
     author="Moyasar",
     author_email="developers@moyasar.com",
     description="Moyasar Python language wrapper",
@@ -22,5 +22,5 @@
         'httpretty',
         'pytest'
     ],
-    download_url='https://github.com/moyasar/moyasar-python/archive/v0.6.0.tar.gz'
+    download_url='https://github.com/moyasar/moyasar-python/archive/v0.6.1.tar.gz'
 )

tests/moyasar/invoice_test.py

@@ -1,10 +1,8 @@
-import os
-import json
-import pytest
-import tests.server_stubs as ss
+import copy
+
 import moyasar
 import tests.fixtures.fixtures as f
-import copy
+import tests.server_stubs as ss
 
 
 def test_create_should_return_intiated_invoice_for_sadad_source():

tests/moyasar/payment_test.py

@@ -1,49 +1,8 @@
-import moyasar
-import tests.server_stubs as ss
-import tests.fixtures.fixtures as f
 import copy
-import pytest
-
-
-def test_create_should_return_intiated_payment_for_sadad_source():
-    params = {"amount": 1000, "currency": "SAR", "description": "Test"}
-    ss.stub_server_request("post", moyasar.Payment.create_url(),
-                           resource=f.payment, status=200)
-    moyasar.api_key = 'sk_test_BQokikJOvBiI2HlWgH4olfQ2'
-    payment = moyasar.Payment.create(params)
-    assert isinstance(payment, moyasar.Payment)
-    assert payment.status == "initiated"
-    assert int(payment.amount) == params['amount']
-    assert payment.currency == params['currency']
-    assert payment.description == params['description']
-
-
-def test_create_with_amount_less_than_100_cent_should_raise_validation_errror():
-    modified_resource = copy.deepcopy(f.payment)
-    modified_resource.update({"amount": 90})
-    ss.stub_server_request('post', moyasar.Payment.create_url(), resource=modified_resource,
-                           status=400, error_message="Validation Failed",
-                           errors={"amount": "must be greater than 99"})
-    assert pytest.raises(Exception)
-
-
-def test_create_payment_for_inovice_should_be_acceptable():
-    ss.stub_server_request("get", moyasar.Invoice.list_url(),
-                           resource=f.invoices, status=200)
-    invoices = moyasar.Invoice.list()
-    first_invoice_id = ''
-    for key, val in invoices[0].__dict__.items():
-        if key == "id":
-            first_invoice_id = val
 
-    modified_resource = copy.deepcopy(f.payment)
-    modified_resource.update({"invoice_id": first_invoice_id})
-    ss.stub_server_request("post", moyasar.Payment.create_url(),
-                           resource=modified_resource, status=200)
-    moyasar.api_key = 'sk_test_BQokikJOvBiI2HlWgH4olfQ2'
-    payment = moyasar.Payment.create(modified_resource)
-    assert isinstance(payment, moyasar.Payment)
-    assert payment.invoice_id == first_invoice_id
+import moyasar
+import tests.fixtures.fixtures as f
+import tests.server_stubs as ss
 
 
 def test_list_should_return_list_of_payment_objects():
@@ -87,29 +46,6 @@ def test_update_should_update_payment_description():
     assert new_description["description"] == after_updated.description
 
 
-# def test_refund_should_operate_normally_by_recharging_back_all_amount_as_a_default():
-#     id = '328f5dca-91ec-435d-b13f-86052a1d0f7b'
-#     ss.stub_server_request("get", moyasar.Payment.fetch_url(id),
-#                            resource=f.payment, status=200)
-#     moyasar.api_key = 'sk_test_BQokikJOvBiI2HlWgH4olfQ2'
-#     original = moyasar.Payment.fetch(id)
-#     params = {'status': 'refunded', 'refunded': original.amount}
-#     custom_invoice = copy.deepcopy(f.payment)
-#     custom_invoice.update(params)
-#     ss.stub_server_request("post", f'{moyasar.api_url}/payments/{id}/refund',
-#                            resource=custom_invoice, status=200)
-#     moyasar.api_key = 'sk_test_BQokikJOvBiI2HlWgH4olfQ2'
-#     refunded = original.refund(amount=original.amount)
-
-
-def test_refund_should_accept_partial_refund_amounts():
-    pass
-
-
-def test_refund_with_failed_payment_should_raise_invalid_request_error():
-    pass
-
-
 def test_eqaulity_check_holds_among_identical_payments_only():
     id = '1b82356d-b5fd-46f8-bde9-3680d62f289a'
     ss.stub_server_request("get", moyasar.Payment.fetch_url(id),