ZReviewTender 1.3.1 → 1.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c8aa61d9df145edfd0173d98b25bb14d808cbdfc245d0e98b6bbbd8a93252d40
-  data.tar.gz: e9179552c2ee27f447dffd6bad8719e74d5d4081943a6c77e8a95f0347afbdd9
+  metadata.gz: 8e59afd752f35d64b4d0f5c3b6958aa53231f79a13e7b6a95e48329af5af5244
+  data.tar.gz: f8f3ed908946b3d719b41c471388282de7eeb9d6f364bd71bfd576f907e3d6af
 SHA512:
-  metadata.gz: 2470ca04e3802dcd49092a5faf86a606655cfe69dd9077baa05bacc07688d3ca8ddb33fd69aa97f377a46c177be7a86ad4e2cac92184e3510c1500882472785a
-  data.tar.gz: acbb5ea1d6c87f91bdd7de77160c97c3da9e6733ccc89bee64510f9c66500e476113a1f89886e29eb9e5e42ec49b0a9aa366a8ab2cad120995a4b4887d7136b4
+  metadata.gz: 82aa507c9a3f5d5f07d5b1ff853102d7f80e97d476d3903a4ea03126c71a3660fb3f5685773429c4a2d4a3ca4413e1d28e27c606f9c7531ecdd76da6739cd834
+  data.tar.gz: 7709b79e8a7b2f3c2ddff3ded887d4e9f3ccf5ca1a0852799bd6eb61b006dba656e1fb854d0b73b0ed425243c98131e485aea8fe7044f3b948b32e2cec59461f

data/.version

@@ -1 +1 @@
-1.3.1
+1.3.3

data/lib/AndroidFetcher.rb

@@ -39,6 +39,11 @@ class AndroidFetcher < ReviewFetcher
             reviewsInfoLink = reviewsInfo&.dig("tokenPagination", "nextPageToken")
 
             customerReviews = reviewsInfo["reviews"]
+
+            if customerReviews.nil?
+                break
+            end
+
             puts "[AndroidFetcher] Fetch reviews in #{config.packageName}, count: #{customerReviews.length}"
             customerReviews.each do |customerReview|
 

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,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ZReviewTender
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.3.3
 platform: ruby
 authors:
 - ZhgChgLi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-08-20 00:00:00.000000000 Z
+date: 2022-10-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-http
@@ -38,34 +38,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 2.4.1
-- !ruby/object:Gem::Dependency
-  name: google-cloud-translate-v2
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.3.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.3.0
-- !ruby/object:Gem::Dependency
-  name: google-apis-androidpublisher_v3
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.25.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.25.0
 description: ZReviewTender - App Reviews Automatic Bot
 email: 
 executables: