feat: make remarks on people
This commit is contained in:
@@ -27,6 +27,37 @@ class PeopleRLDBModel(RLDBBaseModel):
|
|||||||
deleted_at = Column(DateTime(timezone=True), nullable=True, index=True)
|
deleted_at = Column(DateTime(timezone=True), nullable=True, index=True)
|
||||||
|
|
||||||
|
|
||||||
|
class Comment:
|
||||||
|
# 评论内容
|
||||||
|
content: str
|
||||||
|
# 评论人
|
||||||
|
author: str
|
||||||
|
# 创建时间
|
||||||
|
created_at: datetime
|
||||||
|
# 更新时间
|
||||||
|
updated_at: datetime
|
||||||
|
|
||||||
|
def __init__(self, **kwargs):
|
||||||
|
self.content = kwargs.get('content', '')
|
||||||
|
self.author = kwargs.get('author', '')
|
||||||
|
self.created_at = kwargs.get('created_at', datetime.now())
|
||||||
|
self.updated_at = kwargs.get('updated_at', datetime.now())
|
||||||
|
|
||||||
|
def to_dict(self) -> dict:
|
||||||
|
return {
|
||||||
|
'content': self.content,
|
||||||
|
'author': self.author,
|
||||||
|
'created_at': int(self.created_at.timestamp()),
|
||||||
|
'updated_at': int(self.updated_at.timestamp()),
|
||||||
|
}
|
||||||
|
|
||||||
|
@classmethod
|
||||||
|
def from_dict(cls, data: dict):
|
||||||
|
data['created_at'] = datetime.fromtimestamp(data['created_at'])
|
||||||
|
data['updated_at'] = datetime.fromtimestamp(data['updated_at'])
|
||||||
|
return cls(**data)
|
||||||
|
|
||||||
|
|
||||||
class People:
|
class People:
|
||||||
# 数据库 ID
|
# 数据库 ID
|
||||||
id: str
|
id: str
|
||||||
@@ -47,7 +78,7 @@ class People:
|
|||||||
# 个人介绍
|
# 个人介绍
|
||||||
introduction: Dict[str, str]
|
introduction: Dict[str, str]
|
||||||
# 总结评价
|
# 总结评价
|
||||||
comments: Dict[str, str]
|
comments: Dict[str, "Comment"]
|
||||||
# 封面
|
# 封面
|
||||||
cover: str = None
|
cover: str = None
|
||||||
# 创建时间
|
# 创建时间
|
||||||
@@ -98,7 +129,7 @@ class People:
|
|||||||
marital_status=data.marital_status,
|
marital_status=data.marital_status,
|
||||||
match_requirement=data.match_requirement,
|
match_requirement=data.match_requirement,
|
||||||
introduction=json.loads(data.introduction) if data.introduction else {},
|
introduction=json.loads(data.introduction) if data.introduction else {},
|
||||||
comments=json.loads(data.comments) if data.comments else {},
|
comments={k: Comment.from_dict(v) for k, v in json.loads(data.comments).items()} if data.comments else {},
|
||||||
cover=data.cover,
|
cover=data.cover,
|
||||||
created_at=data.created_at,
|
created_at=data.created_at,
|
||||||
)
|
)
|
||||||
@@ -115,7 +146,7 @@ class People:
|
|||||||
'marital_status': self.marital_status,
|
'marital_status': self.marital_status,
|
||||||
'match_requirement': self.match_requirement,
|
'match_requirement': self.match_requirement,
|
||||||
'introduction': self.introduction,
|
'introduction': self.introduction,
|
||||||
'comments': self.comments,
|
'comments': {k: v.to_dict() for k, v in self.comments.items()},
|
||||||
'cover': self.cover,
|
'cover': self.cover,
|
||||||
'created_at': int(self.created_at.timestamp()) if self.created_at else None,
|
'created_at': int(self.created_at.timestamp()) if self.created_at else None,
|
||||||
}
|
}
|
||||||
@@ -132,7 +163,7 @@ class People:
|
|||||||
marital_status=self.marital_status,
|
marital_status=self.marital_status,
|
||||||
match_requirement=self.match_requirement,
|
match_requirement=self.match_requirement,
|
||||||
introduction=json.dumps(self.introduction, ensure_ascii=False),
|
introduction=json.dumps(self.introduction, ensure_ascii=False),
|
||||||
comments=json.dumps(self.comments, ensure_ascii=False),
|
comments=json.dumps({k: v.to_dict() for k, v in self.comments.items()}, ensure_ascii=False),
|
||||||
cover=self.cover,
|
cover=self.cover,
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|||||||
@@ -1,8 +1,10 @@
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
import logging
|
||||||
import uuid
|
import uuid
|
||||||
from models.people import People, PeopleRLDBModel
|
from models.people import People, PeopleRLDBModel, Comment
|
||||||
|
from datetime import datetime
|
||||||
from utils.error import ErrorCode, error
|
from utils.error import ErrorCode, error
|
||||||
from utils import rldb
|
from utils import rldb
|
||||||
|
|
||||||
@@ -66,6 +68,50 @@ class PeopleService:
|
|||||||
|
|
||||||
return peoples, error(ErrorCode.SUCCESS, "")
|
return peoples, error(ErrorCode.SUCCESS, "")
|
||||||
|
|
||||||
|
def save_remark(self, people_id: str, content: str) -> error:
|
||||||
|
"""
|
||||||
|
为人物添加或更新备注
|
||||||
|
|
||||||
|
:param people_id: 人物ID
|
||||||
|
:param content: 备注内容
|
||||||
|
:return: 错误对象
|
||||||
|
"""
|
||||||
|
people: People
|
||||||
|
err: error
|
||||||
|
people, err = self.get(people_id)
|
||||||
|
logging.info(f"get people before save remark: {people}")
|
||||||
|
if not err.success:
|
||||||
|
return err
|
||||||
|
remark = people.comments.get("remark", None)
|
||||||
|
if remark is not None:
|
||||||
|
remark.content = content
|
||||||
|
remark.updated_at = datetime.now()
|
||||||
|
else:
|
||||||
|
people.comments["remark"] = Comment(content=content)
|
||||||
|
logging.info(f"save remark for people {people}")
|
||||||
|
_, err = self.save(people)
|
||||||
|
return err
|
||||||
|
|
||||||
|
def delete_remark(self, people_id: str) -> error:
|
||||||
|
"""
|
||||||
|
删除人物备注
|
||||||
|
|
||||||
|
:param people_id: 人物ID
|
||||||
|
:return: 错误对象
|
||||||
|
"""
|
||||||
|
people: People
|
||||||
|
err: error
|
||||||
|
people, err = self.get(people_id)
|
||||||
|
if not err.success:
|
||||||
|
return err
|
||||||
|
|
||||||
|
if "remark" in people.comments:
|
||||||
|
del people.comments["remark"]
|
||||||
|
_, err = self.save(people)
|
||||||
|
return err
|
||||||
|
|
||||||
|
return error(ErrorCode.SUCCESS, "")
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
people_service = None
|
people_service = None
|
||||||
|
|||||||
@@ -150,3 +150,24 @@ async def get_peoples(
|
|||||||
peoples = [people.to_dict() for people in results]
|
peoples = [people.to_dict() for people in results]
|
||||||
return BaseResponse(error_code=0, error_info="success", data=peoples)
|
return BaseResponse(error_code=0, error_info="success", data=peoples)
|
||||||
|
|
||||||
|
|
||||||
|
class RemarkRequest(BaseModel):
|
||||||
|
content: str
|
||||||
|
|
||||||
|
|
||||||
|
@api.post("/people/{people_id}/remark")
|
||||||
|
async def post_remark(people_id: str, request: RemarkRequest):
|
||||||
|
service = get_people_service()
|
||||||
|
error = service.save_remark(people_id, request.content)
|
||||||
|
if not error.success:
|
||||||
|
return BaseResponse(error_code=error.code, error_info=error.info)
|
||||||
|
return BaseResponse(error_code=0, error_info="success")
|
||||||
|
|
||||||
|
|
||||||
|
@api.delete("/people/{people_id}/remark")
|
||||||
|
async def delete_remark(people_id: str):
|
||||||
|
service = get_people_service()
|
||||||
|
error = service.delete_remark(people_id)
|
||||||
|
if not error.success:
|
||||||
|
return BaseResponse(error_code=error.code, error_info=error.info)
|
||||||
|
return BaseResponse(error_code=0, error_info="success")
|
||||||
|
|||||||
Reference in New Issue
Block a user