ZReviewTender 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4905d8141a111bf59431bb91ae97e09b7a1b1d55c311c0ccda08b3ef0c9b6fc8
-  data.tar.gz: 346a8c5be0271f0be78bcfa0947333f7e2283988785d3ade883799fae38ed205
+  metadata.gz: 2807fe3efdfb17de59b50713359ba58097f36482389f1d4089056103d16be154
+  data.tar.gz: 8366edb466dda73e67a553084b7b96e97f42c03e4cdb8dc2509e2edacd2f1d3b
 SHA512:
-  metadata.gz: b4a3eba5f67873c14d40bf96ec20820a2ba4e985722f42132b1983bfa60b40eb475088be78c958d13e2c1be43bd03b8965509efcafb5adc01757333d0d44720a
-  data.tar.gz: db5d1acb0233c84fe06dbcb654dbda40ee97b25eb85f52d74dfd77ea7f34779f072ca25c4d2367b5500bf780a0ffbc5e49d7b8b592012e9f92387b96d032acc8
+  metadata.gz: 6eb36009c81955c741701b5c57559d67a16c1fd7df2528b2893ceae37f40c00879d81d8a6a65d4eae930d6125b2f33492f966837ed440acd15d56e42a631c378
+  data.tar.gz: 108d45d065e7f045a5bb88c72fe8e8e79b132f5bb42cdb7e9f00191a4b660e3ff726f4027d79889e5b0d0c67975cf56c02494754449641774f5107b2fb1ed96b

data/lib/Processors/SlackProcessor.rb

@@ -9,7 +9,7 @@ require "time"
 
 class SlackProcessor < Processor
 
-    attr_accessor :botToken, :inCommingWebHookURL, :targetChannel, :timeZoneOffset
+    attr_accessor :botToken, :inCommingWebHookURL, :targetChannel, :timeZoneOffset, :attachmentGroupByNumber
 
     def initialize(config, configFilePath, baseExecutePath)
         @config = config
@@ -20,6 +20,11 @@ class SlackProcessor < Processor
         @inCommingWebHookURL = config["slackInCommingWebHookURL"]
         @targetChannel = config["slackBotTargetChannel"]
         @timeZoneOffset = Helper.unwrapRequiredParameter(config, "slackTimeZoneOffset")
+        @attachmentGroupByNumber = 1
+
+        if !config['slackAttachmentGroupByNumber'].nil? && config['slackAttachmentGroupByNumber'] != "" && config['slackAttachmentGroupByNumber'].to_i > 0  && config['slackAttachmentGroupByNumber'].to_i < 100
+            @attachmentGroupByNumber = config['slackAttachmentGroupByNumber'].to_i
+        end
 
         if (botToken.nil? && inCommingWebHookURL.nil?) || (botToken == "" && inCommingWebHookURL == "")
             raise "must specify slackBotToken or slackInCommingWebHookURL in SlackProcessor."
@@ -30,35 +35,51 @@ class SlackProcessor < Processor
 
     def processReviews(reviews, platform)
 
-        # 1 review 1 message
-        reviews.each do |review|
+        pendingPayloads = []
+
+        # Slack Message Limit: posting one message per second per channel
+        reviews.each_slice(attachmentGroupByNumber) do |reviewGroup|
             payload = Payload.new()
             payload.attachments = []
-            
-            attachment = Payload::Attachment.new()
 
-            stars = "★" * review.rating + "☆" * (5 - review.rating)
-            color = review.rating >= 4 ? "good" : (review.rating > 2 ? "warning" : "danger")
-            date = Time.at(review.createdDateTimestamp).getlocal(timeZoneOffset)
-            
-            title = "#{stars}"
-            if !review.title.nil?
-                title = "#{review.title} - #{stars}"
-            end
+            reviewGroup.each do |review|
+                attachment = Payload::Attachment.new()
+
+                stars = "★" * review.rating + "☆" * (5 - review.rating)
+                color = review.rating >= 4 ? "good" : (review.rating > 2 ? "warning" : "danger")
+                date = Time.at(review.createdDateTimestamp).getlocal(timeZoneOffset)
                 
-            attachment.color = color
-            attachment.author_name = review.userName
-            attachment.fallback = title
-            attachment.title = title
-            attachment.text = review.body
-            attachment.footer = "#{platform} - #{review.platform} - #{review.appVersion} - #{review.territory} - <#{review.url}|#{date}>"
-            
-            payload.attachments.append(attachment)
+                title = "#{stars}"
+                if !review.title.nil?
+                    title = "#{review.title} - #{stars}"
+                end
+                    
+                attachment.color = color
+                attachment.author_name = review.userName
+                attachment.fallback = title
+                attachment.title = title
+                attachment.text = review.body
+                attachment.footer = "#{platform} - #{review.platform} - #{review.appVersion} - #{review.territory} - <#{review.url}|#{date}>"
+                
+                payload.attachments.append(attachment)
+            end
+
+            pendingPayloads.append(payload)
+        end
+
+        loop do
+            payload = pendingPayloads.pop
 
             result = request(payload)
-            if !result
+            if !result[:ok]
                 Helper.logError(result)
+                if result[:message] == "ratelimited"
+                    sleep(1)
+                    pendingPayloads.append(payload)
+                end
             end
+
+            break if pendingPayloads.length < 1
         end
 
         return reviews
@@ -108,10 +129,10 @@ class SlackProcessor < Processor
         res = http.request(req)
 
         if isInCommingWebHook
-            return res.body == "ok"
+            return {"ok":res.body == "ok", "message":nil}
         else
             result = JSON.parse(res.body)
-            return result["ok"] == true
+            return {"ok":result["ok"] == true, "message":result['error']}
         end
         
     end

metadata

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