refactor: 为了方便学习源码，移除掉DAO层

Author: colorful3

app/api/cms/admin.py

@@ -7,16 +7,17 @@
 from itertools import groupby
 from operator import itemgetter
 
-from flask import jsonify
-from lin.core import get_ep_infos, route_meta
-from lin.exception import Success
+from flask import jsonify, request
+from lin import db
+from lin.core import get_ep_infos, route_meta, manager, find_user, find_auth_module
+from lin.db import get_total_nums
+from lin.enums import UserSuper, UserActive
+from lin.exception import Success, NotFound, ParameterException, Forbidden
 from lin.jwt import admin_required
 from lin.log import Logger
 from lin.redprint import Redprint
 
-from app.dao.auth import AuthDAO
-from app.dao.group import GroupDAO
-from app.dao.user import UserDAO
+from app.libs.utils import paginate
 from app.validators.forms import NewGroup, DispatchAuth, DispatchAuths, RemoveAuths, UpdateGroup, ResetPasswordForm, \
     UpdateUserInfoForm
 
@@ -34,7 +35,31 @@ def authority():
 @route_meta(auth='查询所有用户', module='管理员', mount=False)
 @admin_required
 def get_admin_users():
-    user_and_group, total_nums = UserDAO().get_all()
+    start, count = paginate()
+    group_id = request.args.get('group_id')
+    condition = {
+        'super': UserSuper.COMMON.value,
+        'group_id': group_id
+    } if group_id else {
+        'super': UserSuper.COMMON.value
+    }
+
+    users = db.session.query(
+        manager.user_model, manager.group_model.name
+    ).filter_by(soft=True, **condition).join(
+        manager.group_model,
+        manager.user_model.group_id == manager.group_model.id
+    ).offset(start).limit(count).all()
+
+    user_and_group = []
+    for user, group_name in users:
+        setattr(user, 'group_name', group_name)
+        user._fields.append('group_name')
+        user.hide('update_time', 'delete_time')
+        user_and_group.append(user)
+    # 有分组的时候就加入分组条件
+    # total_nums = get_total_nums(manager.user_model, is_soft=True, super=UserSuper.COMMON.value)
+    total_nums = get_total_nums(manager.user_model, is_soft=True, **condition)
     return jsonify({
         "collection": user_and_group,
         'total_nums': total_nums
@@ -46,7 +71,13 @@ def get_admin_users():
 @admin_required
 def change_user_password(uid):
     form = ResetPasswordForm().validate_for_api()
-    UserDAO().reset_user_password(uid, form.new_password.data)
+
+    user = find_user(id=uid)
+    if user is None:
+        raise NotFound(msg='用户不存在')
+    with db.auto_commit():
+        user.reset_password(form.new_password.data)
+
     return Success(msg='密码修改成功')
 
 
@@ -55,7 +86,12 @@ def change_user_password(uid):
 @Logger(template='管理员删除了一个用户')  # 记录日志
 @admin_required
 def delete_user(uid):
-    UserDAO().remove_user(uid)
+    user = manager.user_model.get(id=uid)
+    if user is None:
+        raise NotFound(msg='用户不存在')
+    # user.delete(commit=True)
+    # 此处我们使用硬删除，一般情况下，推荐使用软删除即，上一行注释的代码
+    user.hard_delete(commit=True)
     return Success(msg='操作成功')
 
 
@@ -64,34 +100,60 @@ def delete_user(uid):
 @admin_required
 def update_user(uid):
     form = UpdateUserInfoForm().validate_for_api()
-    UserDAO().update(uid, form)
+
+    user = manager.user_model.get(id=uid)
+    if user is None:
+        raise NotFound(msg='用户不存在')
+    if user.email != form.email.data:
+        exists = manager.user_model.get(email=form.email.data)
+        if exists:
+            raise ParameterException(msg='邮箱已被注册，请重新输入邮箱')
+    with db.auto_commit():
+        user.email = form.email.data
+        user.group_id = form.group_id.data
     return Success(msg='操作成功')
 
 
 @admin_api.route('/disable/<int:uid>', methods=['PUT'])
 @route_meta(auth='禁用用户', module='管理员', mount=False)
 @admin_required
 def trans2disable(uid):
-    UserDAO().change_status(uid, 'active')
+    _change_status(uid, 'active')
     return Success(msg='操作成功')
 
 
 @admin_api.route('/active/<int:uid>', methods=['PUT'])
 @route_meta(auth='激活用户', module='管理员', mount=False)
 @admin_required
 def trans2active(uid):
-    UserDAO().change_status(uid, 'disable')
+    _change_status(uid, 'disable')
     return Success(msg='操作成功')
 
 
 @admin_api.route('/groups', methods=['GET'])
 @route_meta(auth='查询所有权限组及其权限', module='管理员', mount=False)
 @admin_required
 def get_admin_groups():
-    groups_info, total_nums = GroupDAO().get_groups_info()
+    start, count = paginate()
+    groups = manager.group_model.query.filter().offset(
+        start).limit(count).all()
+    if groups is None:
+        raise NotFound(msg='不存在任何权限组')
+
+    for group in groups:
+        auths = db.session.query(
+            manager.auth_model.auth, manager.auth_model.module
+        ).filter_by(soft=False, group_id=group.id).all()
+
+        auths = [{'auth': auth[0], 'module': auth[1]} for auth in auths]
+        res = _split_modules(auths)
+        setattr(group, 'auths', res)
+        group._fields.append('auths')
+
+    total_nums = get_total_nums(manager.group_model)
 
     return jsonify({
-        "collection": groups_info,
+        "collection": groups,
         'total_nums': total_nums
     })
 
@@ -100,15 +162,26 @@ def get_admin_groups():
 @route_meta(auth='查询所有权限组', module='管理员', mount=False)
 @admin_required
 def get_all_group():
-    groups = GroupDAO().get_all()
+    groups = manager.group_model.get(one=False)
+    if groups is None:
+        raise NotFound(msg='不存在任何权限组')
     return jsonify(groups)
 
 
 @admin_api.route('/group/<int:gid>', methods=['GET'])
 @route_meta(auth='查询一个权限组及其权限', module='管理员', mount=False)
 @admin_required
 def get_group(gid):
-    group = GroupDAO().get_single_info(gid)
+    group = manager.group_model.get(id=gid, one=True, soft=False)
+    if group is None:
+        raise NotFound(msg='分组不存在')
+    auths = db.session.query(
+        manager.auth_model.auth, manager.auth_model.module
+    ).filter_by(soft=False, group_id=group.id).all()
+    auths = [{'auth': auth[0], 'module': auth[1]} for auth in auths]
+    res = _split_modules(auths)
+    setattr(group, 'auths', res)
+    group._fields.append('auths')
     return jsonify(group)
 
 
@@ -118,7 +191,18 @@ def get_group(gid):
 @admin_required
 def create_group():
     form = NewGroup().validate_for_api()
-    GroupDAO().new_group(form)
+    exists = manager.group_model.get(name=form.name.data)
+    if exists:
+        raise Forbidden(msg='分组已存在，不可创建同名分组')
+    with db.auto_commit():
+        group = manager.group_model.create(name=form.name.data, info=form.info.data)
+        db.session.flush()
+
+        for auth in form.auths.data:
+            meta = find_auth_module(auth)
+            if meta:
+                manager.auth_model.create(auth=meta.auth, module=meta.module, group_id=group.id)
+
     return Success(msg='新建分组成功')
 
 
@@ -127,7 +211,10 @@ def create_group():
 @admin_required
 def update_group(gid):
     form = UpdateGroup().validate_for_api()
-    GroupDAO().update_group(gid, form)
+    exists = manager.group_model.get(id=gid)
+    if not exists:
+        raise NotFound(msg='分组不存在，更新失败')
+    exists.update(name=form.name.data, info=form.info.data, commit=True)
     return Success(msg='更新分组成功')
 
 
@@ -136,7 +223,14 @@ def update_group(gid):
 @Logger(template='管理员删除一个权限组')  # 记录日志
 @admin_required
 def delete_group(gid):
-    GroupDAO().remove_group(gid)
+    exist = manager.group_model.get(id=gid)
+    if not exist:
+        raise NotFound(msg='分组不存在，删除失败')
+    if manager.user_model.get(group_id=gid):
+        raise Forbidden(msg='分组下存在用户，不可删除')
+    # 删除group拥有的权限
+    manager.auth_model.query.filter(manager.auth_model.group_id == gid).delete()
+    exist.delete(commit=True)
     return Success(msg='删除分组成功')
 
 
@@ -145,7 +239,16 @@ def delete_group(gid):
 @admin_required
 def dispatch_auth():
     form = DispatchAuth().validate_for_api()
-    AuthDAO().patch_one(form)
+    one = manager.auth_model.get(group_id=form.group_id.data, auth=form.auth.data)
+    if one:
+        raise Forbidden(msg='已有权限，不可重复添加')
+    meta = find_auth_module(form.auth.data)
+    manager.auth_model.create(
+        group_id=form.group_id.data,
+        auth=meta.auth,
+        module=meta.module,
+        commit=True
+    )
     return Success(msg='添加权限成功')
 
 
@@ -154,7 +257,16 @@ def dispatch_auth():
 @admin_required
 def dispatch_auths():
     form = DispatchAuths().validate_for_api()
-    AuthDAO().patch_all(form)
+    with db.auto_commit():
+        for auth in form.auths.data:
+            one = manager.auth_model.get(group_id=form.group_id.data, auth=auth)
+            if not one:
+                meta = find_auth_module(auth)
+                manager.auth_model.create(
+                    group_id=form.group_id.data,
+                    auth=meta.auth,
+                    module=meta.module
+                )
     return Success(msg='添加权限成功')
 
 
@@ -163,7 +275,13 @@ def dispatch_auths():
 @admin_required
 def remove_auths():
     form = RemoveAuths().validate_for_api()
-    AuthDAO().remove_auths(form)
+
+    with db.auto_commit():
+        db.session.query(manager.auth_model).filter(
+            manager.auth_model.auth.in_(form.auths.data),
+            manager.auth_model.group_id == form.group_id.data
+        ).delete(synchronize_session=False)
+
     return Success(msg='删除权限成功')
 
 
@@ -175,6 +293,27 @@ def _split_modules(auths):
         res.append({key: list(group)})
     return res
 
+
+def _change_status(uid, active_or_disable='active'):
+    user = manager.user_model.get(id=uid)
+    if user is None:
+        raise NotFound(msg='用户不存在')
+
+    active_or_not = UserActive.NOT_ACTIVE.value \
+        if active_or_disable == 'active' \
+        else UserActive.ACTIVE.value
+
+    if active_or_disable == 'active':
+        if not user.is_active:
+            raise Forbidden(msg='当前用户已处于禁止状态')
+
+    elif active_or_disable == 'disable':
+        if user.is_active:
+            raise Forbidden(msg='当前用户已处于激活状态')
+
+    with db.auto_commit():
+        user.active = active_or_not
+
 # --------------------------------------------------
 # --------------------Abandon-----------------------
 # --------------------------------------------------

app/api/cms/log.py

@@ -3,12 +3,15 @@
     :license: MIT, see LICENSE for more details.
 """
 
-from flask import jsonify
-from lin.core import route_meta
+from flask import jsonify, request
+from lin import db
+from lin.core import route_meta, Log
+from lin.exception import NotFound, ParameterException
 from lin.jwt import group_required
 from lin.redprint import Redprint
+from lin.util import paginate
+from sqlalchemy import text
 
-from app.dao.log import LogDAO
 from app.validators.forms import LogFindForm
 
 log_api = Redprint('log')
@@ -20,7 +23,16 @@
 @group_required
 def get_logs():
     form = LogFindForm().validate_for_api()
-    logs, total_nums = LogDAO().get_by_paginate(form)
+    start, count = paginate()
+    logs = db.session.query(Log).filter()
+    if form.name.data:
+        logs = logs.filter(Log.user_name == form.name.data)
+    if form.start.data and form.end.data:
+        logs = logs.filter(Log.time.between(form.start.data, form.end.data))
+    total_nums = logs.count()
+    logs = logs.order_by(text('time desc')).offset(start).limit(count).all()
+    if not logs:
+        raise NotFound(msg='没有找到相关日志')
     return jsonify({
         "total_nums": total_nums,
         "collection": logs
@@ -33,7 +45,19 @@ def get_logs():
 @group_required
 def get_user_logs():
     form = LogFindForm().validate_for_api()
-    logs, total_nums = LogDAO().search_by_keyword(form)
+    keyword = request.args.get('keyword', default=None, type=str)
+    if keyword is None or '':
+        raise ParameterException(msg='搜索关键字不可为空')
+    start, count = paginate()
+    logs = Log.query.filter(Log.message.like(f'%{keyword}%'))
+    if form.name.data:
+        logs = logs.filter(Log.user_name == form.name.data)
+    if form.start.data and form.end.data:
+        logs = logs.filter(Log._time.between(form.start.data, form.end.data))
+    total_nums = logs.count()
+    logs = logs.order_by(text('time desc')).offset(start).limit(count).all()
+    if not logs:
+        raise NotFound(msg='没有找到相关日志')
     return jsonify({
         "total_nums": total_nums,
         "collection": logs
@@ -44,5 +68,9 @@ def get_user_logs():
 @route_meta(auth='查询日志记录的用户', module='日志')
 @group_required
 def get_users():
-    users = LogDAO().get_users_by_paginate()
+    start, count = paginate()
+    user_names = db.session.query(Log.user_name).filter_by(
+        soft=False).group_by(text('user_name')).having(
+        text('count(user_name) > 0')).offset(start).limit(count).all()
+    users = [user_name[0] for user_name in user_names]
     return jsonify(users)