ZReviewTender 1.2.7 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d2943cc5872e966ed140f7300a31570056b8d11a08c24ef3f3e7af07612ebfa1
-  data.tar.gz: 7f6c610e0f1277d71f89d7678e754e9ae543865dd0942f1a2b77d40606f35538
+  metadata.gz: c8aa61d9df145edfd0173d98b25bb14d808cbdfc245d0e98b6bbbd8a93252d40
+  data.tar.gz: e9179552c2ee27f447dffd6bad8719e74d5d4081943a6c77e8a95f0347afbdd9
 SHA512:
-  metadata.gz: 5ef30f02a3719a92277a2b4014f0cc074927aad1e3fe0466a4e1e2352baed8244a160d1800a7e188740357219e566389befb8f088d9deae6d02a933914ee7871
-  data.tar.gz: 5605793e165c0fc01c8ff1aa635eb7dda2c5894f75e590b03e44e6194d4ce5b237e50506925bc1a100dea887adc3369e95bc36f920b02d1c315e530acb507c8e
+  metadata.gz: 2470ca04e3802dcd49092a5faf86a606655cfe69dd9077baa05bacc07688d3ca8ddb33fd69aa97f377a46c177be7a86ad4e2cac92184e3510c1500882472785a
+  data.tar.gz: acbb5ea1d6c87f91bdd7de77160c97c3da9e6733ccc89bee64510f9c66500e476113a1f89886e29eb9e5e42ec49b0a9aa366a8ab2cad120995a4b4887d7136b4

data/.version

@@ -1 +1 @@
-1.2.7
+1.3.1

data/config/android.example.yml

@@ -1,6 +1,6 @@
 platform: 'android'
 packageName: '' # Android App Package Name
-keyFilePath: '' # Google Android Publisher API Credential .json File Path
+keyFilePath: '' # Google Android Publisher API Service Account Credential .json File Path
 playConsoleDeveloperAccountID: '' # Google Console Developer Account ID
 playConsoleAppID: '' # Google Console App ID
 processors:
@@ -13,7 +13,7 @@ processors:
     - GoogleTranslateProcessor: # Google Translate Processor, will translate review text to your language, you can remove whole block if you don't needed it.
         class: "GoogleTranslateProcessor"
         enable: false # enable
-        googleTranslateAPIKeyFilePath: '' # Google Translate API Credential .json File Path
+        googleTranslateAPIKeyFilePath: '' # Google Translate API Service Account Credential .json File Path
         googleTranslateTargetLang: 'zh-TW' # Translate to what Language
         googleTranslateTerritoriesExclude: ["zh-Hant","zh-Hans"] # Review origin Territory (language) that you don't want to translate. (language for android e.g. zh-Hant, en)
     - SlackProcessor: # Slack Processor, resend App Review to Slack.
@@ -24,3 +24,25 @@ processors:
         slackBotToken: "" # Slack Bot Token, send slack message throught Slack Bot.
         slackBotTargetChannel: "" # Slack Bot Token, send slack message throught Slack Bot. (recommended, first priority)
         slackInCommingWebHookURL: "" # Slack In-Comming WebHook URL, Send slack message throught In-Comming WebHook, not recommended, deprecated.
+    - GoogleSheetProcessor: # Google Sheet Processor, log review to google sheet
+        class: "GoogleSheetProcessor"
+        enable: false # enable
+        googleSheetAPIKeyFilePath: "" # Google Translate API Service Account Credential .json File Path
+        googleSheetTimeZoneOffset: "+08:00" # Review Created Date TimeZone
+        googleSheetID: "" # Google Sheet ID, you can get it on google sheet url: e.g. https://docs.google.com/spreadsheets/d/googleSheetID/
+        googleSheetName: "Sheet1" # Sheet Name
+        values: ["%RATING%","%TITLE%\n%BODY%","%APPVERSION%","%CREATEDDATE%"] # Columns Data, you can uses magic variable below to compose string.
+        # %TITLE% for review's title
+        # %BODY% for review's content
+        # %RATING% for review's rating 1~5
+        # %PLATFORM% for review's platform Apple or Android
+        # %ID% for review's ID
+        # %USERNAME% for review's reviewer username
+        # %URL% for link to review
+        # %TERRITORY% for review's territory (language for android e.g. zh-Hant, en)
+        # %APPVERSION% for review's reviewer app version
+        # %CREATEDDATE% for review's created date
+        
+        keywordsInclude: [] # keywords you want to filter out
+        ratingsInclude: [] # ratings you want to filter out
+        territoriesInclude: [] # territories you want to filter out(language for android e.g. zh-Hant, en)

