Merge pull request #49 from hurricanemark/Phase2-BaselineToSeriousWorks

Phase2 baseline to serious works
hurricanemark · Nov 7, 2022 · 294e86c · 294e86c
2 parents 227b7fb + 145f8e3
commit 294e86c
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 3 deletions.
diff --git a/index.js b/index.js
@@ -277,12 +277,15 @@ function getWeatherBitDailyForecast(city){
       // console.log(uriWeatherBitStr);
       try {
         request(uriWeatherBitStr, async function (err, response, body) {
-          console.log(response.statusCode);
-
           if (response.statusCode == 429) {
             console.log("WARNING: You have exceeded your API call limit with weatherbit.io!");
             resolve(null);
           }
+          if (response.statusCode == 403) {
+            console.log("WARNING: Free plan limit is used up.  Data will be available again on the 3rd of next month.");
+            retCode = JSON.parse(body);
+            resolve(retCode);
+          }
           if (response.statusCode == 200) {
             retCode = await JSON.parse(body);
             resolve(retCode);
@@ -362,8 +365,12 @@ async function gatherWeatheBits(city) {
   ]);
 
 
+  // Check is the service trial expired
+  if (dailyForecast.error === 'API key not valid, or not yet activated.') {
+    return { locale: city, alertStatus: 403, alertData: null, curStatus: 403, curData: null, foreStatus: 403, foreData: null, airqStatus: 403, airqData: null, error: 'Free plan has reached its limit.  Data will be available again on the 3rd of next month.' };    
+  } 
   // Make sure all promisses fulfilled.
-  if (dailyForecast  !== null && alerts !== null && airQuality !== null && currentConditions !== null ) {
+  else if (dailyForecast  !== null && alerts !== null && airQuality !== null && currentConditions !== null ) {
     let currentHour = new Date().getHours(); 
     let aStatus = 200;
     let aData = alerts;

diff --git a/views/pages/weatherbit.ejs b/views/pages/weatherbit.ejs
@@ -31,6 +31,8 @@
         <div class="jumbotron jumbotron-fluid" style="padding:10px 5px 15px 20px;">
           <% if( typeof(error)==="undefined" || curStatus===400 ){ %>
             <p style="color:gray"> Waiting for data.</p>
+            <% } else if ( typeof(error)!="undefined" && curStatus===403 ) { %>
+              <p style="color:gray">We apologize.  <%= error %></p>
             <% } else { %>
 
               <p style="color:gray"><strong>City</strong>: <%= curData.city_name %> , <%= curData.state_code %>
@@ -122,8 +124,11 @@
       <div class="col-sm-6">
           <h5>Current Air Quality</h5>
           <div class="jumbotron jumbotron-fluid" style="padding:10px 5px 15px 20px;">
+
             <% if( typeof(error)==="undefined" || airqStatus===400 ) { %>
               <p style="color:gray"> Waiting for data.</p>
+            <% } else if ( typeof(error)!="undefined" && airqStatus===403 ) { %>
+                <p style="color:gray"> <%= error %></p>
               <% } else { %>
                 <p style="color:gray"><strong>Local hourly</strong>: <%= airqData.timestamp_local.split('T')[1] %> 
                 </p>     
@@ -222,6 +227,8 @@
         <div class="jumbotron jumbotron-fluid"  style="padding:10px 5px 15px 20px; overflow-x:auto;">
           <% if( typeof(error)==="undefined" || foreStatus===400 ){ %>
             <p style="color:gray"> Waiting for data.</p>
+            <% } else if ( typeof(error)!="undefined" && foreStatus===403 ) { %>
+              <p style="color:gray"> <%= error %></p>            
             <% } else { %>
               <div style="color:rgb(18, 83, 175);"><%= trendingTemperature(foreData.data) %></div>
               <table class="styled-table">