Advanced to version 1.3.1.

README.rst

@@ -7,7 +7,8 @@ Description
 ===========
 
 *Mia! Accounting* is an accounting module for Flask_ applications.
-It implements `double-entry bookkeeping`_, and generates the following
+It is designed both for mobile and desktop environments.  It
+implements `double-entry bookkeeping`_.  It generates the following
 accounting reports:
 
 * Trial balance
@@ -18,6 +19,18 @@ In addition, *Mia! Accounting* tracks offsets for unpaid payables and
 receivables.
 
 
+Live Demonstration and Test Site
+================================
+
+There is a `live demonstration`_ for *Mia! Accounting*.  It runs the
+same code as the `test site`_ in the `source distribution`_.  It is
+the simplest website that works with *Mia! Accounting*.  It is also
+used in the automatic tests.
+
+If you do not have a running Flask application or do not know how to
+start one, you may start with the test site.
+
+
 Installation
 ============
 
@@ -27,27 +40,16 @@ Install *Mia! Accounting* with ``pip``:
 
     pip install mia-accounting
 
-You may also download the from the `PyPI project page`_ or the
+You may also download from the `PyPI project page`_ or the
 `release page`_ on the `Git repository`_.
 
 
-Test Site and Live Demonstration
-================================
-
-You may find a working example in the `test site`_ in the
-`source distribution`_.  It is the simplest website that works with
-*Mia! Accounting*.  It is used in the automatic tests.  It is the same
-code run for `live demonstration`_.
-
-If you do not have a running Flask application or do not know how to
-start one, you may start with the test site.
-
-
 Prerequisites
 =============
 
 You need a running Flask application with database user login.
-The primary key of the user data model must be integer.
+The primary key of the user data model must be integer.  You also
+need at least one user.
 
 The following front-end JavaScript libraries must be loaded.  You may
 download it locally or use CDN_.
@@ -122,24 +124,13 @@ The following is an example configuration for *Mia! Accounting*.
 Database Initialization
 =======================
 
-After the configuration, you need to run
-`flask_sqlalchemy.SQLAlchemy.create_all`_ to create the
-database tables that *Mia! Accounting* uses.
-
-*Mia! Accounting* adds three console commands:
-
-* ``accounting-init-base``
-* ``accounting-init-accounts``
-* ``accounting-init-currencies``
-
-After database tables are created, run
-``accounting-init-base`` first, and then the other two commands.
+After the configuration, run the ``accounting-init-db`` console
+command to initialize the accounting database.  You need to specify
+the username of a user as the data creator.
 
 ::
 
-    % flask --app myapp accounting-init-base
-    % flask --app myapp accounting-init-accounts
-    % flask --app myapp accounting-init-currencies
+    % flask --app myapp accounting-init-db -u username
 
 
 Navigation Menu
@@ -201,9 +192,9 @@ Authors
 
 .. _Flask: https://flask.palletsprojects.com
 .. _double-entry bookkeeping: https://en.wikipedia.org/wiki/Double-entry_bookkeeping
+.. _live demonstration: https://accounting.imacat.idv.tw
 .. _test site: https://github.com/imacat/mia-accounting/tree/main/tests/test_site
 .. _source distribution: https://pypi.org/project/mia-accounting/#files
-.. _live demonstration: https://accounting.imacat.idv.tw
 .. _PyPI project page: https://pypi.org/project/mia-accounting
 .. _release page: https://github.com/imacat/mia-accounting/releases
 .. _Git repository: https://github.com/imacat/mia-accounting
@@ -214,6 +205,5 @@ Authors
 .. _Tempus-Dominus: https://getdatepicker.com
 .. _UserUtilityInterface: https://mia-accounting.readthedocs.io/en/latest/accounting.utils.html#accounting.utils.user.UserUtilityInterface
 .. _init_app: https://mia-accounting.readthedocs.io/en/latest/accounting.html#accounting.init_app
-.. _flask_sqlalchemy.SQLAlchemy.create_all: https://flask-sqlalchemy.palletsprojects.com/en/3.0.x/api/#flask_sqlalchemy.SQLAlchemy.create_all
 .. _Bootstrap navigation bar: https://getbootstrap.com/docs/5.3/components/navbar/
 .. _documentation on Read the Docs: https://mia-accounting.readthedocs.io

docs/source/accounting.rst

@@ -19,6 +19,14 @@ Subpackages
 Submodules
 ----------
 
+accounting.commands module
+--------------------------
+
+.. automodule:: accounting.commands
+   :members:
+   :undoc-members:
+   :show-inheritance:
+
 accounting.forms module
 -----------------------
 

docs/source/conf.py

@@ -13,7 +13,7 @@ sys.path.insert(0, os.path.abspath('../../src/'))
 project = 'Mia! Accounting'
 copyright = '2023, imacat'
 author = 'imacat'
-release = '1.2.0'
+release = '1.3.1'
 
 # -- General configuration ---------------------------------------------------
 # https://www.sphinx-doc.org/en/master/usage/configuration.html#general-configuration

docs/source/intro.rst

@@ -2,7 +2,8 @@ Introduction
 ============
 
 *Mia! Accounting* is an accounting module for Flask_ applications.
-It implements `double-entry bookkeeping`_, and generates the following
+It is designed both for mobile and desktop environments.  It
+implements `double-entry bookkeeping`_.  It generates the following
 accounting reports:
 
 * Trial balance
@@ -13,6 +14,18 @@ In addition, *Mia! Accounting* tracks offsets for unpaid payables and
 receivables.
 
 
+Live Demonstration and Test Site
+--------------------------------
+
+There is a `live demonstration`_ for *Mia! Accounting*.  It runs the
+same code as the `test site`_ in the `source distribution`_.  It is
+the simplest website that works with *Mia! Accounting*.  It is also
+used in the automatic tests.
+
+If you do not have a running Flask application or do not know how to
+start one, you may start with the test site.
+
+
 Installation
 ------------
 
@@ -22,27 +35,16 @@ Install *Mia! Accounting* with ``pip``:
 
     pip install mia-accounting
 
-You may also download the from the `PyPI project page`_ or the
+You may also download from the `PyPI project page`_ or the
 `release page`_ on the `Git repository`_.
 
 
-Test Site and Live Demonstration
---------------------------------
-
-You may find a working example in the `test site`_ in the
-`source distribution`_.  It is the simplest website that works with
-*Mia! Accounting*.  It is used in the automatic tests.  It is the same
-code run for `live demonstration`_.
-
-If you do not have a running Flask application or do not know how to
-start one, you may start with the test site.
-
-
 Prerequisites
 -------------
 
 You need a running Flask application with database user login.
-The primary key of the user data model must be integer.
+The primary key of the user data model must be integer.  You also
+need at least one user.
 
 The following front-end JavaScript libraries must be loaded.  You may
 download it locally or use CDN_.
@@ -67,24 +69,13 @@ See an example in :ref:`example-userutils`.
 Database Initialization
 -----------------------
 
-After the configuration, you need to run
-`flask_sqlalchemy.SQLAlchemy.create_all`_ to create the
-database tables that *Mia! Accounting* uses.
-
-*Mia! Accounting* adds three console commands:
-
-* ``accounting-init-base``
-* ``accounting-init-accounts``
-* ``accounting-init-currencies``
-
-After database tables are created, run
-``accounting-init-base`` first, and then the other two commands.
+After the configuration, run the ``accounting-init-db`` console
+command to initialize the accounting database.  You need to specify
+the username of a user as the data creator.
 
 ::
 
