[Fix] number of share handling (#33)

Author: ileodo

Makefile

@@ -6,7 +6,7 @@ ${VENV}/bin/activate:
 
 venv: ${VENV}/bin/activate
 
-install: requirements.txt requirements-dev.txt venv
+install: pyproject.toml venv
 	${VENV}/bin/pip3 install -e .
 
 test:

pyproject.toml

@@ -5,10 +5,8 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "moneywiz-api"
-version = "1.0.6"
-authors = [
-    { name="iLeoDo", email="iLeoDo@gmail.com" },
-]
+version = "1.0.7"
+authors = [{ name = "iLeoDo", email = "iLeoDo@gmail.com" }]
 description = "A Python api to access moneywiz sqlite database"
 readme = "README.md"
 requires-python = ">=3.10"
@@ -17,19 +15,10 @@ classifiers = [
     "License :: OSI Approved :: MIT License",
     "Operating System :: OS Independent",
 ]
-dependencies = [
-    "pandas"
-]
+dependencies = ["pandas"]
 
 [project.optional-dependencies]
-dev = [
-    "pytest",
-    "pytest-cov",
-    "ruff",
-    "mypy",
-    "build",
-    "twine"
-]
+dev = ["pytest", "pytest-cov", "ruff", "mypy", "build", "twine"]
 
 [project.scripts]
 moneywiz-cli = "moneywiz_api.cli.cli:main"
@@ -40,9 +29,7 @@ moneywiz-cli = "moneywiz_api.cli.cli:main"
 
 
 [tool.pytest.ini_options]
-pythonpath = [
-    ".", "src",
-]
+pythonpath = [".", "src"]
 
 
 [tool.ruff]

src/moneywiz_api/model/investment_holding.py

@@ -1,6 +1,6 @@
 from dataclasses import dataclass, field
-from typing import Dict, Any, Optional
 from decimal import Decimal
+from typing import Any, Dict, Optional
 
 from moneywiz_api.model.raw_data_handler import RawDataHandler as RDH
 from moneywiz_api.model.record import Record
@@ -47,7 +47,7 @@ def __init__(self, row):
         self.opening_number_of_shares = RDH.get_nullable_decimal(
             row, "ZOPENNINGNUMBEROFSHARES"
         )
-        self.number_of_shares = RDH.get_decimal(row, "ZNUMBEROFSHARES")
+        self.number_of_shares = RDH.get_nullable_decimal(row, "ZNUMBEROFSHARES")
         # self.price_per_share = row["ZPRICEPERSHARE"]
         self.symbol = row["ZSYMBOL"]
         self.holding_type = row["ZHOLDINGTYPE"]
@@ -62,6 +62,7 @@ def __init__(self, row):
         )
 
         # Fixes
+        self.number_of_shares = self.number_of_shares or Decimal(0)
 
         # Validate
         self.validate()

src/moneywiz_api/model/transaction.py

@@ -177,7 +177,7 @@ def __init__(self, row):
         self.fee = RDH.get_decimal(row, "ZFEE2")
 
         self.investment_holding = row["ZINVESTMENTHOLDING"]
-        self.number_of_shares = RDH.get_decimal(row, "ZNUMBEROFSHARES1")
+        self.number_of_shares = RDH.get_decimal(row, "ZNUMBEROFSHARES")
         self.price_per_share = RDH.get_decimal(row, "ZPRICEPERSHARE1")
 
         # Fixes
@@ -230,7 +230,7 @@ def __init__(self, row):
         self.fee = RDH.get_decimal(row, "ZFEE2")
 
         self.investment_holding = row["ZINVESTMENTHOLDING"]
-        self.number_of_shares = RDH.get_decimal(row, "ZNUMBEROFSHARES1")
+        self.number_of_shares = RDH.get_decimal(row, "ZNUMBEROFSHARES")
         self.price_per_share = RDH.get_decimal(row, "ZPRICEPERSHARE1")
 
         # Fixes

tests/integration/conftest.py

@@ -1,12 +1,11 @@
 from pathlib import Path
 
 from moneywiz_api import MoneywizApi
-
 from tests.integration.test_config import (
-    TEST_DB_PATH,
+    # BALANCE_AS_OF_DATE,
     # CASH_BALANCES,
     # HOLDINGS_BALANCES,
-    # BALANCE_AS_OF_DATE,
+    TEST_DB_PATH,
 )
 
 moneywizApi = MoneywizApi(Path(TEST_DB_PATH))