Oppdaterer fra master repo

.github/workflows/python-app.yml

@@ -0,0 +1,42 @@
+# This workflow will install Python dependencies, run tests and lint with a single version of Python
+# For more information see: https://help.github.com/actions/language-and-framework-guides/using-python-with-github-actions
+
+name: Python application
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Set up Python 3.9
+      uses: actions/setup-python@v2
+      with:
+        python-version: 3.9
+    - name: Install dependencies
+      run: |
+        python -m pip install --upgrade pip
+        pip install flake8 pytest
+        pip install pytest-cov
+        if [ -f requirements.txt ]; then pip install -r requirements.txt; fi
+    - name: Lint with flake8
+      run: |
+        # stop the build if there are Python syntax errors or undefined names
+        flake8 . --count --select=E9,F63,F7,F82 --show-source --statistics
+        # exit-zero treats all errors as warnings. The GitHub editor is 127 chars wide
+        flake8 . --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics
+    - name: Test with pytest
+      run: |
+        pytest --cov=./ --cov-report=xml
+
+    - name: Codecov
+      uses: codecov/codecov-action@v2.1.0
+      with:
+        files: ./coverage.xml

.gitignore

@@ -1,12 +1,18 @@
 personal_api_settings.py
 .vscode/*
 *.csv
-ynab/models/__pycache__/*
-ynab/ynab/__pycache__/*
-ynab/__pycache__/*
+*/*/*/__pycache__/*
+*/__pycache__/*
 __pycache__/*
 api_settings.py
-api_settings.py
 sync_accounts.1.py
 bash_script.sh
 api_settings_temp.py
+log/*
+*.log
+transacti*
+statement*
+workspace*
+secret*
+coverage.xml
+.coverage

GetPaymentsOneAccount.py

@@ -2,51 +2,32 @@
 # https://support.youneedabudget.com/t/y72kjg
 
 import csv
-from  Helpers import create_authenticated_http_session,get_accounts,get_standing_orders,get_payments,get_transactions,getTransactionDate,getPayee,getMemo, getOut, getIn, getPaymentsDate
-
-def getAccount(http_session, customerId, accountNo):
-    accounts = get_accounts(
-        http_session, 
-        customerId)
-
-    for account in accounts:
-        if account['accountNumber'] == accountNo:
-            return account
-
-    return None
-
+from sbanken.Sbanken import Sbanken
+from helpers.Helpers import getPaymentsDate, getAccounts
 
 def main():
     # enable_debug_logging()
     import api_settings
     import pprint
 
-    http_session = create_authenticated_http_session(api_settings.CLIENTID, api_settings.SECRET)
+    sbanken = Sbanken(api_settings.CUSTOMERID, api_settings.CLIENTID, api_settings.SECRET)
 
-    # customer_info = get_customer_information(http_session, api_settings.CUSTOMERID)
+    # customer_info = sbanken.GetCustomerInfo()
     # pprint.pprint(customer_info)
 
     # pprint.pprint(accounts)
 
-    # accountNo = input('What is the account number:')
-    accountNo = '97104496257'
-    account = getAccount(http_session, api_settings.CUSTOMERID, accountNo)
+    accountNo = input('What is the account number:')
+    account = getAccounts(sbanken, accountNo)
 
     if account == None:
         print('Account not found!')
         exit(1)
 
-    # stOrders = get_standing_orders(
-    #     http_session,
-    #     api_settings.CUSTOMERID,
-    #     account['accountId']
-    # )
+    # stOrders = sbanken.GetStandingOrders(account['accountId'])
     # pprint.pprint(stOrders)
 
-    payments = get_payments(
-        http_session, 
-        api_settings.CUSTOMERID,
-        account['accountId'])
+    payments = sbanken.GetPayments(account['accountId'])
     # pprint.pprint(payments)
 
     with open(account['name']+'_'+account['accountNumber']+'_Payments.csv', 'w', encoding='utf-8') as csvfile:

GetStatementOneAccount.py

@@ -1,32 +1,17 @@
 import csv
-from  Helpers import create_authenticated_http_session,get_accounts,get_transactions,getTransactionDate,getPayee,getMemo, getOut, getIn
-
-def getAccount(http_session, customerId, accountNo):
-    accounts = get_accounts(
-        http_session, 
-        customerId)
-
-    for account in accounts:
-        if account['accountNumber'] == accountNo:
-            return account
-
-    return None
+from sbanken.Sbanken import Sbanken
+from helpers.Helpers import getAccounts, getTransactionDate, getPayee, getMemo, getOut, getIn
 
 
 def main():
     # enable_debug_logging()
     import api_settings
     import pprint
 
-    http_session = create_authenticated_http_session(api_settings.CLIENTID, api_settings.SECRET)
-
-    # customer_info = get_customer_information(http_session, api_settings.CUSTOMERID)
-    # pprint.pprint(customer_info)
-
-    # pprint.pprint(accounts)
+    sbanken = Sbanken(api_settings.CUSTOMERID, api_settings.CLIENTID, api_settings.SECRET)
 
     accountNo = input('What is the account number:')
-    account = getAccount(http_session, api_settings.CUSTOMERID, accountNo)
+    account = getAccounts(sbanken, accountNo)
 
     if account == None:
         print('Account not found!')
@@ -39,11 +24,7 @@ def main():
     if months > 12:
         months = 12
 
-    transactions = get_transactions(
-        http_session, 
-        api_settings.CUSTOMERID,
-        account['accountId'],
-        months)
+    transactions = sbanken.GetTransactions(account['accountId'],months)
     # pprint.pprint(transactions)
 
     with open(account['name']+'_'+account['accountNumber']+'.csv', 'w', encoding='utf-8') as csvfile:

GetStatementOneYear.py

@@ -1,50 +1,30 @@
 import csv
-from  Helpers import get_transactions_year,create_authenticated_http_session,get_accounts,get_transactions,getTransactionDate,getPayee,getMemo, getOut, getIn
-
-def getAccount(http_session, customerId, accountNo):
-    accounts = get_accounts(
-        http_session, 
-        customerId)
-
-    for account in accounts:
-        if account['accountNumber'] == accountNo:
-            return account
-
-    return None
-
+from sbanken.Sbanken import Sbanken
+from  helpers.Helpers import getAccounts, getTransactionDate,getPayee,getMemo, getOut, getIn
 
 def main():
     # enable_debug_logging()
     import api_settings
     import pprint
 
-    http_session = create_authenticated_http_session(api_settings.CLIENTID, api_settings.SECRET)
-
-    # customer_info = get_customer_information(http_session, api_settings.CUSTOMERID)
-    # pprint.pprint(customer_info)
-
-    # pprint.pprint(accounts)
+    sbanken = Sbanken(api_settings.CUSTOMERID, api_settings.CLIENTID, api_settings.SECRET)
 
     accountNo = input('What is the account number:')
-    account = getAccount(http_session, api_settings.CUSTOMERID, accountNo)
+    account = getAccounts(sbanken, accountNo)
 
     if account == None:
         print('Account not found!')
         exit(1)
 
     year = input('What year?')
     if year == '':
-        year = 2019
+        year = 2020
 
     year = int(year)
     if year < 2000:
-        year = 2019
+        year = 2020
 
-    transactions = get_transactions_year(
-        http_session, 
-        api_settings.CUSTOMERID,
-        account['accountId'],
-        year)
+    transactions = sbanken.GetTransactionsForYear(account['accountId'],year)
     # pprint.pprint(transactions)
 
     with open(account['name']+'_'+account['accountNumber']+'.csv', 'w', encoding='utf-8') as csvfile:

GetStatementsAllAccounts.py

@@ -1,26 +1,20 @@
 import csv
-from  Helpers import *
+from sbanken.Sbanken import Sbanken
+from helpers.Helpers import getAccounts, getTransactionDate, getPayee, getMemo, getOut, getIn
 
 
 def main():
     # enable_debug_logging()
     import api_settings
     import pprint
 
-    http_session = create_authenticated_http_session(api_settings.CLIENTID, api_settings.SECRET)
-
-    accounts = get_accounts(
-        http_session, 
-        api_settings.CUSTOMERID)
+    sbanken = Sbanken(api_settings.CUSTOMERID, api_settings.CLIENTID, api_settings.SECRET)
 
+    accounts = getAccounts(sbanken)
 
     for account in accounts:
 
-        transactions = get_transactions(
-            http_session, 
-            api_settings.CUSTOMERID,
-            account['accountId'],
-            1)
+        transactions = sbanken.GetTransactions(account['accountId'],1)
         # pprint.pprint(transactions)
 
         with open(account['name']+'_'+account['accountNumber']+'.csv', 'w', encoding='utf-8') as csvfile: