From 684947bba780a05a82a3ce07ced936e620d23e81 Mon Sep 17 00:00:00 2001 From: Paulina Khew Date: Mon, 8 Feb 2021 16:51:20 -0500 Subject: [PATCH 1/5] Initial commit of application_credit.py and tests --- shopify/resources/__init__.py | 1 + shopify/resources/application_credit.py | 12 ++++++++++++ test/application_credit_test.py | 15 +++++++++++++++ test/fixtures/application_credit.json | 8 ++++++++ test/fixtures/application_credits.json | 10 ++++++++++ 5 files changed, 46 insertions(+) create mode 100644 shopify/resources/application_credit.py create mode 100644 test/application_credit_test.py create mode 100644 test/fixtures/application_credit.json create mode 100644 test/fixtures/application_credits.json diff --git a/shopify/resources/__init__.py b/shopify/resources/__init__.py index 803c5351..16220739 100644 --- a/shopify/resources/__init__.py +++ b/shopify/resources/__init__.py @@ -17,6 +17,7 @@ from .tax_line import TaxLine from .script_tag import ScriptTag from .application_charge import ApplicationCharge +from .application_credit import ApplicationCredit from .recurring_application_charge import RecurringApplicationCharge from .usage_charge import UsageCharge from .asset import Asset diff --git a/shopify/resources/application_credit.py b/shopify/resources/application_credit.py new file mode 100644 index 00000000..042a5d5a --- /dev/null +++ b/shopify/resources/application_credit.py @@ -0,0 +1,12 @@ +from ..base import ShopifyResource + +class ApplicationCredit(ShopifyResource): + _prefix_source = "application_credits/$application_credit_id/" + + @classmethod + def _prefix(cls, options={}): + application_credit_id = options.get("application_credit_id") + if application_credit_id: + return "%s/application_credits/%s" % (cls.site, application_credit_id) + else: + return "%s" % (cls.site) diff --git a/test/application_credit_test.py b/test/application_credit_test.py new file mode 100644 index 00000000..0c97dccd --- /dev/null +++ b/test/application_credit_test.py @@ -0,0 +1,15 @@ +import shopify +from test.test_helper import TestCase +from pyactiveresource.activeresource import ActiveResource + +class ApplicationCreditTest(TestCase): + def test_get_application_credit(self): + self.fake("application_credits/445365009", method='GET', body=self.load_fixture('application_credit')) + application_credit = shopify.ApplicationCredit.find(445365009) + self.assertEqual('5.00', application_credit.amount) + + def test_get_all_application_credits(self): + self.fake("application_credits", method='GET', body=self.load_fixture('application_credits')) + application_credits = shopify.ApplicationCredit.find() + self.assertEqual(1, len(application_credits)) + self.assertEqual(445365009, application_credits[0].id) diff --git a/test/fixtures/application_credit.json b/test/fixtures/application_credit.json new file mode 100644 index 00000000..4d6c3de0 --- /dev/null +++ b/test/fixtures/application_credit.json @@ -0,0 +1,8 @@ +{ + "application_credit": { + "id": 445365009, + "amount": "5.00", + "description": "credit for application refund", + "test": null + } +} diff --git a/test/fixtures/application_credits.json b/test/fixtures/application_credits.json new file mode 100644 index 00000000..b487a523 --- /dev/null +++ b/test/fixtures/application_credits.json @@ -0,0 +1,10 @@ +{ + "application_credits": [ + { + "id": 445365009, + "amount": "5.00", + "description": "credit for application refund", + "test": null + } + ] +} From f2afa6ce2acbbcfbff3f4172ac84389aefaea1f8 Mon Sep 17 00:00:00 2001 From: Paulina Khew Date: Mon, 8 Feb 2021 17:32:01 -0500 Subject: [PATCH 2/5] Add test_create_application_credit() function --- test/application_credit_test.py | 28 ++++++++++++++++++++++++++-- 1 file changed, 26 insertions(+), 2 deletions(-) diff --git a/test/application_credit_test.py b/test/application_credit_test.py index 0c97dccd..cfa84fad 100644 --- a/test/application_credit_test.py +++ b/test/application_credit_test.py @@ -1,15 +1,39 @@ import shopify +import json from test.test_helper import TestCase from pyactiveresource.activeresource import ActiveResource class ApplicationCreditTest(TestCase): def test_get_application_credit(self): - self.fake("application_credits/445365009", method='GET', body=self.load_fixture('application_credit')) + self.fake('application_credits/445365009', method='GET', body=self.load_fixture('application_credit'), code=200) application_credit = shopify.ApplicationCredit.find(445365009) self.assertEqual('5.00', application_credit.amount) def test_get_all_application_credits(self): - self.fake("application_credits", method='GET', body=self.load_fixture('application_credits')) + self.fake('application_credits', method='GET', body=self.load_fixture('application_credits'), code=200) application_credits = shopify.ApplicationCredit.find() self.assertEqual(1, len(application_credits)) self.assertEqual(445365009, application_credits[0].id) + + def test_create_application_credit(self): + self.fake( + 'application_credits', + method='POST', + body=self.load_fixture('application_credit'), + headers={'Content-type': 'application/json'}, + code=201 + ) + + application_credit = shopify.ApplicationCredit.create({ + 'description': 'application credit for refund', + 'amount': 5.0 + }) + + expected_body = { + "application_credit": { + "description": "application credit for refund", + "amount": 5.0 + } + } + + self.assertEqual(expected_body, json.loads(self.http.request.data.decode("utf-8"))) From 1c312b489a8dfcf2648a287abd5b1ff65773ff34 Mon Sep 17 00:00:00 2001 From: Paulina Khew Date: Mon, 8 Feb 2021 17:35:13 -0500 Subject: [PATCH 3/5] Remove unused pyactiveresource imports --- test/application_credit_test.py | 1 - test/fulfillment_event_test.py | 2 -- 2 files changed, 3 deletions(-) diff --git a/test/application_credit_test.py b/test/application_credit_test.py index cfa84fad..630d023d 100644 --- a/test/application_credit_test.py +++ b/test/application_credit_test.py @@ -1,7 +1,6 @@ import shopify import json from test.test_helper import TestCase -from pyactiveresource.activeresource import ActiveResource class ApplicationCreditTest(TestCase): def test_get_application_credit(self): diff --git a/test/fulfillment_event_test.py b/test/fulfillment_event_test.py index 1ba9a73e..c58cc6eb 100644 --- a/test/fulfillment_event_test.py +++ b/test/fulfillment_event_test.py @@ -1,6 +1,5 @@ import shopify from test.test_helper import TestCase -from pyactiveresource.activeresource import ActiveResource class FulFillmentEventTest(TestCase): def test_get_fulfillment_event(self): @@ -21,4 +20,3 @@ def test_error_on_incorrect_status(self): fulfillment_event = shopify.FulfillmentEvent.find(12584341209251, order_id='2776493818019', fulfillment_id='2608403447971') fulfillment_event.status = incorrect_status fulfillment_event.save() - From 398e0ec815938280895590f9d9a3a3e73a1c427f Mon Sep 17 00:00:00 2001 From: Paulina Khew Date: Mon, 8 Feb 2021 17:38:11 -0500 Subject: [PATCH 4/5] Update CHANGELOG --- CHANGELOG | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG b/CHANGELOG index 795baab5..246a91b4 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,6 +1,7 @@ - Added support for Fulfillment.update_tracking ([#432](https://github.com/Shopify/shopify_python_api/pull/432)) - Add FulfillmentEvent resource ([#454](https://github.com/Shopify/shopify_python_api/pull/454)) - Fix for being unable to get the len() of a filter ([#456](https://github.com/Shopify/shopify_python_api/pull/456)) +- Add ApplicationCredit resource ([#457](https://github.com/Shopify/shopify_python_api/pull/457)) == Version 8.2.0 - [Feature] Add support for Dynamic API Versioning. When the library is initialized, it will now make a request to From 7fb299689f838e07e55e3a8cb866d15e52d2fedb Mon Sep 17 00:00:00 2001 From: Paulina Khew Date: Tue, 9 Feb 2021 17:24:10 -0500 Subject: [PATCH 5/5] Replace logic in application_credit.py with a pass --- shopify/resources/application_credit.py | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/shopify/resources/application_credit.py b/shopify/resources/application_credit.py index 042a5d5a..83b8de1f 100644 --- a/shopify/resources/application_credit.py +++ b/shopify/resources/application_credit.py @@ -1,12 +1,4 @@ from ..base import ShopifyResource class ApplicationCredit(ShopifyResource): - _prefix_source = "application_credits/$application_credit_id/" - - @classmethod - def _prefix(cls, options={}): - application_credit_id = options.get("application_credit_id") - if application_credit_id: - return "%s/application_credits/%s" % (cls.site, application_credit_id) - else: - return "%s" % (cls.site) + pass