更新逻辑(使用主键查询) (#47)

Author: JohnRichard4096

docs/apis/advanced.md

@@ -53,10 +53,10 @@ async def remove_currency(currency_id: str, session: AsyncSession):
     ...
 ```
 
-### `~~.getcurrency`
+### `~~.get_currency`
 
 ```python
-async def getcurrency(currency_id: str, session: AsyncSession) -> CurrencyMeta | None:
+async def get_currency(currency_id: str, session: AsyncSession) -> CurrencyMeta | None:
     """获取一个货币的元信息
 
     Args:

docs/apis/kernel.md

@@ -31,7 +31,7 @@ class CurrencyRepository:
     async def update_currency(self, currency_data: CurrencyData) -> CurrencyMeta:
         """更新货币信息"""
 
-    async def getcurrency(self, currency_id: str) -> CurrencyMeta | None:
+    async def get_currency(self, currency_id: str) -> CurrencyMeta | None:
         """获取货币信息"""
         ...
 

pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "nonebot-plugin-value"
-version = "0.0.9.post1"
+version = "0.0.9.post2"
 description = "Value API for NoneBot2"
 readme = "README.md"
 requires-python = ">=3.10"

src/nonebot_plugin_value/api/api_balance.py

@@ -46,7 +46,7 @@ async def del_account(user_id: str, currency_id: str | None = None) -> bool:
     """
     if currency_id is None:
         currency_id = (await _get_default()).id
-    return await _del_account(user_id)
+    return await _del_account(user_id, currency_id=currency_id)
 
 
 async def get_or_create_account(

src/nonebot_plugin_value/api/api_currency.py

@@ -1,9 +1,9 @@
 from nonebot_plugin_orm import get_session
 
 from ..pyd_models.currency_pyd import CurrencyData
+from ..services.currency import get_currency as _g_currency
 from ..services.currency import get_default_currency as _default_currency
 from ..services.currency import get_or_create_currency as _create_currency
-from ..services.currency import getcurrency as _g_currency
 from ..services.currency import list_currencies as _currencies
 from ..services.currency import remove_currency as _remove_currency
 from ..services.currency import update_currency as _update_currency

src/nonebot_plugin_value/repository.py

@@ -9,7 +9,7 @@
 from .models.balance import Transaction, UserAccount
 from .models.currency import CurrencyMeta
 from .pyd_models.currency_pyd import CurrencyData
-from .uuid_lib import NAMESPACE_VALUE
+from .uuid_lib import NAMESPACE_VALUE, get_uni_id
 
 DEFAULT_NAME = "DEFAULT_CURRENCY_USD"
 DEFAULT_CURRENCY_UUID = uuid5(NAMESPACE_VALUE, DEFAULT_NAME)
@@ -53,7 +53,7 @@ async def update_currency(self, currency_data: CurrencyData) -> CurrencyMeta:
             session.add(currency_meta)
             return currency_meta
 
-    async def getcurrency(self, currency_id: str) -> CurrencyMeta | None:
+    async def get_currency(self, currency_id: str) -> CurrencyMeta | None:
         """获取货币信息"""
         async with self.session as session:
             result = await self.session.execute(
@@ -117,10 +117,7 @@ async def get_or_create_account(
             # 检查账户是否存在
             stmt = (
                 select(UserAccount)
-                .where(
-                    UserAccount.id == user_id,
-                    UserAccount.currency_id == currency_id,
-                )
+                .where(UserAccount.uni_id == get_uni_id(user_id, currency_id))
                 .with_for_update()
             )
             result = await session.execute(stmt)
@@ -132,7 +129,7 @@ async def get_or_create_account(
 
             session.add(currency)
             account = UserAccount(
-                uni_id=uuid5(NAMESPACE_VALUE, f"{user_id}{currency_id}").hex,
+                uni_id=get_uni_id(user_id, currency_id),
                 id=user_id,
                 currency_id=currency_id,
                 balance=currency.default_balance,
@@ -142,17 +139,17 @@ async def get_or_create_account(
             await session.commit()
 
             stmt = select(UserAccount).where(
-                UserAccount.id == user_id,
-                UserAccount.currency_id == currency_id,
+                UserAccount.uni_id == get_uni_id(user_id, currency_id)
             )
             result = await session.execute(stmt)
             account = result.scalar_one()
             session.add(account)
             return account
 
-    async def get_balance(self, account_id: str) -> float | None:
+    async def get_balance(self, account_id: str, currency_id: str) -> float | None:
         """获取账户余额"""
-        account = await self.session.get(UserAccount, account_id)
+        uni_id = get_uni_id(account_id, currency_id)
+        account = await self.session.get(UserAccount, uni_id)
         return account.balance if account else None
 
     async def update_balance(
@@ -165,10 +162,7 @@ async def update_balance(
             account = (
                 await session.execute(
                     select(UserAccount)
-                    .where(
-                        UserAccount.id == account_id,
-                        UserAccount.currency_id == currency_id,
-                    )
+                    .where(UserAccount.uni_id == get_uni_id(account_id, currency_id))
                     .with_for_update()
                 )
             ).scalar_one_or_none()
@@ -212,14 +206,21 @@ async def list_accounts(
                 session.add_all(data)
             return data
 
-    async def remove_account(self, account_id: str):
+    async def remove_account(self, account_id: str, currency_id: str | None = None):
         """删除账户"""
         async with self.session as session:
-            stmt = (
-                select(UserAccount)
-                .where(UserAccount.id == account_id)
-                .with_for_update()
-            )
+            if not currency_id:
+                stmt = (
+                    select(UserAccount)
+                    .where(UserAccount.id == account_id)
+                    .with_for_update()
+                )
+            else:
+                stmt = (
+                    select(UserAccount)
+                    .where(UserAccount.uni_id == get_uni_id(account_id, currency_id))
+                    .with_for_update()
+                )
             accounts = (await session.execute(stmt)).scalars().all()
             if not accounts:
                 raise ValueError("Account not found")
@@ -250,7 +251,7 @@ async def create_transaction(
             if timestamp is None:
                 timestamp = datetime.now(timezone.utc)
             uuid = uuid1().hex
-            stmt = insert(Transaction).values(
+            transaction_data = Transaction(
                 id=uuid,
                 account_id=account_id,
                 currency_id=currency_id,
@@ -261,18 +262,18 @@ async def create_transaction(
                 balance_after=balance_after,
                 timestamp=timestamp,
             )
-            await session.execute(stmt)
+            session.add(transaction_data)
             await session.commit()
             stmt = (
                 select(Transaction)
                 .where(
                     Transaction.id == uuid,
-                    Transaction.timestamp == timestamp,
                 )
                 .with_for_update()
             )
             result = await session.execute(stmt)
-            transaction = result.scalars().one()
+            transaction = result.scalar_one_or_none()
+            assert transaction, f"无法读取到交易记录[... WHERE id = {uuid} ...]!"
             session.add(transaction)
             return transaction
 

src/nonebot_plugin_value/services/balance.py

@@ -16,7 +16,10 @@
 
 
 async def del_account(
-    account_id: str, session: AsyncSession | None = None, fail_then_throw: bool = False
+    account_id: str,
+    session: AsyncSession | None = None,
+    fail_then_throw: bool = False,
+    currency_id: str | None = None,
 ) -> bool:
     """删除账户
 
@@ -28,7 +31,7 @@ async def del_account(
         session = get_session()
     async with session:
         try:
-            await AccountRepository(session).remove_account(account_id)
+            await AccountRepository(session).remove_account(account_id, currency_id)
             return True
         except Exception:
             await session.rollback()

src/nonebot_plugin_value/services/currency.py

@@ -52,7 +52,7 @@ async def list_currencies(session: AsyncSession) -> Sequence[CurrencyMeta]:
         return data
 
 
-async def getcurrency(currency_id: str, session: AsyncSession) -> CurrencyMeta | None:
+async def get_currency(currency_id: str, session: AsyncSession) -> CurrencyMeta | None:
     """获取一个货币的元信息
 
     Args:
@@ -63,7 +63,7 @@ async def getcurrency(currency_id: str, session: AsyncSession) -> CurrencyMeta |
         CurrencyMeta | None: 货币元数据（不存在为None）
     """
     async with session:
-        metadata = await CurrencyRepository(session).getcurrency(currency_id)
+        metadata = await CurrencyRepository(session).get_currency(currency_id)
         return metadata
 
 
@@ -85,15 +85,15 @@ async def get_or_create_currency(
             while True:
                 currency_data.id = uuid4().hex
                 if (
-                    await getcurrency(
+                    await get_currency(
                         uuid4().hex,
                         session,
                     )
                     is None
                 ):
                     break
         if (
-            metadata := await getcurrency(
+            metadata := await get_currency(
                 currency_data.id,
                 session,
             )

src/nonebot_plugin_value/uuid_lib.py

@@ -6,3 +6,7 @@
 
 def to_uuid(s: str) -> str:
     return uuid5(NAMESPACE_VALUE, s).hex
+
+
+def get_uni_id(user_id: str, currency_id: str) -> str:
+    return uuid5(NAMESPACE_VALUE, f"{user_id}{currency_id}").hex