data/config/apple.example.yml

@@ -9,13 +9,13 @@ processors:
         enable: true # enable
         keywordsInclude: [] # keywords you want to filter out
         ratingsInclude: [] # ratings you want to filter out
-        territoriesInclude: [] # territories you want to filter out
+        territoriesInclude: [] # territories you want to filter out (territory for Apple e.g. TWN)
     - GoogleTranslateProcessor: # Google Translate Processor, will translate review text to your language, you can remove whole block if you don't needed it.
         class: "GoogleTranslateProcessor"
         enable: false # enable
-        googleTranslateAPIKeyFilePath: '' # Google Translate API Credential .json File Path
+        googleTranslateAPIKeyFilePath: '' # Google Translate API Service Account Credential .json File Path
         googleTranslateTargetLang: 'zh-TW' # Translate to what Language
-        googleTranslateTerritoriesExclude: ["TWN","CHN"] # Review origin Territory that you don't want to translate.
+        googleTranslateTerritoriesExclude: ["TWN","CHN"] # Review origin Territory that you don't want to translate. (territory for Apple e.g. TWN)
     - SlackProcessor: # Slack Processor, resend App Review to Slack.
         class: "SlackProcessor"
         enable: true # enable
@@ -24,3 +24,25 @@ processors:
         slackBotToken: "" # Slack Bot Token, send slack message throught Slack Bot.
         slackBotTargetChannel: "" # Slack Bot Token, send slack message throught Slack Bot. (recommended, first priority)
         slackInCommingWebHookURL: "" # Slack In-Comming WebHook URL, Send slack message throught In-Comming WebHook, not recommended, deprecated.
+    - GoogleSheetProcessor: # Google Sheet Processor, log review to google sheet
+        class: "GoogleSheetProcessor"
+        enable: false # enable
+        googleSheetAPIKeyFilePath: "" # Google Translate API Service Account Credential .json File Path
+        googleSheetTimeZoneOffset: "+08:00" # Review Created Date TimeZone
+        googleSheetID: "" # Google Sheet ID, you can get it on google sheet url: e.g. https://docs.google.com/spreadsheets/d/googleSheetID/
+        googleSheetName: "Sheet1" # Sheet Name
+        values: ["%RATING%","%TITLE%\n%BODY%","%APPVERSION%","%CREATEDDATE%"] # Columns Data, you can uses magic variable below to compose string.
+        # %TITLE% for review's title
+        # %BODY% for review's content
+        # %RATING% for review's rating 1~5
+        # %PLATFORM% for review's platform Apple or Android
+        # %ID% for review's ID
+        # %USERNAME% for review's reviewer username
+        # %URL% for link to review
+        # %TERRITORY% for review's territory (territory for Apple e.g. TWN)
+        # %APPVERSION% for review's reviewer app version
+        # %CREATEDDATE% for review's created date
+        
+        keywordsInclude: [] # keywords you want to filter out
+        ratingsInclude: [] # ratings you want to filter out
+        territoriesInclude: [] # territories you want to filter out (territory for Apple e.g. TWN)

data/lib/AndroidFetcher.rb

@@ -1,22 +1,20 @@
 $lib = File.expand_path('../lib', File.dirname(__FILE__))
 
-require "Models/Review"
 require "Helper"
+require "GoogleAPI"
+require "Models/Review"
 require "Models/ReviewFetcher"
-require "time"
-require "google/apis/androidpublisher_v3"
 
 class AndroidFetcher < ReviewFetcher
 
-    attr_accessor :token, :client
+    attr_accessor :token, :googleAPI
 
     def initialize(config)
         @processors = []
         @config = config
         @platform = 'Android'
-
-        @client = Google::Apis::AndroidpublisherV3::AndroidPublisherService.new
-        @client.authorization = Google::Auth::ServiceAccountCredentials.make_creds(json_key_io: config.keyContent, scope: 'https://www.googleapis.com/auth/androidpublisher')
+        @logger = ZLogger.new(config.baseExecutePath)
+        @googleAPI = GoogleAPI.new(config.keyFilePath, config.baseExecutePath, ["https://www.googleapis.com/auth/androidpublisher"])
 
         puts "[AndroidFetcher] Init Success."
     end
@@ -28,43 +26,106 @@ class AndroidFetcher < ReviewFetcher
         puts "[AndroidFetcher] Start execute(), latestCheckTimestamp: #{latestCheckTimestamp}"
 
         reviews = []
-        
-        # Google API Bug, couldn't specify limit/offse/pagination, google only return a few recent reviews.
-        customerReviews = client.list_reviews(config.packageName).reviews
-        puts "[AndroidFetcher] Fetch reviews in #{config.packageName}, count: #{customerReviews.length}"
-        customerReviews.each do |customerReview|
-
-            customerReviewID = customerReview.review_id
-            customerReviewTitle = nil
-            customerReviewBody = customerReview.comments[0].user_comment.text.strip
-            customerReviewRating = customerReview.comments[0].user_comment.star_rating.to_i
-            customerReviewReviewerNickname = customerReview.author_name
-            customerReviewCreatedDateTimestamp = customerReview.comments[0].user_comment.last_modified.seconds.to_i
-            customerReviewTerritory = customerReview.comments[0].user_comment.reviewer_language
-            customerReviewVersionString = "unknown"
-            if !customerReview.comments[0].user_comment.app_version_name.nil?
-                customerReviewVersionString = "#{customerReview.comments[0].user_comment.app_version_name}"
-                if !customerReview.comments[0].user_comment.app_version_code.nil?
-                    customerReviewVersionString = "#{customerReviewVersionString}(#{customerReview.comments[0].user_comment.app_version_code})"
+
+        reviewsInfoLink = "https://androidpublisher.googleapis.com/androidpublisher/v3/applications/#{config.packageName}/reviews"
+
+        # Note: You can retrieve only the reviews that users have created or modified within the last week. 
+        # https://developers.google.com/android-publisher/reply-to-reviews#retrieving_a_set_of_reviews
+
+        puts "[AndroidFetcher] Fetch reviews in #{config.packageName}"
+
+        loop do
+            reviewsInfo = googleAPI.request(reviewsInfoLink)
+            reviewsInfoLink = reviewsInfo&.dig("tokenPagination", "nextPageToken")
+
+            customerReviews = reviewsInfo["reviews"]
+            puts "[AndroidFetcher] Fetch reviews in #{config.packageName}, count: #{customerReviews.length}"
+            customerReviews.each do |customerReview|
+
+                customerReviewID = customerReview&.dig("reviewId")
+                customerReviewTitle = nil
+                customerReviewReviewerNickname = customerReview&.dig("authorName")
+                customerReviewVersionString = "unknown"
+                customerReviewPlatform = platform
+                customerReviewCreatedDateTimestamp = 0
+                
+                comment = customerReview&.dig("comments", 0, "userComment")
+                if !comment.nil?
+                    customerReviewBody = comment&.dig("text")
+                    customerReviewTerritory = comment&.dig("reviewerLanguage")
+
+                    if !customerReviewBody.nil?
+                        customerReviewBody = customerReviewBody.strip
+                    end
+
+                    customerReviewRating = comment&.dig("starRating")
+                    if !customerReviewRating.nil?
+                        customerReviewRating = customerReviewRating.to_i
+                    end
+
+                    customerReviewCreatedDateTimestamp = comment&.dig("lastModified", "seconds")
+                    if !customerReviewCreatedDateTimestamp.nil?
+                        customerReviewCreatedDateTimestamp = customerReviewCreatedDateTimestamp.to_i
+                    end
+
+                    androidOSVersion = comment&.dig("androidOsVersion")
+                    if !androidOSVersion.nil?
+                        customerReviewPlatform = "#{platform} #{androidOSVersion}"
+                    end
+
+                    versionString = comment&.dig("appVersionName")
+                    if !versionString.nil?
+                        customerReviewVersionString = "#{versionString}"
+
+                        versionCode = comment&.dig("appVersionCode")
+                        if !versionCode.nil?
+                            customerReviewVersionString = "#{customerReviewVersionString}(#{versionCode})"
+                        end
+                    end
+
+                    deviceInfo = []
+                    manufacturer = comment&.dig("deviceMetadata", "manufacturer")
+                    if !manufacturer.nil?
+                        deviceInfo.append(manufacturer)
+                    end
+
+                    productName = comment&.dig("deviceMetadata", "productName")
+                    if !productName.nil?
+                        deviceInfo.append(productName)
+                    end
+
+                    if deviceInfo.length > 0
+                        customerReviewReviewerNickname = "#{customerReviewReviewerNickname} - #{deviceInfo.join("/")}"
+                    end
+                end
+
+                if latestCheckTimestamp >= customerReviewCreatedDateTimestamp
+                    reviewsInfoLink = nil
+                    break
+                else
+                    url = "https://play.google.com/store/apps/details?id=#{config.packageName}&reviewId=#{customerReviewID}"
+                    if !config.accountID.nil? && !config.appID.nil?
+                        url = "https://play.google.com/console/developers/#{config.accountID}/app/#{config.appID}/user-feedback/review-details?reviewId=#{customerReviewID}"
+                    end
+                    reviews.append(Review.new(customerReviewPlatform, customerReviewID, customerReviewReviewerNickname, customerReviewRating, customerReviewTitle, customerReviewBody, customerReviewCreatedDateTimestamp, url, customerReviewVersionString, customerReviewTerritory))
+                    
+                    # init first time, need first review to set as latestCheckTimestamp
+                    if latestCheckTimestamp == 0
+                        reviewsInfoLink = nil
+                        break
+                    end
                 end
             end
-            customerReviewPlatform = "Android #{customerReview.comments[0].user_comment.android_os_version}"
             
-            url = "https://play.google.com/store/apps/details?id=#{config.packageName}&reviewId=#{customerReviewID}"
-            if !config.accountID.nil? && !config.appID.nil?
-                url = "https://play.google.com/console/developers/#{config.accountID}/app/#{config.appID}/user-feedback/review-details?reviewId=#{customerReviewID}"
-            end
-            reviews.append(Review.new(customerReviewPlatform, customerReviewID, customerReviewReviewerNickname, customerReviewRating, customerReviewTitle, customerReviewBody, customerReviewCreatedDateTimestamp, url, customerReviewVersionString, customerReviewTerritory))
+            break if reviewsInfoLink.nil?
         end
 
-        reviews = reviews.reject{ |review| latestCheckTimestamp >= review.createdDateTimestamp }.sort! { |a, b|  a.createdDateTimestamp <=> b.createdDateTimestamp }
-        
-        puts "[AndroidFetcher] latest reviews count: #{reviews.length}"
+        puts "[AndroidFetcher] Fetch reviews in #{config.packageName}, total reviews count: #{reviews.length}"
 
         if reviews.length > 0
+            reviews = reviews.sort! { |a, b|  a.createdDateTimestamp <=> b.createdDateTimestamp }
 
             puts "[AndroidFetcher] latest review: #{reviews.last.body}, #{reviews.last.createdDateTimestamp}"
-            
             setPlatformLatestCheckTimestamp(reviews.last.createdDateTimestamp)
 
             # init first time, send welcome message

data/lib/AppleFetcher.rb

@@ -175,7 +175,8 @@ class AppleFetcher < ReviewFetcher
             exp: Time.now.to_i + 60*20,
             aud: 'appstoreconnect-v1'
         }
-        token = JWT.encode payload, config.keyContent, 'ES256', header_fields={kid:config.keyID, typ:"JWT"}
+        
+        return JWT.encode payload, config.keyContent, 'ES256', header_fields={kid:config.keyID, typ:"JWT"}
     end
 
     private

data/lib/GoogleAPI.rb

@@ -0,0 +1,99 @@
+$lib = File.expand_path('../lib', File.dirname(__FILE__))
+
+require "jwt"
+require "time"
+
+class GoogleAPI < Processor
+
+    attr_accessor :keyContent, :keyID, :tokenURI, :clientEmail, :logger, :scopes, :token
+
+    def initialize(keyFilePath, baseExecutePath, scopes = [])
+
+        @logger = ZLogger.new(baseExecutePath)
+
+        keyFileContent = JSON.parse(File.read(keyFilePath))
+
+        @keyContent = Helper.unwrapRequiredParameter(keyFileContent,"private_key")
+        @keyID = Helper.unwrapRequiredParameter(keyFileContent,"private_key_id")
+        @clientEmail = Helper.unwrapRequiredParameter(keyFileContent,"client_email")
+        @tokenURI = Helper.unwrapRequiredParameter(keyFileContent,"token_uri")
+
+        @scopes = scopes
+
+        @token = generateJWT()
+
+        puts "[GoogleAPI] Init Success."
+    end
+
+    def request(url, method = "GET", data = nil, retryCount = 0)
+        uri = URI(url)
+        https = Net::HTTP.new(uri.host, uri.port)
+        https.use_ssl = true
+        
+        request = Net::HTTP::Get.new(uri)
+        if method.upcase == "POST"
+            request = Net::HTTP::Post.new(uri)
+            if !data.nil?
+                request['Content-Type'] = 'application/json'
+                request.body = JSON.dump(data)
+            end
+        end
+        
+        request['Authorization'] = "Bearer #{token}";
+        
+        response = https.request(request).read_body
+        result = JSON.parse(response)
+
+        if !result["error"].nil?
+            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
+        else
+            return result
+        end
+
+    end
+
+    private
+    def generateJWT(retryCount = 0)
+        payload = {
+            iss: clientEmail,
+            sub: clientEmail,
+            scope: scopes.join(' '),
+            aud: tokenURI,
+            iat: Time.now.to_i,
+            exp: Time.now.to_i + 60*20
+        }
+
+        rsa_private = OpenSSL::PKey::RSA.new(keyContent)
+        token = JWT.encode payload, rsa_private, 'RS256', header_fields = {kid:keyID, typ:"JWT"}
+
+        uri = URI(tokenURI)
+        https = Net::HTTP.new(uri.host, uri.port)
+        https.use_ssl = true
+        request = Net::HTTP::Post.new(uri)
+        request.body = "grant_type=urn%3Aietf%3Aparams%3Aoauth%3Agrant-type%3Ajwt-bearer&assertion=#{token}"
+
+        response = https.request(request).read_body
+        result = JSON.parse(response)
+
+        if result["access_token"].nil?
+            if retryCount >= 10
+                raise "Could not generate google api JWT, key id: #{keyID}, error message: #{response}"
+            else
+                message = "Could not generate google api JWT, retry. (#{retryCount + 1})"
+                logger.logWarn(message)
+                puts "[GoogleAPI] #{message}"
+                return generateJWT(retryCount + 1)
+            end
+        else
+            return result["access_token"]
+        end
+    end
+end

data/lib/Models/AndroidConfig.rb

@@ -5,18 +5,17 @@ require "Helper"
 require "time"
 
 class AndroidConfig
-    attr_accessor :keyContent, :packageName, :accountID, :appID, :baseExecutePath
+    attr_accessor :keyFilePath, :packageName, :accountID, :appID, :baseExecutePath
     def initialize(configYMLObj, configFilePath, baseExecutePath)
-        keyFilePath = Helper.unwrapRequiredParameter(configYMLObj,"keyFilePath")
+        @keyFilePath = Helper.unwrapRequiredParameter(configYMLObj,"keyFilePath")
 
         if Pathname.new(keyFilePath).absolute?
             configDir = File.dirname(configFilePath)
-            keyFilePath = "#{configDir}#{keyFilePath}"
+            @keyFilePath = "#{configDir}#{keyFilePath}"
         end
 
         @accountID = configYMLObj["playConsoleDeveloperAccountID"]
         @appID = configYMLObj["playConsoleAppID"]
-        @keyContent = File.open(keyFilePath)
         @baseExecutePath = baseExecutePath
         @packageName = Helper.unwrapRequiredParameter(configYMLObj,"packageName")
     end

data/lib/Processors/GoogleSheetProcessor.rb

@@ -0,0 +1,100 @@
+$lib = File.expand_path('../lib', File.dirname(__FILE__))
+
+require "Models/Review"
+require "Models/Processor"
+require "Helper"
+require "pathname"
+require "GoogleAPI"
+
+class GoogleSheetProcessor < Processor
+
+    attr_accessor :keywordsInclude, :ratingsInclude, :territoriesInclude, :logger, :googleAPI, :sheetID, :sheetName, :formatValues, :timeZoneOffset
+
+    def initialize(config, configFilePath, baseExecutePath)
+        @config = config
+        @configFilePath = configFilePath
+        @baseExecutePath = baseExecutePath
+        @logger = ZLogger.new(baseExecutePath)
+
+        keyFilePath = Helper.unwrapRequiredParameter(config, "googleSheetAPIKeyFilePath")
+
+        if Pathname.new(keyFilePath).absolute?
+            configDir = File.dirname(configFilePath)
+            keyFilePath = "#{configDir}#{keyFilePath}"
+        end
+
+        @googleAPI = GoogleAPI.new(keyFilePath, baseExecutePath, ["https://www.googleapis.com/auth/drive", "https://www.googleapis.com/auth/drive.file", "https://www.googleapis.com/auth/spreadsheets"])
+
+        @keywordsInclude = []
+        if !config["keywordsInclude"].nil?
+            @keywordsInclude = config["keywordsInclude"]
+        end
+
+        @ratingsInclude = []
+        if !config["ratingsInclude"].nil?
+            @ratingsInclude = config["ratingsInclude"]
+        end
+
+        @territoriesInclude = []
+        if !config["territoriesInclude"].nil?
+            @territoriesInclude = config["territoriesInclude"]
+        end
+
+        @timeZoneOffset = Helper.unwrapRequiredParameter(config, "googleSheetTimeZoneOffset")
+        @sheetID = Helper.unwrapRequiredParameter(config, "googleSheetID")
+        @sheetName = Helper.unwrapRequiredParameter(config, "googleSheetName")
+        @formatValues = []
+        if !config["values"].nil?
+            @formatValues = config["values"]
+        end
+
+        puts "[GoogleSheetProcessor] Init Success."
+    end
+
+    def processReviews(reviews, platform)
+        
+        if reviews.length < 1
+            return reviews
+        end
+
+        filterReviews = reviews
+        
+        if ratingsInclude.length > 0
+            filterReviews = filterReviews.select{ |review| ratingsInclude.map{ |rating| rating.to_i }.include? review.rating }
+        end
+
+        if territoriesInclude.length > 0
+            filterReviews = filterReviews.select{ |review| territoriesInclude.map{ |territory| territory.upcase }.include? review.territory.upcase }
+        end
+
+        if keywordsInclude.length > 0
+            keywordsInclude.select{ |keywordsInclude| keywordsInclude != "" }.each do |keywordInclude|
+                filterReviews = filterReviews.select{ |review| review.body.include? keywordInclude }
+            end
+        end
+
+        filterReviews.each do |review|
+            cols = []
+            formatValues.each do |formatValue|
+                formatValue = formatValue.gsub("%TITLE%", review.title || "")
+                formatValue = formatValue.gsub("%BODY%", review.body || "")
+                formatValue = formatValue.gsub("%RATING%", review.rating.nil? ? "" :review.rating.to_s)
+                formatValue = formatValue.gsub("%PLATFORM%", review.platform || "")
+                formatValue = formatValue.gsub("%ID%", review.id || "")
+                formatValue = formatValue.gsub("%USERNAME%", review.userName || "")
+                formatValue = formatValue.gsub("%URL%", review.url || "")
+                formatValue = formatValue.gsub("%TERRITORY%", review.territory || "")
+                formatValue = formatValue.gsub("%APPVERSION%", review.appVersion || "")
+                formatValue = formatValue.gsub("%CREATEDDATE%", review.createdDateTimestamp.nil? ? "" : Time.at(review.createdDateTimestamp).getlocal(timeZoneOffset).to_s)
+
+                cols.append(formatValue)
+            end
+            
+            puts "[GoogleSheetProcessor] insert #{cols} to #{sheetID}-#{sheetName}"
+
+            googleAPI.request("https://sheets.googleapis.com/v4/spreadsheets/#{sheetID}/values/#{sheetName}:append?valueInputOption=RAW", "POST", {:values => [cols]})
+        end
+
+        return reviews
+    end
+end

