From 7494b87ba121ed12f40d323b35c7361d0b07dd43 Mon Sep 17 00:00:00 2001
From: Thomas Beckers <tabeckers95@gmail.com>
Date: Mon, 23 Nov 2020 15:16:11 +0100
Subject: [PATCH] Updated health check

---
 .../Interfaces/Services/IHealthCheckService.cs   | 15 +++++++++++++++
 Swabbr.Core/Services/HealthCheckService.cs       | 16 ++++++++++++++--
 2 files changed, 29 insertions(+), 2 deletions(-)

diff --git a/Swabbr.Core/Interfaces/Services/IHealthCheckService.cs b/Swabbr.Core/Interfaces/Services/IHealthCheckService.cs
index 87ca778c..1521944f 100644
--- a/Swabbr.Core/Interfaces/Services/IHealthCheckService.cs
+++ b/Swabbr.Core/Interfaces/Services/IHealthCheckService.cs
@@ -10,6 +10,21 @@ public interface IHealthCheckService
         /// <summary>
         ///     Checks if our backend is healthy.
         /// </summary>
+        /// <remarks>
+        ///     This can generally be used as a wrapper
+        ///     call to call all other checks in this 
+        ///     interface.
+        /// </remarks>
         Task<bool> IsHealthyAsync();
+
+        /// <summary>
+        ///     Checks our data store.
+        /// </summary>
+        Task<bool> IsDataStoreHealthyAsync();
+
+        /// <summary>
+        ///     Checks our notification service.
+        /// </summary>
+        Task<bool> IsNotificationServiceHealthyAsync();
     }
 }
diff --git a/Swabbr.Core/Services/HealthCheckService.cs b/Swabbr.Core/Services/HealthCheckService.cs
index 1f84d6dd..bfb694b0 100644
--- a/Swabbr.Core/Services/HealthCheckService.cs
+++ b/Swabbr.Core/Services/HealthCheckService.cs
@@ -23,11 +23,23 @@ public HealthCheckService(INotificationService notificationService,
             _healthCheckRepository = healthCheckRepository ?? throw new ArgumentNullException(nameof(healthCheckRepository));
         }
 
+        /// <summary>
+        ///     Checks our database health.
+        /// </summary>
+        public Task<bool> IsDataStoreHealthyAsync()
+            => _healthCheckRepository.IsAliveAsync();
+
         /// <summary>
         ///     Checks the notification service and database.
         /// </summary>
         public async Task<bool> IsHealthyAsync()
-            => !await _notificationService.IsServiceOnlineAsync().ConfigureAwait(false) ||
-               !await _healthCheckRepository.IsAliveAsync().ConfigureAwait(false);
+            => await IsDataStoreHealthyAsync().ConfigureAwait(false) &&
+               await IsNotificationServiceHealthyAsync().ConfigureAwait(false);
+
+        /// <summary>
+        ///     Checks our notification service health.
+        /// </summary>
+        public Task<bool> IsNotificationServiceHealthyAsync()
+            => _notificationService.IsServiceOnlineAsync();
     }
 }