status-im
/
open-bounty
mirror of https://github.com/status-im/open-bounty.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

DB query refactoring, save PRs also when opened 

* store pull-requests to DB also when opened instead of only when
  merged to allow for showing bounty claims
* refactor SQL queries
* look for PR keywords also in title
* improve PR keyword regexes
This commit is contained in:
Teemu Patja 2017-02-24 11:05:13 +02:00
parent 1ad6fb3b93
commit ec5f07a578
No known key found for this signature in database
GPG Key ID: F5B7035E6580FD4C
7 changed files with 206 additions and 139 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
resources/migrations/20170222143232-bounty-claim-changes.down.sql Normal file
View File

21
resources/migrations/20170222143232-bounty-claim-changes.up.sql Normal file
View File

@ -0,0 +1,21 @@
ALTER TABLE "public"."issue_comment"
ADD COLUMN "updated" timestamp DEFAULT timezone('utc'::text, now());
ALTER TABLE "public"."pull_requests" ADD COLUMN "state" integer DEFAULT '0';
CREATE TABLE "public"."pull_request_state" (
"id" integer,
"description" character varying(32),
PRIMARY KEY ("id")
);
INSERT INTO pull_request_state (id, description)
VALUES(0, 'opened');
INSERT INTO pull_request_state (id, description)
VALUES(1, 'merged');
INSERT INTO pull_request_state (id, description)
VALUES(2, 'closed');

152
resources/sql/queries.sql
View File

