Merge pull request #1250 from syucream/fix/refine-attr-types

Cleanup old fashion attr types

Author: userlocalhost

airone/lib/http.py

@@ -10,7 +10,7 @@
 from django.utils.encoding import smart_str
 
 from airone.lib.acl import ACLObjType
-from airone.lib.types import AttrTypes, AttrTypeValue
+from airone.lib.types import AttrTypeValue
 from entity import models as entity_models
 from entry import models as entry_models
 from job.models import JobOperation, JobStatus
@@ -182,8 +182,8 @@ def render(request, template, context={}):
         context["config"][app] = config.TEMPLATE_CONFIG
 
     context["attr_type"] = {}
-    for attr_type in AttrTypes:
-        context["attr_type"][attr_type.NAME] = attr_type.TYPE
+    for name, type in AttrTypeValue.items():
+        context["attr_type"][name] = type
     context["attr_type_value"] = AttrTypeValue
 
     # set Construct for Entity status

airone/lib/types.py

@@ -23,132 +23,10 @@ class AttrType(enum.IntEnum):
     ARRAY_ROLE = _ARRAY | ROLE
 
 
-class MetaAttrType(type):
-    def __eq__(cls, comp):
-        if isinstance(comp, int):
-            return cls.TYPE == comp
-        elif isinstance(comp, str):
-            return cls.NAME == comp
-        else:
-            return cls.TYPE == comp.TYPE
-
-    def __ne__(cls, comp):
-        return not cls == comp
-
-    def __repr__(cls):
-        return str(cls.TYPE)
-
-    def __int__(cls):
-        return cls.TYPE
-
-
-class AttrTypeObj(metaclass=MetaAttrType):
-    NAME = "entry"
-    TYPE = AttrType.OBJECT
-    DEFAULT_VALUE = None
-
-
-# STRING-type restricts data size to AttributeValue.MAXIMUM_VALUE_LENGTH
-class AttrTypeStr(metaclass=MetaAttrType):
-    NAME = "string"
-    TYPE = AttrType.STRING
-    DEFAULT_VALUE = ""
-
-
-class AttrTypeNamedObj(metaclass=MetaAttrType):
-    NAME = "named_entry"
-    TYPE = AttrType.NAMED_OBJECT
-    DEFAULT_VALUE = {"name": "", "id": None}
-
-
-class AttrTypeArrObj(metaclass=MetaAttrType):
-    NAME = "array_entry"
-    TYPE = AttrType.ARRAY_OBJECT
-    DEFAULT_VALUE = []
-
-
-class AttrTypeArrStr(metaclass=MetaAttrType):
-    NAME = "array_string"
-    TYPE = AttrType.ARRAY_STRING
-    DEFAULT_VALUE = []
-
-
-class AttrTypeArrNamedObj(metaclass=MetaAttrType):
-    NAME = "array_named_entry"
-    TYPE = AttrType.ARRAY_NAMED_OBJECT
-    DEFAULT_VALUE: Any = dict().values()
-
-
-class AttrTypeArrGroup(metaclass=MetaAttrType):
-    NAME = "array_group"
-    TYPE = AttrType.ARRAY_GROUP
-    DEFAULT_VALUE = []
-
-
-class AttrTypeText(metaclass=MetaAttrType):
-    NAME = "textarea"
-    TYPE = AttrType.TEXT
-    DEFAULT_VALUE = ""
-
-
-class AttrTypeBoolean(metaclass=MetaAttrType):
-    NAME = "boolean"
-    TYPE = AttrType.BOOLEAN
-    DEFAULT_VALUE = False
-
-
-class AttrTypeGroup(metaclass=MetaAttrType):
-    NAME = "group"
-    TYPE = AttrType.GROUP
-    DEFAULT_VALUE = None
-
-
-class AttrTypeDate(metaclass=MetaAttrType):
-    NAME = "date"
-    TYPE = AttrType.DATE
-    DEFAULT_VALUE = None
-
-
-class AttrTypeRole(metaclass=MetaAttrType):
-    NAME = "role"
-    TYPE = AttrType.ROLE
-    DEFAULT_VALUE = None
-
-
-class AttrTypeArrRole(metaclass=MetaAttrType):
-    NAME = "array_role"
-    TYPE = AttrType.ARRAY_ROLE
-    DEFAULT_VALUE = []
-
-
-class AttrTypeDatetime(metaclass=MetaAttrType):
-    NAME = "datetime"
-    TYPE = AttrType.DATETIME
-    DEFAULT_VALUE = None
-
-
-AttrTypes = [
-    AttrTypeStr,
-    AttrTypeObj,
-    AttrTypeNamedObj,
-    AttrTypeArrStr,
-    AttrTypeArrObj,
-    AttrTypeArrNamedObj,
-    AttrTypeArrGroup,
-    AttrTypeText,
-    AttrTypeBoolean,
-    AttrTypeGroup,
-    AttrTypeDate,
-    AttrTypeRole,
-    AttrTypeArrRole,
-    AttrTypeDatetime,
-]
 AttrTypeValue = {
     "object": AttrType.OBJECT,
     "string": AttrType.STRING,
-    "named": AttrType._NAMED,
     "named_object": AttrType.NAMED_OBJECT,
-    "array": AttrType._ARRAY,
     "array_object": AttrType.ARRAY_OBJECT,
     "array_string": AttrType.ARRAY_STRING,
     "array_named_object": AttrType.ARRAY_NAMED_OBJECT,

entity/views.py

@@ -17,7 +17,7 @@
     http_post,
     render,
 )
