From 9d9ebefc301096fc475d2f122685e8d3e979d937 Mon Sep 17 00:00:00 2001
From: Vitaliy Vlasov <siphiuel@gmail.com>
Date: Thu, 1 Mar 2018 16:55:44 +0200
Subject: [PATCH 1/4] [Fix #330] Do not handle claims for issues that have been
 merged already

---
 resources/sql/queries.sql             |  8 ++++
 src/clj/commiteth/db/issues.clj       |  6 +++
 src/clj/commiteth/routes/webhooks.clj | 64 ++++++++++++---------------
 3 files changed, 42 insertions(+), 36 deletions(-)

diff --git a/resources/sql/queries.sql b/resources/sql/queries.sql
index 1421ced..0673ca6 100644
--- a/resources/sql/queries.sql
+++ b/resources/sql/queries.sql
@@ -412,6 +412,14 @@ SELECT exists(SELECT 1
   FROM issues
   WHERE issue_id = :issue_id);
 
+-- :name get-issue :? :1
+-- :doc get issue from DB by repo-id and issue-number
+SELECT issue_id, issue_number, is_open, winner_login, commit_sha
+FROM issues
+WHERE repo_id = :repo_id
+AND issue_number = :issue_number;
+
+
 
 -- :name open-bounties :? :*
 -- :doc all open bounty issues
diff --git a/src/clj/commiteth/db/issues.clj b/src/clj/commiteth/db/issues.clj
index 834684f..a32634a 100644
--- a/src/clj/commiteth/db/issues.clj
+++ b/src/clj/commiteth/db/issues.clj
@@ -101,3 +101,9 @@
         first
         :exists
         boolean)))
+
+(defn get-issue
+  [repo-id issue-number]
+  (jdbc/with-db-connection [con-db *db*]
+    (db/get-issue con-db {:repo_id repo-id
+                          :issue_number issue-number})))
diff --git a/src/clj/commiteth/routes/webhooks.clj b/src/clj/commiteth/routes/webhooks.clj
index 32997e1..8ab27bc 100644
--- a/src/clj/commiteth/routes/webhooks.clj
+++ b/src/clj/commiteth/routes/webhooks.clj
@@ -109,26 +109,17 @@
             (extract pr-title))))
 
 
-(defn ensure-bounty-issue
-  "Checks if an issue has a bounty label attached and returns its number"
-  [user repo issue-number]
-  (when-let [issue (github/get-issue user repo issue-number)]
-    (when (bounties/has-bounty-label? issue)
-      issue-number)))
-
-
 (defn handle-claim
-  [user-id login name avatar_url owner repo repo-id bounty-issue-number pr-id pr-number head-sha merged? event-type]
+  [issue user-id login name avatar_url owner repo repo-id pr-id pr-number head-sha merged? event-type]
   (users/create-user user-id login name nil avatar_url)
-  (let [issue (github/get-issue owner repo bounty-issue-number)
-        open-or-edit? (contains? #{:opened :edited} event-type)
+  (let [open-or-edit? (contains? #{:opened :edited} event-type)
         close? (= :closed event-type)
         pr-data {:repo_id   repo-id
                  :pr_id     pr-id
                  :pr_number pr-number
                  :user_id   user-id
-                 :issue_number bounty-issue-number
-                 :issue_id (:id issue)
+                 :issue_number (:issue_number issue)
+                 :issue_id (:issue_id issue)
                  :state event-type}]
 
     ;; TODO: in the opened case if the submitting user has no
@@ -138,18 +129,18 @@
     (cond
       open-or-edit? (do
                       (log/info "PR with reference to bounty issue"
-                                bounty-issue-number "opened")
+                                 (:issue_number issue) "opened")
                       (pull-requests/save (merge pr-data {:state :opened
                                                           :commit_sha head-sha})))
       close? (if merged?
                (do (log/info "PR with reference to bounty issue"
-                             bounty-issue-number "merged")
+                             (:issue_number issue) "merged")
                    (pull-requests/save
                     (merge pr-data {:state :merged
                                     :commit_sha head-sha}))
-                   (issues/update-commit-sha (:id issue) head-sha))
+                   (issues/update-commit-sha (:issue_id issue) head-sha))
                (do (log/info "PR with reference to bounty issue"
-                             bounty-issue-number "closed with no merge")
+                             (:issue_number issue) "closed with no merge")
                    (pull-requests/save
                     (merge pr-data {:state :closed
                                     :commit_sha head-sha})))))))
