Merge pull request #251 from ds-wizard/release/4.14.0

Release 4.14.0

registry-public/package.yaml

@@ -1,5 +1,5 @@
 name: registry-public
-version: '4.13.0'
+version: '4.14.0'
 synopsis: Registry Public
 description: Registry Public
 category: Web

registry-server/package.yaml

@@ -1,5 +1,5 @@
 name: registry-server
-version: '4.13.0'
+version: '4.14.0'
 synopsis: Engine Registry
 description: Engine Registry
 category: Web

registry-server/src/Registry/Api/Handler/Swagger/Api.hs

@@ -38,7 +38,7 @@ swagger =
             s._swaggerInfo
               { _infoTitle = "Registry API"
               , _infoDescription = Just "API specification for Registry"
-              , _infoVersion = "4.13.0"
+              , _infoVersion = "4.14.0"
               , _infoLicense =
                   Just $
                     License

shared-common/package.yaml

@@ -1,5 +1,5 @@
 name: shared-common
-version: '4.13.0'
+version: '4.14.0'
 synopsis: Engine Shared
 description: Engine Shared
 category: Web

shared-common/src/Shared/ActionKey/Database/DAO/ActionKey/ActionKeyDAO.hs

@@ -31,6 +31,11 @@ findActionKeyByHashAndType hash aType = do
   tenantUuid <- asks (.tenantUuid')
   createFindEntityByFn entityName [tenantQueryUuid tenantUuid, ("hash", hash), ("type", show aType)]
 
+findActionKeyByIdentityAndType' :: (AppContextC s sc m, ToField identity, FromField identity, FromField aType, Show aType) => String -> aType -> m (Maybe (ActionKey identity aType))
+findActionKeyByIdentityAndType' identity aType = do
+  tenantUuid <- asks (.tenantUuid')
+  createFindEntityByFn' entityName [tenantQueryUuid tenantUuid, ("identity", identity), ("type", show aType)]
+
 findActionKeyByIdentityAndHash'
   :: ( AppContextC s sc m
      , FromField aType

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

@@ -56,6 +56,7 @@ jsonSpecialFields "adData" = "data"
 jsonSpecialFields "seData" = "data"
 jsonSpecialFields "scData" = "data"
 jsonSpecialFields "sqData" = "data"
+jsonSpecialFields "srData" = "data"
 jsonSpecialFields "ouiData" = "data"
 jsonSpecialFields "qeData" = "data"
 jsonSpecialFields "aType" = "type"

wizard-common/package.yaml

@@ -1,5 +1,5 @@
 name: wizard-common
-version: '4.13.0'
+version: '4.14.0'
 synopsis: Wizard Engine
 description: Wizard Engine
 category: Web
@@ -34,6 +34,7 @@ library:
   - directory
   - exceptions
   - fsutils
+  - hashable
   - http-client
   - http-client-tls
   - http-types

wizard-common/src/WizardLib/Common/Util/Hashable.hs

@@ -0,0 +1,46 @@
+{-# LANGUAGE StandaloneDeriving #-}
+
+module WizardLib.Common.Util.Hashable where
+
+import Data.Hashable
+import Data.Time
+import GHC.Generics
+
+import Shared.Common.Model.Common.MapEntry
+import WizardLib.KnowledgeModel.Model.Event.EventField
+import WizardLib.KnowledgeModel.Model.KnowledgeModel.KnowledgeModel
+
+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
+
+instance Hashable MetricMeasure
+instance Hashable QuestionValidation
+instance Hashable QuestionValueType
+instance Hashable a => Hashable (EventField a)
+instance (Hashable key, Hashable value) => Hashable (MapEntry key value)

wizard-common/src/WizardLib/KnowledgeModel/Model/Event/Answer/AnswerEvent.hs

@@ -1,10 +1,12 @@
 module WizardLib.KnowledgeModel.Model.Event.Answer.AnswerEvent where
 
+import Data.Hashable
 import Data.Time
 import qualified Data.UUID as U
 import GHC.Generics
 
 import Shared.Common.Model.Common.MapEntry
+import WizardLib.Common.Util.Hashable ()
 import WizardLib.KnowledgeModel.Model.Event.EventField
 import WizardLib.KnowledgeModel.Model.KnowledgeModel.KnowledgeModel
 
@@ -20,6 +22,8 @@ data AddAnswerEvent = AddAnswerEvent
   }
   deriving (Show, Eq, Generic)
 
+instance Hashable AddAnswerEvent
+
 data EditAnswerEvent = EditAnswerEvent
   { uuid :: U.UUID
   , parentUuid :: U.UUID
@@ -33,10 +37,20 @@ data EditAnswerEvent = EditAnswerEvent
   }
   deriving (Show, Eq, Generic)
 
+instance Hashable EditAnswerEvent
+
 data DeleteAnswerEvent = DeleteAnswerEvent
   { uuid :: U.UUID
   , parentUuid :: U.UUID
   , entityUuid :: U.UUID
   , createdAt :: UTCTime
   }
-  deriving (Show, Eq, Generic)
+  deriving (Show, Generic)
+
+instance Eq DeleteAnswerEvent where
+  a == b =
+    a.uuid == b.uuid
+      && a.parentUuid == b.parentUuid
+      && a.entityUuid == b.entityUuid
+
+instance Hashable DeleteAnswerEvent

wizard-common/src/WizardLib/KnowledgeModel/Model/Event/Chapter/ChapterEvent.hs

@@ -1,10 +1,12 @@
 module WizardLib.KnowledgeModel.Model.Event.Chapter.ChapterEvent where
 
+import Data.Hashable
 import Data.Time
 import qualified Data.UUID as U
 import GHC.Generics
 
 import Shared.Common.Model.Common.MapEntry
+import WizardLib.Common.Util.Hashable ()
 import WizardLib.KnowledgeModel.Model.Event.EventField
 
 data AddChapterEvent = AddChapterEvent
@@ -18,6 +20,8 @@ data AddChapterEvent = AddChapterEvent
   }
   deriving (Show, Eq, Generic)
 
+instance Hashable AddChapterEvent
+
 data EditChapterEvent = EditChapterEvent
   { uuid :: U.UUID
   , parentUuid :: U.UUID
@@ -30,10 +34,14 @@ data EditChapterEvent = EditChapterEvent
   }
   deriving (Show, Eq, Generic)
 
+instance Hashable EditChapterEvent
+
 data DeleteChapterEvent = DeleteChapterEvent
   { uuid :: U.UUID
   , parentUuid :: U.UUID
   , entityUuid :: U.UUID
   , createdAt :: UTCTime
   }
   deriving (Show, Eq, Generic)
+
+instance Hashable DeleteChapterEvent

wizard-common/src/WizardLib/KnowledgeModel/Model/Event/Choice/ChoiceEvent.hs

@@ -1,10 +1,12 @@
 module WizardLib.KnowledgeModel.Model.Event.Choice.ChoiceEvent where
 
+import Data.Hashable
 import Data.Time
 import qualified Data.UUID as U
 import GHC.Generics
 
 import Shared.Common.Model.Common.MapEntry
+import WizardLib.Common.Util.Hashable ()
 import WizardLib.KnowledgeModel.Model.Event.EventField
 
 data AddChoiceEvent = AddChoiceEvent
@@ -17,6 +19,8 @@ data AddChoiceEvent = AddChoiceEvent
   }
   deriving (Show, Eq, Generic)
 
+instance Hashable AddChoiceEvent
+
 data EditChoiceEvent = EditChoiceEvent
   { uuid :: U.UUID
   , parentUuid :: U.UUID
@@ -27,10 +31,14 @@ data EditChoiceEvent = EditChoiceEvent
   }
   deriving (Show, Eq, Generic)
 
+instance Hashable EditChoiceEvent
+
 data DeleteChoiceEvent = DeleteChoiceEvent
   { uuid :: U.UUID
   , parentUuid :: U.UUID
   , entityUuid :: U.UUID
   , createdAt :: UTCTime
   }
   deriving (Show, Eq, Generic)
+
+instance Hashable DeleteChoiceEvent

wizard-common/src/WizardLib/KnowledgeModel/Model/Event/Event.hs

@@ -1,7 +1,9 @@
 module WizardLib.KnowledgeModel.Model.Event.Event where
 
+import Data.Hashable
 import GHC.Generics
 
+import WizardLib.Common.Util.Hashable ()
 import WizardLib.KnowledgeModel.Model.Event.Answer.AnswerEvent
 import WizardLib.KnowledgeModel.Model.Event.Chapter.ChapterEvent
 import WizardLib.KnowledgeModel.Model.Event.Choice.ChoiceEvent
@@ -61,3 +63,5 @@ data Event
   | MoveExpertEvent' MoveExpertEvent
   | MoveReferenceEvent' MoveReferenceEvent
   deriving (Show, Eq, Generic)
+
+instance Hashable Event

wizard-common/src/WizardLib/KnowledgeModel/Model/Event/Expert/ExpertEvent.hs

@@ -1,10 +1,12 @@
 module WizardLib.KnowledgeModel.Model.Event.Expert.ExpertEvent where
 
+import Data.Hashable
 import Data.Time
 import qualified Data.UUID as U
 import GHC.Generics
 
 import Shared.Common.Model.Common.MapEntry
+import WizardLib.Common.Util.Hashable ()
 import WizardLib.KnowledgeModel.Model.Event.EventField
 
 data AddExpertEvent = AddExpertEvent
@@ -18,6 +20,8 @@ data AddExpertEvent = AddExpertEvent
   }
   deriving (Show, Eq, Generic)
 
+instance Hashable AddExpertEvent
+
 data EditExpertEvent = EditExpertEvent
   { uuid :: U.UUID
   , parentUuid :: U.UUID
@@ -29,10 +33,14 @@ data EditExpertEvent = EditExpertEvent
   }
   deriving (Show, Eq, Generic)
 
+instance Hashable EditExpertEvent
+
 data DeleteExpertEvent = DeleteExpertEvent
   { uuid :: U.UUID
   , parentUuid :: U.UUID
   , entityUuid :: U.UUID
   , createdAt :: UTCTime
   }
   deriving (Show, Eq, Generic)
+
+instance Hashable DeleteExpertEvent

wizard-common/src/WizardLib/KnowledgeModel/Model/Event/Integration/IntegrationEvent.hs

@@ -1,17 +1,21 @@
 module WizardLib.KnowledgeModel.Model.Event.Integration.IntegrationEvent where
 
+import Data.Hashable
 import Data.Time
 import qualified Data.UUID as U
 import GHC.Generics
 
 import Shared.Common.Model.Common.MapEntry
+import WizardLib.Common.Util.Hashable ()
 import WizardLib.KnowledgeModel.Model.Event.EventField
 
 data AddIntegrationEvent
   = AddApiIntegrationEvent' AddApiIntegrationEvent
   | AddWidgetIntegrationEvent' AddWidgetIntegrationEvent
   deriving (Show, Eq, Generic)
 
+instance Hashable AddIntegrationEvent
+
 data AddApiIntegrationEvent = AddApiIntegrationEvent
   { uuid :: U.UUID
   , parentUuid :: U.UUID
@@ -34,6 +38,8 @@ data AddApiIntegrationEvent = AddApiIntegrationEvent
   }
   deriving (Show, Eq, Generic)
 
+instance Hashable AddApiIntegrationEvent
+
 data AddWidgetIntegrationEvent = AddWidgetIntegrationEvent
   { uuid :: U.UUID
   , parentUuid :: U.UUID
@@ -49,11 +55,15 @@ data AddWidgetIntegrationEvent = AddWidgetIntegrationEvent
   }
   deriving (Show, Eq, Generic)
 
+instance Hashable AddWidgetIntegrationEvent
+
 data EditIntegrationEvent
   = EditApiIntegrationEvent' EditApiIntegrationEvent
   | EditWidgetIntegrationEvent' EditWidgetIntegrationEvent
   deriving (Show, Eq, Generic)
 
+instance Hashable EditIntegrationEvent
+
 data EditApiIntegrationEvent = EditApiIntegrationEvent
   { uuid :: U.UUID
   , parentUuid :: U.UUID
@@ -76,6 +86,8 @@ data EditApiIntegrationEvent = EditApiIntegrationEvent
   }
   deriving (Show, Eq, Generic)
 
+instance Hashable EditApiIntegrationEvent
+
 data EditWidgetIntegrationEvent = EditWidgetIntegrationEvent
   { uuid :: U.UUID
   , parentUuid :: U.UUID
@@ -91,10 +103,14 @@ data EditWidgetIntegrationEvent = EditWidgetIntegrationEvent
   }
   deriving (Show, Eq, Generic)
 
+instance Hashable EditWidgetIntegrationEvent
+
 data DeleteIntegrationEvent = DeleteIntegrationEvent
   { uuid :: U.UUID
   , parentUuid :: U.UUID
   , entityUuid :: U.UUID
   , createdAt :: UTCTime
   }
   deriving (Show, Eq, Generic)
+
+instance Hashable DeleteIntegrationEvent

wizard-common/src/WizardLib/KnowledgeModel/Model/Event/KnowledgeModel/KnowledgeModelEvent.hs

@@ -1,10 +1,12 @@
 module WizardLib.KnowledgeModel.Model.Event.KnowledgeModel.KnowledgeModelEvent where
 
+import Data.Hashable
 import Data.Time
 import qualified Data.UUID as U
 import GHC.Generics
 
 import Shared.Common.Model.Common.MapEntry
+import WizardLib.Common.Util.Hashable ()
 import WizardLib.KnowledgeModel.Model.Event.EventField
 
 data AddKnowledgeModelEvent = AddKnowledgeModelEvent
@@ -16,6 +18,8 @@ data AddKnowledgeModelEvent = AddKnowledgeModelEvent
   }
   deriving (Show, Eq, Generic)
 
+instance Hashable AddKnowledgeModelEvent
+
 data EditKnowledgeModelEvent = EditKnowledgeModelEvent
   { uuid :: U.UUID
   , parentUuid :: U.UUID
@@ -30,3 +34,5 @@ data EditKnowledgeModelEvent = EditKnowledgeModelEvent
   , createdAt :: UTCTime
   }
   deriving (Show, Eq, Generic)
+
+instance Hashable EditKnowledgeModelEvent