-from airone.lib.types import AttrType, AttrTypes
+from airone.lib.types import AttrType, AttrTypeValue
 from entry.models import AttributeValue, Entry
 from job.models import Job
 from user.models import History
@@ -70,7 +70,7 @@ def create(request):
             for x in Entity.objects.filter(is_active=True)
             if request.user.has_permission(x, ACLType.Readable)
         ],
-        "attr_types": AttrTypes,
+        "attr_types": AttrTypeValue,
     }
     return render(request, "create_entity.html", context)
 
@@ -88,7 +88,7 @@ def edit(request, entity_id):
     # - current value of any attributes even if the entity has been deleted
     context = {
         "entity": entity,
-        "attr_types": AttrTypes,
+        "attr_types": AttrTypeValue,
         "attributes": [
             {
                 "id": x.id,
@@ -132,7 +132,9 @@ def edit(request, entity_id):
                 {
                     "name": "type",
                     "type": str,
-                    "checker": lambda x: (any([y == int(x["type"]) for y in AttrTypes])),
+                    "checker": lambda x: (
+                        any([y == int(x["type"]) for y in AttrTypeValue.values()])
+                    ),
                 },
                 {"name": "is_mandatory", "type": bool},
                 {"name": "is_delete_in_chain", "type": bool},
@@ -236,7 +238,9 @@ def do_edit(request, entity_id, recv_data):
                 {
                     "name": "type",
                     "type": str,
-                    "checker": lambda x: (any([y == int(x["type"]) for y in AttrTypes])),
+                    "checker": lambda x: (
+                        any([y == int(x["type"]) for y in AttrTypeValue.values()])
+                    ),
                 },
                 {"name": "is_mandatory", "type": bool},
                 {"name": "is_delete_in_chain", "type": bool},

entry/tests/test_api_v2.py

@@ -13,8 +13,8 @@
 from airone.lib.log import Logger
 from airone.lib.test import AironeViewTest
 from airone.lib.types import (
+    AttrDefaultValue,
     AttrType,
-    AttrTypeStr,
     AttrTypeValue,
 )
 from entity.models import Entity, EntityAttr
@@ -396,7 +396,7 @@ def test_retrieve_entry(self):
             next(filter(lambda x: x["schema"]["name"] == "opt", resp_data["attrs"])),
             {
                 "type": AttrType.STRING,
-                "value": {"as_string": AttrTypeStr.DEFAULT_VALUE},
+                "value": {"as_string": AttrDefaultValue[AttrType.STRING]},
                 "id": None,
                 "is_mandatory": False,
                 "is_readable": True,

templates/edit_entity_content.html

@@ -41,8 +41,8 @@
               <div class='row'>
                 <div class='col-4'>
                   <select class="attr_type" disabled="true">
-                    {% for type in attr_types %}
-                    <option value="{{ type.TYPE }}" {% if attr.type == type.TYPE %}selected="selected"{% endif %}>{{ type.NAME }}</option>
+                    {% for name, type in attr_types.items %}
+                    <option value="{{ type }}" {% if attr.type == type %}selected="selected"{% endif %}>{{ name }}</option>
                     {% endfor %}
                   </select>
                 </div>
@@ -116,8 +116,8 @@
                 <div class='col-4'>
 
               <select class="attr_type">
-                {% for type in attr_types %}
-                <option value="{{ type.TYPE }}">{{ type.NAME }}</option>
+                {% for name, type in attr_types.items %}
+                <option value="{{ type }}">{{ name }}</option>
                 {% endfor %}
               </select>