ZReviewTender 1.3.4 → 1.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1b3ef6989fc515d9162992d6b84d80c89b435496957df5321c0972b06425878e
-  data.tar.gz: 58684ea2739c5dc7416f87932285b2004d0d29763ba0a1864a3ca9fe991d4106
+  metadata.gz: feb984f506b75958c72f8761516e3a2f2eb7487bebe769cb34749b5ee9b7922e
+  data.tar.gz: 6e27d2cf2cb46cef519dec0b5c47504bd8d3db94dc36836b5994bedb41b36a13
 SHA512:
-  metadata.gz: 1ae62fdf0c26212d0c3f5d1ed9179fd5203be69cec5c8c4ce2301856dc32f48e66056756dcd858cb5000de1ee844a352d8e8c724cc28960baa285de206d4e6bb
-  data.tar.gz: a40d9adf22be74e8198ecec348a838664c53703b3cede6cd808d612ae6ac1523e81efd35b33be90d1bce29bf7fe034e43a3ebebb226c9fd7abb6d7a5a4a2305d
+  metadata.gz: 1cc47714f9d05221d981fd09439a12ebb053e10233057b09594a1e814a5a9481842a280e613ad14ae650743e470a9d403371b3fba94b75524e1a0073ee2fc3cf
+  data.tar.gz: 4e67b7b958027bf74a4c0f870d26b30f77ac12da9e7b4b9cd1cde3e4a94805606bc2d9d8aab2d12194d4b8af94196882869d7ff4cc536a671eb2c3899ad3e5a9

data/.version

@@ -1 +1 @@
-1.3.4
+1.3.6

data/config/android.example.yml

@@ -29,8 +29,11 @@ processors:
         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
+        googleSheetInsertStyle:
+            - type: "append" # Google Sheet Insert type, append or insert
+            - at: 0 # required if type is insert, where index should insert at
+            - sheetID: null # required if type is insert, the sheet ID, you can get it on google sheet url: e.g. https://docs.google.com/spreadsheets/d/googleSpreadsheetID/edit#gid=sheetID
+            - sheetName: "Sheet1" # required if type is append, a.k.a google sheet tab 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

data/config/apple.example.yml

@@ -29,8 +29,12 @@ processors:
         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
+        googleSpreadsheetID: "1_lc82p-epecVKwpUWlXh1yyNWaSrygzDb8I0QH2xkTI" # Google Sheet SpreadSheet ID, you can get it on google sheet url: e.g. https://docs.google.com/spreadsheets/d/googleSpreadsheetID/
+        googleSheetInsertStyle:
+            - type: "append" # Google Sheet Insert type, append or insert
+            - at: 0 # required if type is insert, where index should insert at
+            - sheetID: null # required if type is insert, the sheet ID, you can get it on google sheet url: e.g. https://docs.google.com/spreadsheets/d/googleSpreadsheetID/edit#gid=sheetID
+            - sheetName: "Sheet1" # required if type is append, a.k.a google sheet tab 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

data/lib/AndroidFetcher.rb

@@ -136,8 +136,9 @@ class AndroidFetcher < ReviewFetcher
 
 
         # init first time, send welcome message
-        if latestCheckTimestamp == 0 
+        if latestCheckTimestamp == 0 && isSentWelcomeMessage() == false
             sendWelcomMessage()
+            setSentWelcomeMessage()
         elsif reviews.length > 0
             processReviews(reviews, platform)
         end

data/lib/AppleFetcher.rb

@@ -38,8 +38,9 @@ class AppleFetcher < ReviewFetcher
         end
 
         # init first time, send welcome message
-        if latestCheckTimestamp == 0 
+        if latestCheckTimestamp == 0 && isSentWelcomeMessage() == false
             sendWelcomMessage()
+            setSentWelcomeMessage()
         elsif reviews.length > 0
             reviews = fullfillAppInfo(reviews)
             processReviews(reviews, platform)

data/lib/Models/ReviewFetcher.rb

@@ -31,6 +31,17 @@ class ReviewFetcher
         end
     end
 
+    def setSentWelcomeMessage()
+        basePath = "#{config.baseExecutePath}/latestCheckTimestamp/"
+        Helper.createDirIfNotExist(basePath)
+        File.open("#{basePath}/#{platform}Welcome", 'w') { |file| file.write("") }
+    end
+
+    def isSentWelcomeMessage()
+        filePath = "#{config.baseExecutePath}/latestCheckTimestamp/#{platform}Welcome"
+        return File.exists?(filePath)
+    end
+
     def setPlatformLatestCheckTimestamp(timestamp)
         basePath = "#{config.baseExecutePath}/latestCheckTimestamp/"
         Helper.createDirIfNotExist(basePath)

data/lib/Processors/GoogleSheetProcessor.rb

@@ -8,7 +8,7 @@ require "GoogleAPI"
 
 class GoogleSheetProcessor < Processor
 
