Add Plugin, remove ApiLegacy and Widget integration

Author: vknaisl

registry-server/package.yaml

@@ -106,7 +106,6 @@ tests:
     - case-insensitive
     - containers
     - data-default
-    - ginger
     - http-types
     - mtl
     - monad-control

shared-common/package.yaml

@@ -41,7 +41,6 @@ library:
   - directory
   - exceptions
   - fsutils
-  - ginger
   - hashable
   - http-client
   - http-client-tls

shared-common/src/Shared/Common/Util/Ginger.hs

@@ -1,36 +1,3 @@
-{-# LANGUAGE StandaloneDeriving #-}
-
 module Shared.Common.Util.Hashable where
 
-import Data.Hashable
-import Data.Time
-import GHC.Generics
-
-deriving instance Generic Day
-
-instance Hashable Day
-
-deriving instance Generic LocalTime
-
-instance Hashable LocalTime
-
-deriving instance Generic TimeOfDay
-
-instance Hashable TimeOfDay
-
-deriving instance Generic TimeZone
-
-instance Hashable TimeZone
-
-instance Hashable DiffTime where
-  hashWithSalt s = (hashWithSalt s :: Double -> Int) . realToFrac
-
-deriving instance Generic UTCTime
-
-instance Hashable UTCTime
-
-deriving instance Eq ZonedTime
-
-deriving instance Generic ZonedTime
-
-instance Hashable ZonedTime
+import Data.Aeson ()

shared-common/src/Shared/Common/Util/Hashable.hs

@@ -17,8 +17,7 @@ instance FromJSON AddIntegrationEvent where
     integrationType <- o .: "integrationType"
     case integrationType of
       "ApiIntegration" -> parseJSON (Object o) >>= \event -> return (AddApiIntegrationEvent' event)
-      "ApiLegacyIntegration" -> parseJSON (Object o) >>= \event -> return (AddApiLegacyIntegrationEvent' event)
-      "WidgetIntegration" -> parseJSON (Object o) >>= \event -> return (AddWidgetIntegrationEvent' event)
+      "PluginIntegration" -> parseJSON (Object o) >>= \event -> return (AddPluginIntegrationEvent' event)
       _ -> fail "One of the events has unsupported integrationType"
   parseJSON _ = mzero
 
@@ -30,18 +29,11 @@ instance ToJSON AddApiIntegrationEvent where
   toJSON = toJSONWithAdditionalData [("integrationType", "ApiIntegration")]
 
 -- --------------------------------------------
-instance FromJSON AddApiLegacyIntegrationEvent where
+instance FromJSON AddPluginIntegrationEvent where
   parseJSON = genericParseJSON jsonOptions
 
-instance ToJSON AddApiLegacyIntegrationEvent where
-  toJSON = toJSONWithAdditionalData [("integrationType", "ApiLegacyIntegration")]
-
--- --------------------------------------------
-instance FromJSON AddWidgetIntegrationEvent where
-  parseJSON = genericParseJSON jsonOptions
-
-instance ToJSON AddWidgetIntegrationEvent where
-  toJSON = toJSONWithAdditionalData [("integrationType", "WidgetIntegration")]
+instance ToJSON AddPluginIntegrationEvent where
+  toJSON = toJSONWithAdditionalData [("integrationType", "PluginIntegration")]
 
 -- --------------------------------------------
 -- --------------------------------------------
@@ -53,8 +45,7 @@ instance FromJSON EditIntegrationEvent where
     integrationType <- o .: "integrationType"
     case integrationType of
       "ApiIntegration" -> parseJSON (Object o) >>= \event -> return (EditApiIntegrationEvent' event)
-      "ApiLegacyIntegration" -> parseJSON (Object o) >>= \event -> return (EditApiLegacyIntegrationEvent' event)
-      "WidgetIntegration" -> parseJSON (Object o) >>= \event -> return (EditWidgetIntegrationEvent' event)
+      "PluginIntegration" -> parseJSON (Object o) >>= \event -> return (EditPluginIntegrationEvent' event)
       _ -> fail "One of the events has unsupported integrationType"
   parseJSON _ = mzero
 
@@ -66,15 +57,8 @@ instance ToJSON EditApiIntegrationEvent where
   toJSON = toJSONWithAdditionalData [("integrationType", "ApiIntegration")]
 
 -- --------------------------------------------
-instance FromJSON EditApiLegacyIntegrationEvent where
-  parseJSON = genericParseJSON jsonOptions
-
-instance ToJSON EditApiLegacyIntegrationEvent where
-  toJSON = toJSONWithAdditionalData [("integrationType", "ApiLegacyIntegration")]
-
--- --------------------------------------------
-instance FromJSON EditWidgetIntegrationEvent where
+instance FromJSON EditPluginIntegrationEvent where
   parseJSON = genericParseJSON jsonOptions
 
-instance ToJSON EditWidgetIntegrationEvent where
-  toJSON = toJSONWithAdditionalData [("integrationType", "WidgetIntegration")]
+instance ToJSON EditPluginIntegrationEvent where
+  toJSON = toJSONWithAdditionalData [("integrationType", "PluginIntegration")]

shared-common/src/Shared/KnowledgeModel/Api/Resource/KnowledgeModel/Event/Integration/IntegrationEventJM.hs

@@ -15,11 +15,8 @@ instance ToSchema AddIntegrationEvent
 instance ToSchema AddApiIntegrationEvent where
   declareNamedSchema = toSwaggerWithType "eventType" a_km1_ir
 
-instance ToSchema AddApiLegacyIntegrationEvent where
-  declareNamedSchema = toSwaggerWithType "eventType" a_km1_iop
-
-instance ToSchema AddWidgetIntegrationEvent where
-  declareNamedSchema = toSwaggerWithType "eventType" a_km1_iwp
+instance ToSchema AddPluginIntegrationEvent where
+  declareNamedSchema = toSwaggerWithType "eventType" a_km1_io
 
 -- --------------------------------------------
 -- --------------------------------------------
@@ -28,13 +25,10 @@ instance ToSchema EditIntegrationEvent
 instance ToSchema EditApiIntegrationEvent where
   declareNamedSchema = toSwaggerWithType "eventType" e_km1_ir
 
-instance ToSchema EditApiLegacyIntegrationEvent where
-  declareNamedSchema = toSwaggerWithType "eventType" e_km1_iop
-
-instance ToSchema EditWidgetIntegrationEvent where
-  declareNamedSchema = toSwaggerWithType "eventType" e_km1_iwp
+instance ToSchema EditPluginIntegrationEvent where
+  declareNamedSchema = toSwaggerWithType "eventType" e_km1_io
 
 -- --------------------------------------------
 -- --------------------------------------------
 instance ToSchema DeleteIntegrationEvent where
-  declareNamedSchema = toSwaggerWithType "eventType" d_km1_iop
+  declareNamedSchema = toSwaggerWithType "eventType" d_km1_ir

shared-common/src/Shared/KnowledgeModel/Api/Resource/KnowledgeModel/Event/Integration/IntegrationEventSM.hs

@@ -222,8 +222,7 @@ instance FromJSON Integration where
     referenceType <- o .: "integrationType"
     case referenceType of
       "ApiIntegration" -> parseJSON (Object o) >>= \event -> return (ApiIntegration' event)
-      "ApiLegacyIntegration" -> parseJSON (Object o) >>= \event -> return (ApiLegacyIntegration' event)
-      "WidgetIntegration" -> parseJSON (Object o) >>= \event -> return (WidgetIntegration' event)
+      "PluginIntegration" -> parseJSON (Object o) >>= \event -> return (PluginIntegration' event)
       _ -> fail "One of the integrations has unsupported integrationType"
   parseJSON _ = mzero
 
@@ -278,15 +277,8 @@ instance FromJSON RequestFailedTypeHintResponse where
   parseJSON = genericParseJSON (jsonOptionsWithTypeField "responseType")
 
 -- --------------------------------------------------------------------
-instance ToJSON ApiLegacyIntegration where
+instance ToJSON PluginIntegration where
   toJSON = genericToJSON (jsonOptionsWithTypeField "integrationType")
 
-instance FromJSON ApiLegacyIntegration where
-  parseJSON = genericParseJSON (jsonOptionsWithTypeField "integrationType")
-
--- --------------------------------------------------------------------
-instance ToJSON WidgetIntegration where
-  toJSON = genericToJSON (jsonOptionsWithTypeField "integrationType")
-
-instance FromJSON WidgetIntegration where
+instance FromJSON PluginIntegration where
   parseJSON = genericParseJSON (jsonOptionsWithTypeField "integrationType")

shared-common/src/Shared/KnowledgeModel/Api/Resource/KnowledgeModel/KnowledgeModelJM.hs

@@ -2,6 +2,7 @@ module Shared.KnowledgeModel.Api.Resource.KnowledgeModel.KnowledgeModelSM where
 
 import Data.Swagger hiding (Reference, Tag)
 
+import Shared.Common.Api.Resource.Common.AesonSM ()
 import Shared.Common.Api.Resource.Common.MapEntrySM ()
 import Shared.Common.Util.Swagger
 import Shared.KnowledgeModel.Api.Resource.KnowledgeModel.KnowledgeModelJM ()
@@ -154,9 +155,5 @@ instance ToSchema RequestFailedTypeHintResponse where
   declareNamedSchema = toSwagger requestFailedTypeHintResponse1
 
 -- --------------------------------------------------------------------
-instance ToSchema ApiLegacyIntegration where
-  declareNamedSchema = toSwaggerWithType "integrationType" bioPortal
-
--- --------------------------------------------------------------------
-instance ToSchema WidgetIntegration where
-  declareNamedSchema = toSwaggerWithType "integrationType" widgetPortal
+instance ToSchema PluginIntegration where
+  declareNamedSchema = toSwaggerWithType "integrationType" orcidPluginIntegration

shared-common/src/Shared/KnowledgeModel/Api/Resource/KnowledgeModel/KnowledgeModelSM.hs

@@ -334,7 +334,7 @@ q4_it1_q6_aYes_followUpQuestion5 =
     , tagUuids = []
     , referenceUuids = []
     , expertUuids = []
-    , integrationUuid = FI.ontologyPortal.uuid
+    , integrationUuid = FI.repositoryApi.uuid
     , variables = Map.fromList [("domain", "biology"), ("country", "be")]
     }
 
@@ -353,7 +353,7 @@ q4_it1_q6_aYes_fuq5VariablesEdited =
     , referenceUuids = q4_it1_q6_aYes_followUpQuestion5.referenceUuids
     , expertUuids = q4_it1_q6_aYes_followUpQuestion5.expertUuids
     , integrationUuid = q4_it1_q6_aYes_followUpQuestion5.integrationUuid
-    , variables = Map.fromList [("domain", "biology"), ("language", "")]
+    , variables = Map.fromList [("country", "be"), ("domain", "biology"), ("language", "")]
     }
 
 q4_it1_q6_aYes_fuq5ConvertedToValue' :: Question