Merge pull request #72 from whdalsrnt/master

refactor: convert datetime type to string type in stat query

Author: Jongmin Kim

src/spaceone/core/model/mongo_model/__init__.py

@@ -5,6 +5,7 @@
 from datetime import datetime
 from functools import reduce
 from mongoengine import EmbeddedDocumentField, EmbeddedDocument, Document, QuerySet, register_connection
+from mongoengine.fields import DateField, DateTimeField, ComplexDateTimeField
 from pymongo import ReadPreference
 from mongoengine.errors import *
 from spaceone.core import config
@@ -107,6 +108,19 @@ def init(cls):
 
                 _MONGO_INIT_MODELS.append(cls)
 
+        cls.load_default_meta()
+
+    @classmethod
+    def load_default_meta(cls):
+        cls._meta['datetime_fields'] = []
+        for name, field in cls._fields.items():
+            if isinstance(field, DateField):
+                cls._meta['datetime_fields'].append(name)
+            elif isinstance(field, DateTimeField):
+                cls._meta['datetime_fields'].append(name)
+            elif isinstance(field, ComplexDateTimeField):
+                cls._meta['datetime_fields'].append(name)
+
     @classmethod
     def connect(cls):
         db_alias = cls._meta.get('db_alias', 'default')
@@ -752,7 +766,8 @@ def _make_group_rule(cls, options, _before_group_keys):
             key, name, operator, sub_fields, sub_conditions, data_type = \
                 cls._get_group_fields(condition, _before_group_keys)
 
-            rule = STAT_GROUP_OPERATORS[operator](condition, key, operator, name, data_type, sub_conditions, sub_fields)
+            rule = STAT_GROUP_OPERATORS[operator](condition, key, operator, name, data_type, sub_conditions, sub_fields,
+                                                  cls._meta['datetime_fields'])
             _group_rule['$group'].update(rule)
 
         return _group_rule, _group_keys
@@ -1149,7 +1164,7 @@ def _make_select_query(cls, select):
             }
         }
 
-        supported_operator = ['add', 'subtract', 'multiply', 'divide', 'size', 'sum', 'date_to_string']
+        supported_operator = ['add', 'subtract', 'multiply', 'divide', 'size', 'sum']
 
         for name, condition in select.items():
             if isinstance(condition, str):

src/spaceone/core/model/mongo_model/stat_operator.py

@@ -23,7 +23,7 @@ def _group_count_resolver(condition, key, operator, name, data_type, sub_conditi
         }
 
 
-def _group_push_resolver(condition, key, operator, name, data_type, sub_conditions, sub_fields, *args):
+def _group_push_resolver(condition, key, operator, name, data_type, sub_conditions, sub_fields, datetime_fields, *args):
     if not key and len(sub_fields) == 0:
         raise ERROR_DB_QUERY(reason=f"'aggregate.group.fields' condition requires fields: {condition}")
 
@@ -43,7 +43,16 @@ def _group_push_resolver(condition, key, operator, name, data_type, sub_conditio
             f_key = sub_field.get('key', sub_field.get('k'))
             f_name = sub_field.get('name', sub_field.get('n'))
 
-            push_query[f_name] = f'${f_key}'
+            if f_key in datetime_fields:
+                push_query[f_name] = {
+                    '$dateToString': {
+                        'format': '%Y-%m-%dT%H:%M:%SZ',
+                        'date': f'${f_key}'
+                    }
+                }
+            else:
+                push_query[f_name] = f'${f_key}'
+
 
         return {
             name: {
@@ -193,7 +202,7 @@ def _project_object_to_array_resolver(condition, key, operator, name, fields, gr
     }
 
 
-def _project_calculate_sub_query(condition, operator, fields, group_keys):
+def _project_calculate_sub_query(condition, operator, fields, group_keys, *args):
     supported_operator = ['add', 'subtract', 'multiply', 'divide']
 
     if operator is None:
@@ -232,20 +241,6 @@ def _project_calculate_sub_query(condition, operator, fields, group_keys):
     }
 
 
-def _project_date_to_string_resolver(condition, key, operator, name, fields, group_keys, *args):
-    if key in group_keys:
-        key = f'_id.{key}'
-
-    return {
-        name: {
-            '$dateToString': {
-                'format':  '%Y-%m-%dT%H:%M:%SZ',
-                'date': f'${key}'
-            }
-        }
-    }
-
-
 def _project_calculate_resolver(condition, key, operator, name, fields, group_keys, *args):
     return {
         name: _project_calculate_sub_query(condition, operator, fields, group_keys)
@@ -270,7 +265,6 @@ def _project_calculate_resolver(condition, key, operator, name, fields, group_ke
     'sum': _project_sum_resolver,
     'array_to_object': _project_array_to_object_resolver,
     'object_to_array': _project_object_to_array_resolver,
-    'date_to_string': _project_date_to_string_resolver,
     'add': _project_calculate_resolver,
     'subtract': _project_calculate_resolver,
     'multiply': _project_calculate_resolver,