finish view: char table post, and char info query

Author: ryan4yin

app/api/character.py

@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*-
+import json
 import logging
 
 from flask.views import MethodView
@@ -36,13 +37,13 @@ class Meta:
         ordered = True
 
     version = ma.fields.String(required=True)
-    table = ma.fields.String(required=True, validate=lambda s: len(s) < 400000)
+    table = ma.fields.String(required=True, load_only=True)
     table_type = ma.fields.String(required=True)
 
     table_name = ma.fields.String(required=True)  # 编码表名称（如小鹤音形拆字表）
 
     group_id = ma.fields.String(required=True)  # 一个编码表，需要绑定一个群号。
-    group_platform = ma.fields.String(required=True)  # 该群所属平台
+    platform = ma.fields.String(required=True)  # 该群所属平台
 
     @validates("version")
     def validate_version(self, version: str):
@@ -76,21 +77,34 @@ def post(self, data: dict):
         """
         # 验证当前用户是指定群的管理员
         if not is_(["owner", "admin"], current_user,
-                   group_id=data['group_id'], platform=data['group_platform']):
+                   group_id=data['group_id'], platform=data['platform']):
             abort(401, message="you are not the admin of this group")
 
         return character.save_split_table(**data)
 
 
+class CharInfoSchema(ma.Schema):
+    char = ma.fields.String()
+    codes = ma.fields.String()
+    split = ma.fields.String()
+    other_info = ma.fields.Dict()
+
+
 @api_rest.definition('Char')
 class CharSchema(ma.Schema):
     class Meta:
         strict = True
         ordered = True
 
-    char = ma.fields.String(required=True, )
-    info = ma.fields.String()
+    char = ma.fields.String(required=True)
+    info = ma.fields.Nested(CharInfoSchema, dump_only=True)
     version = ma.fields.String()
+    table_name = ma.fields.String(required=True)
+
+    @validates("char")
+    def validate_table(self, table: str):
+        if len(table) != 1:
+            raise ValidationError("`char` must be just one character!")
 
 
 @table_bp.route("/info/")
@@ -109,4 +123,5 @@ def get(self, data: dict):
         if not info:
             abort(404, message=f"no info for character {data['char']}")
 
-        return info
+        data['info'] = info
+        return data

app/models/character.py

@@ -18,7 +18,7 @@ class CharsTable(db.Model):
     version = db.Column(db.String(20), index=True, nullable=False)
 
     # 拆字表所属群组，只有该群管理员可编辑该表
-    group_id = db.Column(db.Integer, db.ForeignKey('group.id'), index=True, nullable=False)
+    group_db_id = db.Column(db.Integer, db.ForeignKey('group.id'), index=True, nullable=False)
 
     # 同一张拆字表的同一个版本号只能使用一次
     __table_args__ = (UniqueConstraint('name', 'version'),)

app/service/words/character.py

@@ -55,15 +55,15 @@ def save_split_table(table: str,
                      table_type: str,
                      table_name: str,
                      group_id: str,
-                     group_platform: str):
+                     platform: str):
     """
 
     :param table: 待解析的拆字表字符串
     :param version: 拆字表版本号
     :param table_type: 编码表类型，用于确定应该调用的解析器
     :param table_name: 编码表名称（如小鹤音形拆字表）
     :param group_id: 群组 id（非数据库 id）
