数据库中所有user_qq改名以及user_id和group_id改为字符串

This commit is contained in:
HibiKier
2023-05-22 20:56:42 +08:00
parent 0d3c6d8684
commit 848de7f4fe
68 changed files with 1103 additions and 645 deletions
+4 -3
View File
@@ -14,6 +14,7 @@ from models.group_member_info import GroupInfoUser
from services.log import logger
from utils.message_builder import at, image
from utils.utils import get_message_at, is_number
from .data_source import rank
from .model import RussianUser
@@ -445,10 +446,10 @@ async def end_game(bot: Bot, event: GroupMessageEvent):
await BagUser.add_gold(win_user_id, event.group_id, money - fee)
await BagUser.spend_gold(lose_user_id, event.group_id, money)
win_user, _ = await RussianUser.get_or_create(
user_qq=win_user_id, group_id=event.group_id
user_id=str(win_user_id), group_id=str(event.group_id)
)
lose_user, _ = await RussianUser.get_or_create(
user_qq=lose_user_id, group_id=event.group_id
user_id=str(lose_user_id), group_id=str(event.group_id)
)
bullet_str = ""
for x in rs_player[event.group_id]["bullet"]:
@@ -476,7 +477,7 @@ async def end_game(bot: Bot, event: GroupMessageEvent):
@record.handle()
async def _(event: GroupMessageEvent):
user, _ = await RussianUser.get_or_create(
user_qq=event.user_id, group_id=event.group_id
user_id=str(event.user_id), group_id=str(event.group_id)
)
await record.send(
f"俄罗斯轮盘\n"
+1 -1
View File
@@ -8,7 +8,7 @@ from .model import RussianUser
async def rank(group_id: int, itype: str, num: int) -> Optional[BuildMat]:
all_users = await RussianUser.filter(group_id=group_id).all()
all_user_id = [user.user_qq for user in all_users]
all_user_id = [user.user_id for user in all_users]
if itype == "win_rank":
rank_name = "胜场排行榜"
all_user_data = [user.win_count for user in all_users]
+17 -10
View File
@@ -1,4 +1,3 @@
from tortoise import fields
from services.db_context import Model
@@ -8,9 +7,9 @@ class RussianUser(Model):
id = fields.IntField(pk=True, generated=True, auto_increment=True)
"""自增id"""
user_qq = fields.BigIntField()
user_id = fields.CharField(255)
"""用户id"""
group_id = fields.BigIntField()
group_id = fields.CharField(255)
"""群聊id"""
win_count = fields.IntField(default=0)
"""胜利次数"""
@@ -32,19 +31,19 @@ class RussianUser(Model):
class Meta:
table = "russian_users"
table_description = "俄罗斯轮盘数据表"
unique_together = ("user_qq", "group_id")
unique_together = ("user_id", "group_id")
@classmethod
async def add_count(cls, user_qq: int, group_id: int, itype: str):
async def add_count(cls, user_id: str, group_id: str, itype: str):
"""
说明:
添加用户输赢次数
说明:
:param user_qq: qq号
:param user_id: qq号
:param group_id: 群号
:param itype: 输或赢 'win' or 'lose'
"""
user, _ = await cls.get_or_create(user_qq=user_qq, group_id=group_id)
user, _ = await cls.get_or_create(user_id=user_id, group_id=group_id)
if itype == "win":
_max = (
user.max_winning_streak
@@ -83,19 +82,27 @@ class RussianUser(Model):
)
@classmethod
async def money(cls, user_qq: int, group_id: int, itype: str, count: int) -> bool:
async def money(cls, user_id: str, group_id: str, itype: str, count: int) -> bool:
"""
说明:
添加用户输赢金钱
参数:
:param user_qq: qq号
:param user_id: qq号
:param group_id: 群号
:param itype: 输或赢 'win' or 'lose'
:param count: 金钱数量
"""
user, _ = await cls.get_or_create(user_qq=user_qq, group_id=group_id)
user, _ = await cls.get_or_create(user_id=str(user_id), group_id=group_id)
if itype == "win":
user.make_money = user.make_money + count
elif itype == "lose":
user.lose_money = user.lose_money + count
await user.save(update_fields=["make_money", "lose_money"])
@classmethod
async def _run_script(cls):
return [
"ALTER TABLE russian_users RENAME COLUMN user_qq TO user_id;", # 将user_qq改为user_id
"ALTER TABLE russian_users ALTER COLUMN user_id TYPE character varying(255);",
"ALTER TABLE russian_users ALTER COLUMN group_id TYPE character varying(255);",
]