data/lib/Processors/GoogleTranslateProcessor.rb

@@ -3,18 +3,18 @@ $lib = File.expand_path('../lib', File.dirname(__FILE__))
 require "Models/Review"
 require "Models/Processor"
 require "Helper"
-
 require "pathname"
-require "google/cloud/translate/v2"
+require "GoogleAPI"
 
 class GoogleTranslateProcessor < Processor
 
-    attr_accessor :client, :targetLang, :territoriesExclude
+    attr_accessor :targetLang, :territoriesExclude, :token, :logger, :googleAPI
 
     def initialize(config, configFilePath, baseExecutePath)
         @config = config
         @configFilePath = configFilePath
         @baseExecutePath = baseExecutePath
+        @logger = ZLogger.new(baseExecutePath)
 
         keyFilePath = Helper.unwrapRequiredParameter(config, "googleTranslateAPIKeyFilePath")
 
@@ -23,8 +23,8 @@ class GoogleTranslateProcessor < Processor
             keyFilePath = "#{configDir}#{keyFilePath}"
         end
 
-        ENV["TRANSLATE_CREDENTIALS"] = keyFilePath
-        @client = Google::Cloud::Translate::V2.new
+        @googleAPI = GoogleAPI.new(keyFilePath, baseExecutePath, ["https://www.googleapis.com/auth/cloud-translation","https://www.googleapis.com/auth/cloud-platform"])
+
         @targetLang = Helper.unwrapRequiredParameter(config, "googleTranslateTargetLang")
         @territoriesExclude = []
         if !config['googleTranslateTerritoriesExclude'].nil? && config['googleTranslateTerritoriesExclude'].length > 0
@@ -47,15 +47,25 @@ class GoogleTranslateProcessor < Processor
             puts "[GoogleTranslateProcessor] translate #{reviews[index].body} from #{reviews[index].territory} to #{targetLang}"
 
             if !reviews[index].title.nil?
-                reviews[index].title = "#{client.translate reviews[index].title, to: targetLang} (#{reviews[index].title})"
+                translateTitle = googleAPI.request("https://translation.googleapis.com/language/translate/v2", "POST", {:q => reviews[index].title, :target => targetLang})
+                translateTitle = translateTitle&.dig("data", "translations", 0, "translatedText")
+                if !translateTitle.nil? && translateTitle != reviews[index].title
+                    reviews[index].title = "#{translateTitle} (#{reviews[index].title})"
+                end
+            end
+
+            if !reviews[index].body.nil?
+                translateBody = googleAPI.request("https://translation.googleapis.com/language/translate/v2", "POST", {:q => reviews[index].body, :target => targetLang})
+                translateBody = translateBody&.dig("data", "translations", 0, "translatedText")
+                if !translateBody.nil? && translateBody != reviews[index].body
+                    body = "#{translateBody}"
+                    body += "\r\n===== Translate by Google =====\r\n"
+                    body += reviews[index].body
+                    reviews[index].body = body
+                end
             end
-            body = "#{client.translate reviews[index].body, to: targetLang}"
-            body += "\r\n===== Translate by Google =====\r\n"
-            body += reviews[index].body
-            reviews[index].body = body
         end
 
         return reviews
     end
-
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ZReviewTender
 version: !ruby/object:Gem::Version
-  version: 1.2.7
+  version: 1.3.1
 platform: ruby
 authors:
 - ZhgChgLi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-08-16 00:00:00.000000000 Z
+date: 2022-08-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-http
@@ -79,6 +79,7 @@ files:
 - config/apple.example.yml
 - lib/AndroidFetcher.rb
 - lib/AppleFetcher.rb
+- lib/GoogleAPI.rb
 - lib/Helper.rb
 - lib/Models/AndroidConfig.rb
 - lib/Models/AppleConfig.rb
@@ -87,6 +88,7 @@ files:
 - lib/Models/ReviewFetcher.rb
 - lib/Models/Version.rb
 - lib/Processors/FilterProcessor.rb
+- lib/Processors/GoogleSheetProcessor.rb
 - lib/Processors/GoogleTranslateProcessor.rb
 - lib/Processors/ProcessorTemplate.rb
 - lib/Processors/SlackProcessor.rb