[#119] Remove JSON body from set-field-visibility

serokell · Jul 28, 2022 · 4a373e2 · 4a373e2
1 parent f9c5fa6
commit 4a373e2
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 10 deletions.
diff --git a/lib/Web/API.hs b/lib/Web/API.hs
@@ -37,8 +37,9 @@ type API
     :<|> "set-field-visibility"
       :> RequiredParam "path" EntryPath
       :> RequiredParam "field" FieldName
-      :> ReqBody '[JSON] FieldVisibility
-      :> Post '[JSON] Entry
+      :> (    "public"  :> Post '[JSON] Entry
+         :<|> "private" :> Post '[JSON] Entry
+         )
 
     :<|> "delete-field"
       :> RequiredParam "path" EntryPath

diff --git a/lib/Web/Server.hs b/lib/Web/Server.hs
@@ -125,14 +125,24 @@ reportErrors io = do
     Right (Right a) -> do
       return a
 
+-- setFieldVisibility
+--   :: (forall a. Command a -> Handler a)
+--   -> Bool
+--   -> EntryPath
+--   -> FieldName
+--   -> Handler Entry
+
 makeServer
   :: (SomeBackend -> (forall a. Command a -> Handler a))
   -> Server API
 makeServer run backend
   =    view               (run backend)
   :<|> create             (run backend)
   :<|> setField           (run backend)
-  :<|> setFieldVisibility (run backend)
+  :<|> (\path field->
+            setFieldVisibility (run backend) path field Public
+       :<|> setFieldVisibility (run backend) path field Private
+       )
   :<|> deleteField        (run backend)
   :<|> find'              (run backend)
   :<|> rename             (run backend)

diff --git a/tests/server-integration/SetField/SetFieldTest.hs b/tests/server-integration/SetField/SetFieldTest.hs
@@ -122,8 +122,8 @@ unit_set_field_visibility = cofferTest do
   createEntry "dir/entry"
   void $ setField "dir/entry" "private-field" Nothing "contents"
   void $ setField "dir/entry" "public-field" Nothing "contents"
-  changeFieldVisibility "dir/entry" "private-field" False
-  changeFieldVisibility "dir/entry" "public-field" True
+  changeFieldVisibility "dir/entry" "private-field" "private"
+  changeFieldVisibility "dir/entry" "public-field" "public"
 
   response <-
     executeCommand

diff --git a/tests/server-integration/Utils.hs b/tests/server-integration/Utils.hs
@@ -118,12 +118,12 @@ setField path name public contents =
   where
     visibility = boolToVisibility <$> public
 
-changeFieldVisibility :: Text -> Text -> Bool -> IO ()
-changeFieldVisibility path field public = void $
+changeFieldVisibility :: Text -> Text -> Text -> IO ()
+changeFieldVisibility path field visibility = void $
   executeCommand
     POST
-    ["set-field-visibility"]
-    (ReqBodyJson $ String $ boolToVisibility public)
+    ["set-field-visibility", visibility]
+    NoReqBody
     ignoreResponse
     ( mconcat
         [ "path" =: path

diff --git a/tests/server-integration/View/ViewTest.hs b/tests/server-integration/View/ViewTest.hs
@@ -18,7 +18,7 @@ unit_view_an_entry = cofferTest do
   createEntry "dir/entry"
   void $ setField "dir/entry" "public-field" Nothing "contents"
   void $ setField "dir/entry" "private-field" Nothing "multiline\ncontents"
-  changeFieldVisibility "dir/entry" "private-field" False
+  changeFieldVisibility "dir/entry" "private-field" "private"
 
   response <-
     executeCommand