Convert functions to use the APIResponse class to manage responses fr…

…om API.
opengamedata · Jun 5, 2024 · 70a63a4 · 70a63a4
1 parent f8a3ee1
commit 70a63a4
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 7 deletions.
diff --git a/site/gamedata.php b/site/gamedata.php
@@ -2,6 +2,7 @@
 
 require_once 'includes/app_config.php';
 require_once 'includes/services.php';
+require_once 'models/APIResponse.php';
 require_once 'models/game.php';
 require_once 'models/game_file_info.php';
 require_once 'components/pipeline_button.php';
@@ -45,10 +46,12 @@
     $response_obj = services\getGameFileInfoByMonth($game_id);
 
     if (isset($response_obj)) {
-        if ($response_obj->{'status'} == "SUCCESS") {
-            $game_files = GameFileInfo::fromObj($response_obj->{'val'});
+        $api_response = APIResponse::fromObj($response_obj);
+
+        if ($api_response->Status() == "SUCCESS") {
+            $game_files = GameFileInfo::fromObj($api_response->Value());
             if (!isset($game_files) || $game_files == null) {
-                $err_str = "Got empty game_files from request that had status=".$response_obj->{'status'}." and val=".json_encode($response_obj->{'val'});
+                $err_str = "Got empty game_files from request that had status=".$api_response->Status()." and val=".json_encode($api_response->Value());
                 error_log($err_str);
             }
 
@@ -79,7 +82,7 @@
             $feature_files = $game_files->getFeatureFiles() ? $game_files->getFeatureFiles(): [];
         }
         else {
-            $err_str = "getGameFileInfoByMonth request, with year=null and month=null, was unsuccessful:\n".$response_obj->{'msg'}."\nDamn, maybe the authors shouldn't have written in a request for a specific month's data, but failed to supply a month! Who'd have thought?!?";
+            $err_str = "getGameFileInfoByMonth request, with year=null and month=null, was unsuccessful:\n".$api_response->Message()."\nDamn, maybe the authors shouldn't have written in a request for a specific month's data, but failed to supply a month! Who'd have thought?!?";
             error_log($err_str);
         }
     }

diff --git a/site/index.php b/site/index.php
@@ -2,6 +2,7 @@
 
 require_once 'includes/app_config.php';
 require_once 'includes/services.php';
+require_once 'models/APIResponse.php';
 require_once 'models/game.php';
 require_once 'models/game_usage.php';
 require_once 'models/game_card.php';
@@ -18,11 +19,12 @@
     $response_obj = services\getGameUsage($key);
     $game_usage = null;
     if (isset($response_obj)) {
-        if ($response_obj->{'status'} == "SUCCESS") {
-            $game_usage = GameUsage::fromObj($response_obj->{'val'});
+        $api_response = APIResponse::fromObj($response_obj);
+        if ($api_response->Status() == "SUCCESS") {
+            $game_usage = GameUsage::fromObj($api_response->Value());
         }
         else {
-            $err_str = "getGameUsage request, with game id=".$key.", was unsuccessful:\n".$response_obj->{'msg'};
+            $err_str = "getGameUsage request, with game id=".$key.", was unsuccessful:\n".$api_response->Message();
             error_log($err_str);
         }
     }