From ba77ff11e9b8c3e914b53cf70c105f2e6e6268d1 Mon Sep 17 00:00:00 2001
From: allegroai <>
Date: Mon, 3 May 2021 18:08:39 +0300
Subject: [PATCH] Fix missing custom metric values turn up first in sorting

---
 apiserver/database/model/base.py | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/apiserver/database/model/base.py b/apiserver/database/model/base.py
index 1586484..10a0e40 100644
--- a/apiserver/database/model/base.py
+++ b/apiserver/database/model/base.py
@@ -695,14 +695,13 @@ class GetMixin(PropsMixin):
         mongo_field = first(
             v for k, v in cls.get_all_fields_with_instance() if k == mongo_field_name
         )
-        if not mongo_field:
-            return
 
-        params = {}
         if isinstance(mongo_field, ListField):
-            params["is_list"] = True
+            params = {"is_list": True}
         elif isinstance(mongo_field, StringField):
-            params["empty_value"] = ""
+            params = {"empty_value": ""}
+        else:
+            params = {}
         non_empty = query & field_exists(mongo_field_name, **params)
         empty = query & field_does_not_exist(mongo_field_name, **params)
         return non_empty, empty