Merge pull request #32 from pooranjoyb/sristy17-patch-1

pooranjoyb · web-flow · commit affd0cc75600 · 2025-02-07T00:05:00.000+05:30
Refactoring Health Class
diff --git a/examples/health/getAntivirus.cpp b/examples/health/getAntivirus.cpp
@@ -4,14 +4,10 @@
 int main() {
     std::string projectId = "66fbb5a100070a3a1d19";
     std::string apiKey = "";
-
-    Appwrite appwrite(projectId);
-    Health& health = appwrite.getHealth();
-    
-    health.setup(apiKey, projectId);
-
+    Appwrite appwrite(projectId, apiKey);
+   
     try {
-        std::string response = health.getAntivirus();
+        std::string response = appwrite.getHealth().getAntivirus();
         std::cout << "Health Check Done! \nResponse: " << response << std::endl;
     } catch (const AppwriteException& ex) {
         std::cerr << "Exception: " << ex.what() << std::endl;
diff --git a/examples/health/getCache.cpp b/examples/health/getCache.cpp
@@ -4,14 +4,10 @@
 int main() {
     std::string projectId = "66fbb5a100070a3a1d19";
     std::string apiKey = "";
-
-    Appwrite appwrite(projectId);
-    Health& health = appwrite.getHealth();
+    Appwrite appwrite(projectId, apiKey);
     
-    health.setup(apiKey, projectId);
-
     try {
-        std::string response = health.getCache();
+        std::string response = appwrite.getHealth().getCache();
         std::cout << "Health Check Done! \nResponse: " << response << std::endl;
     } catch (const AppwriteException& ex) {
         std::cerr << "Exception: " << ex.what() << std::endl;
diff --git a/examples/health/getDB.cpp b/examples/health/getDB.cpp
@@ -4,14 +4,10 @@
 int main() {
     std::string projectId = "66fbb5a100070a3a1d19";
     std::string apiKey = "";
-
-    Appwrite appwrite(projectId);
-    Health& health = appwrite.getHealth();
+    Appwrite appwrite(projectId, apiKey);
     
-    health.setup(apiKey, projectId);
-
     try {
-        std::string response = health.getDB();
+        std::string response = appwrite.getHealth().getDB();
         std::cout << "Health Check Done! \nResponse: " << response << std::endl;
     } catch (const AppwriteException& ex) {
         std::cerr << "Exception: " << ex.what() << std::endl;
diff --git a/examples/health/getHealth.cpp b/examples/health/getHealth.cpp
@@ -4,14 +4,10 @@
 int main() {
     std::string projectId = "66fbb5a100070a3a1d19";
     std::string apiKey = "";
-
-    Appwrite appwrite(projectId);
-    Health& health = appwrite.getHealth();
+    Appwrite appwrite(projectId, apiKey);
     
-    health.setup(apiKey, projectId);
-
     try {
-        std::string response = health.getHealth();
+        std::string response = appwrite.getHealth().getHealthStatus();
         std::cout << "Health Check Done! \nResponse: " << response << std::endl;
     } catch (const AppwriteException& ex) {
         std::cerr << "Exception: " << ex.what() << std::endl;
diff --git a/examples/health/getPubSub.cpp b/examples/health/getPubSub.cpp
@@ -4,14 +4,10 @@
 int main() {
     std::string projectId = "66fbb5a100070a3a1d19";
     std::string apiKey = "";
-
-    Appwrite appwrite(projectId);
-    Health& health = appwrite.getHealth();
+    Appwrite appwrite(projectId, apiKey);
     
-    health.setup(apiKey, projectId);
-
     try {
-        std::string response = health.getPubSub();
+        std::string response = appwrite.getHealth().getPubSub();
         std::cout << "Health Check Done! \nResponse: " << response << std::endl;
     } catch (const AppwriteException& ex) {
         std::cerr << "Exception: " << ex.what() << std::endl;
diff --git a/examples/health/getQueue.cpp b/examples/health/getQueue.cpp
@@ -4,14 +4,10 @@
 int main() {
     std::string projectId = "66fbb5a100070a3a1d19";
     std::string apiKey = "";
-
-    Appwrite appwrite(projectId);
-    Health& health = appwrite.getHealth();
+    Appwrite appwrite(projectId, apiKey);
     
-    health.setup(apiKey, projectId);
-
     try {
-        std::string response = health.getQueue();
+        std::string response = appwrite.getHealth().getQueue();
         std::cout << "Health Check Done! \nResponse: " << response << std::endl;
     } catch (const AppwriteException& ex) {
         std::cerr << "Exception: " << ex.what() << std::endl;
diff --git a/examples/health/getStorage.cpp b/examples/health/getStorage.cpp
@@ -4,14 +4,10 @@
 int main() {
     std::string projectId = "66fbb5a100070a3a1d19";
     std::string apiKey = "";
-
-    Appwrite appwrite(projectId);
-    Health& health = appwrite.getHealth();
+    Appwrite appwrite(projectId, apiKey);
     
-    health.setup(apiKey, projectId);
-
     try {
-        std::string response = health.getStorage();
+        std::string response = appwrite.getHealth().getStorage();
         std::cout << "Health Check Done! \nResponse: " << response << std::endl;
     } catch (const AppwriteException& ex) {
         std::cerr << "Exception: " << ex.what() << std::endl;
diff --git a/examples/health/getStorageLocal.cpp b/examples/health/getStorageLocal.cpp
@@ -4,14 +4,10 @@
 int main() {
     std::string projectId = "66fbb5a100070a3a1d19";
     std::string apiKey = "";
-
-    Appwrite appwrite(projectId);
-    Health& health = appwrite.getHealth();
+    Appwrite appwrite(projectId, apiKey);
     
-    health.setup(apiKey, projectId);
-
     try {
-        std::string response = health.getStorageLocal();
+        std::string response = appwrite.getHealth().getStorageLocal();
         std::cout << "Health Check Done! \nResponse: " << response << std::endl;
     } catch (const AppwriteException& ex) {
         std::cerr << "Exception: " << ex.what() << std::endl;
diff --git a/examples/health/getTime.cpp b/examples/health/getTime.cpp
@@ -3,15 +3,10 @@
 
 int main() {
     std::string projectId = "66fbb5a100070a3a1d19";
-    std::string apiKey = "";
-
     Appwrite appwrite(projectId);
-    Health& health = appwrite.getHealth();
-    
-    health.setup(apiKey, projectId);
-
+  
     try {
-        std::string response = health.getTime();
+        std::string response = appwrite.getHealth().getTime();
         std::cout << "Health Check Done! \nResponse: " << response << std::endl;
     } catch (const AppwriteException& ex) {
         std::cerr << "Exception: " << ex.what() << std::endl;
diff --git a/examples/health/params/getCertificate.cpp b/examples/health/params/getCertificate.cpp
@@ -3,16 +3,12 @@
 
 int main() {
     std::string projectId = "66fbb5a100070a3a1d19";
-    std::string apiKey = "";
     std::string domain = "pooranjoyb.tech";
-
-    Appwrite appwrite(projectId);
-    Health& health = appwrite.getHealth();
-    
-    health.setup(apiKey, projectId);
+    std::string apiKey = "";
+    Appwrite appwrite(projectId, apiKey);
 
     try {
-        std::string response = health.getCertificate(domain);
+        std::string response = appwrite.getHealth().getCertificate(domain);
         std::cout << "Health Check Done! \nResponse: " << response << std::endl;
     } catch (const AppwriteException& ex) {
         std::cerr << "Exception: " << ex.what() << std::endl;
diff --git a/examples/health/params/getQueueBuilds.cpp b/examples/health/params/getQueueBuilds.cpp
@@ -3,16 +3,12 @@
 
 int main() {
     std::string projectId = "66fbb5a100070a3a1d19";
-    std::string apiKey = "";
     std::string threshold = "5";
-
-    Appwrite appwrite(projectId);
-    Health& health = appwrite.getHealth();
+    std::string apiKey = "";
+    Appwrite appwrite(projectId, apiKey);
     
-    health.setup(apiKey, projectId);
-
     try {
-        std::string response = health.getQueueBuilds(threshold);
+        std::string response = appwrite.getHealth().getQueueBuilds(threshold);
         std::cout << "Health Check Done! \nResponse: " << response << std::endl;
     } catch (const AppwriteException& ex) {
         std::cerr << "Exception: " << ex.what() << std::endl;
diff --git a/examples/health/params/getQueueCertificates.cpp b/examples/health/params/getQueueCertificates.cpp
@@ -3,16 +3,12 @@
 
 int main() {
     std::string projectId = "66fbb5a100070a3a1d19";
-    std::string apiKey = "";
     std::string threshold = "5";
-
-    Appwrite appwrite(projectId);
-    Health& health = appwrite.getHealth();
+    std::string apiKey = "";
+    Appwrite appwrite(projectId, apiKey);
     
-    health.setup(apiKey, projectId);
-
     try {
-        std::string response = health.getQueueCertificates(threshold);
+        std::string response = appwrite.getHealth().getQueueCertificates(threshold);
         std::cout << "Health Check Done! \nResponse: " << response << std::endl;
     } catch (const AppwriteException& ex) {
         std::cerr << "Exception: " << ex.what() << std::endl;
diff --git a/examples/health/params/getQueueFunctions.cpp b/examples/health/params/getQueueFunctions.cpp
@@ -3,16 +3,12 @@
 
 int main() {
     std::string projectId = "66fbb5a100070a3a1d19";
-    std::string apiKey = "";
     std::string threshold = "5";
-
-    Appwrite appwrite(projectId);
-    Health& health = appwrite.getHealth();
+    std::string apiKey = "";
+    Appwrite appwrite(projectId, apiKey);
     
-    health.setup(apiKey, projectId);
-
     try {
-        std::string response = health.getQueueFunctions(threshold);
+        std::string response = appwrite.getHealth().getQueueFunctions(threshold);
         std::cout << "Health Check Done! \nResponse: " << response << std::endl;
     } catch (const AppwriteException& ex) {
         std::cerr << "Exception: " << ex.what() << std::endl;
diff --git a/examples/health/params/getQueueMails.cpp b/examples/health/params/getQueueMails.cpp
@@ -3,16 +3,12 @@
 
 int main() {
     std::string projectId = "66fbb5a100070a3a1d19";
-    std::string apiKey = "";
     std::string threshold = "5";
-
-    Appwrite appwrite(projectId);
-    Health& health = appwrite.getHealth();
+    std::string apiKey = "";
+    Appwrite appwrite(projectId, apiKey);
     
-    health.setup(apiKey, projectId);
-
     try {
-        std::string response = health.getQueueMails(threshold);
+        std::string response = appwrite.getHealth().getQueueMails(threshold);
         std::cout << "Health Check Done! \nResponse: " << response << std::endl;
     } catch (const AppwriteException& ex) {
         std::cerr << "Exception: " << ex.what() << std::endl;
diff --git a/examples/health/params/getQueueMessaging.cpp b/examples/health/params/getQueueMessaging.cpp
@@ -3,16 +3,12 @@
 
 int main() {
     std::string projectId = "66fbb5a100070a3a1d19";
-    std::string apiKey = "";
     std::string threshold = "5";
-
-    Appwrite appwrite(projectId);
-    Health& health = appwrite.getHealth();
+    std::string apiKey = "";
+    Appwrite appwrite(projectId, apiKey);
     
-    health.setup(apiKey, projectId);
-
     try {
-        std::string response = health.getQueueMessaging(threshold);
+        std::string response = appwrite.getHealth().getQueueMessaging(threshold);
         std::cout << "Health Check Done! \nResponse: " << response << std::endl;
     } catch (const AppwriteException& ex) {
         std::cerr << "Exception: " << ex.what() << std::endl;
diff --git a/examples/health/params/getQueueMigrations.cpp b/examples/health/params/getQueueMigrations.cpp
@@ -3,16 +3,12 @@
 
 int main() {
     std::string projectId = "66fbb5a100070a3a1d19";
-    std::string apiKey = "";
     std::string threshold = "5";
-
-    Appwrite appwrite(projectId);
-    Health& health = appwrite.getHealth();
-    
-    health.setup(apiKey, projectId);
+    std::string apiKey = "";
+    Appwrite appwrite(projectId, apiKey);
 
     try {
-        std::string response = health.getQueueMigrations(threshold);
+        std::string response = appwrite.getHealth().getQueueMigrations(threshold);
         std::cout << "Health Check Done! \nResponse: " << response << std::endl;
     } catch (const AppwriteException& ex) {
         std::cerr << "Exception: " << ex.what() << std::endl;
diff --git a/examples/health/params/getQueueUsageDump.cpp b/examples/health/params/getQueueUsageDump.cpp
@@ -3,16 +3,12 @@
 
 int main() {
     std::string projectId = "66fbb5a100070a3a1d19";
-    std::string apiKey = "";
     std::string threshold = "5";
-
-    Appwrite appwrite(projectId);
-    Health& health = appwrite.getHealth();
+    std::string apiKey = "";
+    Appwrite appwrite(projectId, apiKey);
     
-    health.setup(apiKey, projectId);
-
     try {
-        std::string response = health.getQueueUsageDump(threshold);
+        std::string response = appwrite.getHealth().getQueueUsageDump(threshold);
         std::cout << "Health Check Done! \nResponse: " << response << std::endl;
     } catch (const AppwriteException& ex) {
         std::cerr << "Exception: " << ex.what() << std::endl;
diff --git a/examples/health/params/getQueueUsageWebhooks.cpp b/examples/health/params/getQueueUsageWebhooks.cpp
@@ -3,16 +3,12 @@
 
 int main() {
     std::string projectId = "66fbb5a100070a3a1d19";
-    std::string apiKey = "";
     std::string threshold = "5";
-
-    Appwrite appwrite(projectId);
-    Health& health = appwrite.getHealth();
+    std::string apiKey = "";
+    Appwrite appwrite(projectId, apiKey);
     
-    health.setup(apiKey, projectId);
-
     try {
-        std::string response = health.getQueueUsageWebhooks(threshold);
+        std::string response = appwrite.getHealth().getQueueUsageWebhooks(threshold);
         std::cout << "Health Check Done! \nResponse: " << response << std::endl;
     } catch (const AppwriteException& ex) {
         std::cerr << "Exception: " << ex.what() << std::endl;
diff --git a/include/classes/Health.hpp b/include/classes/Health.hpp
@@ -11,7 +11,7 @@ class Health {
     Health(const std::string& projectId, const std::string& apiKey);
 
     // core
-    std::string getHealth();
+    std::string getHealthStatus();
     std::string getAntivirus();
     std::string getCache();
     std::string getDB();
diff --git a/src/services/Health.cpp b/src/services/Health.cpp
@@ -10,7 +10,7 @@
 Health::Health(const std::string& projectId, const std::string& apiKey)
     : projectId(projectId), apiKey(apiKey) {}
 
-std::string Health::getHealth(){
+std::string Health::getHealthStatus(){
 
     std::string url = Config::API_BASE_URL + "/health";
 
diff --git a/tests/health/getDB b/tests/health/getDB
diff --git a/tests/health/getHealth b/tests/health/getHealth
diff --git a/tests/health/getPubSub b/tests/health/getPubSub