@@ -177,26 +168,27 @@
      pr-number       :number
      pr-body         :body
      pr-title        :title} :pull_request}]
-  (log/debug "handle-pull-request-event" event-type owner repo repo-id login pr-body pr-title)
-  (log/debug (extract-issue-number pr-body pr-title))
-  (if-let [bounty-issue-number (->>
-                                  (extract-issue-number pr-body pr-title)
-                                  (first)
-                                  (ensure-bounty-issue owner repo))]
-    (do
-      (log/debug "Referenced bounty issue found" owner repo bounty-issue-number)
-      (handle-claim user-id
-                    login name
-                    avatar_url
-                    owner repo
-                    repo-id
-                    bounty-issue-number
-                    pr-id
-                    pr-number
-                    head-sha
-                    merged?
-                    event-type))
+  (log/info "handle-pull-request-event" event-type owner repo repo-id login pr-body pr-title)
+  (if-let [issue (some->> (extract-issue-number pr-body pr-title)
+                          (first)
+                          (issues/get-issue repo-id))]
+    (if-not (:commit_sha issue) ; no PR has been merged yet referencing this issue
+      (do
+        (log/info "Referenced bounty issue found" owner repo (:issue_number issue))
+        (handle-claim issue
+                      user-id
+                      login name
+                      avatar_url
+                      owner repo
+                      repo-id
+                      pr-id
+                      pr-number
+                      head-sha
+                      merged?
+                      event-type))
+      (log/info "PR for issue already merged"))
     (when (= :edited event-type)
+      ; Remove PR if it does not reference any issue
       (pull-requests/remove pr-id))))
 
 

From 3cdfa549b733eefa265187aa2194f3435850dddd Mon Sep 17 00:00:00 2001
From: Martin Klepsch <martinklepsch@googlemail.com>
Date: Tue, 20 Feb 2018 17:52:40 +0100
Subject: [PATCH 2/4] fix #301: add basic stats to manage payouts screen

---
 resources/templates/home.html          |  1 +
 src/cljs/commiteth/manage_payouts.cljs | 22 ++++++++++++++++++----
 2 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/resources/templates/home.html b/resources/templates/home.html
index 590156e..6afe0ca 100644
--- a/resources/templates/home.html
+++ b/resources/templates/home.html
@@ -65,6 +65,7 @@ height="0" width="0" style="display:none;visibility:hidden"></iframe></noscript>
  src="https://www.facebook.com/tr?id=293089407869419&ev=PageView&noscript=1"
 /></noscript>
 <link href="https://cdnjs.cloudflare.com/ajax/libs/semantic-ui/2.1.8/semantic.min.css" rel="stylesheet" type="text/css" />
+<link href="https://unpkg.com/tachyons@4.9.1/css/tachyons.min.css" rel="stylesheet" type="text/css" />
 <link href="/css/style.css?v={{commiteth-version}}" rel="stylesheet" type="text/css" />
 <script type="text/javascript" src="/js/app.js?v={{commiteth-version}}"></script>
 <script>
diff --git a/src/cljs/commiteth/manage_payouts.cljs b/src/cljs/commiteth/manage_payouts.cljs
index 4c4368a..4f2a756 100644
--- a/src/cljs/commiteth/manage_payouts.cljs
+++ b/src/cljs/commiteth/manage_payouts.cljs
@@ -57,6 +57,19 @@
                        (:claims bounty))]
             [claim-card bounty claim]))))
 
