fix the PullRequest object so it can parse

github.cabal

@@ -34,7 +34,11 @@ extra-source-files:
   fixtures/list-teams.json,
   fixtures/members-list.json,
   fixtures/user-organizations.json,
-  fixtures/user.json
+  fixtures/user.json,
+  fixtures/pull-request-realworld.json,
+  fixtures/pull-request-baxterthehacker.json,
+  fixtures/pull-request-event-github-example.json
+  fixtures/pull-request-event-realworld.json,
 
 flag aeson-compat
   description: Whether to use aeson-compat or aeson-extra
@@ -185,9 +189,11 @@ test-suite github-test
                  vector,
                  unordered-containers,
                  file-embed,
+                 aeson,
+                 text,
+                 bytestring,
                  hspec
   if flag(aeson-compat)
     build-depends: aeson-compat
   else
     build-depends: aeson-extra
-

spec/GitHub/PullRequestsSpec.hs

@@ -1,16 +1,24 @@
 {-# LANGUAGE OverloadedStrings #-}
+{-# LANGUAGE ScopedTypeVariables #-}
+{-# LANGUAGE TemplateHaskell   #-}
 module GitHub.PullRequestsSpec where
 
 import qualified GitHub
 
 import Prelude ()
 import Prelude.Compat
 
+import Data.Aeson.Compat    (eitherDecodeStrict)
 import Data.Either.Compat   (isRight)
 import Data.Foldable        (for_)
 import Data.String          (fromString)
+import qualified Data.Vector as V
 import System.Environment   (lookupEnv)
-import Test.Hspec           (Spec, describe, it, pendingWith, shouldSatisfy)
+import Data.FileEmbed       (embedFile)
+import Test.Hspec           (Spec, describe, it, pendingWith, shouldSatisfy, shouldBe)
+import GitHub.Data.Definitions (simpleUserLogin)
+import GitHub.Data.Options  (IssueState(..))
+import GitHub.Data.PullRequests
 
 fromRightS :: Show a => Either a b -> b
 fromRightS (Right b) = b
@@ -28,8 +36,34 @@ spec = do
     describe "pullRequestsForR" $ do
         it "works" $ withAuth $ \auth -> for_ repos $ \(owner, repo) -> do
             cs <- GitHub.executeRequest auth $
-                GitHub.pullRequestsForR owner repo opts GitHub.FetchAll 
+                GitHub.pullRequestsForR owner repo opts GitHub.FetchAll
             cs `shouldSatisfy` isRight
+    describe "PullRequest" $ do
+        it "can parse PR json, from a PR to the github repo" $ do
+            let pr = fromRightS $
+                  eitherDecodeStrict $(embedFile "fixtures/pull-request-realworld.json")
+
+            pullRequestState pr `shouldBe` StateOpen
+            simpleUserLogin (pullRequestUser pr) `shouldBe` "adnelson"
+            let [user] = V.toList (pullRequestAssignees pr)
+            simpleUserLogin user `shouldBe` "phadej"
+        it "can parse PR json, from the 'baxterthehacker' account" $ do
+            let pr = fromRightS $
+                  eitherDecodeStrict $(embedFile "fixtures/pull-request-baxterthehacker.json")
+            pullRequestState pr `shouldBe` StateClosed
+            simpleUserLogin (pullRequestUser pr) `shouldBe` "baxterthehacker"
+    describe "PullRequestEvent" $ do
+        it "can parse PR event json, example from github docs" $ do
+            let pre = fromRightS $
+                  eitherDecodeStrict $(embedFile "fixtures/pull-request-event-github-example.json")
+            pullRequestEventAction pre `shouldBe` PullRequestOpened
+            simpleUserLogin (pullRequestSender pre) `shouldBe` "baxterthehacker"
+        it "can parse PR event json, example from a real-world github repo" $ do
+            let pre = fromRightS $
+                  eitherDecodeStrict $(embedFile "fixtures/pull-request-event-realworld.json")
+            pullRequestEventAction pre `shouldBe` PullRequestOpened
+            simpleUserLogin (pullRequestSender pre) `shouldBe` "adnelson"
+
   where
     repos =
       [ ("thoughtbot", "paperclip")

src/GitHub/Data/PullRequests.hs

@@ -19,11 +19,14 @@ module GitHub.Data.PullRequests (
 
 import GitHub.Data.Definitions
 import GitHub.Data.Id          (Id)
-import GitHub.Data.Options     (IssueState (..), MergeableState (..))
+import GitHub.Data.Options     (IssueState (..))
 import GitHub.Data.Repos       (Repo)
 import GitHub.Data.Request     (StatusMap)
 import GitHub.Data.URL         (URL)
 import GitHub.Internal.Prelude
+import Data.Vector as V (elem, snoc)
+import Data.Aeson.Types (Parser)
+import qualified Data.Text as T
 import Prelude ()
 
 data SimplePullRequest = SimplePullRequest
@@ -36,7 +39,7 @@ data SimplePullRequest = SimplePullRequest
     , simplePullRequestHtmlUrl   :: !URL
     , simplePullRequestUpdatedAt :: !UTCTime
     , simplePullRequestBody      :: !(Maybe Text)
-    , simplePullRequestAssignees :: (Vector SimpleUser)
+    , simplePullRequestAssignees :: !(Vector SimpleUser)
     , simplePullRequestIssueUrl  :: !URL
     , simplePullRequestDiffUrl   :: !URL
     , simplePullRequestUrl       :: !URL
@@ -60,7 +63,7 @@ data PullRequest = PullRequest
     , pullRequestHtmlUrl        :: !URL
     , pullRequestUpdatedAt      :: !UTCTime
     , pullRequestBody           :: !(Maybe Text)
-    , pullRequestAssignees      :: (Vector SimpleUser)
+    , pullRequestAssignees      :: !(Vector SimpleUser)
     , pullRequestIssueUrl       :: !URL
     , pullRequestDiffUrl        :: !URL
     , pullRequestUrl            :: !URL
@@ -74,12 +77,10 @@ data PullRequest = PullRequest
     , pullRequestComments       :: !Count
     , pullRequestDeletions      :: !Count
     , pullRequestAdditions      :: !Count
-    , pullRequestReviewComments :: !Count
     , pullRequestBase           :: !PullRequestCommit
     , pullRequestCommits        :: !Count
     , pullRequestMerged         :: !Bool
     , pullRequestMergeable      :: !(Maybe Bool)
-    , pullRequestMergeableState :: !MergeableState
     }
   deriving (Show, Data, Typeable, Eq, Ord, Generic)
 
@@ -160,6 +161,9 @@ data PullRequestEventType
     | PullRequestUnassigned
     | PullRequestLabeled
     | PullRequestUnlabeled
+    | PullRequestReviewRequested
+    | PullRequestReviewRequestRemoved
+    | PullRequestEdited
     deriving (Show, Data, Typeable, Eq, Ord, Generic)
 
 instance NFData PullRequestEventType where rnf = genericRnf
@@ -180,8 +184,22 @@ instance Binary PullRequestReference
 -- JSON instances
 -------------------------------------------------------------------------------
 
+-- | Helper function, reads either the "assignee" OR "assigneed" OR
+-- both from a JSON object.
+getAssignees :: Object -> Parser (Vector SimpleUser)
+getAssignees o = do
+    assignees <- o .:? "assignees" .!= mempty
+    maybeAssignee <- o .:? "assignee"
+    pure $ case maybeAssignee of
+        Nothing -> assignees
+        Just assignee | assignee `V.elem` assignees -> assignees
+                      | otherwise -> assignees `V.snoc` assignee
+
 instance FromJSON SimplePullRequest where
-    parseJSON = withObject "SimplePullRequest" $ \o -> SimplePullRequest
+    parseJSON = withObject "SimplePullRequest" $ \o -> do
+      -- | Either key, or both, might be present, and might contain
+      -- redundant information. Take both keys and uniquify the list.
+      SimplePullRequest
         <$> o .:? "closed_at"
         <*> o .: "created_at"
         <*> o .: "user"
@@ -191,7 +209,7 @@ instance FromJSON SimplePullRequest where
         <*> o .: "html_url"
         <*> o .: "updated_at"
         <*> o .:? "body"
-        <*> o .: "assignees"
+        <*> getAssignees o
         <*> o .: "issue_url"
         <*> o .: "diff_url"
         <*> o .: "url"
@@ -231,7 +249,7 @@ instance FromJSON PullRequest where
         <*> o .: "html_url"
         <*> o .: "updated_at"
         <*> o .:? "body"
-        <*> o .: "assignees"
+        <*> getAssignees o
         <*> o .: "issue_url"
         <*> o .: "diff_url"
         <*> o .: "url"
@@ -245,12 +263,10 @@ instance FromJSON PullRequest where
         <*> o .: "comments"
         <*> o .: "deletions"
         <*> o .: "additions"
-        <*> o .: "review_comments"
         <*> o .: "base"
         <*> o .: "commits"
         <*> o .: "merged"
         <*> o .:? "mergeable"
-        <*> o .: "mergeable_state"
 
 instance FromJSON PullRequestLinks where
     parseJSON = withObject "PullRequestLinks" $ \o -> PullRequestLinks
@@ -284,6 +300,10 @@ instance FromJSON PullRequestEventType where
     parseJSON (String "unassigned") = pure PullRequestUnassigned
     parseJSON (String "labeled") = pure PullRequestLabeled
     parseJSON (String "unlabeled") = pure PullRequestUnlabeled
+    parseJSON (String "review_requested") = pure PullRequestReviewRequested
+    parseJSON (String "review_request_removed") = pure PullRequestReviewRequestRemoved
+    parseJSON (String "edited") = pure PullRequestEdited
+    parseJSON (String s) = fail $ "Unknown action type " <> T.unpack s
     parseJSON v = typeMismatch "Could not build a PullRequestEventType" v
 
 instance FromJSON PullRequestReference where