-    % flask --app myapp accounting-init-base
-    % flask --app myapp accounting-init-accounts
-    % flask --app myapp accounting-init-currencies
+    % flask --app myapp accounting-init-db -u username
 
 
 Navigation Menu
@@ -120,9 +111,9 @@ Refer to the `documentation on Read the Docs`_.
 
 .. _Flask: https://flask.palletsprojects.com
 .. _double-entry bookkeeping: https://en.wikipedia.org/wiki/Double-entry_bookkeeping
+.. _live demonstration: https://accounting.imacat.idv.tw
 .. _test site: https://github.com/imacat/mia-accounting/tree/main/tests/test_site
 .. _source distribution: https://pypi.org/project/mia-accounting/#files
-.. _live demonstration: https://accounting.imacat.idv.tw
 .. _PyPI project page: https://pypi.org/project/mia-accounting
 .. _release page: https://github.com/imacat/mia-accounting/releases
 .. _Git repository: https://github.com/imacat/mia-accounting
@@ -131,6 +122,5 @@ Refer to the `documentation on Read the Docs`_.
 .. _FontAwesome: https://fontawesome.com
 .. _Decimal.js: https://mikemcl.github.io/decimal.js
 .. _Tempus-Dominus: https://getdatepicker.com
-.. _flask_sqlalchemy.SQLAlchemy.create_all: https://flask-sqlalchemy.palletsprojects.com/en/3.0.x/api/#flask_sqlalchemy.SQLAlchemy.create_all
 .. _Bootstrap navigation bar: https://getbootstrap.com/docs/5.3/components/navbar/
 .. _documentation on Read the Docs: https://mia-accounting.readthedocs.io

pyproject.toml

@@ -17,7 +17,7 @@
 
 [project]
 name = "mia-accounting"
-version = "1.2.0"
+version = "1.3.1"
 description = "A Flask accounting module."
 readme = "README.rst"
 requires-python = ">=3.11"

src/accounting/__init__.py

