feat✨: 数据迁移

zhenxun/models/bag_user.py

@@ -1,160 +1,161 @@
-# from typing import Dict
+from typing import Dict
 
-# from services.db_context import Model
-# from tortoise import fields
+from tortoise import fields
 
-# from .goods_info import GoodsInfo
+from zhenxun.services.db_context import Model
+
+from .goods_info import GoodsInfo
 
 
-# class BagUser(Model):
+class BagUser(Model):
 
-#     id = fields.IntField(pk=True, generated=True, auto_increment=True)
-#     """自增id"""
-#     user_id = fields.CharField(255)
-#     """用户id"""
-#     group_id = fields.CharField(255)
-#     """群聊id"""
-#     gold = fields.IntField(default=100)
-#     """金币数量"""
-#     spend_total_gold = fields.IntField(default=0)
-#     """花费金币总数"""
-#     get_total_gold = fields.IntField(default=0)
-#     """获取金币总数"""
-#     get_today_gold = fields.IntField(default=0)
-#     """今日获取金币"""
-#     spend_today_gold = fields.IntField(default=0)
-#     """今日获取金币"""
-#     property: Dict[str, int] = fields.JSONField(default={})  # type: ignore
-#     """道具"""
+    id = fields.IntField(pk=True, generated=True, auto_increment=True)
+    """自增id"""
+    user_id = fields.CharField(255)
+    """用户id"""
+    group_id = fields.CharField(255)
+    """群聊id"""
+    gold = fields.IntField(default=100)
+    """金币数量"""
+    spend_total_gold = fields.IntField(default=0)
+    """花费金币总数"""
+    get_total_gold = fields.IntField(default=0)
+    """获取金币总数"""
+    get_today_gold = fields.IntField(default=0)
+    """今日获取金币"""
+    spend_today_gold = fields.IntField(default=0)
+    """今日获取金币"""
+    property: Dict[str, int] = fields.JSONField(default={})  # type: ignore
+    """道具"""
 
-#     class Meta:
-#         table = "bag_users"
-#         table_description = "用户道具数据表"
-#         unique_together = ("user_id", "group_id")
+    class Meta:
+        table = "bag_users"
+        table_description = "用户道具数据表"
+        unique_together = ("user_id", "group_id")
 
