[API] some fixes to sum types JSON serialization

src/Gargantext/API/Node/Contact.hs

@@ -46,6 +46,7 @@ import Gargantext.Database.Admin.Types.Hyperdata (HyperdataAnnuaire(..), Hyperda
 import Gargantext.Database.Admin.Types.Hyperdata.Contact (hyperdataContact)
 import Gargantext.Database.Admin.Types.Node
 import Gargantext.Prelude (($), liftBase, (.), printDebug, pure)
+import qualified Gargantext.Utils.Aeson as GUA
 
 ------------------------------------------------------------------------
 type API = "contact" :> Summary "Contact endpoint"
@@ -105,10 +106,10 @@ addContact _uId _nId _p logStatus = do
 ------------------------------------------------------------------------
 -- TODO unPrefix "pn_" FromJSON, ToJSON, ToSchema, adapt frontend.
 instance FromJSON  AddContactParams where
-  parseJSON = genericParseJSON (defaultOptions { sumEncoding = ObjectWithSingleField })
+  parseJSON = genericParseJSON (defaultOptions { sumEncoding = GUA.defaultTaggedObject })
 
 instance ToJSON    AddContactParams where
-  toJSON = genericToJSON (defaultOptions { sumEncoding = ObjectWithSingleField })
+  toJSON = genericToJSON (defaultOptions { sumEncoding = GUA.defaultTaggedObject })
   
 instance ToSchema  AddContactParams
 instance Arbitrary AddContactParams where

src/Gargantext/API/Public.hs

@@ -42,6 +42,7 @@ import Gargantext.Database.Query.Table.NodeNode (selectPublicNodes)
 import Gargantext.Core.Utils.DateUtils (utc2year)
 import Gargantext.Database.Schema.Node -- (NodePoly(..))
 import Gargantext.Prelude
+import qualified Gargantext.Utils.Aeson as GUA
 
 ------------------------------------------------------------------------
 type API =  API_Home
@@ -138,10 +139,10 @@ data PublicData = PublicData
 
 
 instance FromJSON  PublicData where
-  parseJSON = genericParseJSON (defaultOptions { sumEncoding = ObjectWithSingleField })
+  parseJSON = genericParseJSON (defaultOptions { sumEncoding = GUA.defaultTaggedObject })
 
 instance ToJSON    PublicData where
-  toJSON = genericToJSON (defaultOptions { sumEncoding = ObjectWithSingleField })
+  toJSON = genericToJSON (defaultOptions { sumEncoding = GUA.defaultTaggedObject })
 
 instance ToSchema  PublicData
 instance Arbitrary PublicData where

src/Gargantext/API/Search.hs

@@ -75,12 +75,10 @@ api nId (SearchQuery q SearchContact) o l order = do
 -----------------------------------------------------------------------
 data SearchType = SearchDoc | SearchContact
   deriving (Generic)
-instance FromJSON  SearchType
-  where
-    parseJSON = genericParseJSON (defaultOptions { sumEncoding = ObjectWithSingleField })
-instance ToJSON  SearchType
-  where
-    toJSON = genericToJSON (defaultOptions { sumEncoding = ObjectWithSingleField })
+instance FromJSON SearchType where
+  parseJSON = genericParseJSON (defaultOptions { sumEncoding = ObjectWithSingleField })
+instance ToJSON SearchType where
+  toJSON = genericToJSON (defaultOptions { sumEncoding = ObjectWithSingleField })
 instance ToSchema SearchType
 instance Arbitrary SearchType where
   arbitrary = elements [SearchDoc, SearchContact]
@@ -91,12 +89,10 @@ data SearchQuery =
               , expected :: !SearchType
               }
     deriving (Generic)
-instance FromJSON  SearchQuery
-  where
-    parseJSON = genericParseJSON (defaultOptions { sumEncoding = ObjectWithSingleField })
-instance ToJSON  SearchQuery
-  where
-    toJSON = genericToJSON (defaultOptions { sumEncoding = ObjectWithSingleField })
+instance FromJSON SearchQuery where
+  parseJSON = genericParseJSON defaultOptions
+instance ToJSON SearchQuery where
+  toJSON = genericToJSON defaultOptions
 instance ToSchema SearchQuery
 {-
   where
@@ -111,13 +107,11 @@ data SearchResult =
   SearchResult { result :: !SearchResultTypes}
     deriving (Generic)
 
-instance FromJSON  SearchResult
-  where
-    parseJSON = genericParseJSON (defaultOptions { sumEncoding = ObjectWithSingleField })
+instance FromJSON SearchResult where
+  parseJSON = genericParseJSON defaultOptions
 
-instance ToJSON  SearchResult
-  where
-    toJSON = genericToJSON (defaultOptions { sumEncoding = ObjectWithSingleField })
+instance ToJSON SearchResult where
+  toJSON = genericToJSON defaultOptions
 
 instance ToSchema SearchResult
 {-
@@ -134,12 +128,10 @@ data SearchResultTypes =
   | SearchResultContact  { contacts :: ![Row] }
   | SearchNoResult      { message  :: !Text }
   deriving (Generic)
-instance FromJSON  SearchResultTypes
-  where
-    parseJSON = genericParseJSON (defaultOptions { sumEncoding = defaultTaggedObject })
-instance ToJSON  SearchResultTypes
-  where
-    toJSON = genericToJSON (defaultOptions { sumEncoding = defaultTaggedObject })
+instance FromJSON SearchResultTypes where
+  parseJSON = genericParseJSON (defaultOptions { sumEncoding = defaultTaggedObject })
+instance ToJSON SearchResultTypes where
+  toJSON = genericToJSON (defaultOptions { sumEncoding = defaultTaggedObject })
  
 instance Arbitrary SearchResultTypes where
   arbitrary = do