@@ -61,6 +61,9 @@ def init_app(app: Flask, user_utils: UserUtilityInterface,
     bp.add_app_template_global(default_currency_code,
                                "accounting_default_currency_code")
 
+    from .commands import init_db_command
+    app.cli.add_command(init_db_command)
+
     from . import locale
     locale.init_app(app, bp)
 

src/accounting/account/__init__.py

@@ -19,6 +19,8 @@
 """
 from flask import Flask, Blueprint
 
+from .commands import init_accounts_command
+
 
 def init_app(app: Flask, bp: Blueprint) -> None:
     """Initialize the application.
@@ -32,6 +34,3 @@ def init_app(app: Flask, bp: Blueprint) -> None:
 
     from .views import bp as account_bp
     bp.register_blueprint(account_bp, url_prefix="/accounts")
-
-    from .commands import init_accounts_command
-    app.cli.add_command(init_accounts_command)

src/accounting/account/commands.py

@@ -17,44 +17,21 @@
 """The console commands for the account management.
 
 """
-import os
+import typing as t
 from secrets import randbelow
 
 import click
-from flask.cli import with_appcontext
 
 from accounting import db
 from accounting.models import BaseAccount, Account, AccountL10n
-from accounting.utils.user import has_user, get_user_pk
+from accounting.utils.user import get_user_pk
+import sqlalchemy as sa
 
 AccountData = tuple[int, str, int, str, str, str, bool]
 """The format of the account data, as a list of (ID, base account code, number,
 English, Traditional Chinese, Simplified Chinese, is-need-offset) tuples."""
 
 
-def __validate_username(ctx: click.core.Context, param: click.core.Option,
-                        value: str) -> str:
-    """Validates the username for the click console command.
-
-    :param ctx: The console command context.
-    :param param: The console command option.
-    :param value: The username.
-    :raise click.BadParameter: When validation fails.
-    :return: The username.
-    """
-    value = value.strip()
-    if value == "":
-        raise click.BadParameter("Username empty.")
-    if not has_user(value):
-        raise click.BadParameter(f"User {value} does not exist.")
-    return value
-
-
-@click.command("accounting-init-accounts")
-@click.option("-u", "--username", metavar="USERNAME", prompt=True,
-              help="The username.", callback=__validate_username,
-              default=lambda: os.getlogin())
-@with_appcontext
 def init_accounts_command(username: str) -> None:
     """Initializes the accounts."""
     creator_pk: int = get_user_pk(username)
@@ -63,8 +40,6 @@ def init_accounts_command(username: str) -> None:
         .filter(db.func.length(BaseAccount.code) == 4)\
         .order_by(BaseAccount.code).all()
     if len(bases) == 0:
-        click.echo("Please initialize the base accounts with "
-                   "\"flask accounting-init-base\" first.")
         raise click.Abort
 
     existing: list[Account] = Account.query.all()
@@ -73,7 +48,6 @@ def init_accounts_command(username: str) -> None:
     bases_to_add: list[BaseAccount] = [x for x in bases
                                        if x.code not in existing_base_code]
     if len(bases_to_add) == 0:
-        click.echo("No more account to import.")
         return
 
     existing_id: set[int] = {x.id for x in existing}
@@ -89,14 +63,24 @@ def init_accounts_command(username: str) -> None:
                 existing_id.add(new_id)
                 return new_id
 
-    data: list[AccountData] = []
+    data: list[dict[str, t.Any]] = []
+    l10n_data: list[dict[str, t.Any]] = []
     for base in bases_to_add:
         l10n: dict[str, str] = {x.locale: x.title for x in base.l10n}
-        is_need_offset: bool = __is_need_offset(base.code)
-        data.append((get_new_id(), base.code, 1, base.title_l10n,
-                     l10n["zh_Hant"], l10n["zh_Hans"], is_need_offset))
-    __add_accounting_accounts(data, creator_pk)
-    click.echo(F"{len(data)} added.  Accounting accounts initialized.")
+        account_id: int = get_new_id()
+        data.append({"id": account_id,
+                     "base_code": base.code,
+                     "no": 1,
+                     "title_l10n": base.title_l10n,
+                     "is_need_offset": __is_need_offset(base.code),
+                     "created_by_id": creator_pk,
+                     "updated_by_id": creator_pk})
+        for locale in {"zh_Hant", "zh_Hans"}:
+            l10n_data.append({"account_id": account_id,
+                              "locale": locale,
+                              "title": l10n[locale]})
+    db.session.execute(sa.insert(Account), data)
+    db.session.execute(sa.insert(AccountL10n), l10n_data)
 
 
 def __is_need_offset(base_code: str) -> bool:
@@ -121,29 +105,3 @@ def __is_need_offset(base_code: str) -> bool:
         return True
     # Only assets and liabilities need offset
     return False
-
-
-def __add_accounting_accounts(data: list[AccountData], creator_pk: int)\
-        -> None:
-    """Adds the accounts.
-
-    :param data: A list of (base code, number, title) tuples.
-    :param creator_pk: The primary key of the creator.
-    :return: None.
-    """
-    accounts: list[Account] = [Account(id=x[0],
-                                       base_code=x[1],
-                                       no=x[2],
-                                       title_l10n=x[3],
-                                       is_need_offset=x[6],
-                                       created_by_id=creator_pk,
-                                       updated_by_id=creator_pk)
-                               for x in data]
-    l10n: list[AccountL10n] = [AccountL10n(account_id=x[0],
-                                           locale=y[0],
-                                           title=y[1])
-                               for x in data
-                               for y in (("zh_Hant", x[4]), ("zh_Hans", x[5]))]
-    db.session.bulk_save_objects(accounts)
-    db.session.bulk_save_objects(l10n)
-    db.session.commit()

src/accounting/base_account/__init__.py

@@ -19,6 +19,8 @@
 """
 from flask import Flask, Blueprint
 
+from .commands import init_base_accounts_command
+
 
 def init_app(app: Flask, bp: Blueprint) -> None:
     """Initialize the application.
@@ -32,6 +34,3 @@ def init_app(app: Flask, bp: Blueprint) -> None:
 
     from .views import bp as base_account_bp
     bp.register_blueprint(base_account_bp, url_prefix="/base-accounts")
-
-    from .commands import init_base_accounts_command
-    app.cli.add_command(init_base_accounts_command)

src/accounting/base_account/commands.py

@@ -19,21 +19,17 @@
 """
 import csv
 
-import click
-from flask.cli import with_appcontext
+import sqlalchemy as sa
 
 from accounting import data_dir
 from accounting import db
 from accounting.models import BaseAccount, BaseAccountL10n
 
 
-@click.command("accounting-init-base")
-@with_appcontext
 def init_base_accounts_command() -> None:
     """Initializes the base accounts."""
     if BaseAccount.query.first() is not None:
-        click.echo("Base accounts already exist.")
-        raise click.Abort
+        return
 
     with open(data_dir / "base_accounts.csv") as fp:
         data: list[dict[str, str]] = [x for x in csv.DictReader(fp)]
@@ -45,7 +41,5 @@ def init_base_accounts_command() -> None:
                                         "locale": y,
                                         "title": x[f"l10n-{y}"]}
                                        for x in data for y in locales]
-    db.session.bulk_insert_mappings(BaseAccount, account_data)
-    db.session.bulk_insert_mappings(BaseAccountL10n, l10n_data)
-    db.session.commit()
-    click.echo("Base accounts initialized.")
+    db.session.execute(sa.insert(BaseAccount), account_data)
+    db.session.execute(sa.insert(BaseAccountL10n), l10n_data)

src/accounting/commands.py

@@ -0,0 +1,62 @@
+# The Mia! Accounting Project.
+# Author: imacat@mail.imacat.idv.tw (imacat), 2023/4/10
+
+#  Copyright (c) 2023 imacat.
+#
+#  Licensed under the Apache License, Version 2.0 (the "License");
+#  you may not use this file except in compliance with the License.
+#  You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS,
+#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#  See the License for the specific language governing permissions and
+#  limitations under the License.
+"""The console commands.
+
+"""
+import os
+
+import click
+from flask.cli import with_appcontext
+
+from accounting import db
+from accounting.account import init_accounts_command
+from accounting.base_account import init_base_accounts_command
+from accounting.currency import init_currencies_command
+from accounting.utils.user import has_user
+
+
+def __validate_username(ctx: click.core.Context, param: click.core.Option,
+                        value: str) -> str:
+    """Validates the username for the click console command.
+
+    :param ctx: The console command context.
+    :param param: The console command option.
+    :param value: The username.
+    :raise click.BadParameter: When validation fails.
+    :return: The username.
+    """
+    value = value.strip()
+    if value == "":
+        raise click.BadParameter("Username empty.")
+    if not has_user(value):
+        raise click.BadParameter(f"User {value} does not exist.")
+    return value
+
+
+@click.command("accounting-init-db")
+@click.option("-u", "--username", metavar="USERNAME", prompt=True,
+              help="The username.", callback=__validate_username,
+              default=lambda: os.getlogin())
+@with_appcontext
+def init_db_command(username: str) -> None:
+    """Initializes the accounting database."""
+    db.create_all()
+    init_base_accounts_command()
+    init_accounts_command(username)
+    init_currencies_command(username)
+    db.session.commit()
+    click.echo("Accounting database initialized.")

src/accounting/currency/__init__.py

@@ -19,6 +19,8 @@
 """
 from flask import Flask, Blueprint
 
+from .commands import init_currencies_command
+
 
 def init_app(app: Flask, bp: Blueprint) -> None:
     """Initialize the application.
@@ -33,6 +35,3 @@ def init_app(app: Flask, bp: Blueprint) -> None:
     from .views import bp as currency_bp, api_bp as currency_api_bp
     bp.register_blueprint(currency_bp, url_prefix="/currencies")
     bp.register_blueprint(currency_api_bp, url_prefix="/api/currencies")
-
-    from .commands import init_currencies_command
-    app.cli.add_command(init_currencies_command)

src/accounting/currency/commands.py

@@ -18,42 +18,15 @@
 
 """
 import csv
-import os
 import typing as t
 
-import click
-from flask.cli import with_appcontext
+import sqlalchemy as sa
 
 from accounting import db, data_dir
 from accounting.models import Currency, CurrencyL10n
-from accounting.utils.user import has_user, get_user_pk
-
-CurrencyData = tuple[str, str, str, str]
+from accounting.utils.user import get_user_pk
 
 
-def __validate_username(ctx: click.core.Context, param: click.core.Option,
-                        value: str) -> str:
-    """Validates the username for the click console command.
-
-    :param ctx: The console command context.
-    :param param: The console command option.
-    :param value: The username.
-    :raise click.BadParameter: When validation fails.
-    :return: The username.
-    """
-    value = value.strip()
-    if value == "":
-        raise click.BadParameter("Username empty.")
-    if not has_user(value):
-        raise click.BadParameter(f"User {value} does not exist.")
-    return value
-
-
-@click.command("accounting-init-currencies")
-@click.option("-u", "--username", metavar="USERNAME", prompt=True,
-              help="The username.", callback=__validate_username,
-              default=lambda: os.getlogin())
-@with_appcontext
 def init_currencies_command(username: str) -> None:
     """Initializes the currencies."""
     existing_codes: set[str] = {x.code for x in Currency.query.all()}
@@ -63,7 +36,6 @@ def init_currencies_command(username: str) -> None:
     to_add: list[dict[str, str]] = [x for x in data
                                     if x["code"] not in existing_codes]
     if len(to_add) == 0:
-        click.echo("No more currency to add.")
         return
 
     creator_pk: int = get_user_pk(username)
@@ -77,8 +49,5 @@ def init_currencies_command(username: str) -> None:
                                         "locale": y,
                                         "name": x[f"l10n-{y}"]}
                                        for x in to_add for y in locales]
-    db.session.bulk_insert_mappings(Currency, currency_data)
-    db.session.bulk_insert_mappings(CurrencyL10n, l10n_data)
-    db.session.commit()
-
-    click.echo(F"{len(to_add)} added.  Currencies initialized.")
+    db.session.execute(sa.insert(Currency), currency_data)
+    db.session.execute(sa.insert(CurrencyL10n), l10n_data)

src/accounting/report/reports/search.py

@@ -151,6 +151,17 @@ class LineItemCollector:
                 == journal_entry_date.day))
         except ValueError:
             pass
+        try:
+            journal_entry_date = datetime.strptime(k, "%Y/%m/%d")
+            conditions.append(sa.and_(
+                sa.extract("year", JournalEntry.date)
+                == journal_entry_date.year,
+                sa.extract("month", JournalEntry.date)
+                == journal_entry_date.month,
+                sa.extract("day", JournalEntry.date)
+                == journal_entry_date.day))
+        except ValueError:
+            pass
         return sa.select(JournalEntry.id).filter(sa.or_(*conditions))
 
 

