attributes paginate and fix update value

api/lib/cmdb/attribute.py

@@ -38,17 +38,30 @@ class AttributeManager(object):
             db.session.add(table)
         db.session.flush()
 
-    def get_attributes(self, name=None):
+    @classmethod
+    def search_attributes(cls, name=None, alias=None, page=1, page_size=None):
         """
         :param name: 
+        :param alias: 
+        :param page: 
+        :param page_size: 
         :return: attribute, if name is None, then return all attributes
         """
-        attrs = Attribute.get_by_like(name=name) if name is not None else Attribute.get_by()
+        if name is not None:
+            attrs = Attribute.get_by_like(name=name)
+        elif alias is not None:
+            attrs = Attribute.get_by_like(alias=alias)
+        else:
+            attrs = Attribute.get_by()
+
+        numfound = len(attrs)
+        attrs = attrs[(page - 1) * page_size:][:page_size]
         res = list()
         for attr in attrs:
-            attr["is_choice"] and attr.update(dict(choice_value=self.get_choice_values(attr["id"], attr["value_type"])))
+            attr["is_choice"] and attr.update(dict(choice_value=cls.get_choice_values(attr["id"], attr["value_type"])))
             res.append(attr)
-        return res
+
+        return numfound, res
 
     def get_attribute_by_name(self, name):
         attr = Attribute.get_by(name=name, first=True)
@@ -112,19 +125,19 @@ class AttributeManager(object):
         is_choice = True if choice_value else False
 
         attr.update(flush=True, **kwargs)
-        
+
         if is_choice:
             self._add_choice_values(attr.id, attr.value_type, choice_value)
-            
+
         try:
             db.session.commit()
         except Exception as e:
             db.session.rollback()
             current_app.logger.error("update attribute error, {0}".format(str(e)))
             return abort(400, "update attribute <{0}> failed".format(_id))
-        
+
         AttributeCache.clean(attr)
-        
+
         return attr.id
 
     @staticmethod

api/lib/cmdb/ci.py

@@ -34,8 +34,6 @@ from api.models.cmdb import CITypeAttribute
 from api.tasks.cmdb import ci_cache
 from api.tasks.cmdb import ci_delete
 
-__author__ = 'pycook'
-
 
 class CIManager(object):
     """ manage CI interface

api/lib/cmdb/search.py

@@ -1,6 +1,8 @@
 # -*- coding:utf-8 -*- 
 
 
+from __future__ import unicode_literals
+
 import time
 
 from flask import current_app
@@ -39,7 +41,7 @@ class Search(object):
         self.query_sql = ""
         self.type_id_list = []
         self.only_type_query = False
-    
+
     @staticmethod
     def _operator_proc(key):
         operator = "&"
@@ -127,7 +129,7 @@ class Search(object):
 
         if self.only_type_query:
             return ret_sql.format(query_sql, "ORDER BY B.ci_id {1} LIMIT {0:d}, {2};".format(
-                    (self.page - 1) * self.count, sort_type, self.count))
+                (self.page - 1) * self.count, sort_type, self.count))
 
         elif self.type_id_list:
             self.query_sql = "SELECT B.ci_id FROM ({0}) AS B {1}".format(
@@ -170,13 +172,13 @@ class Search(object):
         elif self.type_id_list:
             self.query_sql = """SELECT C.ci_id
                                 FROM ({0}) AS C
-                                INNER JOIN cis on c_cis.id=C.ci_id
+                                INNER JOIN c_cis on c_cis.id=C.ci_id
-                                WHERE cis.type_id in ({1})""".format(new_table, ",".join(self.type_id_list))
+                                WHERE c_cis.type_id in ({1})""".format(new_table, ",".join(self.type_id_list))
 
             return """SELECT SQL_CALC_FOUND_ROWS DISTINCT C.ci_id, C.value
                       FROM ({0}) AS C
-                      INNER JOIN cis on c_cis.id=C.ci_id
+                      INNER JOIN c_cis on c_cis.id=C.ci_id
-                      WHERE cis.type_id in ({4})
+                      WHERE c_cis.type_id in ({4})
                       ORDER BY C.value {2}
                       LIMIT {1:d}, {3};""".format(new_table,
                                                   (self.page - 1) * self.count,
@@ -299,7 +301,7 @@ class Search(object):
             self.query_sql = query_sql
             current_app.logger.debug(query_sql)
             numfound, res = self._execute_sql(query_sql)
-            current_app.logger.info("query ci ids is: {0}".format(time.time() - s))
+            current_app.logger.debug("query ci ids is: {0}".format(time.time() - s))
             return numfound, [_res[0] for _res in res]
 
         return 0, []

api/lib/cmdb/value.py

@@ -14,6 +14,7 @@ from api.lib.cmdb.const import TableMap
 from api.lib.cmdb.const import ExistPolicy
 from api.lib.cmdb.const import OperateType
 from api.lib.cmdb.history import AttributeHistoryManger
+from api.models.cmdb import Attribute
 
 
 class AttributeValueManager(object):
@@ -47,6 +48,7 @@ class AttributeValueManager(object):
             attr = self._get_attr(field)
             if not attr:
                 continue
+
             value_table = TableMap(attr_name=attr.name).table
             rs = value_table.get_by(ci_id=ci_id,
                                     attr_id=attr.id,
@@ -130,9 +132,16 @@ class AttributeValueManager(object):
 
         for v in value_list:
             v = self._validate(attr, v, value_table, ci_id)
+            if not v and attr.value_type != Attribute.TEXT:
+                v = None
+
             if operate_type == OperateType.ADD:
-                value_table.create(ci_id=ci_id, attr_id=attr.id, value=v)
+                if v is not None:
-                self._write_change(ci_id, attr.id, operate_type, None, v)
+                    value_table.create(ci_id=ci_id, attr_id=attr.id, value=v)
+                    self._write_change(ci_id, attr.id, operate_type, None, v)
             elif existed_attr.value != v:
-                existed_attr.update(value=v)
+                if v is not None:
+                    existed_attr.update(value=v)
+                else:
+                    existed_attr.delete()
                 self._write_change(ci_id, attr.id, operate_type, existed_value, v)

api/views/cmdb/attribute.py

@@ -11,16 +11,26 @@ from api.lib.cmdb.const import RoleEnum
 from api.lib.cmdb.attribute import AttributeManager
 from api.lib.decorator import args_required
 from api.lib.utils import handle_arg_list
+from api.lib.utils import get_page
+from api.lib.utils import get_page_size
+
 
 
 class AttributeSearchView(APIView):
     url_prefix = ("/attributes/s", "/attributes/search")
 
     def get(self):
-        q = request.values.get("q")
+        name = request.values.get("name")
-        attrs = AttributeManager().get_attributes(name=q)
+        alias = request.values.get("alias")
-        count = len(attrs)
+        page = get_page(request.values.get("page", 1))
-        return self.jsonify(numfound=count, attributes=attrs)
+        page_size = get_page_size(request.values.get("page_size"))
+        numfound, res = AttributeManager.search_attributes(name=name, alias=alias, page=page, page_size=page_size)
+
+        return self.jsonify(page=page,
+                            page_size=page_size,
+                            numfound=numfound,
+                            total=len(res),
+                            attributes=res)
 
 
 class AttributeView(APIView):