Skip to content

Feature configs should have different swagger schema names #2425

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 1 commit into from
May 25, 2022
+11 −4
Merged

Feature configs should have different swagger schema names #2425

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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/4-docs/feature-schema-fix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Feature configs should have different swagger schema names
14 changes: 10 additions & 4 deletions libs/wire-api/src/Wire/API/Team/Feature.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -473,10 +473,13 @@ modelTeamFeatureStatusWithConfig name cfgModel = Doc.defineModel (cs $ show name

instance ToSchema cfg => ToSchema (TeamFeatureStatusWithConfig cfg) where
schema =
object "TeamFeatureStatusWithConfig" $
object name $
TeamFeatureStatusWithConfig
<$> tfwcStatus .= field "status" schema
<*> tfwcConfig .= field "config" schema
<*> tfwcConfig .= field "config" inner
where
inner = schema @cfg
name = "TeamFeatureStatusWithConfig." <> fromMaybe "" (getName (schemaDoc inner))

data TeamFeatureStatusWithConfigAndLockStatus (cfg :: *) = TeamFeatureStatusWithConfigAndLockStatus
{ tfwcapsStatus :: TeamFeatureStatusValue,
Expand All @@ -498,11 +501,14 @@ modelTeamFeatureStatusWithConfigAndLockStatus name cfgModel = Doc.defineModel (c

instance ToSchema cfg => ToSchema (TeamFeatureStatusWithConfigAndLockStatus cfg) where
schema =
object "TeamFeatureStatusWithConfigAndLockStatus" $
object name $
TeamFeatureStatusWithConfigAndLockStatus
<$> tfwcapsStatus .= field "status" schema
<*> tfwcapsConfig .= field "config" schema
<*> tfwcapsConfig .= field "config" inner
<*> tfwcapsLockStatus .= field "lockStatus" schema
where
inner = schema @cfg
name = "TeamFeatureStatusWithConfigAndLockStatus." <> fromMaybe "" (getName (schemaDoc inner))

----------------------------------------------------------------------
-- TeamFeatureClassifiedDomainsConfig
Expand Down