-#     @classmethod
-#     async def get_gold(cls, user_id: str, group_id: str) -> int:
-#         """获取当前金币
+    @classmethod
+    async def get_gold(cls, user_id: str, group_id: str) -> int:
+        """获取当前金币
 
-#         参数:
-#             user_id: 用户id
-#             group_id: 所在群组id
+        参数:
+            user_id: 用户id
+            group_id: 所在群组id
 
-#         返回:
-#             int: 金币数量
-#         """
-#         user, _ = await cls.get_or_create(user_id=user_id, group_id=group_id)
-#         return user.gold
+        返回:
+            int: 金币数量
+        """
+        user, _ = await cls.get_or_create(user_id=user_id, group_id=group_id)
+        return user.gold
 
-#     @classmethod
-#     async def get_property(
-#         cls, user_id: str, group_id: str, only_active: bool = False
-#     ) -> Dict[str, int]:
-#         """获取当前道具
+    @classmethod
+    async def get_property(
+        cls, user_id: str, group_id: str, only_active: bool = False
+    ) -> Dict[str, int]:
+        """获取当前道具
 
-#         参数:
-#             user_id: 用户id
-#             group_id: 所在群组id
-#             only_active: 仅仅获取主动使用的道具
+        参数:
+            user_id: 用户id
+            group_id: 所在群组id
+            only_active: 仅仅获取主动使用的道具
 
-#         返回:
-#             Dict[str, int]: 道具名称与数量
-#         """
-#         user, _ = await cls.get_or_create(user_id=user_id, group_id=group_id)
-#         if only_active and user.property:
-#             data = {}
-#             name_list = [
-#                 x.goods_name
-#                 for x in await GoodsInfo.get_all_goods()
-#                 if not x.is_passive
-#             ]
-#             for key in [x for x in user.property if x in name_list]:
-#                 data[key] = user.property[key]
-#             return data
-#         return user.property
+        返回:
+            Dict[str, int]: 道具名称与数量
+        """
+        user, _ = await cls.get_or_create(user_id=user_id, group_id=group_id)
+        if only_active and user.property:
+            data = {}
+            name_list = [
+                x.goods_name
+                for x in await GoodsInfo.get_all_goods()
+                if not x.is_passive
+            ]
+            for key in [x for x in user.property if x in name_list]:
+                data[key] = user.property[key]
+            return data
+        return user.property
 
-#     @classmethod
-#     async def add_gold(cls, user_id: str, group_id: str, num: int):
-#         """增加金币
+    @classmethod
+    async def add_gold(cls, user_id: str, group_id: str, num: int):
+        """增加金币
 
-#         参数:
-#             user_id: 用户id
-#             group_id: 所在群组id
-#             num: 金币数量
-#         """
-#         user, _ = await cls.get_or_create(user_id=user_id, group_id=group_id)
-#         user.gold = user.gold + num
-#         user.get_total_gold = user.get_total_gold + num
-#         user.get_today_gold = user.get_today_gold + num
-#         await user.save(update_fields=["gold", "get_today_gold", "get_total_gold"])
+        参数:
+            user_id: 用户id
+            group_id: 所在群组id
+            num: 金币数量
+        """
+        user, _ = await cls.get_or_create(user_id=user_id, group_id=group_id)
+        user.gold = user.gold + num
+        user.get_total_gold = user.get_total_gold + num
+        user.get_today_gold = user.get_today_gold + num
+        await user.save(update_fields=["gold", "get_today_gold", "get_total_gold"])
 
-#     @classmethod
-#     async def spend_gold(cls, user_id: str, group_id: str, num: int):
-#         """花费金币
+    @classmethod
+    async def spend_gold(cls, user_id: str, group_id: str, num: int):
+        """花费金币
 
-#         参数:
-#             user_id: 用户id
-#             group_id: 所在群组id
-#             num: 金币数量
-#         """
-#         user, _ = await cls.get_or_create(user_id=str(user_id), group_id=str(group_id))
-#         user.gold = user.gold - num
-#         user.spend_total_gold = user.spend_total_gold + num
-#         user.spend_today_gold = user.spend_today_gold + num
-#         await user.save(update_fields=["gold", "spend_total_gold", "spend_today_gold"])
+        参数:
+            user_id: 用户id
+            group_id: 所在群组id
+            num: 金币数量
+        """
+        user, _ = await cls.get_or_create(user_id=str(user_id), group_id=str(group_id))
+        user.gold = user.gold - num
+        user.spend_total_gold = user.spend_total_gold + num
+        user.spend_today_gold = user.spend_today_gold + num
+        await user.save(update_fields=["gold", "spend_total_gold", "spend_today_gold"])
 
-#     @classmethod
-#     async def add_property(cls, user_id: str, group_id: str, name: str, num: int = 1):
-#         """增加道具
+    @classmethod
+    async def add_property(cls, user_id: str, group_id: str, name: str, num: int = 1):
+        """增加道具
 
-#         参数:
-#             user_id: 用户id
-#             group_id: 所在群组id
-#             name: 道具名称
-#             num: 道具数量
-#         """
-#         user, _ = await cls.get_or_create(user_id=str(user_id), group_id=str(group_id))
-#         property_ = user.property
-#         if property_.get(name) is None:
-#             property_[name] = 0
-#         property_[name] += num
-#         user.property = property_
-#         await user.save(update_fields=["property"])
+        参数:
+            user_id: 用户id
+            group_id: 所在群组id
+            name: 道具名称
+            num: 道具数量
+        """
+        user, _ = await cls.get_or_create(user_id=str(user_id), group_id=str(group_id))
+        property_ = user.property
+        if property_.get(name) is None:
+            property_[name] = 0
+        property_[name] += num
+        user.property = property_
+        await user.save(update_fields=["property"])
 
-#     @classmethod
-#     async def delete_property(
-#         cls, user_id: str, group_id: str, name: str, num: int = 1
-#     ) -> bool:
-#         """使用/删除 道具
+    @classmethod
+    async def delete_property(
+        cls, user_id: str, group_id: str, name: str, num: int = 1
+    ) -> bool:
+        """使用/删除 道具
 
-#         参数:
-#             user_id: 用户id
-#             group_id: 所在群组id
-#             name: 道具名称
-#             num: 使用个数
+        参数:
+            user_id: 用户id
+            group_id: 所在群组id
+            name: 道具名称
+            num: 使用个数
 
-#         返回:
-#             bool: 是否使用/删除成功
-#         """
-#         user, _ = await cls.get_or_create(user_id=str(user_id), group_id=str(group_id))
-#         property_ = user.property
-#         if name in property_:
-#             if (n := property_.get(name, 0)) < num:
-#                 return False
-#             if n == num:
-#                 del property_[name]
-#             else:
-#                 property_[name] -= num
-#             await user.save(update_fields=["property"])
-#             return True
-#         return False
+        返回:
+            bool: 是否使用/删除成功
+        """
+        user, _ = await cls.get_or_create(user_id=str(user_id), group_id=str(group_id))
+        property_ = user.property
+        if name in property_:
+            if (n := property_.get(name, 0)) < num:
+                return False
+            if n == num:
+                del property_[name]
+            else:
+                property_[name] -= num
+            await user.save(update_fields=["property"])
+            return True
+        return False
 
-#     @classmethod
-#     async def _run_script(cls):
-#         return [
-#             "ALTER TABLE bag_users DROP props;",  # 删除 props 字段
-#             "ALTER TABLE bag_users RENAME COLUMN user_qq TO user_id;",  # 将user_qq改为user_id
-#             "ALTER TABLE bag_users ALTER COLUMN user_id TYPE character varying(255);",
-#             # 将user_id字段类型改为character varying(255)
-#             "ALTER TABLE bag_users ALTER COLUMN group_id TYPE character varying(255);",
-#         ]
+    @classmethod
+    async def _run_script(cls):
+        return [
+            "ALTER TABLE bag_users DROP props;",  # 删除 props 字段
+            "ALTER TABLE bag_users RENAME COLUMN user_qq TO user_id;",  # 将user_qq改为user_id
+            "ALTER TABLE bag_users ALTER COLUMN user_id TYPE character varying(255);",
+            # 将user_id字段类型改为character varying(255)
+            "ALTER TABLE bag_users ALTER COLUMN group_id TYPE character varying(255);",
+        ]

zhenxun/models/goods_info.py

@@ -46,7 +46,7 @@ class GoodsInfo(Model):
         daily_limit: int = 0,
         is_passive: bool = False,
         icon: str | None = None,
-    ):
+    ) -> str | None:
         """添加商品
 
         参数:
