[Update] 抽象BasePermission (#2710)

* [Update] AssetPermission/RemoteAppPermission抽象BasePermission

* [Update] Perms模块添加迁移文件

* [Update] Perms删除多余迁移文件

* [Update] Perms重新生成RemoteAppPermission迁移文件

apps/perms/models/remote_app_permission.py

@@ -1,75 +1,25 @@
 #  coding: utf-8
 #
 
-import uuid
 from django.db import models
-from django.utils import timezone
 from django.utils.translation import ugettext_lazy as _
 
-from orgs.mixins import OrgModelMixin, OrgManager
-from common.utils import date_expired_default, set_or_append_attr_bulk
+from orgs.mixins import OrgModelMixin
+
+from .base import BasePermission
 
 __all__ = [
     'RemoteAppPermission',
 ]
 
 
-class RemoteAppPermissionQuerySet(models.QuerySet):
-    def active(self):
-        return self.filter(is_active=True)
-
-    def valid(self):
-        return self.active().filter(date_start__lt=timezone.now())\
-            .filter(date_expired__gt=timezone.now())
-
-
-class RemoteAppPermissionManager(OrgManager):
-    def valid(self):
-        return self.get_queryset().valid()
-
-
-class RemoteAppPermission(OrgModelMixin):
-    id = models.UUIDField(default=uuid.uuid4, primary_key=True)
-    name = models.CharField(max_length=128, verbose_name=_('Name'))
-    users = models.ManyToManyField('users.User', related_name='remote_app_permissions', blank=True, verbose_name=_("User"))
-    user_groups = models.ManyToManyField('users.UserGroup', related_name='remote_app_permissions', blank=True, verbose_name=_("User group"))
-    remote_apps = models.ManyToManyField('applications.RemoteApp', related_name='remote_app_permissions', blank=True, verbose_name=_("RemoteApp"))
-    is_active = models.BooleanField(default=True, verbose_name=_('Active'))
-    date_start = models.DateTimeField(default=timezone.now, db_index=True, verbose_name=_("Date start"))
-    date_expired = models.DateTimeField(default=date_expired_default, db_index=True, verbose_name=_('Date expired'))
-    created_by = models.CharField(max_length=128, blank=True, verbose_name=_('Created by'))
-    date_created = models.DateTimeField(auto_now_add=True, verbose_name=_('Date created'))
-    comment = models.TextField(verbose_name=_('Comment'), blank=True)
-
-    objects = RemoteAppPermissionManager.from_queryset(RemoteAppPermissionQuerySet)()
+class RemoteAppPermission(OrgModelMixin, BasePermission):
+    remote_apps = models.ManyToManyField('applications.RemoteApp', related_name='granted_by_permissions', blank=True, verbose_name=_("RemoteApp"))
 
     class Meta:
         unique_together = [('org_id', 'name')]
         verbose_name = _('RemoteApp permission')
         ordering = ('name',)
 
-    def __str__(self):
-        return self.name
-
-    @property
-    def is_expired(self):
-        if self.date_expired > timezone.now() > self.date_start:
-            return False
-        return True
-
-    @property
-    def is_valid(self):
-        if not self.is_expired and self.is_active:
-            return True
-        return False
-
-    def get_all_users(self):
-        users = set(self.users.all())
-        for group in self.user_groups.all():
-            _users = group.users.all()
-            set_or_append_attr_bulk(_users, 'inherit', group.name)
-            users.update(set(_users))
-        return users
-
     def get_all_remote_apps(self):
         return set(self.remote_apps.all())