From f47e9b3150d601ec1509af9cb841526f186dfd5a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BE=9D=E7=91=AA=E8=B2=93?= Date: Sun, 9 Apr 2023 10:04:12 +0800 Subject: [PATCH] Renamed the CurrencyData class to JournalEntryCurrencyData in testlib_offset.py, to be clear. --- tests/test_offset.py | 8 +-- tests/test_unmatched_offset.py | 119 +++++++++++++++++++++------------ tests/testlib_offset.py | 50 ++++++++------ 3 files changed, 109 insertions(+), 68 deletions(-) diff --git a/tests/test_offset.py b/tests/test_offset.py index 8493dce..549ab09 100644 --- a/tests/test_offset.py +++ b/tests/test_offset.py @@ -28,8 +28,8 @@ from flask.testing import FlaskCliRunner from test_site import db from testlib import Accounts, create_test_app, get_client from testlib_journal_entry import match_journal_entry_detail -from testlib_offset import TestData, JournalEntryLineItemData, \ - JournalEntryData, CurrencyData +from testlib_offset import JournalEntryData, JournalEntryCurrencyData, \ + JournalEntryLineItemData, TestData PREFIX: str = "/accounting/journal-entries" """The URL prefix for the journal entry management.""" @@ -81,7 +81,7 @@ class OffsetTestCase(unittest.TestCase): response: httpx.Response journal_entry_data: JournalEntryData = JournalEntryData( - self.data.l_r_or3d.journal_entry.days, [CurrencyData( + self.data.l_r_or3d.journal_entry.days, [JournalEntryCurrencyData( "USD", [], [JournalEntryLineItemData( @@ -405,7 +405,7 @@ class OffsetTestCase(unittest.TestCase): response: httpx.Response journal_entry_data: JournalEntryData = JournalEntryData( - self.data.l_p_or3c.journal_entry.days, [CurrencyData( + self.data.l_p_or3c.journal_entry.days, [JournalEntryCurrencyData( "USD", [JournalEntryLineItemData( Accounts.PAYABLE, diff --git a/tests/test_unmatched_offset.py b/tests/test_unmatched_offset.py index f55dfe9..57c141d 100644 --- a/tests/test_unmatched_offset.py +++ b/tests/test_unmatched_offset.py @@ -26,7 +26,8 @@ from flask.testing import FlaskCliRunner from test_site import db from testlib import create_test_app, get_client, Accounts -from testlib_offset import BaseTestData, JournalEntryData, CurrencyData +from testlib_offset import JournalEntryData, JournalEntryCurrencyData, \ + BaseTestData PREFIX: str = "/accounting/unmatched-offsets" """The URL prefix for the unmatched offset management.""" @@ -432,17 +433,21 @@ class DifferentTestData(BaseTestData): # Original journal entries self.j_r_or1: JournalEntryData = JournalEntryData( - 50, [CurrencyData("USD", [self.l_r_or1d, self.l_r_or4d], - [self.l_r_or1c, self.l_r_or4c])]) + 50, [JournalEntryCurrencyData( + "USD", [self.l_r_or1d, self.l_r_or4d], + [self.l_r_or1c, self.l_r_or4c])]) self.j_r_or2: JournalEntryData = JournalEntryData( - 30, [CurrencyData("USD", [self.l_r_or2d, self.l_r_or3d], - [self.l_r_or2c, self.l_r_or3c])]) + 30, [JournalEntryCurrencyData( + "USD", [self.l_r_or2d, self.l_r_or3d], + [self.l_r_or2c, self.l_r_or3c])]) self.j_p_or1: JournalEntryData = JournalEntryData( - 40, [CurrencyData("USD", [self.l_p_or1d, self.l_p_or4d], - [self.l_p_or1c, self.l_p_or4c])]) + 40, [JournalEntryCurrencyData( + "USD", [self.l_p_or1d, self.l_p_or4d], + [self.l_p_or1c, self.l_p_or4c])]) self.j_p_or2: JournalEntryData = JournalEntryData( - 20, [CurrencyData("USD", [self.l_p_or2d, self.l_p_or3d], - [self.l_p_or2c, self.l_p_or3c])]) + 20, [JournalEntryCurrencyData( + "USD", [self.l_p_or2d, self.l_p_or3d], + [self.l_p_or2c, self.l_p_or3c])]) self._add_journal_entry(self.j_r_or1) self._add_journal_entry(self.j_r_or2) @@ -475,21 +480,25 @@ class DifferentTestData(BaseTestData): # Offset journal entries self.j_r_of1: JournalEntryData = JournalEntryData( - 25, [CurrencyData("USD", [self.l_r_of1d], [self.l_r_of1c])]) + 25, [JournalEntryCurrencyData( + "USD", [self.l_r_of1d], [self.l_r_of1c])]) self.j_r_of2: JournalEntryData = JournalEntryData( - 20, [CurrencyData("USD", - [self.l_r_of2d, self.l_r_of3d, self.l_r_of4d], - [self.l_r_of2c, self.l_r_of3c, self.l_r_of4c])]) + 20, [JournalEntryCurrencyData( + "USD", [self.l_r_of2d, self.l_r_of3d, self.l_r_of4d], + [self.l_r_of2c, self.l_r_of3c, self.l_r_of4c])]) self.j_r_of3: JournalEntryData = JournalEntryData( - 15, [CurrencyData("USD", [self.l_r_of5d], [self.l_r_of5c])]) + 15, [JournalEntryCurrencyData( + "USD", [self.l_r_of5d], [self.l_r_of5c])]) self.j_p_of1: JournalEntryData = JournalEntryData( - 15, [CurrencyData("USD", [self.l_p_of1d], [self.l_p_of1c])]) + 15, [JournalEntryCurrencyData( + "USD", [self.l_p_of1d], [self.l_p_of1c])]) self.j_p_of2: JournalEntryData = JournalEntryData( - 10, [CurrencyData("USD", - [self.l_p_of2d, self.l_p_of3d, self.l_p_of4d], - [self.l_p_of2c, self.l_p_of3c, self.l_p_of4c])]) + 10, [JournalEntryCurrencyData( + "USD", [self.l_p_of2d, self.l_p_of3d, self.l_p_of4d], + [self.l_p_of2c, self.l_p_of3c, self.l_p_of4c])]) self.j_p_of3: JournalEntryData = JournalEntryData( - 5, [CurrencyData("USD", [self.l_p_of5d], [self.l_p_of5c])]) + 5, [JournalEntryCurrencyData( + "USD", [self.l_p_of5d], [self.l_p_of5c])]) self._set_is_need_offset({Accounts.RECEIVABLE, Accounts.PAYABLE}, False) @@ -537,29 +546,41 @@ class SameTestData(BaseTestData): # Original journal entries self.j_r_or1: JournalEntryData = JournalEntryData( - 60, [CurrencyData("USD", [self.l_r_or1d], [self.l_r_or1c])]) + 60, [JournalEntryCurrencyData( + "USD", [self.l_r_or1d], [self.l_r_or1c])]) self.j_r_or2: JournalEntryData = JournalEntryData( - 50, [CurrencyData("USD", [self.l_r_or2d], [self.l_r_or2c])]) + 50, [JournalEntryCurrencyData( + "USD", [self.l_r_or2d], [self.l_r_or2c])]) self.j_r_or3: JournalEntryData = JournalEntryData( - 40, [CurrencyData("USD", [self.l_r_or3d], [self.l_r_or3c])]) + 40, [JournalEntryCurrencyData( + "USD", [self.l_r_or3d], [self.l_r_or3c])]) self.j_r_or4: JournalEntryData = JournalEntryData( - 30, [CurrencyData("USD", [self.l_r_or4d], [self.l_r_or4c])]) + 30, [JournalEntryCurrencyData( + "USD", [self.l_r_or4d], [self.l_r_or4c])]) self.j_r_or5: JournalEntryData = JournalEntryData( - 20, [CurrencyData("USD", [self.l_r_or5d], [self.l_r_or5c])]) + 20, [JournalEntryCurrencyData( + "USD", [self.l_r_or5d], [self.l_r_or5c])]) self.j_r_or6: JournalEntryData = JournalEntryData( - 10, [CurrencyData("USD", [self.l_r_or6d], [self.l_r_or6c])]) + 10, [JournalEntryCurrencyData( + "USD", [self.l_r_or6d], [self.l_r_or6c])]) self.j_p_or1: JournalEntryData = JournalEntryData( - 60, [CurrencyData("USD", [self.l_p_or1d], [self.l_p_or1c])]) + 60, [JournalEntryCurrencyData( + "USD", [self.l_p_or1d], [self.l_p_or1c])]) self.j_p_or2: JournalEntryData = JournalEntryData( - 50, [CurrencyData("USD", [self.l_p_or2d], [self.l_p_or2c])]) + 50, [JournalEntryCurrencyData( + "USD", [self.l_p_or2d], [self.l_p_or2c])]) self.j_p_or3: JournalEntryData = JournalEntryData( - 40, [CurrencyData("USD", [self.l_p_or3d], [self.l_p_or3c])]) + 40, [JournalEntryCurrencyData( + "USD", [self.l_p_or3d], [self.l_p_or3c])]) self.j_p_or4: JournalEntryData = JournalEntryData( - 30, [CurrencyData("USD", [self.l_p_or4d], [self.l_p_or4c])]) + 30, [JournalEntryCurrencyData( + "USD", [self.l_p_or4d], [self.l_p_or4c])]) self.j_p_or5: JournalEntryData = JournalEntryData( - 20, [CurrencyData("USD", [self.l_p_or5d], [self.l_p_or5c])]) + 20, [JournalEntryCurrencyData( + "USD", [self.l_p_or5d], [self.l_p_or5c])]) self.j_p_or6: JournalEntryData = JournalEntryData( - 10, [CurrencyData("USD", [self.l_p_or6d], [self.l_p_or6c])]) + 10, [JournalEntryCurrencyData( + "USD", [self.l_p_or6d], [self.l_p_or6c])]) self._add_journal_entry(self.j_r_or1) self._add_journal_entry(self.j_r_or2) @@ -606,29 +627,41 @@ class SameTestData(BaseTestData): # Offset journal entries self.j_r_of1: JournalEntryData = JournalEntryData( - 65, [CurrencyData("USD", [self.l_r_of1d], [self.l_r_of1c])]) + 65, [JournalEntryCurrencyData( + "USD", [self.l_r_of1d], [self.l_r_of1c])]) self.j_r_of2: JournalEntryData = JournalEntryData( - 35, [CurrencyData("USD", [self.l_r_of2d], [self.l_r_of2c])]) + 35, [JournalEntryCurrencyData( + "USD", [self.l_r_of2d], [self.l_r_of2c])]) self.j_r_of3: JournalEntryData = JournalEntryData( - 35, [CurrencyData("USD", [self.l_r_of3d], [self.l_r_of3c])]) + 35, [JournalEntryCurrencyData( + "USD", [self.l_r_of3d], [self.l_r_of3c])]) self.j_r_of4: JournalEntryData = JournalEntryData( - 35, [CurrencyData("USD", [self.l_r_of4d], [self.l_r_of4c])]) + 35, [JournalEntryCurrencyData( + "USD", [self.l_r_of4d], [self.l_r_of4c])]) self.j_r_of5: JournalEntryData = JournalEntryData( - 35, [CurrencyData("USD", [self.l_r_of5d], [self.l_r_of5c])]) + 35, [JournalEntryCurrencyData( + "USD", [self.l_r_of5d], [self.l_r_of5c])]) self.j_r_of6: JournalEntryData = JournalEntryData( - 15, [CurrencyData("USD", [self.l_r_of6d], [self.l_r_of6c])]) + 15, [JournalEntryCurrencyData( + "USD", [self.l_r_of6d], [self.l_r_of6c])]) self.j_p_of1: JournalEntryData = JournalEntryData( - 65, [CurrencyData("USD", [self.l_p_of1d], [self.l_p_of1c])]) + 65, [JournalEntryCurrencyData( + "USD", [self.l_p_of1d], [self.l_p_of1c])]) self.j_p_of2: JournalEntryData = JournalEntryData( - 35, [CurrencyData("USD", [self.l_p_of2d], [self.l_p_of2c])]) + 35, [JournalEntryCurrencyData( + "USD", [self.l_p_of2d], [self.l_p_of2c])]) self.j_p_of3: JournalEntryData = JournalEntryData( - 35, [CurrencyData("USD", [self.l_p_of3d], [self.l_p_of3c])]) + 35, [JournalEntryCurrencyData( + "USD", [self.l_p_of3d], [self.l_p_of3c])]) self.j_p_of4: JournalEntryData = JournalEntryData( - 35, [CurrencyData("USD", [self.l_p_of4d], [self.l_p_of4c])]) + 35, [JournalEntryCurrencyData( + "USD", [self.l_p_of4d], [self.l_p_of4c])]) self.j_p_of5: JournalEntryData = JournalEntryData( - 35, [CurrencyData("USD", [self.l_p_of5d], [self.l_p_of5c])]) + 35, [JournalEntryCurrencyData( + "USD", [self.l_p_of5d], [self.l_p_of5c])]) self.j_p_of6: JournalEntryData = JournalEntryData( - 15, [CurrencyData("USD", [self.l_p_of6d], [self.l_p_of6c])]) + 15, [JournalEntryCurrencyData( + "USD", [self.l_p_of6d], [self.l_p_of6c])]) self._set_is_need_offset({Accounts.RECEIVABLE, Accounts.PAYABLE}, False) diff --git a/tests/testlib_offset.py b/tests/testlib_offset.py index ad7f2ff..6d4c014 100644 --- a/tests/testlib_offset.py +++ b/tests/testlib_offset.py @@ -76,7 +76,7 @@ class JournalEntryLineItemData: return form -class CurrencyData: +class JournalEntryCurrencyData: """The journal entry currency data.""" def __init__(self, currency: str, debit: list[JournalEntryLineItemData], @@ -111,7 +111,7 @@ class CurrencyData: class JournalEntryData: """The journal entry data.""" - def __init__(self, days: int, currencies: list[CurrencyData]): + def __init__(self, days: int, currencies: list[JournalEntryCurrencyData]): """Constructs a journal entry. :param days: The number of days before today. @@ -119,7 +119,7 @@ class JournalEntryData: """ self.id: int = -1 self.days: int = days - self.currencies: list[CurrencyData] = currencies + self.currencies: list[JournalEntryCurrencyData] = currencies self.note: str | None = None for currency in self.currencies: for line_item in currency.debit: @@ -269,17 +269,21 @@ class TestData(BaseTestData): # Original journal entries self.j_r_or1: JournalEntryData = JournalEntryData( - 50, [CurrencyData("USD", [self.l_r_or1d, self.l_r_or4d], - [self.l_r_or1c, self.l_r_or4c])]) + 50, [JournalEntryCurrencyData( + "USD", [self.l_r_or1d, self.l_r_or4d], + [self.l_r_or1c, self.l_r_or4c])]) self.j_r_or2: JournalEntryData = JournalEntryData( - 30, [CurrencyData("USD", [self.l_r_or2d, self.l_r_or3d], - [self.l_r_or2c, self.l_r_or3c])]) + 30, [JournalEntryCurrencyData( + "USD", [self.l_r_or2d, self.l_r_or3d], + [self.l_r_or2c, self.l_r_or3c])]) self.j_p_or1: JournalEntryData = JournalEntryData( - 40, [CurrencyData("USD", [self.l_p_or1d, self.l_p_or4d], - [self.l_p_or1c, self.l_p_or4c])]) + 40, [JournalEntryCurrencyData( + "USD", [self.l_p_or1d, self.l_p_or4d], + [self.l_p_or1c, self.l_p_or4c])]) self.j_p_or2: JournalEntryData = JournalEntryData( - 20, [CurrencyData("USD", [self.l_p_or2d, self.l_p_or3d], - [self.l_p_or2c, self.l_p_or3c])]) + 20, [JournalEntryCurrencyData( + "USD", [self.l_p_or2d, self.l_p_or3d], + [self.l_p_or2c, self.l_p_or3c])]) self._add_journal_entry(self.j_r_or1) self._add_journal_entry(self.j_r_or2) @@ -322,21 +326,25 @@ class TestData(BaseTestData): # Offset journal entries self.j_r_of1: JournalEntryData = JournalEntryData( - 25, [CurrencyData("USD", [self.l_r_of1d], [self.l_r_of1c])]) + 25, [JournalEntryCurrencyData( + "USD", [self.l_r_of1d], [self.l_r_of1c])]) self.j_r_of2: JournalEntryData = JournalEntryData( - 20, [CurrencyData("USD", - [self.l_r_of2d, self.l_r_of3d, self.l_r_of4d], - [self.l_r_of2c, self.l_r_of3c, self.l_r_of4c])]) + 20, [JournalEntryCurrencyData( + "USD", [self.l_r_of2d, self.l_r_of3d, self.l_r_of4d], + [self.l_r_of2c, self.l_r_of3c, self.l_r_of4c])]) self.j_r_of3: JournalEntryData = JournalEntryData( - 15, [CurrencyData("USD", [self.l_r_of5d], [self.l_r_of5c])]) + 15, [JournalEntryCurrencyData( + "USD", [self.l_r_of5d], [self.l_r_of5c])]) self.j_p_of1: JournalEntryData = JournalEntryData( - 15, [CurrencyData("USD", [self.l_p_of1d], [self.l_p_of1c])]) + 15, [JournalEntryCurrencyData( + "USD", [self.l_p_of1d], [self.l_p_of1c])]) self.j_p_of2: JournalEntryData = JournalEntryData( - 10, [CurrencyData("USD", - [self.l_p_of2d, self.l_p_of3d, self.l_p_of4d], - [self.l_p_of2c, self.l_p_of3c, self.l_p_of4c])]) + 10, [JournalEntryCurrencyData( + "USD", [self.l_p_of2d, self.l_p_of3d, self.l_p_of4d], + [self.l_p_of2c, self.l_p_of3c, self.l_p_of4c])]) self.j_p_of3: JournalEntryData = JournalEntryData( - 5, [CurrencyData("USD", [self.l_p_of5d], [self.l_p_of5c])]) + 5, [JournalEntryCurrencyData( + "USD", [self.l_p_of5d], [self.l_p_of5c])]) self._add_journal_entry(self.j_r_of1) self._add_journal_entry(self.j_r_of2)