From d15d604ebfd90000dabbd2ef978c58b2aeaa46c9 Mon Sep 17 00:00:00 2001
From: Stepan Burlakov <stepansergeevitch@gmail.com>
Date: Fri, 14 Jul 2023 13:05:28 +0300
Subject: [PATCH 1/3] fix database service

---
 src/firebolt/model/database.py   | 5 ++---
 src/firebolt/service/database.py | 5 ++---
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/firebolt/model/database.py b/src/firebolt/model/database.py
index 823437c2947..118db61bb8c 100644
--- a/src/firebolt/model/database.py
+++ b/src/firebolt/model/database.py
@@ -36,9 +36,8 @@ class Database(FireboltBaseModel):
     name: str = field(metadata={"db_name": "database_name"})
     description: str = field()
     region: str = field()
-    _status: str = field(repr=False, metadata={"db_name": "status"})
-    data_size_full: int = field()
-    data_size_compressed: int = field()
+    data_size_full: int = field(metadata={"db_name": "uncompressed_size"})
+    data_size_compressed: int = field(metadata={"db_name": "compressed_size"})
     _attached_engine_names: str = field(
         repr=False, metadata={"db_name": "attached_engines"}, compare=False
     )
diff --git a/src/firebolt/service/database.py b/src/firebolt/service/database.py
index 25f32a3aa9c..609b512f1e9 100644
--- a/src/firebolt/service/database.py
+++ b/src/firebolt/service/database.py
@@ -14,9 +14,8 @@ class DatabaseService(BaseService):
         "database_name",
         "description",
         "region",
-        "status",
-        "data_size_full",
-        "data_size_compressed",
+        "uncompressed_size",
+        "compressed_size",
         "attached_engines",
         "created_on",
         "created_by",

From a60ceb59ce3aff5c368098934b9282ebafbedf20 Mon Sep 17 00:00:00 2001
From: Stepan Burlakov <stepansergeevitch@gmail.com>
Date: Fri, 14 Jul 2023 13:10:12 +0300
Subject: [PATCH 2/3] fix engines service

---
 src/firebolt/model/engine.py   | 3 +--
 src/firebolt/service/engine.py | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/firebolt/model/engine.py b/src/firebolt/model/engine.py
index cffdcce7291..1c830229ad9 100644
--- a/src/firebolt/model/engine.py
+++ b/src/firebolt/model/engine.py
@@ -72,8 +72,7 @@ class Engine(FireboltBaseModel):
     endpoint: str = field(metadata={"db_name": "url"})
     warmup: WarmupMethod = field()
     auto_stop: int = field()
-    type: EngineType = field()
-    provisioning: str = field()
+    type: EngineType = field(metadata={"db_name": "engine_type"})
 
     def __post_init__(self) -> None:
         if isinstance(self.spec, str) and self.spec:
diff --git a/src/firebolt/service/engine.py b/src/firebolt/service/engine.py
index e34982e5024..9f23a3eabfb 100644
--- a/src/firebolt/service/engine.py
+++ b/src/firebolt/service/engine.py
@@ -22,8 +22,7 @@ class EngineService(BaseService):
         "url",
         "warmup",
         "auto_stop",
-        "type",
-        "provisioning",
+        "engine_type",
     )
     GET_SQL = f"SELECT {', '.join(DB_FIELDS)} FROM information_schema.engines"
     GET_BY_NAME_SQL = GET_SQL + " WHERE engine_name=?"

From d3e987c68b2f7049c22e9655b97ad213679e0a43 Mon Sep 17 00:00:00 2001
From: Stepan Burlakov <stepansergeevitch@gmail.com>
Date: Fri, 14 Jul 2023 13:20:49 +0300
Subject: [PATCH 3/3] fix unit tests

---
 tests/unit/service/conftest.py | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/tests/unit/service/conftest.py b/tests/unit/service/conftest.py
index 0dcb74cd948..a639376929c 100644
--- a/tests/unit/service/conftest.py
+++ b/tests/unit/service/conftest.py
@@ -35,7 +35,6 @@ def mock_engine(region: str, server: str, instance_type_1: InstanceType) -> Engi
         warmup=WarmupMethod.MINIMAL,
         auto_stop=7200,
         type=EngineType.GENERAL_PURPOSE,
-        provisioning="Finished",
         _database_name="database",
         _service=None,
     )
@@ -111,7 +110,6 @@ def mock_database(region: str) -> Database:
         data_size_compressed=0,
         create_time=datetime.now().isoformat(),
         create_actor="",
-        _status="",
         _attached_engine_names="-",
         _errors="",
         _service=None,
@@ -128,7 +126,6 @@ def mock_database_2(region: str) -> Database:
         data_size_compressed=0,
         create_time=datetime.now().isoformat(),
         create_actor="",
-        _status="",
         _attached_engine_names="-",
         _errors="",
         _service=None,