src/accounting/templates/accounting/include/nav.html

@@ -51,12 +51,14 @@ First written: 2023/1/26
           {{ A_("Currencies") }}
         </a>
       </li>
+      {% if accounting_can_edit() %}
         <li>
           <a class="dropdown-item {% if request.endpoint and request.endpoint.startswith("accounting.unmatched-offset.") %} active {% endif %}" href="{{ url_for("accounting.unmatched-offset.dashboard") }}">
             <i class="fa-solid fa-link-slash"></i>
             {{ A_("Unmatched Offsets") }}
           </a>
         </li>
+      {% endif %}
       {% if accounting_can_admin() %}
         <li>
           <a class="dropdown-item {% if request.endpoint and request.endpoint.startswith("accounting.option.") %} active {% endif %}" href="{{ url_for("accounting.option.detail") }}">

tests/test_account.py

@@ -21,10 +21,7 @@ import unittest
 from datetime import timedelta, date
 
 import httpx
-import sqlalchemy as sa
-from click.testing import Result
 from flask import Flask
-from flask.testing import FlaskCliRunner
 
 from test_site import db
 from testlib import NEXT_URI, create_test_app, get_client, set_locale, \
@@ -65,59 +62,6 @@ PREFIX: str = "/accounting/accounts"
 """The URL prefix for the account management."""
 
 
-class AccountCommandTestCase(unittest.TestCase):
-    """The account console command test case."""
-
-    def setUp(self) -> None:
-        """Sets up the test.
-        This is run once per test.
-
-        :return: None.
-        """
-        self.app: Flask = create_test_app()
-
-        runner: FlaskCliRunner = self.app.test_cli_runner()
-        with self.app.app_context():
-            from accounting.models import BaseAccount, Account, AccountL10n
-            result: Result
-            result = runner.invoke(args="init-db")
-            self.assertEqual(result.exit_code, 0)
-            if BaseAccount.query.first() is None:
-                result = runner.invoke(args="accounting-init-base")
-                self.assertEqual(result.exit_code, 0)
-            AccountL10n.query.delete()
-            Account.query.delete()
-            db.session.commit()
-
-    def test_init(self) -> None:
-        """Tests the "accounting-init-account" console command.
-
-        :return: None.
-        """
-        from accounting.models import BaseAccount, Account, AccountL10n
-        runner: FlaskCliRunner = self.app.test_cli_runner()
-        with self.app.app_context():
-            result: Result = runner.invoke(args=["accounting-init-accounts",
-                                                 "-u", "editor"])
-            self.assertEqual(result.exit_code, 0)
-        with self.app.app_context():
-            bases: list[BaseAccount] = BaseAccount.query\
-                .filter(sa.func.char_length(BaseAccount.code) == 4).all()
-            accounts: list[Account] = Account.query.all()
-            l10n: list[AccountL10n] = AccountL10n.query.all()
-        self.assertEqual({x.code for x in bases},
-                         {x.base_code for x in accounts})
-        self.assertEqual(len(accounts), len(bases))
-        self.assertEqual(len(l10n), len(bases) * 2)
-        base_dict: dict[str, BaseAccount] = {x.code: x for x in bases}
-        for account in accounts:
-            base: BaseAccount = base_dict[account.base_code]
-            self.assertEqual(account.no, 1)
-            self.assertEqual(account.title_l10n, base.title_l10n)
-            self.assertEqual({x.locale: x.title for x in account.l10n},
-                             {x.locale: x.title for x in base.l10n})
-
-
 class AccountTestCase(unittest.TestCase):
     """The account test case."""
 
@@ -129,15 +73,8 @@ class AccountTestCase(unittest.TestCase):
         """
         self.app: Flask = create_test_app()
 
-        runner: FlaskCliRunner = self.app.test_cli_runner()
         with self.app.app_context():
-            from accounting.models import BaseAccount, Account, AccountL10n
-            result: Result
-            result = runner.invoke(args="init-db")
-            self.assertEqual(result.exit_code, 0)
-            if BaseAccount.query.first() is None:
-                result = runner.invoke(args="accounting-init-base")
-                self.assertEqual(result.exit_code, 0)
+            from accounting.models import Account, AccountL10n
             AccountL10n.query.delete()
             Account.query.delete()
             db.session.commit()
@@ -652,14 +589,6 @@ class AccountTestCase(unittest.TestCase):
         self.assertEqual(response.status_code, 302)
         self.assertEqual(response.headers["Location"], detail_uri)
 
-        response = self.client.post("/accounting/currencies/store",
-                                    data={"csrf_token": self.csrf_token,
-                                          "code": "USD",
-                                          "name": "US Dollars"})
-        self.assertEqual(response.status_code, 302)
-        self.assertEqual(response.headers["Location"],
-                         "/accounting/currencies/USD")
-
         add_journal_entry(self.client,
                           form={"csrf_token": self.csrf_token,
                                 "next": NEXT_URI,

tests/test_base_account.py

@@ -17,14 +17,10 @@
 """The test for the base account management.
 
 """
-import csv
-import typing as t
 import unittest
 
 import httpx
-from click.testing import Result
 from flask import Flask
-from flask.testing import FlaskCliRunner
 
 from testlib import create_test_app, get_client
 
@@ -34,59 +30,6 @@ DETAIL_URI: str = "/accounting/base-accounts/1111"
 """The detail URI."""
 
 
-class BaseAccountCommandTestCase(unittest.TestCase):
-    """The base account console command test case."""
-
-    def setUp(self) -> None:
-        """Sets up the test.
-        This is run once per test.
-
-        :return: None.
-        """
-        from accounting.models import BaseAccount, BaseAccountL10n
-        self.app: Flask = create_test_app()
-
-        runner: FlaskCliRunner = self.app.test_cli_runner()
-        with self.app.app_context():
-            result: Result = runner.invoke(args="init-db")
-            self.assertEqual(result.exit_code, 0)
-            BaseAccountL10n.query.delete()
-            BaseAccount.query.delete()
-
-    def test_init(self) -> None:
-        """Tests the "accounting-init-base" console command.
-
-        :return: None.
-        """
-        from accounting import data_dir
-        from accounting.models import BaseAccount
-
-        with open(data_dir / "base_accounts.csv") as fp:
-            data: dict[dict[str, t.Any]] \
-                = {x["code"]: {"code": x["code"],
-                               "title": x["title"],
-                               "l10n": {y[5:]: x[y]
-                                        for y in x if y.startswith("l10n-")}}
-                   for x in csv.DictReader(fp)}
-
-        runner: FlaskCliRunner = self.app.test_cli_runner()
-        result: Result = runner.invoke(args="accounting-init-base")
-        self.assertEqual(result.exit_code, 0)
-        with self.app.app_context():
-            accounts: list[BaseAccount] = BaseAccount.query.all()
-
-        self.assertEqual(len(accounts), len(data))
-        for account in accounts:
-            self.assertIn(account.code, data)
-            self.assertEqual(account.title_l10n, data[account.code]["title"])
-            l10n: dict[str, str] = {x.locale: x.title for x in account.l10n}
-            self.assertEqual(len(l10n), len(data[account.code]["l10n"]))
-            for locale in l10n:
-                self.assertIn(locale, data[account.code]["l10n"])
-                self.assertEqual(l10n[locale],
-                                 data[account.code]["l10n"][locale])
-
-
 class BaseAccountTestCase(unittest.TestCase):
     """The base account test case."""
 
@@ -96,17 +39,8 @@ class BaseAccountTestCase(unittest.TestCase):
 
         :return: None.
         """