-    attr_accessor :keywordsInclude, :ratingsInclude, :territoriesInclude, :logger, :googleAPI, :sheetID, :sheetName, :formatValues, :timeZoneOffset
+    attr_accessor :keywordsInclude, :ratingsInclude, :territoriesInclude, :logger, :googleAPI, :spreadsheetID, :sheetInsertType, :sheetId, :sheetName, :sheetInsertAt, :formatValues, :timeZoneOffset
 
     def initialize(config, configFilePath, baseExecutePath)
         @config = config
@@ -41,8 +41,31 @@ class GoogleSheetProcessor < Processor
         end
 
         @timeZoneOffset = Helper.unwrapRequiredParameter(config, "googleSheetTimeZoneOffset")
-        @sheetID = Helper.unwrapRequiredParameter(config, "googleSheetID")
-        @sheetName = Helper.unwrapRequiredParameter(config, "googleSheetName")
+        @spreadsheetID = Helper.unwrapRequiredParameter(config, "googleSpreadsheetID")
+        
+        sheetInsertStyle = Helper.unwrapRequiredParameter(config, "googleSheetInsertStyle")
+        if !sheetInsertStyle.is_a? Array
+            raise "googleSheetInsertStyle must specify as Array in GoogleSheetProcessor."
+        end
+
+        sheetInsertStyles = {}
+        sheetInsertStyle.each do |value|
+            value.keys.each do |key|
+                sheetInsertStyles[key] = value[key]
+            end
+        end
+
+        @sheetInsertType = Helper.unwrapRequiredParameter(sheetInsertStyles, "type")
+
+        if sheetInsertType != "insert" && sheetInsertType != "append"
+            raise "googleSheetInsertStyle.type only accept insert or append in GoogleSheetProcessor."
+        elsif sheetInsertType == "insert"
+            @sheetInsertAt = Helper.unwrapRequiredParameter(sheetInsertStyles, "at").to_i
+            @sheetId = Helper.unwrapRequiredParameter(sheetInsertStyles, "sheetID")
+        elsif sheetInsertType == "append"
+            @sheetName = Helper.unwrapRequiredParameter(sheetInsertStyles, "sheetName")
+        end
+        
         @formatValues = []
         if !config["values"].nil?
             @formatValues = config["values"]
@@ -74,7 +97,12 @@ class GoogleSheetProcessor < Processor
         end
 
         values = []
-        filterReviews.each do |review|
+        sortedFilterReviews = filterReviews
+        if sheetInsertType == "insert"
+            sortedFilterReviews = sortedFilterReviews.sort! { |a, b|  b.createdDateTimestamp <=> a.createdDateTimestamp }
+        end
+
+        sortedFilterReviews.each do |review|
             cols = []
             formatValues.each do |formatValue|
                 formatValue = formatValue.gsub("%TITLE%", review.title || "")
@@ -94,13 +122,53 @@ class GoogleSheetProcessor < Processor
         end
 
         page = 1
-        limit = 500
+        limit = 100
         values.each_slice(limit) do |value|
-            puts "[GoogleSheetProcessor] Insert rows(#{page}/#{(values.length/limit).ceil + 1}) to #{sheetID}-#{sheetName}"
+            puts "[GoogleSheetProcessor] Insert rows page:(#{page}/#{(values.length/limit).ceil + 1}) #{sheetInsertType} to #{spreadsheetID}"
             page += 1
-            googleAPI.request("https://sheets.googleapis.com/v4/spreadsheets/#{sheetID}/values/#{sheetName}!A1:append?valueInputOption=RAW", "POST", {:values => value})
+            if sheetInsertType == "insert"
+                googleAPI.request("https://sheets.googleapis.com/v4/spreadsheets/#{spreadsheetID}:batchUpdate", "POST", {
+                    "requests": [
+                        {
+                            "insertRange": {
+                                "range": {
+                                    "sheetId": sheetId,
+                                    "startRowIndex": sheetInsertAt,
+                                    "endRowIndex": sheetInsertAt + value.length
+                                },
+                                "shiftDimension": "ROWS"
+                            }
+                        },
+                        {
+                            "pasteData": {
+                                "data": rowsToString(value),
+                                "type": "PASTE_NORMAL",
+                                "delimiter": ",",
+                                "coordinate": {
+                                    "sheetId": sheetId,
+                                    "rowIndex": sheetInsertAt,
+                                }
+                            }
+                        }
+                    ]
+                })
+            elsif sheetInsertType == "append"
+                googleAPI.request("https://sheets.googleapis.com/v4/spreadsheets/#{spreadsheetID}/values/#{sheetName}!A1:append?valueInputOption=RAW", "POST", {:values => value})
+            end
         end
 
         return reviews
     end
+
+    private
+    def rowsToString(rows)
+        string = ""
+        rows.each do |row|
+            if string != "" 
+                string += "\n"
+            end
+            string += "\"#{row.map{ |v| v.gsub('"','\"') }.join('","')}\""
+        end
+        return string
+    end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ZReviewTender
 version: !ruby/object:Gem::Version
-  version: 1.3.4
+  version: 1.3.6
 platform: ruby
 authors:
 - ZhgChgLi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-10-04 00:00:00.000000000 Z
+date: 2022-10-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-http