+(defn bounty-stats [{:keys [paid unpaid]}]
+  (let [sum-dollars (fn [bounties]
+                      (reduce + (map #(js/parseFloat (:value_usd %)) bounties)))]
+    [:div.cf.pv4
+     [:div.fl.w-50.tc
+      [:div.ttu.tracked "Open"]
+      [:div.f2.pa2 "$" (sum-dollars unpaid)]
+      [:div (count unpaid) " bounties"]]
+
+     [:div.fl.w-50.tc
+      [:div.ttu.tracked "Paid"]
+      [:div.f2.pa2 "$" (sum-dollars paid)]
+      [:div (count paid) " bounties"]]]))
 
 (defn manage-payouts-page []
   (let [owner-bounties (rf/subscribe [:owner-bounties])
@@ -68,15 +81,16 @@
           [:div.ui.text.loader "Loading"]]]
         (let [web3 (.-web3 js/window)
               bounties (vals @owner-bounties)
-              unpaid? #(empty? (:payout_hash %))
-              paid? #(not-empty (:payout_hash %))
-              unpaid-bounties (filter unpaid? bounties)
-              paid-bounties (filter paid? bounties)]
+              paid?  :payout_hash
+              unpaid-bounties (filter (complement paid?) bounties)
+              paid-bounties   (filter paid? bounties)]
           [:div.ui.container
            (when (nil? web3)
              [:div.ui.warning.message
               [:i.warning.icon]
               "To sign off claims, please view Status Open Bounty in Status, Mist or Metamask"])
+           [bounty-stats {:paid paid-bounties
+                          :unpaid unpaid-bounties}]
            [:h3 "New claims"]
            [claim-list unpaid-bounties]
            [:h3 "Old claims"]

From 35a8cfd84c21760b322a16f4366b362cd363475a Mon Sep 17 00:00:00 2001
From: Martin Klepsch <martinklepsch@googlemail.com>
Date: Wed, 21 Feb 2018 16:35:58 +0100
Subject: [PATCH 3/4] #301: turn stats calculation into subscription, improve
 dollar amount display

---
 src/cljs/commiteth/common.cljs         |  6 +++++
 src/cljs/commiteth/manage_payouts.cljs | 35 +++++++++++---------------
 src/cljs/commiteth/subscriptions.cljs  | 21 +++++++++++++++-
 3 files changed, 41 insertions(+), 21 deletions(-)

diff --git a/src/cljs/commiteth/common.cljs b/src/cljs/commiteth/common.cljs
index 94fca42..60f6a31 100644
--- a/src/cljs/commiteth/common.cljs
+++ b/src/cljs/commiteth/common.cljs
@@ -135,4 +135,10 @@
             [:div.page-nav-text [:span (str "Page " page-number " of " page-count)]]
             [draw-page-numbers page-number page-count container-element]]])))
 
+(defn usd-string
+  "Turn a given float into a USD currency string based on the browsers locale setting.
 
+  A more complex and customizable approach can be found in goog.i18n.NumberFormat:
+  https://google.github.io/closure-library/api/goog.i18n.NumberFormat.html"
+  [usd-float]
+  (.toLocaleString usd-float js/navigator.language #js {:style "currency" :currency "USD"}))
diff --git a/src/cljs/commiteth/manage_payouts.cljs b/src/cljs/commiteth/manage_payouts.cljs
index 4f2a756..b32b149 100644
--- a/src/cljs/commiteth/manage_payouts.cljs
+++ b/src/cljs/commiteth/manage_payouts.cljs
@@ -1,6 +1,6 @@
 (ns commiteth.manage-payouts
   (:require [re-frame.core :as rf]
-            [commiteth.common :refer [human-time]]))
+            [commiteth.common :as common :refer [human-time]]))
 
 
 
@@ -58,21 +58,20 @@
             [claim-card bounty claim]))))
 
 (defn bounty-stats [{:keys [paid unpaid]}]
-  (let [sum-dollars (fn [bounties]
-                      (reduce + (map #(js/parseFloat (:value_usd %)) bounties)))]
-    [:div.cf.pv4
-     [:div.fl.w-50.tc
-      [:div.ttu.tracked "Open"]
-      [:div.f2.pa2 "$" (sum-dollars unpaid)]
-      [:div (count unpaid) " bounties"]]
+  [:div.cf.pv4
+   [:div.fl.w-50.tc
+    [:div.ttu.tracked "Open"]
+    [:div.f2.pa2 (common/usd-string (:combined-usd-value unpaid))]
+    [:div (:count unpaid) " bounties"]]
 
-     [:div.fl.w-50.tc
-      [:div.ttu.tracked "Paid"]
-      [:div.f2.pa2 "$" (sum-dollars paid)]
-      [:div (count paid) " bounties"]]]))
+   [:div.fl.w-50.tc
+    [:div.ttu.tracked "Paid"]
+    [:div.f2.pa2 (common/usd-string (:combined-usd-value paid))]
+    [:div (:count paid) " bounties"]]])
 
 (defn manage-payouts-page []
   (let [owner-bounties (rf/subscribe [:owner-bounties])
+        bounty-stats-data (rf/subscribe [:owner-bounties-stats])
         owner-bounties-loading? (rf/subscribe [:get-in [:owner-bounties-loading?]])]
     (fn []
       (if @owner-bounties-loading?
@@ -80,18 +79,14 @@
          [:div.ui.active.inverted.dimmer
           [:div.ui.text.loader "Loading"]]]
         (let [web3 (.-web3 js/window)
-              bounties (vals @owner-bounties)
-              paid?  :payout_hash
-              unpaid-bounties (filter (complement paid?) bounties)
-              paid-bounties   (filter paid? bounties)]
+              bounties (vals @owner-bounties)]
           [:div.ui.container
            (when (nil? web3)
              [:div.ui.warning.message
               [:i.warning.icon]
               "To sign off claims, please view Status Open Bounty in Status, Mist or Metamask"])
-           [bounty-stats {:paid paid-bounties
-                          :unpaid unpaid-bounties}]
+           [bounty-stats @bounty-stats-data]
            [:h3 "New claims"]
-           [claim-list unpaid-bounties]
+           [claim-list (filter (complement :paid?) bounties)]
            [:h3 "Old claims"]
-           [claim-list paid-bounties]])))))
+           [claim-list (filter :paid? bounties)]])))))
diff --git a/src/cljs/commiteth/subscriptions.cljs b/src/cljs/commiteth/subscriptions.cljs
index 6337976..a48ee67 100644
--- a/src/cljs/commiteth/subscriptions.cljs
+++ b/src/cljs/commiteth/subscriptions.cljs
@@ -68,7 +68,26 @@
 (reg-sub
   :owner-bounties
   (fn [db _]
-    (:owner-bounties db)))
+    (->> (for [[id bounty] (:owner-bounties db)]
+           ;; TODO(martinklepsch) we might want to consider using a
+           ;; special prefix or namespace for derived properties that
+           ;; are added to domain records like this
+           ;; e.g. `derived/paid?`
+           [id (assoc bounty :paid? (boolean (:payout_hash bounty)))])
+         (into {}))))
+
+(reg-sub
+ :owner-bounties-stats
+ :<- [:owner-bounties]
+ (fn [owner-bounties _]
+   (let [sum-dollars (fn sum-dollars [bounties]
+                       (reduce + (map #(js/parseFloat (:value_usd %)) bounties)))
+         {:keys [paid unpaid]} (group-by #(if (:paid? %) :paid :unpaid)
+                                         (vals owner-bounties))]
+     {:paid {:count (count paid)
+             :combined-usd-value (sum-dollars paid)}
+      :unpaid {:count (count unpaid)
+               :combined-usd-value (sum-dollars unpaid)}})))
 
 (reg-sub
   :pagination

From 1310c74ce6ee5edb43aebfd475d555d8052f12a0 Mon Sep 17 00:00:00 2001
From: Martin Klepsch <martinklepsch@googlemail.com>
Date: Wed, 14 Mar 2018 18:40:20 +0100
Subject: [PATCH 4/4] break individual stats in two rows on small screens

---
 src/cljs/commiteth/manage_payouts.cljs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/cljs/commiteth/manage_payouts.cljs b/src/cljs/commiteth/manage_payouts.cljs
index b32b149..a3272cc 100644
--- a/src/cljs/commiteth/manage_payouts.cljs
+++ b/src/cljs/commiteth/manage_payouts.cljs
@@ -58,13 +58,13 @@
             [claim-card bounty claim]))))
 
 (defn bounty-stats [{:keys [paid unpaid]}]
-  [:div.cf.pv4
-   [:div.fl.w-50.tc
+  [:div.cf
+   [:div.fl-ns.w-50-ns.tc.pv4
     [:div.ttu.tracked "Open"]
     [:div.f2.pa2 (common/usd-string (:combined-usd-value unpaid))]
     [:div (:count unpaid) " bounties"]]
 
-   [:div.fl.w-50.tc
+   [:div.fl-ns.w-50-ns.tc.pv4
     [:div.ttu.tracked "Paid"]
     [:div.f2.pa2 (common/usd-string (:combined-usd-value paid))]
     [:div (:count paid) " bounties"]]])