Update modules.

mauriciofierrom · Aug 18, 2019 · 30521e8 · 30521e8
1 parent 0420dcf
commit 30521e8
Show file tree

Hide file tree

Showing 9 changed files with 25 additions and 26 deletions.
diff --git a/dialogflow.cabal b/dialogflow.cabal
@@ -32,10 +32,10 @@ source-repository head
 
 library
   exposed-modules:
-    Dialogflow.V2.Message
-    Dialogflow.V2.Payload.Google
-    Dialogflow.V2.Request
-    Dialogflow.V2.Response
+    Dialogflow.V2.Fulfillment.Message
+    Dialogflow.V2.Fulfillment.Payload.Google
+    Dialogflow.V2.Fulfillment.Webhook.Request
+    Dialogflow.V2.Fulfillment.Webhook.Response
     Dialogflow.Util
 
   build-depends:
@@ -57,10 +57,10 @@ test-suite dialog-flow-test
   build-tools: hspec-discover
   other-modules:
       TestUtil
-      Dialogflow.V2.MessageSpec
-      Dialogflow.V2.Payload.GoogleSpec
-      Dialogflow.V2.RequestSpec
-      Dialogflow.V2.ResponseSpec
+      Dialogflow.V2.Fulfillment.MessageSpec
+      Dialogflow.V2.Fulfillment.Payload.GoogleSpec
+      Dialogflow.V2.Fulfillment.Webhook.RequestSpec
+      Dialogflow.V2.Fulfillment.Webhook.ResponseSpec
   hs-source-dirs:
       test
   ghc-options: -threaded -rtsopts -with-rtsopts=-N

diff --git a/src/Dialogflow/V2/Message.hs → src/Dialogflow/V2/Fulfillment/Message.hs b/src/Dialogflow/V2/Message.hs → src/Dialogflow/V2/Fulfillment/Message.hs
@@ -19,7 +19,7 @@ This module contains types for Dialogflow messages to be used in
 a fulfillment webhook response. See the Dialogflow <https://cloud.google.com/dialogflow/docs/reference/rpc/google.cloud.dialogflow.v2#google.cloud.dialogflow.v2.Intent.Message documentation>.
 -}
 
-module Dialogflow.V2.Message
+module Dialogflow.V2.Fulfillment.Message
   ( CardButton(..)
   , BasicCardContent(..)
   , BasicCardButton(..)

diff --git a/src/Dialogflow/V2/Payload/Google.hs → ...alogflow/V2/Fulfillment/Payload/Google.hs b/src/Dialogflow/V2/Payload/Google.hs → ...alogflow/V2/Fulfillment/Payload/Google.hs
@@ -19,7 +19,7 @@ This module contains types for the Google Actions payload to be included
 in the webhook reponse. See the Dialogflow <https://developers.google.com/actions/build/json/dialogflow-webhook-json#dialogflow-response-body documentation>.
 -}
 
