From 314f07c93d87e04cce9cb947efd19ac01a33dc28 Mon Sep 17 00:00:00 2001
From: lucasheld <lucasheld@hotmail.de>
Date: Mon, 12 Sep 2022 22:45:43 +0200
Subject: [PATCH] fix: convert monitor notificationIDList return value

https://github.com/lucasheld/ansible-uptime-kuma/issues/3
---
 tests/test_monitor.py  |  9 +++------
 uptime_kuma_api/api.py | 21 +++++++++++++--------
 2 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/tests/test_monitor.py b/tests/test_monitor.py
index 901d970..f0a65f0 100644
--- a/tests/test_monitor.py
+++ b/tests/test_monitor.py
@@ -190,18 +190,15 @@ class TestMonitor(UptimeKumaTestCase):
         }
         self.do_test_monitor_type(expected_monitor)
 
-    def test_edit_notification_id_list(self):
-        # https://github.com/lucasheld/uptime-kuma-api/issues/3
-
+    def test_notification_id_list(self):
         monitor_id = self.add_monitor()
         notification_id = self.add_notification()
 
         expected_monitor = self.api.get_monitor(monitor_id)
-        expected_monitor["notificationIDList"] = {str(notification_id): True}
+        expected_monitor["notificationIDList"] = [notification_id]
 
-        r = self.api.edit_monitor(id_=monitor_id, notificationIDList=[notification_id])
+        r = self.api.edit_monitor(id_=monitor_id, **expected_monitor)
         self.assertEqual(r["msg"], "Saved.")
-
         monitor = self.api.get_monitor(monitor_id)
         self.compare(monitor, expected_monitor)
 
diff --git a/uptime_kuma_api/api.py b/uptime_kuma_api/api.py
index c238f84..7313783 100644
--- a/uptime_kuma_api/api.py
+++ b/uptime_kuma_api/api.py
@@ -32,7 +32,11 @@ def gen_secret(length: int) -> str:
     return ''.join(random.choice(chars) for _ in range(length))
 
 
-def _convert_monitor_data(kwargs):
+def _convert_monitor_return(monitor):
+    monitor["notificationIDList"] = [int(i) for i in monitor["notificationIDList"].keys()]
+
+
+def _convert_monitor_input(kwargs):
     if not kwargs["accepted_statuscodes"]:
         kwargs["accepted_statuscodes"] = ["200-299"]
 
@@ -50,7 +54,6 @@ def _convert_monitor_data(kwargs):
 
     if kwargs["type"] == MonitorType.PUSH and not kwargs.get("pushToken"):
         kwargs["pushToken"] = gen_secret(10)
-    return kwargs
 
 
 def _build_notification_data(
@@ -136,13 +139,12 @@ def _build_status_page_data(
     return slug, config, icon, publicGroupList
 
 
-def _convert_docker_host_data(kwargs):
+def _convert_docker_host_input(kwargs):
     if not kwargs["dockerDaemon"]:
         if kwargs["dockerType"] == DockerType.SOCKET:
             kwargs["dockerDaemon"] = "/var/run/docker.sock"
         elif kwargs["dockerType"] == DockerType.TCP:
             kwargs["dockerDaemon"] = "tcp://localhost:2375"
-    return kwargs
 
 
 def _build_docker_host_data(
@@ -572,11 +574,14 @@ class UptimeKumaApi(object):
 
     def get_monitors(self):
         r = list(self._get_event_data(Event.MONITOR_LIST).values())
+        for monitor in r:
+            _convert_monitor_return(monitor)
         int_to_bool(r, ["active"])
         return r
 
     def get_monitor(self, id_: int):
         r = self._call('getMonitor', id_)["monitor"]
+        _convert_monitor_return(r)
         int_to_bool(r, ["active"])
         return r
 
@@ -596,7 +601,7 @@ class UptimeKumaApi(object):
 
     def add_monitor(self, **kwargs):
         data = self._build_monitor_data(**kwargs)
-        data = _convert_monitor_data(data)
+        _convert_monitor_input(data)
         _check_arguments_monitor(data)
         r = self._call('add', data)
         return r
@@ -604,7 +609,7 @@ class UptimeKumaApi(object):
     def edit_monitor(self, id_: int, **kwargs):
         data = self.get_monitor(id_)
         data.update(kwargs)
-        data = _convert_monitor_data(data)
+        _convert_monitor_input(data)
         _check_arguments_monitor(data)
         r = self._call('editMonitor', data)
         return r
@@ -967,13 +972,13 @@ class UptimeKumaApi(object):
 
     def add_docker_host(self, **kwargs):
         data = _build_docker_host_data(**kwargs)
-        data = _convert_docker_host_data(data)
+        _convert_docker_host_input(data)
         return self._call('addDockerHost', (data, None))
 
     def edit_docker_host(self, id_: int, **kwargs):
         data = self.get_docker_host(id_)
         data.update(kwargs)
-        data = _convert_docker_host_data(data)
+        _convert_docker_host_input(data)
         return self._call('addDockerHost', (data, id_))
 
     def delete_docker_host(self, id_: int):