Update Refund API responses (#19)

Author: ghostwriternr

.github/workflows/dev.yml

@@ -2,9 +2,9 @@ name: dev workflow
 
 on:
   push:
-    branches: [ master, main ]
+    branches: [master, main]
   pull_request:
-    branches: [ master, main ]
+    branches: [master, main]
 
   # Allows you to run this workflow manually from the Actions tab
   workflow_dispatch:
@@ -13,25 +13,40 @@ jobs:
   test:
     strategy:
       matrix:
-        python-versions: [3.6, 3.7, 3.8, 3.9]
+        python-versions: ["3.8", "3.9"]
         os: [ubuntu-18.04, macos-latest, windows-latest]
     runs-on: ${{ matrix.os }}
 
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-python@v2
+      - uses: actions/checkout@v3
+      - uses: actions/setup-python@v4
         with:
           python-version: ${{ matrix.python-versions }}
 
+      - name: Install Poetry
+        uses: snok/install-poetry@v1
+        with:
+          virtualenvs-create: true
+          virtualenvs-in-project: true
+
+      - name: Load cached venv
+        id: cached-poetry-dependencies
+        uses: actions/cache@v3
+        with:
+          path: ~/.cache
+          key: venv-${{ runner.os }}-${{ steps.setup-python.outputs.python-version }}-${{ hashFiles('**/poetry.lock') }}
+
       - name: Install dependencies
-        run: |
-          python -m pip install --upgrade pip
-          pip install poetry tox tox-gh-actions
-          poetry install
+        if: steps.cached-poetry-dependencies.outputs.cache-hit != 'true'
+        run: poetry install --no-interaction --no-root
+
+      - name: Install package
+        run: poetry install --no-interaction
 
-      - name: test with tox
-        run:
-          tox
+      - name: Run tests
+        run: |
+          source $VENV
+          poetry run pytest tests
 
       - name: list files
         run: ls -l .

.pre-commit-config.yaml

@@ -32,3 +32,4 @@ repos:
     hooks:
       - id: mypy
         exclude: tests/
+        args: [--show-error-codes]

CONTRIBUTING.md

@@ -95,7 +95,7 @@ Before you submit a pull request, check that it meets these guidelines:
 2. If the pull request adds functionality, the docs should be updated. Put
    your new functionality into a function with a docstring, and add the
    feature to the list in README.md.
-3. The pull request should work for Python 3.6, 3.7, 3.8 and 3.9. Check
+3. The pull request should work for Python 3.8 and 3.9. Check
    https://github.com/SetuHQ/setu-python-sdk/actions
    and make sure that the tests pass for all supported Python versions.
 

README.md

@@ -114,7 +114,7 @@ try:
             ),
         ],
     )
-    assert batch_initiate_refund_response.refunds[0].status == "MarkedForRefund"
+    assert batch_initiate_refund_response.refunds[0].status == "Pending"
 except SetuAPIException as e:
     assert False
 ```

poetry.lock

@@ -13,8 +13,6 @@ classifiers=[
     'License :: OSI Approved :: MIT License',
     'Natural Language :: English',
     'Programming Language :: Python :: 3',
-    'Programming Language :: Python :: 3.6',
-    'Programming Language :: Python :: 3.7',
     'Programming Language :: Python :: 3.8',
     'Programming Language :: Python :: 3.9',
 ]
@@ -24,7 +22,7 @@ packages = [
 ]
 
 [tool.poetry.dependencies]
-python = ">=3.6.2,<4.0"
+python = ">=3.8.0,<4.0"
 PyJWT = "^2.4.0"
 requests = "^2.27.1"
 marshmallow = "^3.14.1"
@@ -53,11 +51,13 @@ mkdocs-autorefs = "^0.3.1"
 pre-commit = "^2.17.0"
 toml = "^0.10.2"
 bump2version = "^1.0.1"
+types-requests = "^2.30.0.0"
+types-deprecated = "^1.2.9.2"
 
 [tool.black]
 line-length = 120
 skip-string-normalization = true
-target-version = ['py36', 'py37', 'py38']
+target-version = ['py38']
 include = '\.pyi?$'
 exclude = '''
 /(
@@ -86,5 +86,5 @@ skip_gitignore = true
 #skip_glob = docs/conf.py
 
 [build-system]
-requires = ["poetry-core>=1.0.0"]
+requires = ["poetry-core"]
 build-backend = "poetry.core.masonry.api"

pyproject.toml

@@ -189,7 +189,9 @@ class RefundResponseItem:
     bill_id: str
     transaction_ref_id: str
     amount: Amount
+    type: str
     status: str
+    created_at: datetime
     deductions: Optional[List[Deduction]] = None
     initiated_at: Optional[datetime] = None
 

setu/contract.py

@@ -175,7 +175,9 @@ class RefundResponseItemSchema(Schema):
     transaction_ref_id = fields.Str(data_key="transactionRefID")
     amount = fields.Nested(AmountSchema())
     status = fields.Str()
+    type = fields.Str()
     deductions = fields.List(fields.Nested(DeductionResponseSchema()), required=False)
+    created_at = fields.DateTime(data_key="createdAt")
     initiated_at = fields.DateTime(data_key="initiatedAt", required=False)
 
     @post_load

setu/serial.py

@@ -40,14 +40,12 @@ exclude_lines =
 
 [tox:tox]
 isolated_build = true
-envlist = py36, py37, py38, py39, format, lint, build
+envlist = py38, py39, format, lint, build
 
 [gh-actions]
 python =
     3.9: py39
     3.8: py38, format, lint, build
-    3.7: py37
-    3.6: py36
 
 [tool:pytest]
 log_cli = True
@@ -62,7 +60,7 @@ setenv =
     PYTHONPATH = {toxinidir}
     PYTHONWARNINGS = ignore
 commands =
-    pytest --cov=setu --cov-branch --cov-report=xml --cov-report=term-missing tests
+    pytest --cov-branch --cov-report=xml --cov-report=term-missing tests
 
 [testenv:format]
 allowlist_externals =

setup.cfg

@@ -92,7 +92,7 @@ def test_deeplink(v2_creds):
             ],
         )
         LOGGER.info(batch_initiate_refund_response)
-        assert batch_initiate_refund_response.refunds[0].status == "MarkedForRefund"
+        assert batch_initiate_refund_response.refunds[0].status == "Pending"
 
         # Get refund batch status
         refund_batch_status_response = dl.get_batch_refund_status(batch_initiate_refund_response.batch_id)
@@ -107,7 +107,7 @@ def test_deeplink(v2_creds):
 
         refund_batch_status_response = dl.get_refund_status_by_identifier("bill", link.platform_bill_id)
         LOGGER.info(refund_batch_status_response)
-        assert refund_batch_status_response.refunds[0].status == "MarkedForRefund"
+        assert refund_batch_status_response.refunds[0].status == "Pending"
 
         # Get individual refund status
         refund_status_response = dl.get_refund_status(batch_initiate_refund_response.refunds[0].id)