Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

BitBucket posting comments #223

Merged
merged 2 commits into from
Jan 28, 2016
Merged

BitBucket posting comments #223

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
775b720
adding posting comments to bitbucket - had to drop down to API v1
czechboy0 Jan 28, 2016
670a02f
removed unused code - we can't do these things for bitbucket :(
czechboy0 Jan 28, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions BuildaGitServer/BitBucket/BitBucketComment.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ class BitBucketComment: BitBucketEntity, CommentType {
required init(json: NSDictionary) {

self.body = json
.dictionaryForKey("content")
.stringForKey("raw")
.optionalDictionaryForKey("content")?
.stringForKey("raw") ?? json.stringForKey("content")

super.init(json: json)
}
Expand Down
9 changes: 8 additions & 1 deletion BuildaGitServer/BitBucket/BitBucketEndpoints.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,14 @@ class BitBucketEndpoints {
assert(params?["repo"] != nil, "A repo must be specified")
assert(params?["pr"] != nil, "A PR must be specified")
let pr = self.endpointURL(.PullRequests, params: params)
return "\(pr)/comments"

if params?["method"] == "POST" {
let repo = params!["repo"]!
let pr = params!["pr"]!
return "/1.0/repositories/\(repo)/pullrequests/\(pr)/comments"
} else {
return "\(pr)/comments"
}

case .CommitStatuses:

Expand Down
53 changes: 23 additions & 30 deletions BuildaGitServer/BitBucket/BitBucketServer.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,8 +167,29 @@ extension BitBucketServer: SourceServerType {

func postCommentOnIssue(comment: String, issueNumber: Int, repo: String, completion: (comment: CommentType?, error: ErrorType?) -> ()) {

//TODO
completion(comment: nil, error: Error.withInfo("Posting comments on BitBucket not yet supported"))
let params = [
"repo": repo,
"pr": issueNumber.description
]

let body = [
"content": comment
]

self._sendRequestWithMethod(.POST, endpoint: .PullRequestComments, params: params, query: nil, body: body) { (response, body, error) -> () in

if error != nil {
completion(comment: nil, error: error)
return
}

if let body = body as? NSDictionary {
let comment = BitBucketComment(json: body)
completion(comment: comment, error: nil)
} else {
completion(comment: nil, error: Error.withInfo("Wrong body \(body)"))
}
}
}

func getCommentsOfIssue(issueNumber: Int, repo: String, completion: (comments: [CommentType]?, error: ErrorType?) -> ()) {
Expand Down Expand Up @@ -199,44 +220,16 @@ extension BitBucketServer {

private func _sendRequest(request: NSMutableURLRequest, isRetry: Bool = false, completion: HTTP.Completion) {

// let cachedInfo = self.cache.getCachedInfoForRequest(request)
// if let etag = cachedInfo.etag {
// request.setValue(etag, forHTTPHeaderField: "If-None-Match")
// }

self.http.sendRequest(request) { (response, body, error) -> () in

if let error = error {
completion(response: response, body: body, error: error)
return
}

// if let response = response {
// let headers = response.allHeaderFields
//
// if
// let resetTime = (headers["X-RateLimit-Reset"] as? NSString)?.doubleValue,
// let limit = (headers["X-RateLimit-Limit"] as? NSString)?.integerValue,
// let remaining = (headers["X-RateLimit-Remaining"] as? NSString)?.integerValue {
//
// let rateLimitInfo = GitHubRateLimit(resetTime: resetTime, limit: limit, remaining: remaining)
// self.latestRateLimitInfo = rateLimitInfo
//
// } else {
// Log.error("No X-RateLimit info provided by GitHub in headers: \(headers), we're unable to detect the remaining number of allowed requests. GitHub might fail to return data any time now :(")
// }
// }

//error out on special HTTP status codes
let statusCode = response!.statusCode
switch statusCode {
// case 200...299: //good response, cache the returned data
// let responseInfo = ResponseInfo(response: response!, body: body)
// cachedInfo.update(responseInfo)
// case 304: //not modified, return the cached response
// let responseInfo = cachedInfo.responseInfo!
// completion(response: responseInfo.response, body: responseInfo.body, error: nil)
// return
case 401: //unauthorized, use refresh token to get a new access token
//only try to refresh token once
if !isRetry {
Expand Down