@ -21,7 +21,11 @@ RETURNING id, login, name, email, avatar_url, token, address, created;
-- :name update-user! :! :n -- :name update-user! :! :n
-- :doc updates an existing user record -- :doc updates an existing user record
UPDATE users UPDATE users
SET login = :login, name = :name, email = :email, token = :token, address = :address SET login = :login,
name = :name,
email = :email,
token = :token,
address = :address
WHERE id = :id; WHERE id = :id;
-- :name update-user-token! :<! :1 -- :name update-user-token! :<! :1
@ -44,9 +48,9 @@ WHERE id = :id;
-- :name get-repo-owner :? :1 -- :name get-repo-owner :? :1
SELECT * SELECT *
FROM users u FROM users u, repositories r
INNER JOIN repositories r ON r.user_id = u.id WHERE r.repo_id = :repo_id
WHERE r.repo_id = :repo_id; AND r.user_id = u.id;
-- Repositories -------------------------------------------------------------------- -- Repositories --------------------------------------------------------------------
@ -130,6 +134,8 @@ UPDATE issues
SET transaction_hash = :transaction_hash SET transaction_hash = :transaction_hash
WHERE issue_id = :issue_id; WHERE issue_id = :issue_id;
-- TODO: this is terrible
-- :name update-contract-address :<! :1 -- :name update-contract-address :<! :1
-- :doc updates contract-address for a given issue -- :doc updates contract-address for a given issue
WITH t AS ( WITH t AS (
@ -142,9 +148,9 @@ WITH t AS (
i.repo_id AS repo_id, i.repo_id AS repo_id,
r.login AS login, r.login AS login,
r.repo AS repo r.repo AS repo
FROM issues i FROM issues i, repositories r
INNER JOIN repositories r ON r.repo_id = i.repo_id WHERE r.repo_id = i.repo_id
WHERE i.issue_id = :issue_id AND i.issue_id = :issue_id
) )
UPDATE issues i UPDATE issues i
SET contract_address = :contract_address SET contract_address = :contract_address
@ -169,19 +175,26 @@ WHERE contract_address IS NULL
-- Pull Requests ------------------------------------------------------------------- -- Pull Requests -------------------------------------------------------------------
-- :name create-pull-request! :! :n -- :name save-pull-request! :! :n
-- :doc creates pull request -- :doc inserts or updates a pull request record
INSERT INTO pull_requests (repo_id, pr_id, pr_number, issue_number, commit_id, user_id) INSERT INTO pull_requests (pr_id,
SELECT repo_id,
pr_number,
issue_number,
commit_id,
user_id,
state)
VALUES(:pr_id,
:repo_id, :repo_id,
:pr_id,
:pr_number, :pr_number,
:issue_number, :issue_number,
:commit_id, :commit_id,
:user_id :user_id,
WHERE NOT exists(SELECT 1 :state)
FROM pull_requests ON CONFLICT (pr_id) DO UPDATE
WHERE repo_id = :repo_id AND pr_id = :pr_id); SET
state = :state,
commit_id = :commit_id;
-- Bounties ------------------------------------------------------------------------ -- Bounties ------------------------------------------------------------------------
@ -191,27 +204,25 @@ SELECT
i.contract_address AS contract_address, i.contract_address AS contract_address,
i.issue_id AS issue_id, i.issue_id AS issue_id,
u.address AS payout_address u.address AS payout_address
FROM issues i FROM issues i, pull_requests p, users u
INNER JOIN pull_requests p WHERE
ON (p.commit_id = i.commit_id OR coalesce(p.issue_number, -1) = i.issue_number) (p.commit_id = i.commit_id OR coalesce(p.issue_number, -1) = i.issue_number)
AND p.repo_id = i.repo_id AND p.repo_id = i.repo_id
INNER JOIN users u AND u.id = p.user_id
ON u.id = p.user_id AND i.execute_hash IS NULL;
WHERE i.execute_hash IS NULL;
-- :name pending-payouts-list :? :* -- :name pending-payouts-list :? :*
-- :doc lists all recently closed issues awaiting to be confirmed -- :doc lists all recently closed issues awaiting to be confirmed
SELECT SELECT
i.contract_address AS contract_address, i.contract_address AS contract_address,
i.issue_id AS issue_id, i.issue_id AS issue_id,
i.execute_hash AS execute_hash u.address AS payout_address
FROM issues i FROM issues i, pull_requests p, users u
INNER JOIN pull_requests p WHERE
ON (p.commit_id = i.commit_id OR coalesce(p.issue_number, -1) = i.issue_number) (p.commit_id = i.commit_id OR coalesce(p.issue_number, -1) = i.issue_number)
AND p.repo_id = i.repo_id AND p.repo_id = i.repo_id
INNER JOIN users u AND u.id = p.user_id
ON u.id = p.user_id AND i.confirm_hash IS NULL
WHERE i.confirm_hash IS NULL
AND i.execute_hash IS NOT NULL; AND i.execute_hash IS NOT NULL;
-- :name confirmed-payouts-list :? :* -- :name confirmed-payouts-list :? :*
@ -219,14 +230,13 @@ WHERE i.confirm_hash IS NULL
SELECT SELECT
i.contract_address AS contract_address, i.contract_address AS contract_address,
i.issue_id AS issue_id, i.issue_id AS issue_id,
i.payout_hash AS payout_hash u.address AS payout_address
FROM issues i FROM issues i, pull_requests p, users u
INNER JOIN pull_requests p WHERE
ON (p.commit_id = i.commit_id OR coalesce(p.issue_number, -1) = i.issue_number) (p.commit_id = i.commit_id OR coalesce(p.issue_number, -1) = i.issue_number)
AND p.repo_id = i.repo_id AND p.repo_id = i.repo_id
INNER JOIN users u AND u.id = p.user_id
ON u.id = p.user_id AND i.payout_receipt IS NULL
WHERE i.payout_receipt IS NULL
AND i.payout_hash IS NOT NULL; AND i.payout_hash IS NOT NULL;
-- :name update-confirm-hash :! :n -- :name update-confirm-hash :! :n
@ -254,7 +264,7 @@ SET payout_receipt = :payout_receipt
WHERE issue_id = :issue_id; WHERE issue_id = :issue_id;
-- :name all-bounties-list :? :* -- :name all-bounties-list :? :*
-- :doc lists all issues labeled as 'bounty' -- :doc open (not merged) bounty issues
SELECT SELECT
i.contract_address AS contract_address, i.contract_address AS contract_address,
i.issue_id AS issue_id, i.issue_id AS issue_id,
@ -264,16 +274,13 @@ SELECT
i.balance AS issue_balance, i.balance AS issue_balance,
r.login AS owner_name, r.login AS owner_name,
r.repo AS repo_name r.repo AS repo_name
FROM issues i FROM issues i, repositories r
INNER JOIN repositories r WHERE
ON r.repo_id = i.repo_id r.repo_id = i.repo_id
WHERE i.commit_id IS NULL AND i.commit_id IS NULL;
AND NOT EXISTS(SELECT 1
FROM pull_requests
WHERE issue_number = i.issue_number);
-- :name owner-bounties-list :? :* -- :name owner-bounties-list :? :*
-- :doc lists fixed issues -- :doc lists fixed issues (bounties awaiting maintainer confirmation)
SELECT SELECT
i.contract_address AS contract_address, i.contract_address AS contract_address,
i.issue_id AS issue_id, i.issue_id AS issue_id,
@ -293,21 +300,18 @@ SELECT
r.login AS owner_name, r.login AS owner_name,
r.repo AS repo_name, r.repo AS repo_name,
o.address AS owner_address o.address AS owner_address
FROM issues i FROM issues i, pull_requests p, users u, users o, repositories r
INNER JOIN pull_requests p WHERE
ON (p.commit_id = i.commit_id OR coalesce(p.issue_number, -1) = i.issue_number) (p.commit_id = i.commit_id OR coalesce(p.issue_number, -1) = i.issue_number)
AND p.repo_id = i.repo_id AND p.repo_id = i.repo_id
INNER JOIN users u AND u.id = p.user_id
ON u.id = p.user_id AND r.repo_id = i.repo_id
INNER JOIN repositories r AND r.user_id = o.id
ON r.repo_id = i.repo_id AND r.user_id = :owner_id
INNER JOIN users o
ON r.user_id = o.id
WHERE r.user_id = :owner_id
AND i.confirm_hash IS NOT NULL; AND i.confirm_hash IS NOT NULL;
-- :name owner-issues-list :? :* -- :name owner-issues-list :? :*
-- :doc lists all not yet fixed issues in a given owner's repository -- :doc owner's bounty issues with no merged PR
SELECT SELECT
i.contract_address AS contract_address, i.contract_address AS contract_address,
i.issue_id AS issue_id, i.issue_id AS issue_id,
@ -316,19 +320,18 @@ SELECT
i.repo_id AS repo_id, i.repo_id AS repo_id,
r.login AS owner_name, r.login AS owner_name,
r.repo AS repo_name r.repo AS repo_name
FROM issues i FROM issues i, repositories r
INNER JOIN repositories r WHERE r.repo_id = i.repo_id
ON r.repo_id = i.repo_id AND r.user_id = :owner_id
WHERE r.user_id = :owner_id
AND i.commit_id IS NULL AND i.commit_id IS NULL
AND NOT exists(SELECT 1 AND NOT exists(SELECT 1
FROM pull_requests FROM pull_requests
WHERE issue_number = i.issue_number); WHERE issue_number = i.issue_number
AND state = 1);
-- TODO: misleading name. this is used when updating bounty balances. maybe we should exclude at least bounties that have been paid?
-- :name wallets-list :? :* -- :name open-bounty-contracts :? :*
-- :doc lists all contract ids -- :doc bounty issues with mined bounty contracts
SELECT SELECT
i.contract_address AS contract_address, i.contract_address AS contract_address,
r.login AS login, r.login AS login,
@ -337,22 +340,26 @@ SELECT
i.issue_number AS issue_number, i.issue_number AS issue_number,
i.issue_id AS issue_id, i.issue_id AS issue_id,
i.balance AS balance i.balance AS balance
FROM issues i FROM issues i, repositories r
INNER JOIN repositories r ON r.repo_id = i.repo_id WHERE r.repo_id = i.repo_id
WHERE contract_address IS NOT NULL; AND contract_address IS NOT NULL
AND i.payout_hash IS NULL;
-- :name get-bounty :? :1 -- :name get-bounty :? :1
-- :doc details for a bounty issue given owner, repo and issue nunber
SELECT SELECT
i.contract_address AS contract_address, i.contract_address AS contract_address,
i.issue_id AS issue_id, i.issue_id AS issue_id,
i.issue_number AS issue_number, i.issue_number AS issue_number,
i.balance AS balance, i.balance AS balance,
r.login AS login, r.login AS login,
r.repo AS repo r.repo AS repo,
FROM issues i i.state AS state
INNER JOIN repositories r ON r.repo_id = i.repo_id FROM issues i, repositories r
WHERE i.issue_number = :issue_number WHERE i.issue_number = :issue_number
AND r.login = :login AND r.repo = :repo; AND r.repo_id = i.repo_id
AND r.login = :login
AND r.repo = :repo;
-- :name get-balance :? :1 -- :name get-balance :? :1
-- :doc gets current balance of a wallet attached to a given issue -- :doc gets current balance of a wallet attached to a given issue
@ -367,8 +374,8 @@ SET balance = :balance
WHERE contract_address = :contract_address; WHERE contract_address = :contract_address;
-- :name save-issue-comment-image! :<! :1 -- :name save-issue-comment-image! :<! :1
-- :doc insert or update image data for a given issue's github comment
INSERT INTO issue_comment (issue_id, png_data) INSERT INTO issue_comment (issue_id, png_data)
VALUES (:issue_id, :png_data) VALUES (:issue_id, :png_data)
ON CONFLICT (issue_id) DO UPDATE ON CONFLICT (issue_id) DO UPDATE
@ -377,6 +384,7 @@ RETURNING id;
-- :name get-issue-comment-image :? :1 -- :name get-issue-comment-image :? :1
-- :doc retrieve image data for given issue's github comment
SELECT png_data SELECT png_data
FROM issue_comment FROM issue_comment
WHERE issue_id = :issue_id; WHERE issue_id = :issue_id;

4
src/clj/commiteth/db/bounties.clj
View File

@ -60,7 +60,7 @@
(db/get-bounty con-db {:login user :repo repo :issue_number issue-number}))) (db/get-bounty con-db {:login user :repo repo :issue_number issue-number})))
(defn list-wallets (defn open-bounty-contracts
[] []
(jdbc/with-db-connection [con-db *db*] (jdbc/with-db-connection [con-db *db*]
(db/wallets-list con-db))) (db/open-bounty-contracts con-db)))

