ZReviewTender 1.3.1 → 1.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c8aa61d9df145edfd0173d98b25bb14d808cbdfc245d0e98b6bbbd8a93252d40
-  data.tar.gz: e9179552c2ee27f447dffd6bad8719e74d5d4081943a6c77e8a95f0347afbdd9
+  metadata.gz: 42b1c7196a1088ba1af0ea680c1fe89b41daa91be09c137f3b9ab61d1b775501
+  data.tar.gz: d9d29e7dca76fde9d957cbc8360726baa925f25cf232e918b045d68c8d2206e1
 SHA512:
-  metadata.gz: 2470ca04e3802dcd49092a5faf86a606655cfe69dd9077baa05bacc07688d3ca8ddb33fd69aa97f377a46c177be7a86ad4e2cac92184e3510c1500882472785a
-  data.tar.gz: acbb5ea1d6c87f91bdd7de77160c97c3da9e6733ccc89bee64510f9c66500e476113a1f89886e29eb9e5e42ec49b0a9aa366a8ab2cad120995a4b4887d7136b4
+  metadata.gz: 4181c131a12529197907e3859577169e029dfafb52d49f3d2e91e1352a4a549b331a7a0c621bf9a9243af9c51922b704ef94dd5e3b9030f05753f1a30be1820a
+  data.tar.gz: 5a23d413b5e4ed62d302eeecbff51d90df24b254060aca00f5542ada623a4332d3771ca068971561c51ca390be32ea4325f8c2491ac989d2cea4e717683aae25

data/.version

@@ -1 +1 @@
-1.3.1
+1.3.2

data/lib/GoogleAPI.rb

@@ -45,14 +45,21 @@ class GoogleAPI < Processor
         result = JSON.parse(response)
 
         if !result["error"].nil?
-            if retryCount >= 10
-                raise "Could not connect to #{tokenURI}, key id: #{keyID}, error message: #{response}"
+            # Quota exceeded for quota metric 'Write requests' and limit 'Write requests per minute per user
+            if result["error"]["code"] == 429
+                puts "[GoogleAPI] Reached Rate Limited, sleep 30 secs..."
+                sleep(30)
+                return request(url, method, data, 0)
             else
-                @token = generateJWT()
-                message = "JWT Invalid, retry. (#{retryCount + 1})"
-                logger.logWarn(message)
-                puts "[GoogleAPI] #{message}"
-                return request(url, method, data, retryCount + 1)
+                if retryCount >= 10
+                    raise "Could not connect to #{tokenURI}, key id: #{keyID}, error message: #{response}"
+                else
+                    @token = generateJWT()
+                    message = "JWT Invalid, retry. (#{retryCount + 1})"
+                    logger.logWarn(message)
+                    puts "[GoogleAPI] #{message}"
+                    return request(url, method, data, retryCount + 1)
+                end
             end
         else
             return result

data/lib/Processors/GoogleSheetProcessor.rb

@@ -73,6 +73,7 @@ class GoogleSheetProcessor < Processor
             end
         end
 
+        values = []
         filterReviews.each do |review|
             cols = []
             formatValues.each do |formatValue|
@@ -89,10 +90,15 @@ class GoogleSheetProcessor < Processor
 
                 cols.append(formatValue)
             end
-            
-            puts "[GoogleSheetProcessor] insert #{cols} to #{sheetID}-#{sheetName}"
+            values.append(cols)
+        end
 
-            googleAPI.request("https://sheets.googleapis.com/v4/spreadsheets/#{sheetID}/values/#{sheetName}:append?valueInputOption=RAW", "POST", {:values => [cols]})
+        page = 1
+        limit = 500
+        values.each_slice(limit) do |value|
+            puts "[GoogleSheetProcessor] Insert rows(#{page}/#{(values.length/limit).ceil + 1}) to #{sheetID}-#{sheetName}"
+            page += 1
+            googleAPI.request("https://sheets.googleapis.com/v4/spreadsheets/#{sheetID}/values/#{sheetName}!A1:append?valueInputOption=RAW", "POST", {:values => value})
         end
 
         return reviews

data/lib/Processors/SlackProcessor.rb

@@ -82,6 +82,7 @@ class SlackProcessor < Processor
                 logger.logError(payload)
                 logger.logError(result)
                 if result[:message] == "ratelimited"
+                    puts "[SlackProcessor] Reached Rate Limited, sleep 1 sec..."
                     sleep(1)
                     pendingPayloads.insert(0, payload)
                 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ZReviewTender
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.3.2
 platform: ruby
 authors:
 - ZhgChgLi