-    :param group_platform: 该群所属平台
+    :param platform: 该群所属平台
     :return:
     """
     version_ = parse_version(version)
@@ -73,11 +73,11 @@ def save_split_table(table: str,
 
     # 新建 version 行
     group_db_id = db.session.query(Group) \
-        .filter_by(group_id=group_id, platform=group_platform) \
+        .filter_by(group_id=group_id, platform=platform) \
         .first().id
     chars_table = CharsTable(name=table_name,
                              version=version,
-                             group_id=group_db_id)
+                             group_db_id=group_db_id)
     db.session.add(chars_table)  # 将 chars_table 插入表中
     table_id = db.session.query(CharsTable) \
         .filter_by(name=table_name, version=version) \
@@ -91,13 +91,18 @@ def save_split_table(table: str,
     # 最后提交修改
     db.session.commit()
 
-    return chars_table
+    return {
+        "version": version,
+        "table_name": table_name,
+        "group_id": group_id,
+        "platform": platform,
+    }
 
 
 def get_latest_version(table_name: str):
     """获取最新的拆字表版本号"""
     versions = map(itemgetter(0), db.session.query(CharsTable.version) \
-                   .filer_by(name=table_name))
+                   .filter_by(name=table_name))
     versions = list(map(parse_version, versions))
     latest_version = max(versions) if versions else parse_version("0.0.0")
 
@@ -113,8 +118,9 @@ def get_info(char: str, table_name, version=None):
         .filter_by(version=version).first()[0]
 
     # 在该拆字表内查找 char 的信息
-    info = db.session.query(Character) \
+    info: Character = db.session.query(Character) \
         .filter_by(char=char, table_id=table_id) \
         .first()
 
+    info.other_info = json.loads(info.other_info)
     return info

migrations/versions/0253176ac39b_.py

@@ -0,0 +1,38 @@
+"""empty message
+
+Revision ID: 0253176ac39b
+Revises: 75c03fa5228c
+Create Date: 2019-03-06 20:59:18.574638
+
+"""
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision = '0253176ac39b'
+down_revision = '75c03fa5228c'
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.add_column('chars_table', sa.Column('group_db_id', sa.Integer(), nullable=False))
+    op.create_index(op.f('ix_chars_table_group_db_id'), 'chars_table', ['group_db_id'], unique=False)
+    op.drop_index('ix_chars_table_group_id', table_name='chars_table')
+    op.drop_constraint('chars_table_group_id_fkey', 'chars_table', type_='foreignkey')
+    op.create_foreign_key(None, 'chars_table', 'group', ['group_db_id'], ['id'])
+    op.drop_column('chars_table', 'group_id')
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.add_column('chars_table', sa.Column('group_id', sa.INTEGER(), autoincrement=False, nullable=False))
+    op.drop_constraint(None, 'chars_table', type_='foreignkey')
+    op.create_foreign_key('chars_table_group_id_fkey', 'chars_table', 'group', ['group_id'], ['id'])
+    op.create_index('ix_chars_table_group_id', 'chars_table', ['group_id'], unique=False)
+    op.drop_index(op.f('ix_chars_table_group_db_id'), table_name='chars_table')
+    op.drop_column('chars_table', 'group_db_id')
+    # ### end Alembic commands ###

tests/api/test_character.py

@@ -3,12 +3,14 @@
 """
 测试 'api.characters'
 """
-
+import json
 import pytest
 from flask import Response, url_for
 from flask.testing import FlaskClient
 
 from app.models import Group, GroupUser, GroupUserRelation
+from app.models.character import CharsTable
+from app.service.words.character import get_info
 from tests.conftest import username, password
 
 platform = 'qq'
@@ -45,8 +47,8 @@ def login(client):
     return resp
 
 
-@pytest.mark.usefixtures("group_admin", "user")
-def test_post_table(client: FlaskClient):
+@pytest.mark.usefixtures("user", "group_admin")
+def test_post_table_query(client: FlaskClient, db):
     login(client)
 
     payload = {
@@ -57,9 +59,20 @@ def test_post_table(client: FlaskClient):
 顷：　qkb qkbr=拆分：　比左 一 ノ 冂 人=首末：　比左 人=编码：　b  r
 皆：　jpb jpbb=拆分：　比左 匕 白=首末：　比左 白=编码：　b  b""",
         "group_id": group_id,
-        "group_platform": platform,
+        "platform": platform,
     }
-    # resp: Response = client.post(url_for("characters.TableView"), json=payload)
+    resp: Response = client.post(url_for("characters.TableView"), json=payload)
+
+    assert resp.status_code == 201
+    assert resp.json['version'] == payload['version']
 
-    # assert resp.status_code == 201
+    resp_2: Response = client.get(url_for("characters.CharView"), json={
+        "char": "比",
+        "version": "0.0.1",
+        "table_name": "小鹤音形拆字表"
+    })
 
+    info = resp_2.json['info']
+    assert info['codes'] == "bi bibb*"
+    assert info['split'] == '比左 匕'
+    assert info['other_info'] == {'编码': 'b b', '首末': '比左 匕'}