15
src/clj/commiteth/db/pull_requests.clj
View File

@ -1,10 +1,17 @@
(ns commiteth.db.pull-requests (ns commiteth.db.pull-requests
(:require [commiteth.db.core :refer [*db*] :as db] (:require [commiteth.db.core :refer [*db*] :as db]
[clojure.java.jdbc :as jdbc] [clojure.java.jdbc :as jdbc]
[clojure.set :refer [rename-keys]])) [clojure.tools.logging :as log]))
(defn create
"Creates pull-request" (defn save
"Creates or updates a pull-request"
[pull-request] [pull-request]
(let [state (case (:state pull-request)
:opened 0
:merged 1
:closed 2)]
(log/debug (assoc pull-request :state state))
(jdbc/with-db-connection [con-db *db*] (jdbc/with-db-connection [con-db *db*]
(db/create-pull-request! con-db pull-request))) (db/save-pull-request! con-db
(assoc pull-request :state state)))))

97
src/clj/commiteth/routes/webhooks.clj
View File

@ -60,63 +60,92 @@
(issues/close commit-id issue-id)))) (issues/close commit-id issue-id))))
(def ^:const keywords (def ^:const keywords
[#"(?i)close\s+#(\d+)" [#"(?i)close:?\s+#(\d+)"
#"(?i)closes\s+#(\d+)" #"(?i)closes:?\s+#(\d+)"
#"(?i)closed\s+#(\d+)" #"(?i)closed:?\s+#(\d+)"
#"(?i)fix\s+#(\d+)" #"(?i)fix:?\s+#(\d+)"
#"(?i)fixes\s+#(\d+)" #"(?i)fixes:?\s+#(\d+)"
#"(?i)fixed\s+#(\d+)" #"(?i)fixed:?\s+#(\d+)"
#"(?i)resolve\s+#(\d+)" #"(?i)resolve:?\s?#(\d+)"
#"(?i)resolves\s+#(\d+)" #"(?i)resolves:?\s+#(\d+)"
#"(?i)resolved\s+#(\d+)"]) #"(?i)resolved:?\s+#(\d+)"])
(defn extract-issue-number (defn extract-issue-number
[pr-body] [pr-body pr-title]
(let [extract (fn [source]
(mapcat #(keep (mapcat #(keep
(fn [s] (fn [s]
(try (let [issue-number (Integer/parseInt (second s))] (try (let [issue-number (Integer/parseInt (second s))]
(when (pos? issue-number) (when (pos? issue-number)
issue-number)) issue-number))
(catch NumberFormatException _))) (catch NumberFormatException _)))
(re-seq % pr-body)) keywords)) (re-seq % source)) keywords))]
(concat (extract pr-body)
(extract pr-title))))
(defn validate-issue-number (defn ensure-bounty-issue
"Checks if an issue has a bounty label attached and returns its number" "Checks if an issue has a bounty label attached and returns its number"
[user repo issue-number] [user repo issue-number]
(when-let [issue (github/get-issue user repo issue-number)] (when-let [issue (github/get-issue user repo issue-number)]
(when (bounties/has-bounty-label? issue) (when (bounties/has-bounty-label? issue)
issue-number))) issue-number)))
(defn handle-pull-request-closed
[{{{owner :login} :owner (defn handle-pull-request-event
;; when a PR is opened, only consider it as a claim if:
;; * PR references an existing bounty-issue
;;
;; when a PR is merged via close event, only consider it a bounty
;; claim being accepted if:
;; * PR exists in DB
;; * PR references an existing bounty-issue
[event-type
{{{owner :login} :owner
repo :name repo :name
repo-id :id} :repository repo-id :id} :repository
{{user-id :id {{user-id :id
login :login login :login
avatar_url :avatar_url
name :name} :user name :name} :user
id :id id :id
pr-number :number pr-number :number
pr-body :body} :pull_request}] pr-body :body
(log/debug "handle-pull-request-closed" owner repo repo-id login pr-body) pr-title :title} :pull_request}]
(future (log/debug "handle-pull-request-event" event-type owner repo repo-id login pr-body pr-title)
(let [commit-id (find-commit-id owner repo pr-number ["merged"]) (log/debug (extract-issue-number pr-body pr-title))
issue-number (->> (when-let [bounty-issue-number (->>
(extract-issue-number pr-body) (extract-issue-number pr-body pr-title)
(first) (first)
(validate-issue-number owner repo)) (ensure-bounty-issue owner repo))]
m {:commit_id commit-id :issue_number issue-number}] (log/debug "Referenced bounty issue found" bounty-issue-number)
(log/debug "handle-pull-request-closed" commit-id issue-number) (users/create-user user-id login name nil avatar_url nil)
(when (or commit-id issue-number) (let [pr-data {:repo_id repo-id
(log/debug (format "Pull request %s/%s/%s closed with reference to %s"
login repo pr-number
(if commit-id (str "commit-id " commit-id)
(str "issue-number " issue-number))))
(pull-requests/create (merge m {:repo_id repo-id
:pr_id id :pr_id id
:pr_number pr-number :pr_number pr-number
:user_id user-id})) :user_id user-id
(users/create-user user-id login name nil nil))))) :issue_number bounty-issue-number
:state event-type}]
(case event-type
:opened (do
(log/info "PR with reference to bounty issue"
bounty-issue-number "opened")
(pull-requests/save (merge pr-data {:state :opened
:commit_id nil})))
:closed (if-let [commit-id (find-commit-id owner
repo
pr-number
["merged"])]
(do (log/info "PR with reference to bounty issue"
bounty-issue-number "merged")
(pull-requests/save
(merge pr-data {:state :merged
:commit_id commit-id})))
(do (log/info "PR with reference to bounty issue"
bounty-issue-number "closed with no merge")
(pull-requests/save
(merge pr-data {:state :closed
:commit_id nil}))))))))
(defn handle-issue (defn handle-issue
@ -134,8 +163,10 @@
(defn handle-pull-request (defn handle-pull-request
[pull-request] [pull-request]
(when (= "closed" (:action pull-request)) (case (:action pull-request)
(handle-pull-request-closed pull-request)) "opened" (handle-pull-request-event :opened pull-request)
"closed" (handle-pull-request-event :closed pull-request)
nil)
(ok)) (ok))

2
src/clj/commiteth/scheduler.clj
View File

@ -78,7 +78,7 @@
comment-id :comment_id comment-id :comment_id
issue-id :issue_id issue-id :issue_id
old-balance :balance old-balance :balance
issue-number :issue_number} (db-bounties/list-wallets)] issue-number :issue_number} (db-bounties/open-bounty-contracts)]
(when comment-id (when comment-id
(let [current-balance-hex (eth/get-balance-hex contract-address) (let [current-balance-hex (eth/get-balance-hex contract-address)
current-balance-eth (eth/hex->eth current-balance-hex 8) current-balance-eth (eth/hex->eth current-balance-hex 8)