-        from accounting.models import BaseAccount
         self.app: Flask = create_test_app()
 
-        runner: FlaskCliRunner = self.app.test_cli_runner()
-        with self.app.app_context():
-            result: Result = runner.invoke(args="init-db")
-            self.assertEqual(result.exit_code, 0)
-            if BaseAccount.query.first() is None:
-                result = runner.invoke(args="accounting-init-base")
-                self.assertEqual(result.exit_code, 0)
-
     def test_nobody(self) -> None:
         """Test the permission as nobody.
 

tests/test_commands.py

@@ -0,0 +1,157 @@
+# The Mia! Accounting Project.
+# Author: imacat@mail.imacat.idv.tw (imacat), 2023/4/10
+
+#  Copyright (c) 2023 imacat.
+#
+#  Licensed under the Apache License, Version 2.0 (the "License");
+#  you may not use this file except in compliance with the License.
+#  You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS,
+#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#  See the License for the specific language governing permissions and
+#  limitations under the License.
+"""The test for the console commands.
+
+"""
+import csv
+import typing as t
+import unittest
+
+import sqlalchemy as sa
+from click.testing import Result
+from flask import Flask
+from flask.testing import FlaskCliRunner
+from sqlalchemy.sql.ddl import DropTable
+
+from test_site import db
+from testlib import create_test_app
+
+
+class ConsoleCommandTestCase(unittest.TestCase):
+    """The console command test case."""
+
+    def setUp(self) -> None:
+        """Sets up the test.
+        This is run once per test.
+
+        :return: None.
+        """
+        self.app: Flask = create_test_app()
+
+        with self.app.app_context():
+            # Drop every accounting table, to see if accounting-init recreates
+            # them correctly.
+            tables: list[sa.Table] \
+                = [db.metadata.tables[x] for x in db.metadata.tables
+                   if x.startswith("accounting_")]
+            for table in tables:
+                db.session.execute(DropTable(table))
+            db.session.commit()
+            inspector: sa.Inspector = sa.inspect(db.session.connection())
+            self.assertEqual(len({x for x in inspector.get_table_names()
+                                  if x.startswith("accounting_")}),
+                             0)
+
+    def test_init(self) -> None:
+        """Tests the "accounting-init" console command.
+
+        :return: None.
+        """
+        runner: FlaskCliRunner = self.app.test_cli_runner()
+        with self.app.app_context():
+            result: Result = runner.invoke(
+                args=["accounting-init-db", "-u", "editor"])
+        self.assertEqual(result.exit_code, 0,
+                         result.output + str(result.exception))
+        self.__test_base_account_data()
+        self.__test_account_data()
+        self.__test_currency_data()
+
+    def __test_base_account_data(self) -> None:
+        """Tests the base account data.
+
+        :return: None.
+        """
+        from accounting import data_dir
+        from accounting.models import BaseAccount
+
+        with open(data_dir / "base_accounts.csv") as fp:
+            data: dict[dict[str, t.Any]] \
+                = {x["code"]: {"code": x["code"],
+                               "title": x["title"],
+                               "l10n": {y[5:]: x[y]
+                                        for y in x if y.startswith("l10n-")}}
+                   for x in csv.DictReader(fp)}
+
+        with self.app.app_context():
+            accounts: list[BaseAccount] = BaseAccount.query.all()
+
+        self.assertEqual(len(accounts), len(data))
+        for account in accounts:
+            self.assertIn(account.code, data)
+            self.assertEqual(account.title_l10n, data[account.code]["title"])
+            l10n: dict[str, str] = {x.locale: x.title for x in account.l10n}
+            self.assertEqual(len(l10n), len(data[account.code]["l10n"]))
+            for locale in l10n:
+                self.assertIn(locale, data[account.code]["l10n"])
+                self.assertEqual(l10n[locale],
+                                 data[account.code]["l10n"][locale])
+
+    def __test_account_data(self) -> None:
+        """Tests the account data.
+
+        :return: None.
+        """
+        from accounting.models import BaseAccount, Account, AccountL10n
+
+        with self.app.app_context():
+            bases: list[BaseAccount] = BaseAccount.query\
+                .filter(sa.func.char_length(BaseAccount.code) == 4).all()
+            accounts: list[Account] = Account.query.all()
+            l10n: list[AccountL10n] = AccountL10n.query.all()
+
+        self.assertEqual({x.code for x in bases},
+                         {x.base_code for x in accounts})
+        self.assertEqual(len(accounts), len(bases))
+        self.assertEqual(len(l10n), len(bases) * 2)
+        base_dict: dict[str, BaseAccount] = {x.code: x for x in bases}
+        for account in accounts:
+            base: BaseAccount = base_dict[account.base_code]
+            self.assertEqual(account.no, 1)
+            self.assertEqual(account.title_l10n, base.title_l10n)
+            self.assertEqual({x.locale: x.title for x in account.l10n},
+                             {x.locale: x.title for x in base.l10n})
+
+    def __test_currency_data(self) -> None:
+        """Tests the currency data.
+
+        :return: None.
+        """
+        from accounting import data_dir
+        from accounting.models import Currency
+
+        with open(data_dir / "currencies.csv") as fp:
+            data: dict[dict[str, t.Any]] \
+                = {x["code"]: {"code": x["code"],
+                               "name": x["name"],
+                               "l10n": {y[5:]: x[y]
+                                        for y in x if y.startswith("l10n-")}}
+                   for x in csv.DictReader(fp)}
+
+        with self.app.app_context():
+            currencies: list[Currency] = Currency.query.all()
+
+        self.assertEqual(len(currencies), len(data))
+        for currency in currencies:
+            self.assertIn(currency.code, data)
+            self.assertEqual(currency.name_l10n, data[currency.code]["name"])
+            l10n: dict[str, str] = {x.locale: x.name for x in currency.l10n}
+            self.assertEqual(len(l10n), len(data[currency.code]["l10n"]))
+            for locale in l10n:
+                self.assertIn(locale, data[currency.code]["l10n"])
+                self.assertEqual(l10n[locale],
+                                 data[currency.code]["l10n"][locale])

tests/test_currency.py

@@ -17,15 +17,11 @@
 """The test for the currency management.
 
 """
-import csv
-import typing as t
 import unittest
 from datetime import timedelta, date
 
 import httpx
-from click.testing import Result
 from flask import Flask
-from flask.testing import FlaskCliRunner
 
 from test_site import db
 from testlib import NEXT_URI, create_test_app, get_client, set_locale, \
@@ -59,62 +55,6 @@ PREFIX: str = "/accounting/currencies"
 """The URL prefix for the currency management."""
 
 
-class CurrencyCommandTestCase(unittest.TestCase):
-    """The account console command test case."""
-
-    def setUp(self) -> None:
-        """Sets up the test.
-        This is run once per test.
-
-        :return: None.
-        """
-        self.app: Flask = create_test_app()
-
-        runner: FlaskCliRunner = self.app.test_cli_runner()
-        with self.app.app_context():
-            from accounting.models import Currency, CurrencyL10n
-            result: Result
-            result = runner.invoke(args="init-db")
-            self.assertEqual(result.exit_code, 0)
-            CurrencyL10n.query.delete()
-            Currency.query.delete()
-            db.session.commit()
-
-    def test_init(self) -> None:
-        """Tests the "accounting-init-currencies" console command.
-
-        :return: None.
-        """
-        from accounting import data_dir
-        from accounting.models import Currency
-
-        with open(data_dir / "currencies.csv") as fp:
-            data: dict[dict[str, t.Any]] \
-                = {x["code"]: {"code": x["code"],
-                               "name": x["name"],
-                               "l10n": {y[5:]: x[y]
-                                        for y in x if y.startswith("l10n-")}}
-                   for x in csv.DictReader(fp)}
-
-        runner: FlaskCliRunner = self.app.test_cli_runner()
-        with self.app.app_context():
-            result: Result = runner.invoke(
-                args=["accounting-init-currencies", "-u", "editor"])
-            self.assertEqual(result.exit_code, 0)
-            currencies: list[Currency] = Currency.query.all()
-
-        self.assertEqual(len(currencies), len(data))
-        for currency in currencies:
-            self.assertIn(currency.code, data)
-            self.assertEqual(currency.name_l10n, data[currency.code]["name"])
-            l10n: dict[str, str] = {x.locale: x.name for x in currency.l10n}
-            self.assertEqual(len(l10n), len(data[currency.code]["l10n"]))
-            for locale in l10n:
-                self.assertIn(locale, data[currency.code]["l10n"])
-                self.assertEqual(l10n[locale],
-                                 data[currency.code]["l10n"][locale])
-
-
 class CurrencyTestCase(unittest.TestCase):
     """The currency test case."""
 
@@ -126,12 +66,8 @@ class CurrencyTestCase(unittest.TestCase):
         """
         self.app: Flask = create_test_app()
 