-module Dialogflow.V2.Payload.Google where
+module Dialogflow.V2.Fulfillment.Payload.Google where
 
 import Data.Aeson ( parseJSON
                   , toJSON
@@ -34,7 +34,7 @@ import Data.Foldable (asum)
 import qualified Data.HashMap.Strict as HM
 
 import Dialogflow.Util
-import qualified Dialogflow.V2.Message as M
+import qualified Dialogflow.V2.Fulfillment.Message as M
 
 -- | This field can be used to provide responses for different platforms
 -- like Actions on Google.

diff --git a/src/Dialogflow/V2/Request.hs → ...logflow/V2/Fulfillment/Webhook/Request.hs b/src/Dialogflow/V2/Request.hs → ...logflow/V2/Fulfillment/Webhook/Request.hs
@@ -1,6 +1,5 @@
 {-# LANGUAGE OverloadedStrings #-}
 {-# LANGUAGE RecordWildCards #-}
-{-# LANGUAGE NamedFieldPuns #-}
 
 {-|
 Module      : Dialogflow.V2.Request
@@ -12,7 +11,7 @@ Maintainer  : Mauricio Fierro <[email protected]>
 This module contains types for Dialogflow webhook requests. See the Dialogflow <https://cloud.google.com/dialogflow/docs/reference/rpc/google.cloud.dialogflow.v2#webhookrequest documentation>.
 -}
 
-module Dialogflow.V2.Request where
+module Dialogflow.V2.Fulfillment.Webhook.Request where
 
 import Data.Aeson ( FromJSON
                   , parseJSON

diff --git a/src/Dialogflow/V2/Response.hs → ...ogflow/V2/Fulfillment/Webhook/Response.hs b/src/Dialogflow/V2/Response.hs → ...ogflow/V2/Fulfillment/Webhook/Response.hs
@@ -11,7 +11,7 @@ Maintainer  : Mauricio Fierro <[email protected]>
 This module contains types for Dialogflow webhook response. See the Dialogflow <https://cloud.google.com/dialogflow/docs/reference/rpc/google.cloud.dialogflow.v2#webhookresponse documentation>.
 -}
 
-module Dialogflow.V2.Response where
+module Dialogflow.V2.Fulfillment.Webhook.Response where
 
 import Data.Aeson ( parseJSON
                   , toJSON
@@ -24,10 +24,10 @@ import Dialogflow.Util (noNullObjects)
 
 import qualified Data.Map as M
 
-import Dialogflow.V2.Request (Context)
-import Dialogflow.V2.Message
+import Dialogflow.V2.Fulfillment.Webhook.Request (Context)
+import Dialogflow.V2.Fulfillment.Message
 
-import qualified Dialogflow.V2.Payload.Google as G
+import qualified Dialogflow.V2.Fulfillment.Payload.Google as G
 
 -- TODO: When this is included, no messages or payload is taken into account.
 -- We gotta cover this.

diff --git a/test/Dialogflow/V2/MessageSpec.hs → .../Dialogflow/V2/Fulfillment/MessageSpec.hs b/test/Dialogflow/V2/MessageSpec.hs → .../Dialogflow/V2/Fulfillment/MessageSpec.hs
@@ -1,11 +1,11 @@
 {-# LANGUAGE OverloadedStrings #-}
 
-module Dialogflow.V2.MessageSpec where
+module Dialogflow.V2.Fulfillment.MessageSpec where
 
 import Test.Hspec
 import TestUtil
 
-import Dialogflow.V2.Message
+import Dialogflow.V2.Fulfillment.Message
 
 basePath :: FilePath
 basePath = "files/message/"

diff --git a/test/Dialogflow/V2/Payload/GoogleSpec.hs → ...flow/V2/Fulfillment/Payload/GoogleSpec.hs b/test/Dialogflow/V2/Payload/GoogleSpec.hs → ...flow/V2/Fulfillment/Payload/GoogleSpec.hs
@@ -1,12 +1,12 @@
-module Dialogflow.V2.Payload.GoogleSpec where
+module Dialogflow.V2.Fulfillment.Payload.GoogleSpec where
 
 import Test.Hspec
 
 import TestUtil
-import Dialogflow.V2.Payload.Google
+import Dialogflow.V2.Fulfillment.Payload.Google
 import Data.Aeson
 
-import qualified Dialogflow.V2.Message as M
+import qualified Dialogflow.V2.Fulfillment.Message as M
 
 basePath :: FilePath
 basePath = "files/payload/google/"

diff --git a/test/Dialogflow/V2/RequestSpec.hs → ...low/V2/Fulfillment/Webhook/RequestSpec.hs b/test/Dialogflow/V2/RequestSpec.hs → ...low/V2/Fulfillment/Webhook/RequestSpec.hs
@@ -1,12 +1,12 @@
 {-# LANGUAGE OverloadedStrings #-}
 
-module Dialogflow.V2.RequestSpec where
+module Dialogflow.V2.Fulfillment.Webhook.RequestSpec where
 
 import Data.Aeson (eitherDecode)
 import Test.Hspec
 import qualified Data.Map as M
 
-import Dialogflow.V2.Request
+import Dialogflow.V2.Fulfillment.Webhook.Request
 import TestUtil
 
 basePath :: FilePath

diff --git a/test/Dialogflow/V2/ResponseSpec.hs → ...ow/V2/Fulfillment/Webhook/ResponseSpec.hs b/test/Dialogflow/V2/ResponseSpec.hs → ...ow/V2/Fulfillment/Webhook/ResponseSpec.hs
@@ -1,10 +1,10 @@
-module Dialogflow.V2.ResponseSpec where
+module Dialogflow.V2.Fulfillment.Webhook.ResponseSpec where
 
 import Test.Hspec
 
 import qualified Data.Map as M
 
-import Dialogflow.V2.Response
+import Dialogflow.V2.Fulfillment.Webhook.Response
 import TestUtil
 
 basePath :: FilePath