@@ -60,8 +60,9 @@ class GoodsInfo(Model):
             icon: 图标
         """
         if not await cls.exists(goods_name=goods_name):
+            uuid_ = uuid.uuid1()
             await cls.create(
-                uuid=uuid.uuid1(),
+                uuid=uuid_,
                 goods_name=goods_name,
                 goods_price=goods_price,
                 goods_description=goods_description,
@@ -71,6 +72,8 @@ class GoodsInfo(Model):
                 is_passive=is_passive,
                 icon=icon,
             )
+            return str(uuid_)
+        return None
 
     @classmethod
     async def delete_goods(cls, goods_name: str) -> bool:

zhenxun/models/sign_group_user.py

@@ -0,0 +1,81 @@
+from datetime import datetime
+from typing import List, Literal, Optional, Tuple, Union
+
+from tortoise import fields
+
+from zhenxun.services.db_context import Model
+
+
+class SignGroupUser(Model):
+
+    id = fields.IntField(pk=True, generated=True, auto_increment=True)
+    """自增id"""
+    user_id = fields.CharField(255)
+    """用户id"""
+    group_id = fields.CharField(255)
+    """群聊id"""
+    checkin_count = fields.IntField(default=0)
+    """签到次数"""
+    checkin_time_last = fields.DatetimeField(default=datetime.min)
+    """最后签到时间"""
+    impression = fields.DecimalField(10, 3, default=0)
+    """好感度"""
+    add_probability = fields.DecimalField(10, 3, default=0)
+    """双倍签到增加概率"""
+    specify_probability = fields.DecimalField(10, 3, default=0)
+    """使用指定双倍概率"""
+    # specify_probability = fields.DecimalField(10, 3, default=0)
+
+    class Meta:
+        table = "sign_group_users"
+        table_description = "群员签到数据表"
+        unique_together = ("user_id", "group_id")
+
+    @classmethod
+    async def sign(cls, user: "SignGroupUser", impression: float):
+        """
+        说明:
+            签到
+        说明:
+            :param user: 用户
+            :param impression: 增加的好感度
+        """
+        user.checkin_time_last = datetime.now()
+        user.checkin_count = user.checkin_count + 1
+        user.add_probability = 0
+        user.specify_probability = 0
+        user.impression = float(user.impression) + impression
+        await user.save()
+
+    @classmethod
+    async def get_all_impression(
+        cls, group_id: Union[int, str]
+    ) -> Tuple[List[str], List[float], List[str]]:
+        """
+        说明:
+            获取该群所有用户 id 及对应 好感度
+        参数:
+            :param group_id: 群号
+        """
+        if group_id:
+            query = cls.filter(group_id=str(group_id))
+        else:
+            query = cls
+        value_list = await query.all().values_list("user_id", "group_id", "impression")  # type: ignore
+        user_list = []
+        group_list = []
+        impression_list = []
+        for value in value_list:
+            user_list.append(value[0])
+            group_list.append(value[1])
+            impression_list.append(float(value[2]))
+        return user_list, impression_list, group_list
+
+    @classmethod
+    async def _run_script(cls):
+        return [
+            "ALTER TABLE sign_group_users RENAME COLUMN user_qq TO user_id;",  # 将user_id改为user_id
+            "ALTER TABLE sign_group_users ALTER COLUMN user_id TYPE character varying(255);",
+            # 将user_id字段类型改为character varying(255)
+            "ALTER TABLE sign_group_users ALTER COLUMN group_id TYPE character varying(255);",
+        ]

zhenxun/models/user_console.py

@@ -15,7 +15,7 @@ class UserConsole(Model):
     """自增id"""
     user_id = fields.CharField(255, unique=True, description="用户id")
     """用户id"""
-    uid = fields.IntField(description="UID")
+    uid = fields.IntField(description="UID", unique=True)
     """UID"""
     gold = fields.IntField(default=100, description="金币数量")
     """金币数量"""