From 79739ff94d21e8384c3382c7ecf5e969c6db1efa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bernhard=20M=C3=A4hr?= <git@bmaehr.com>
Date: Wed, 16 Aug 2017 21:59:20 +0200
Subject: [PATCH] Changed parsing because of deprecated payload parts #41

---
 models/values/payload_request_details.rb | 38 +++++++++++++++++-------
 1 file changed, 28 insertions(+), 10 deletions(-)

diff --git a/models/values/payload_request_details.rb b/models/values/payload_request_details.rb
index 7011dfa..7b35830 100644
--- a/models/values/payload_request_details.rb
+++ b/models/values/payload_request_details.rb
@@ -12,9 +12,13 @@ def valid?
     end
 
     def repository_url
-      return "" unless payload["repository"]
-      return "" unless payload["repository"]["url"]
-      payload["repository"]["url"].strip
+      if payload["project"] && payload["project"]["git_http_url"]
+        payload["project"]["git_http_url"].strip
+      elsif payload["repository"] && payload["repository"]["url"]
+        payload["repository"]["url"].strip
+      else
+        ""
+      end
     end
 
     def repository_group
@@ -23,19 +27,33 @@ def repository_group
     end
 
     def repository_name
-      return "" unless payload["repository"]
-      return "" unless payload["repository"]["name"]
-      payload["repository"]["name"].strip
+      if payload["project"] && payload["project"]["name"]
+        payload["project"]["name"].strip
+      elsif payload["repository"] && payload["repository"]["name"]
+        payload["repository"]["name"].strip
+      else
+        ""
+      end
     end
 
     def repository_homepage
-      return "" unless payload["repository"]
-      return "" unless payload["repository"]["homepage"]
-      payload["repository"]["homepage"].strip
+      if payload["project"] && payload["project"]["homepage"]
+        payload["project"]["homepage"].strip
+      elsif payload["repository"] && payload["repository"]["homepage"]
+        payload["repository"]["homepage"].strip
+      else
+        ""
+      end
     end
 
     def full_branch_reference
-      payload["ref"].to_s.strip
+      if payload["ref"]
+        payload["ref"].to_s.strip
+      elsif payload["changes"] && payload["changes"][0] && payload["changes"][0]["ref"]
+        payload["changes"][0]["ref"].strip
+      else
+        ""
+      end
     end
 
     def delete_branch_commit?