diff --git a/app/mock-registry/src/Flow/Lookup.hs b/app/mock-registry/src/Flow/Lookup.hs index adac5ae..ee914a1 100644 --- a/app/mock-registry/src/Flow/Lookup.hs +++ b/app/mock-registry/src/Flow/Lookup.hs @@ -14,7 +14,7 @@ module Flow.Lookup where -import App.Types (FlowHandler) +import App.Types (Flow, FlowHandler) import Domain.Subscriber import Kernel.Prelude import Kernel.Storage.Esqueleto @@ -29,10 +29,10 @@ lookup req = withFlowHandlerAPI $ do create :: Subscriber -> FlowHandler AckResponse create sub = withFlowHandlerAPI $ do - runTransaction $ Sub.create sub + runTransaction $ Sub.create @Flow sub return Ack delete :: Text -> Text -> FlowHandler AckResponse delete uniqueKeyId subscriberId = withFlowHandlerAPI $ do - runTransaction $ Sub.deleteByKey (uniqueKeyId, subscriberId) + runTransaction $ Sub.deleteByKey @Flow (uniqueKeyId, subscriberId) return Ack diff --git a/app/mock-registry/src/Storage/Queries/Subscriber.hs b/app/mock-registry/src/Storage/Queries/Subscriber.hs index 5e31c8c..bfb7187 100644 --- a/app/mock-registry/src/Storage/Queries/Subscriber.hs +++ b/app/mock-registry/src/Storage/Queries/Subscriber.hs @@ -11,19 +11,21 @@ the GNU Affero General Public License along with this program. If not, see . -} +{-# LANGUAGE ScopedTypeVariables #-} {-# LANGUAGE TypeApplications #-} module Storage.Queries.Subscriber where +import App.Types import Domain.Subscriber import Kernel.Prelude import Kernel.Storage.Esqueleto as Esq import Kernel.Types.Common import Storage.Tabular.Subscriber -findByAll :: (MonadThrow m, Log m, Transactionable m) => Maybe Text -> Maybe Text -> Maybe Domain -> Maybe SubscriberType -> m [Subscriber] +findByAll :: forall m. (MonadThrow m, Log m, Transactionable Flow m) => Maybe Text -> Maybe Text -> Maybe Domain -> Maybe SubscriberType -> m [Subscriber] findByAll mbKeyId mbSubId mbDomain mbSubType = - Esq.findAll $ do + Esq.findAll @m @Flow $ do parkingLocation <- from $ table @SubscriberT where_ $ whenJust_ mbKeyId (\keyId -> parkingLocation ^. SubscriberUniqueKeyId ==. val keyId) @@ -32,13 +34,13 @@ findByAll mbKeyId mbSubId mbDomain mbSubType = &&. whenJust_ mbSubType (\subType -> parkingLocation ^. SubscriberSubscriberType ==. val subType) return parkingLocation -create :: Subscriber -> SqlDB () +create :: Subscriber -> SqlDB m () create = Esq.create -deleteByKey :: (Text, Text) -> SqlDB () +deleteByKey :: (Text, Text) -> SqlDB m () deleteByKey = Esq.deleteByKey @SubscriberT -findAll :: (MonadThrow m, Log m, Transactionable m) => m [Subscriber] +findAll :: forall m. (MonadThrow m, Log m, Transactionable Flow m) => m [Subscriber] findAll = - Esq.findAll $ do + Esq.findAll @m @Flow $ do from $ table @SubscriberT diff --git a/stack.yaml b/stack.yaml index 3790032..1d33168 100644 --- a/stack.yaml +++ b/stack.yaml @@ -45,7 +45,7 @@ packages: extra-deps: # - ../shared-kernel/lib/mobility-core - git: https://github.com/nammayatri/shared-kernel.git - commit: 296681fc0018daa19ce0f99d85bd87b6a61afc39 + commit: f15ddf41baa5f23a35f3566f2edd16887d3a6467 subdirs: - lib/mobility-core - git: https://github.com/juspay/passetto diff --git a/stack.yaml.lock b/stack.yaml.lock index bf997cf..336b8d4 100644 --- a/stack.yaml.lock +++ b/stack.yaml.lock @@ -10,13 +10,13 @@ packages: version: 0.1.0.0 git: https://github.com/nammayatri/shared-kernel.git pantry-tree: - size: 16451 - sha256: 513889e102b30b2da7f2d4dbbd52e7f4176777278e6345491d96892417ff2919 - commit: 296681fc0018daa19ce0f99d85bd87b6a61afc39 + size: 16452 + sha256: 8fbb41553364bd5a65a3de04e18ca141ad58afbe33e89e8248d85e16b39123d1 + commit: f15ddf41baa5f23a35f3566f2edd16887d3a6467 original: subdir: lib/mobility-core git: https://github.com/nammayatri/shared-kernel.git - commit: 296681fc0018daa19ce0f99d85bd87b6a61afc39 + commit: f15ddf41baa5f23a35f3566f2edd16887d3a6467 - completed: subdir: core name: passetto-core