Skip to content

Refactor and test user event serialisation #3912

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pcapriotti merged 10 commits into from
Mar 18, 2024
Merged

Refactor and test user event serialisation #3912

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
62fff2d
Move brig event serialisation code
pcapriotti Feb 28, 2024
c511009
Implement schemas for user events
pcapriotti Feb 29, 2024
3fcf49b
Move user events to wire-api
pcapriotti Mar 5, 2024
bdf0b84
Add golden test examples for user events
pcapriotti Mar 5, 2024
db4fc4e
Add user event golden tests
pcapriotti Mar 5, 2024
3062f06
Fix user event serialisation golden tests
pcapriotti Mar 5, 2024
a717e69
Add CHANGELOG entry
pcapriotti Mar 5, 2024
e9e76a0
Lint
pcapriotti Mar 6, 2024
d7fcfdc
Remove unused arguments
pcapriotti Mar 15, 2024
953d052
fixup! Lint
pcapriotti Mar 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions changelog.d/5-internal/user-events
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Use schema-profunctor for user event serialisation and introduce golden tests
2 changes: 0 additions & 2 deletions libs/brig-types/brig-types.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ library
Brig.Types.Team.LegalHold
Brig.Types.Test.Arbitrary
Brig.Types.User
Brig.Types.User.Event

other-modules: Paths_brig_types
hs-source-dirs: src
Expand Down Expand Up @@ -85,7 +84,6 @@ library
, imports
, QuickCheck >=2.9
, text >=0.11
, tinylog
, types-common >=0.16
, wire-api

Expand Down
2 changes: 0 additions & 2 deletions libs/brig-types/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
, tasty-hunit
, tasty-quickcheck
, text
, tinylog
, types-common
, wire-api
}:
Expand All @@ -38,7 +37,6 @@ mkDerivation {
imports
QuickCheck
text
tinylog
types-common
wire-api
];
Expand Down
223 changes: 0 additions & 223 deletions libs/brig-types/src/Brig/Types/User/Event.hs
View file
Open in desktop

This file was deleted.

9 changes: 5 additions & 4 deletions libs/types-common/src/Data/Id.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ module Data.Id
ScimTokenId,
parseIdFromText,
idToText,
idObjectSchema,
IdObject (..),

-- * Client IDs
Expand Down Expand Up @@ -444,7 +445,7 @@ newtype IdObject a = IdObject {fromIdObject :: a}
deriving (ToJSON, FromJSON, S.ToSchema) via Schema (IdObject a)

instance ToSchema a => ToSchema (IdObject a) where
schema =
object "Id" $
IdObject
<$> fromIdObject .= field "id" schema
schema = idObjectSchema (IdObject <$> fromIdObject .= schema)

idObjectSchema :: ValueSchemaP NamedSwaggerDoc a b -> ValueSchemaP NamedSwaggerDoc a b
idObjectSchema sch = object "Id" (field "id" sch)
2 changes: 2 additions & 0 deletions libs/wire-api/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,7 @@
, tasty-quickcheck
, text
, time
, tinylog
, transitive-anns
, types-common
, unliftio
Expand Down Expand Up @@ -190,6 +191,7 @@ mkDerivation {
tagged
text
time
tinylog
transitive-anns
types-common
unordered-containers
Expand Down
Loading