From c869bccc042374789a46c93031bdb88390e5e4ae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BE=9D=E7=91=AA=E8=B2=93?= <imacat@mail.imacat.idv.tw>
Date: Sat, 18 Mar 2023 19:06:12 +0800
Subject: [PATCH] Reordered the methods of the Account data model.

---
 src/accounting/models.py | 60 ++++++++++++++++++++--------------------
 1 file changed, 30 insertions(+), 30 deletions(-)

diff --git a/src/accounting/models.py b/src/accounting/models.py
index c35edf1..71f7f8c 100644
--- a/src/accounting/models.py
+++ b/src/accounting/models.py
@@ -198,6 +198,36 @@ class Account(db.Model):
                 return
         self.l10n.append(AccountL10n(locale=current_locale, title=value))
 
+    @property
+    def query_values(self) -> list[str]:
+        """Returns the values to be queried.
+
+        :return: The values to be queried.
+        """
+        return [self.code, self.title_l10n] + [x.title for x in self.l10n]
+
+    @property
+    def is_modified(self) -> bool:
+        """Returns whether a product account was modified.
+
+        :return: True if modified, or False otherwise.
+        """
+        if db.session.is_modified(self):
+            return True
+        for l10n in self.l10n:
+            if db.session.is_modified(l10n):
+                return True
+        return False
+
+    def delete(self) -> None:
+        """Deletes this account.
+
+        :return: None.
+        """
+        AccountL10n.query.filter(AccountL10n.account == self).delete()
+        cls: t.Type[t.Self] = self.__class__
+        cls.query.filter(cls.id == self.id).delete()
+
     @classmethod
     def find_by_code(cls, code: str) -> t.Self | None:
         """Finds an account by its code.
@@ -252,14 +282,6 @@ class Account(db.Model):
                                 cls.base_code != "3353")\
             .order_by(cls.base_code, cls.no).all()
 
-    @property
-    def query_values(self) -> list[str]:
-        """Returns the values to be queried.
-
-        :return: The values to be queried.
-        """
-        return [self.code, self.title_l10n] + [x.title for x in self.l10n]
-
     @classmethod
     def cash(cls) -> t.Self:
         """Returns the cash account.
@@ -276,28 +298,6 @@ class Account(db.Model):
         """
         return cls.find_by_code(cls.ACCUMULATED_CHANGE_CODE)
 
-    @property
-    def is_modified(self) -> bool:
-        """Returns whether a product account was modified.
-
-        :return: True if modified, or False otherwise.
-        """
-        if db.session.is_modified(self):
-            return True
-        for l10n in self.l10n:
-            if db.session.is_modified(l10n):
-                return True
-        return False
-
-    def delete(self) -> None:
-        """Deletes this account.
-
-        :return: None.
-        """
-        AccountL10n.query.filter(AccountL10n.account == self).delete()
-        cls: t.Type[t.Self] = self.__class__
-        cls.query.filter(cls.id == self.id).delete()
-
 
 class AccountL10n(db.Model):
     """A localized account title."""