Skip to content

Commit ee0ad1d

Browse files
fisxfisx
authored
Cleanup module structure (#2672)
* Move module files. * Change module names inside files. find ./services/brig/ -name '*.hs' -exec perl -i -pe 's/Brig.Sem/Brig.Effects/g' {} \; * Fix cabal file. * changelog
1 parent 1bd1117 commit ee0ad1d

File tree

17 files changed

+45
-44
lines changed

17 files changed

+45
-44
lines changed

‎changelog.d/5-internal/cleanup-module-structure‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Move Brig.Sem.* modules to Brig.Effects (consistency)

‎services/brig/brig.cabal‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,14 @@ library
5858
Brig.Effects.BlacklistPhonePrefixStore.Cassandra
5959
Brig.Effects.BlacklistStore
6060
Brig.Effects.BlacklistStore.Cassandra
61+
Brig.Effects.CodeStore
62+
Brig.Effects.CodeStore.Cassandra
6163
Brig.Effects.Delay
64+
Brig.Effects.PasswordResetStore
65+
Brig.Effects.PasswordResetStore.CodeStore
6266
Brig.Effects.SFT
67+
Brig.Effects.UserPendingActivationStore
68+
Brig.Effects.UserPendingActivationStore.Cassandra
6369
Brig.Email
6470
Brig.Federation.Client
6571
Brig.Index.Eval
@@ -85,12 +91,6 @@ library
8591
Brig.Queue.Types
8692
Brig.RPC
8793
Brig.Run
88-
Brig.Sem.CodeStore
89-
Brig.Sem.CodeStore.Cassandra
90-
Brig.Sem.PasswordResetStore
91-
Brig.Sem.PasswordResetStore.CodeStore
92-
Brig.Sem.UserPendingActivationStore
93-
Brig.Sem.UserPendingActivationStore.Cassandra
9494
Brig.SMTP
9595
Brig.Team.API
9696
Brig.Team.DB

‎services/brig/src/Brig/API.hs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@ import qualified Brig.API.Internal as Internal
2525
import qualified Brig.API.Public as Public
2626
import Brig.Effects.BlacklistPhonePrefixStore (BlacklistPhonePrefixStore)
2727
import Brig.Effects.BlacklistStore (BlacklistStore)
28-
import Brig.Sem.CodeStore
29-
import Brig.Sem.PasswordResetStore (PasswordResetStore)
30-
import Brig.Sem.UserPendingActivationStore (UserPendingActivationStore)
28+
import Brig.Effects.CodeStore
29+
import Brig.Effects.PasswordResetStore (PasswordResetStore)
30+
import Brig.Effects.UserPendingActivationStore (UserPendingActivationStore)
3131
import qualified Data.Swagger.Build.Api as Doc
3232
import Network.Wai.Routing (Routes)
3333
import Polysemy

‎services/brig/src/Brig/API/Internal.hs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,9 @@ import Brig.Effects.BlacklistStore (BlacklistStore)
4545
import qualified Brig.IO.Intra as Intra
4646
import Brig.Options hiding (internalEvents, sesQueue)
4747
import qualified Brig.Provider.API as Provider
48-
import Brig.Sem.CodeStore (CodeStore)
49-
import Brig.Sem.PasswordResetStore (PasswordResetStore)
50-
import Brig.Sem.UserPendingActivationStore (UserPendingActivationStore)
48+
import Brig.Effects.CodeStore (CodeStore)
49+
import Brig.Effects.PasswordResetStore (PasswordResetStore)
50+
import Brig.Effects.UserPendingActivationStore (UserPendingActivationStore)
5151
import qualified Brig.Team.API as Team
5252
import Brig.Team.DB (lookupInvitationByEmail)
5353
import Brig.Types.Connection

‎services/brig/src/Brig/API/Public.hs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,9 @@ import Brig.Effects.BlacklistStore (BlacklistStore)
4949
import qualified Brig.IO.Intra as Intra
5050
import Brig.Options hiding (internalEvents, sesQueue)
5151
import qualified Brig.Provider.API as Provider
52-
import Brig.Sem.CodeStore (CodeStore)
53-
import Brig.Sem.PasswordResetStore (PasswordResetStore)
54-
import Brig.Sem.UserPendingActivationStore (UserPendingActivationStore)
52+
import Brig.Effects.CodeStore (CodeStore)
53+
import Brig.Effects.PasswordResetStore (PasswordResetStore)
54+
import Brig.Effects.UserPendingActivationStore (UserPendingActivationStore)
5555
import qualified Brig.Team.API as Team
5656
import qualified Brig.Team.Email as Team
5757
import Brig.Types.Activation (ActivationPair)

‎services/brig/src/Brig/API/User.hs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -116,12 +116,12 @@ import qualified Brig.InternalEvent.Types as Internal
116116
import Brig.Options hiding (Timeout, internalEvents)
117117
import Brig.Password
118118
import qualified Brig.Queue as Queue
119-
import Brig.Sem.CodeStore (CodeStore)
120-
import qualified Brig.Sem.CodeStore as E
121-
import Brig.Sem.PasswordResetStore (PasswordResetStore)
122-
import qualified Brig.Sem.PasswordResetStore as E
123-
import Brig.Sem.UserPendingActivationStore (UserPendingActivation (..), UserPendingActivationStore)
124-
import qualified Brig.Sem.UserPendingActivationStore as UserPendingActivationStore
119+
import Brig.Effects.CodeStore (CodeStore)
120+
import qualified Brig.Effects.CodeStore as E
121+
import Brig.Effects.PasswordResetStore (PasswordResetStore)
122+
import qualified Brig.Effects.PasswordResetStore as E
123+
import Brig.Effects.UserPendingActivationStore (UserPendingActivation (..), UserPendingActivationStore)
124+
import qualified Brig.Effects.UserPendingActivationStore as UserPendingActivationStore
125125
import qualified Brig.Team.DB as Team
126126
import Brig.Types.Activation (ActivationPair)
127127
import Brig.Types.Connection

‎services/brig/src/Brig/CanonicalInterpreter.hs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@ import Brig.Effects.BlacklistPhonePrefixStore (BlacklistPhonePrefixStore)
55
import Brig.Effects.BlacklistPhonePrefixStore.Cassandra (interpretBlacklistPhonePrefixStoreToCassandra)
66
import Brig.Effects.BlacklistStore (BlacklistStore)
77
import Brig.Effects.BlacklistStore.Cassandra (interpretBlacklistStoreToCassandra)
8-
import Brig.Sem.CodeStore (CodeStore)
9-
import Brig.Sem.CodeStore.Cassandra (codeStoreToCassandra, interpretClientToIO)
10-
import Brig.Sem.PasswordResetStore (PasswordResetStore)
11-
import Brig.Sem.PasswordResetStore.CodeStore (passwordResetStoreToCodeStore)
12-
import Brig.Sem.UserPendingActivationStore (UserPendingActivationStore)
13-
import Brig.Sem.UserPendingActivationStore.Cassandra (userPendingActivationStoreToCassandra)
8+
import Brig.Effects.CodeStore (CodeStore)
9+
import Brig.Effects.CodeStore.Cassandra (codeStoreToCassandra, interpretClientToIO)
10+
import Brig.Effects.PasswordResetStore (PasswordResetStore)
11+
import Brig.Effects.PasswordResetStore.CodeStore (passwordResetStoreToCodeStore)
12+
import Brig.Effects.UserPendingActivationStore (UserPendingActivationStore)
13+
import Brig.Effects.UserPendingActivationStore.Cassandra (userPendingActivationStoreToCassandra)
1414
import qualified Cassandra as Cas
1515
import Control.Lens ((^.))
1616
import Imports

‎services/brig/src/Brig/Data/Activation.hs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@ import Brig.App (Env)
3535
import Brig.Data.User
3636
import Brig.Data.UserKey
3737
import Brig.Options
38-
import qualified Brig.Sem.CodeStore as E
39-
import Brig.Sem.CodeStore.Cassandra
38+
import qualified Brig.Effects.CodeStore as E
39+
import Brig.Effects.CodeStore.Cassandra
4040
import Brig.Types.Intra
4141
import Cassandra
4242
import Control.Error

services/brig/src/Brig/Sem/CodeStore.hs renamed to services/brig/src/Brig/Effects/CodeStore.hs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
-- with this program. If not, see <https://www.gnu.org/licenses/>.
1717
{-# LANGUAGE TemplateHaskell #-}
1818

19-
module Brig.Sem.CodeStore where
19+
module Brig.Effects.CodeStore where
2020

2121
import Data.Id
2222
import Data.Time.Clock

services/brig/src/Brig/Sem/CodeStore/Cassandra.hs renamed to services/brig/src/Brig/Effects/CodeStore/Cassandra.hs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,14 @@
1616
-- with this program. If not, see <https://www.gnu.org/licenses/>.
1717
{-# LANGUAGE RecordWildCards #-}
1818

19-
module Brig.Sem.CodeStore.Cassandra
19+
module Brig.Effects.CodeStore.Cassandra
2020
( codeStoreToCassandra,
2121
interpretClientToIO,
2222
)
2323
where
2424

2525
import Brig.Data.Instances ()
26-
import Brig.Sem.CodeStore
26+
import Brig.Effects.CodeStore
2727
import Cassandra
2828
import Data.ByteString.Conversion (toByteString')
2929
import Data.Id

0 commit comments

Comments
 (0)