-        runner: FlaskCliRunner = self.app.test_cli_runner()
         with self.app.app_context():
             from accounting.models import Currency, CurrencyL10n
-            result: Result
-            result = runner.invoke(args="init-db")
-            self.assertEqual(result.exit_code, 0)
             CurrencyL10n.query.delete()
             Currency.query.delete()
             db.session.commit()
@@ -588,21 +524,6 @@ class CurrencyTestCase(unittest.TestCase):
         list_uri: str = PREFIX
         response: httpx.Response
 
-        runner: FlaskCliRunner = self.app.test_cli_runner()
-        with self.app.app_context():
-            from accounting.models import BaseAccount
-            if BaseAccount.query.first() is None:
-                result = runner.invoke(args="accounting-init-base")
-                self.assertEqual(result.exit_code, 0)
-
-        response = self.client.post("/accounting/accounts/store",
-                                    data={"csrf_token": self.csrf_token,
-                                          "base_code": "1111",
-                                          "title": "Cash"})
-        self.assertEqual(response.status_code, 302)
-        self.assertEqual(response.headers["Location"],
-                         "/accounting/accounts/1111-001")
-
         response = self.client.post(f"{PREFIX}/store",
                                     data={"csrf_token": self.csrf_token,
                                           "code": JPY.code,

tests/test_description_editor.py

@@ -20,9 +20,7 @@
 import unittest
 from datetime import date
 
-from click.testing import Result
 from flask import Flask
-from flask.testing import FlaskCliRunner
 
 from testlib import NEXT_URI, Accounts, create_test_app, get_client, \
     add_journal_entry
@@ -39,22 +37,8 @@ class DescriptionEditorTestCase(unittest.TestCase):
         """
         self.app: Flask = create_test_app()
 
-        runner: FlaskCliRunner = self.app.test_cli_runner()
         with self.app.app_context():
-            from accounting.models import BaseAccount, JournalEntry, \
-                JournalEntryLineItem
-            result: Result
-            result = runner.invoke(args="init-db")
-            self.assertEqual(result.exit_code, 0)
-            if BaseAccount.query.first() is None:
-                result = runner.invoke(args="accounting-init-base")
-                self.assertEqual(result.exit_code, 0)
-            result = runner.invoke(args=["accounting-init-currencies",
-                                         "-u", "editor"])
-            self.assertEqual(result.exit_code, 0)
-            result = runner.invoke(args=["accounting-init-accounts",
-                                         "-u", "editor"])
-            self.assertEqual(result.exit_code, 0)
+            from accounting.models import JournalEntry, JournalEntryLineItem
             JournalEntry.query.delete()
             JournalEntryLineItem.query.delete()
 

tests/test_journal_entry.py

@@ -22,9 +22,7 @@ from datetime import date, timedelta
 from decimal import Decimal
 
 import httpx
-from click.testing import Result
 from flask import Flask
-from flask.testing import FlaskCliRunner
 
 from test_site import db
 from testlib import NEXT_URI, Accounts, create_test_app, get_client, \
@@ -51,22 +49,8 @@ class CashReceiptJournalEntryTestCase(unittest.TestCase):
         """
         self.app: Flask = create_test_app()
 
-        runner: FlaskCliRunner = self.app.test_cli_runner()
         with self.app.app_context():
-            from accounting.models import BaseAccount, JournalEntry, \
-                JournalEntryLineItem
-            result: Result
-            result = runner.invoke(args="init-db")
-            self.assertEqual(result.exit_code, 0)
-            if BaseAccount.query.first() is None:
-                result = runner.invoke(args="accounting-init-base")
-                self.assertEqual(result.exit_code, 0)
-            result = runner.invoke(args=["accounting-init-currencies",
-                                         "-u", "editor"])
-            self.assertEqual(result.exit_code, 0)
-            result = runner.invoke(args=["accounting-init-accounts",
-                                         "-u", "editor"])
-            self.assertEqual(result.exit_code, 0)
+            from accounting.models import JournalEntry, JournalEntryLineItem
             JournalEntry.query.delete()
             JournalEntryLineItem.query.delete()
 
@@ -670,22 +654,8 @@ class CashDisbursementJournalEntryTestCase(unittest.TestCase):
         """
         self.app: Flask = create_test_app()
 
-        runner: FlaskCliRunner = self.app.test_cli_runner()
         with self.app.app_context():
-            from accounting.models import BaseAccount, JournalEntry, \
-                JournalEntryLineItem
-            result: Result
-            result = runner.invoke(args="init-db")
-            self.assertEqual(result.exit_code, 0)
-            if BaseAccount.query.first() is None:
-                result = runner.invoke(args="accounting-init-base")
-                self.assertEqual(result.exit_code, 0)
-            result = runner.invoke(args=["accounting-init-currencies",
-                                         "-u", "editor"])
-            self.assertEqual(result.exit_code, 0)
-            result = runner.invoke(args=["accounting-init-accounts",
-                                         "-u", "editor"])
-            self.assertEqual(result.exit_code, 0)
+            from accounting.models import JournalEntry, JournalEntryLineItem
             JournalEntry.query.delete()
             JournalEntryLineItem.query.delete()
 
@@ -1265,22 +1235,9 @@ class TransferJournalEntryTestCase(unittest.TestCase):
         """
         self.app: Flask = create_test_app()
 
-        runner: FlaskCliRunner = self.app.test_cli_runner()
         with self.app.app_context():
-            from accounting.models import BaseAccount, JournalEntry, \
+            from accounting.models import JournalEntry, \
                 JournalEntryLineItem
-            result: Result
-            result = runner.invoke(args="init-db")
-            self.assertEqual(result.exit_code, 0)
-            if BaseAccount.query.first() is None:
-                result = runner.invoke(args="accounting-init-base")
-                self.assertEqual(result.exit_code, 0)
-            result = runner.invoke(args=["accounting-init-currencies",
-                                         "-u", "editor"])
-            self.assertEqual(result.exit_code, 0)
-            result = runner.invoke(args=["accounting-init-accounts",
-                                         "-u", "editor"])
-            self.assertEqual(result.exit_code, 0)
             JournalEntry.query.delete()
             JournalEntryLineItem.query.delete()
 
@@ -2139,22 +2096,8 @@ class JournalEntryReorderTestCase(unittest.TestCase):
         """
         self.app: Flask = create_test_app()
 
-        runner: FlaskCliRunner = self.app.test_cli_runner()
         with self.app.app_context():
-            from accounting.models import BaseAccount, JournalEntry, \
-                JournalEntryLineItem
-            result: Result
-            result = runner.invoke(args="init-db")
-            self.assertEqual(result.exit_code, 0)
-            if BaseAccount.query.first() is None:
-                result = runner.invoke(args="accounting-init-base")
-                self.assertEqual(result.exit_code, 0)
-            result = runner.invoke(args=["accounting-init-currencies",
-                                         "-u", "editor"])
-            self.assertEqual(result.exit_code, 0)
-            result = runner.invoke(args=["accounting-init-accounts",
-                                         "-u", "editor"])
-            self.assertEqual(result.exit_code, 0)
+            from accounting.models import JournalEntry, JournalEntryLineItem
             JournalEntry.query.delete()
             JournalEntryLineItem.query.delete()
 

tests/test_offset.py

@@ -23,9 +23,7 @@ import unittest
 from decimal import Decimal
 
 import httpx
-from click.testing import Result
 from flask import Flask
-from flask.testing import FlaskCliRunner
 
 from test_site import db
 from testlib import Accounts, create_test_app, get_client, \
@@ -47,22 +45,8 @@ class OffsetTestCase(unittest.TestCase):
         """
         self.app: Flask = create_test_app()
 
-        runner: FlaskCliRunner = self.app.test_cli_runner()
         with self.app.app_context():
-            from accounting.models import BaseAccount, JournalEntry, \
-                JournalEntryLineItem
-            result: Result
-            result = runner.invoke(args="init-db")
-            self.assertEqual(result.exit_code, 0)
-            if BaseAccount.query.first() is None:
-                result = runner.invoke(args="accounting-init-base")
-                self.assertEqual(result.exit_code, 0)
-            result = runner.invoke(args=["accounting-init-currencies",
-                                         "-u", "editor"])
-            self.assertEqual(result.exit_code, 0)
-            result = runner.invoke(args=["accounting-init-accounts",
-                                         "-u", "editor"])
-            self.assertEqual(result.exit_code, 0)
+            from accounting.models import JournalEntry, JournalEntryLineItem
             JournalEntry.query.delete()
             JournalEntryLineItem.query.delete()
 

tests/test_option.py

@@ -21,9 +21,7 @@ import unittest
 from datetime import datetime, timedelta
 
 import httpx
-from click.testing import Result
 from flask import Flask
-from flask.testing import FlaskCliRunner
 
 from test_site import db
 from testlib import NEXT_URI, Accounts, create_test_app, get_client
@@ -49,21 +47,8 @@ class OptionTestCase(unittest.TestCase):
         """
         self.app: Flask = create_test_app()
 
-        runner: FlaskCliRunner = self.app.test_cli_runner()
         with self.app.app_context():
-            from accounting.models import BaseAccount, Option
-            result: Result
-            result = runner.invoke(args="init-db")
-            self.assertEqual(result.exit_code, 0)
-            if BaseAccount.query.first() is None:
-                result = runner.invoke(args="accounting-init-base")
-                self.assertEqual(result.exit_code, 0)
-            result = runner.invoke(args=["accounting-init-currencies",
-                                         "-u", "editor"])
-            self.assertEqual(result.exit_code, 0)
-            result = runner.invoke(args=["accounting-init-accounts",
-                                         "-u", "editor"])
-            self.assertEqual(result.exit_code, 0)
+            from accounting.models import Option
             Option.query.delete()
 
         self.client, self.csrf_token = get_client(self.app, "admin")

tests/test_report.py

@@ -21,9 +21,7 @@ import unittest
 from datetime import date
 
 import httpx
-from click.testing import Result
 from flask import Flask
-from flask.testing import FlaskCliRunner
 
 from testlib import create_test_app, get_client, Accounts, BaseTestData
 
@@ -44,22 +42,8 @@ class ReportTestCase(unittest.TestCase):
         """
         self.app: Flask = create_test_app()
 
-        runner: FlaskCliRunner = self.app.test_cli_runner()
         with self.app.app_context():
-            from accounting.models import BaseAccount, JournalEntry, \
-                JournalEntryLineItem
-            result: Result
-            result = runner.invoke(args="init-db")
-            self.assertEqual(result.exit_code, 0)
-            if BaseAccount.query.first() is None:
-                result = runner.invoke(args="accounting-init-base")
-                self.assertEqual(result.exit_code, 0)
-            result = runner.invoke(args=["accounting-init-currencies",
-                                         "-u", "editor"])
-            self.assertEqual(result.exit_code, 0)
-            result = runner.invoke(args=["accounting-init-accounts",
-                                         "-u", "editor"])
-            self.assertEqual(result.exit_code, 0)
+            from accounting.models import JournalEntry, JournalEntryLineItem
             JournalEntry.query.delete()
             JournalEntryLineItem.query.delete()
 

tests/test_site/__init__.py

@@ -21,9 +21,10 @@ import os
 import typing as t
 from secrets import token_urlsafe
 
-import click
-from flask import Flask, Blueprint, render_template, redirect, Response
-from flask.cli import with_appcontext
+from click.testing import Result
+from flask import Flask, Blueprint, render_template, redirect, Response, \
+    url_for
+from flask.testing import FlaskCliRunner
 from flask_babel_js import BabelJS
 from flask_sqlalchemy import SQLAlchemy
 from flask_wtf import CSRFProtect
@@ -63,7 +64,6 @@ def create_app(is_testing: bool = False) -> Flask:
     db.init_app(app)
 
     app.register_blueprint(bp, url_prefix="/")
-    app.cli.add_command(init_db_command)
 
     from . import locale
     locale.init_app(app)
@@ -87,7 +87,8 @@ def create_app(is_testing: bool = False) -> Flask:
                 and auth.current_user().username == "admin"
 
         def unauthorized(self) -> Response:
-            return redirect("/login")
+            from accounting.utils.next_uri import append_next
+            return redirect(append_next(url_for("auth.login-form")))
 
         @property
         def cls(self) -> t.Type[auth.User]:
@@ -110,20 +111,27 @@ def create_app(is_testing: bool = False) -> Flask:
 
     accounting.init_app(app, user_utils=UserUtilities())
 
+    with app.app_context():
+        init_db(app)
+
     return app
 
 
-@click.command("init-db")
-@with_appcontext
-def init_db_command() -> None:
-    """Initializes the database."""
+def init_db(app: Flask) -> None:
+    """Initializes the database.
+
+    :param app: The Flask application.
+    :return: None.
+    """
     db.create_all()
     from .auth import User
     for username in ["viewer", "editor", "admin", "nobody"]:
         if User.query.filter(User.username == username).first() is None:
             db.session.add(User(username=username))
     db.session.commit()
-    click.echo("Database initialized successfully.")
+    runner: FlaskCliRunner = app.test_cli_runner()
+    result: Result = runner.invoke(args=["accounting-init-db", "-u", "editor"])
+    assert result.exit_code == 0, result.output + str(result.exception)
 
 
 @bp.get("/", endpoint="home")

tests/test_site/auth.py

@@ -18,7 +18,7 @@
 
 """
 from flask import Blueprint, render_template, Flask, redirect, url_for, \
-    session, request, g
+    session, request, g, Response
 
 from . import db
 
@@ -44,11 +44,13 @@ class User(db.Model):
 
 
 @bp.get("login", endpoint="login-form")
-def show_login_form() -> str:
+def show_login_form() -> str | Response:
     """Shows the login form.
 
     :return: The login form.
     """
+    if "user" in session:
+        return redirect(url_for("accounting-report.default"))
     return render_template("login.html")
 
 
@@ -58,11 +60,12 @@ def login() -> redirect:
 
     :return: The redirection to the home page.
     """
+    from accounting.utils.next_uri import inherit_next, or_next
     if request.form.get("username") not in {"viewer", "editor", "admin",
                                             "nobody"}:
-        return redirect(url_for("auth.login"))
+        return redirect(inherit_next(url_for("auth.login")))
     session["user"] = request.form.get("username")
-    return redirect(url_for("home.home"))
+    return redirect(or_next(url_for("accounting-report.default")))
 
 
 @bp.post("logout", endpoint="logout")

tests/test_site/templates/home.html

@@ -21,4 +21,12 @@ First written: 2023/1/27
 #}
 {% extends "base.html" %}
 
-{% block header %}{% block title %}{{ _("Home") }}{% endblock %}{% endblock %}
+{% block header %}{% block title %}{{ _("Mia! Accounting Live Demonstration") }}{% endblock %}{% endblock %}
+
+{% block content %}
+
+<p>{{ _("This is the live demonstration of the Mia! Accounting project.  Please <a href=\"/login?next=%%2Faccounting\">log in</a> to continue.") }}</p>
+
+<p>{{ _("You may also want to check the <a href=\"https://mia-accounting.readthedocs.io\">full documentation</a> and the <a href=\"https://github.com/imacat/mia-accounting\">Github repository</a>.") }}</p>
+
+{% endblock %}

tests/test_site/templates/login.html

@@ -27,6 +27,9 @@ First written: 2023/1/27
 
 <form action="{{ url_for("auth.login") }}" method="post">
   <input type="hidden" name="csrf_token" value="{{ csrf_token() }}">
+  {% if request.args.next %}
+    <input type="hidden" name="next" value="{{ request.args.next }}">
+  {% endif %}
   <button class="btn btn-primary" type="submit" name="username" value="viewer">{{ _("Viewer") }}</button>
   <button class="btn btn-primary" type="submit" name="username" value="editor">{{ _("Editor") }}</button>
   <button class="btn btn-primary" type="submit" name="username" value="admin">{{ _("Administrator") }}</button>

tests/test_site/translations/zh_Hant/LC_MESSAGES/messages.po

@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: mia-accounting-test-site 1.0.0\n"
 "Report-Msgid-Bugs-To: imacat@mail.imacat.idv.tw\n"
-"POT-Creation-Date: 2023-04-06 02:34+0800\n"
-"PO-Revision-Date: 2023-04-06 02:34+0800\n"
+"POT-Creation-Date: 2023-04-11 22:18+0800\n"
+"PO-Revision-Date: 2023-04-11 22:18+0800\n"
 "Last-Translator: imacat <imacat@mail.imacat.idv.tw>\n"
 "Language: zh_Hant\n"
 "Language-Team: zh_Hant <imacat@mail.imacat.idv.tw>\n"
@@ -25,7 +25,6 @@ msgid "en"
 msgstr "zh-Hant"
 
 #: tests/test_site/templates/base.html:46
-#: tests/test_site/templates/home.html:24
 msgid "Home"
 msgstr "首頁"
 
@@ -42,19 +41,39 @@ msgstr "登入"
 msgid "Error:"
 msgstr "錯誤："
 
-#: tests/test_site/templates/login.html:30
+#: tests/test_site/templates/home.html:24
+msgid "Mia! Accounting Live Demonstration"
+msgstr "Mia! Accounting 示範站"
+
+#: tests/test_site/templates/home.html:28
+#, python-format
+msgid ""
+"This is the live demonstration of the Mia! Accounting project.  Please <a"
+" href=\"/login?next=%%2Faccounting\">log in</a> to continue."
+msgstr "這是 Mia! Accounting 專案的示範站。請先<a href=\"/login?next=%%2Faccounting\">登入</a>。"
+
+#: tests/test_site/templates/home.html:30
+msgid ""
+"You may also want to check the <a href=\"https://mia-"
+"accounting.readthedocs.io\">full documentation</a> and the <a "
+"href=\"https://github.com/imacat/mia-accounting\">Github repository</a>."
+msgstr ""
+"詳情請參閱<a href=\"https://mia-accounting.readthedocs.io\">完整說明文件</a>與<a "
+"href=\"https://github.com/imacat/mia-accounting\">Github 專案庫</a>。"
+
+#: tests/test_site/templates/login.html:33
 msgid "Viewer"
 msgstr "讀報表者"
 
-#: tests/test_site/templates/login.html:31
+#: tests/test_site/templates/login.html:34
 msgid "Editor"
 msgstr "記帳者"
 
-#: tests/test_site/templates/login.html:32
+#: tests/test_site/templates/login.html:35
 msgid "Administrator"
 msgstr "管理者"
 
-#: tests/test_site/templates/login.html:33
+#: tests/test_site/templates/login.html:36
 msgid "Nobody"
 msgstr "沒有權限者"
 

tests/test_unmatched_offset.py

@@ -20,9 +20,7 @@
 import unittest
 
 import httpx
-from click.testing import Result
 from flask import Flask
-from flask.testing import FlaskCliRunner
 
 from test_site import db
 from testlib import create_test_app, get_client, Accounts, \
@@ -43,22 +41,8 @@ class UnmatchedOffsetTestCase(unittest.TestCase):
         """
         self.app: Flask = create_test_app()
 
-        runner: FlaskCliRunner = self.app.test_cli_runner()
         with self.app.app_context():
-            from accounting.models import BaseAccount, JournalEntry, \
-                JournalEntryLineItem
-            result: Result
-            result = runner.invoke(args="init-db")
-            self.assertEqual(result.exit_code, 0)
-            if BaseAccount.query.first() is None:
-                result = runner.invoke(args="accounting-init-base")
-                self.assertEqual(result.exit_code, 0)
-            result = runner.invoke(args=["accounting-init-currencies",
-                                         "-u", "editor"])
-            self.assertEqual(result.exit_code, 0)
-            result = runner.invoke(args=["accounting-init-accounts",
-                                         "-u", "editor"])
-            self.assertEqual(result.exit_code, 0)
+            from accounting.models import JournalEntry, JournalEntryLineItem
             JournalEntry.query.delete()
             JournalEntryLineItem.query.delete()
 

tests/testlib.py

@@ -103,6 +103,7 @@ def get_client(app: Flask, username: str) -> tuple[httpx.Client, str]:
     csrf_token: str = get_csrf_token(client)
     response: httpx.Response = client.post("/login",
                                            data={"csrf_token": csrf_token,
+                                                 "next": "/",
                                                  "username": username})
     assert response.status_code == 302
     assert response.headers["Location"] == "/"