Skip to content

Comments

Activate/Deactivate Conference Calling Team Feature for Back Office#1938

Closed
battermann wants to merge 31 commits intodevelopfrom
SQSERVICES-729-add-a-function-to-activate-deactivate-a-feature-in-back-office
Closed

Activate/Deactivate Conference Calling Team Feature for Back Office#1938
battermann wants to merge 31 commits intodevelopfrom
SQSERVICES-729-add-a-function-to-activate-deactivate-a-feature-in-back-office

Conversation

@battermann
Copy link
Contributor

@battermann battermann commented Nov 23, 2021

Checklist

  • The PR Title explains the impact of the change.
  • The PR description provides context as to why the change should occur and what the code contributes to that effect. This could also be a link to a JIRA ticket or a Github issue, if there is one.
  • If HTTP endpoint paths have been added or renamed, the endpoint / config-flag checklist (see Wire-employee only backend wiki page) has been followed.
  • If a cassandra schema migration has been added, I ran make git-add-cassandra-schema to update the cassandra schema documentation.
  • changelog.d contains the following bits of information (details):
    • A file with the changelog entry in one or more suitable sub-sections. The sub-sections are marked by directories inside changelog.d.
    • If new config options introduced: added usage description under docs/reference/config-options.md
    • If new config options introduced: recommended measures to be taken by on-premise instance operators.
    • If a cassandra schema migration is backwards incompatible (see also these docs), measures to be taken by on-premise instance operators are explained.
    • If a data migration (not schema migration) introduced: measures to be taken by on-premise instance operators.
    • If public end-points have been changed or added: does nginz need un upgrade?
    • If internal end-points have been added or changed: which services have to be deployed in a specific order?

battermann and others added 29 commits November 22, 2021 08:20
@battermann
Unlock payment route and functionality, no op cassandra impl yet
c199e00 
json roundtrip test for PaymentStatus

C* schema migration for self deleting messages payment status

teamstore implementation for self deleting messages payment status

removed unnecessary function

dynamic lock/unlock payment status

added payment status to feature with config models

removed redundant description

use PaymentStatusValue for API path

removed redundant comment

added roundtrip test for PaymentStatusValue

updated API description

make payment status in config optional

golden tests include payment status, formatting

generic set payment status

error for locked payment status

validate payment status while setting team feature status

fix integration tests

comments
@battermann
removed payment status for app lock team feature from C* schema, and …
a87fe0c 
…updated C* interpreter
@fisx @battermann
This is a delta for #1916 (#1935)
9a09469 
* Fix swagger-1.2.

* Simplify.
@fisx @battermann
improve comment
9982454 
Co-authored-by: fisx <mf@zerobuzz.net>
@battermann
simplification
0a51b92
@battermann
require HasPaymentStatusCol for setting the payment status
f0f50cc
@battermann
clean up
c1a1307
@battermann
FeatureStatus with and without PaymentStatus
17d6c54
@battermann
integration tests + implementation of business logic
9d419ba
@battermann
reduce # of db roundtrips
d235a3f
@battermann
renamed migration
80b9b8c
@fisx
Merge branch 'develop' into SQSERVICES-960-distinguish-between-unlock…
f1824ef 
…-team-feature-and-configure-team-feature
@fisx
Simplify.
95fc91a
@fisx
Factor out feature locking function.
187da92
@battermann
FeatureHasNoConfig with PaymentStatus parameter
1a2b7dc
@battermann
Merge branch 'SQSERVICES-960-distinguish-between-unlock-team-feature-…
dc9c717 
…and-configure-team-feature' of github.com:wireapp/wire-server into SQSERVICES-960-distinguish-between-unlock-team-feature-and-configure-team-feature
@fisx
remove comment
d37484a 
Co-authored-by: fisx <mf@zerobuzz.net>
@fisx
additional roundtrip test
f3d8cdd 
Co-authored-by: fisx <mf@zerobuzz.net>
@fisx
typo
f1f35f6 
Co-authored-by: fisx <mf@zerobuzz.net>
@fisx
clean up
d401dda 
Co-authored-by: fisx <mf@zerobuzz.net>
@battermann
more explicit pattern match
b268c10
@battermann
simplify payment status to payment status value
743da2f
@fisx
typo
151f712 
Co-authored-by: fisx <mf@zerobuzz.net>
@battermann
changelog
fe9fce9
@battermann
update schema docs
1f0c701
@battermann
Merge branch 'SQSERVICES-960-distinguish-between-unlock-team-feature-…
4823614 
…and-configure-team-feature' of github.com:wireapp/wire-server into SQSERVICES-960-distinguish-between-unlock-team-feature-and-configure-team-feature
@battermann
typo
43b1be0
@battermann
schema for conference calling payment status
5dfa900
@battermann
wip
7d50aa8
jschaul
jschaul reviewed Nov 24, 2021
View reviewed changes
services/galley/schema/src/V56_ConferenceCallingPaymentStatus.hs Outdated
Copy link
Member

@jschaul jschaul Nov 24, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please combine the statements of 55 and 56 into a single migration step, if introduced in one and the same PR. That can be done in the same CQL statement as here you're operating on the same table; or in general also in multiple CQL statements but of the same migration, see e.g. https://github.com/wireapp/wire-server/blob/develop/services/brig/schema/src/V30.hs.

Copy link
Contributor

@fisx fisx Nov 24, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's two different PRs, but this one is based on #1937, which hasn't been merged yet.

@battermann battermann force-pushed the SQSERVICES-729-add-a-function-to-activate-deactivate-a-feature-in-back-office branch from 30c5ae9 to 0ce4626 Compare November 24, 2021 16:20
@fisx fisx changed the base branch from develop to SQSERVICES-960-distinguish-between-unlock-team-feature-and-configure-team-feature November 24, 2021 21:28
@fisx
Copy link
Contributor

fisx commented Nov 24, 2021

I've changed the base of the PR, we can change it back when #1937 has landed on develop. The merge conflicts are going to be fun, but I'll take care of that.

@fisx
Copy link
Contributor

fisx commented Nov 24, 2021

@battermann please take a look at #1943, and close this in favor of the new one if you think I've resolved the conflicts correctly.

Base automatically changed from SQSERVICES-960-distinguish-between-unlock-team-feature-and-configure-team-feature to develop November 25, 2021 19:22
@fisx
Copy link
Contributor

fisx commented Dec 8, 2021

@battermann can this be closed in favor of #1943?

@battermann
Copy link
Contributor Author

battermann commented Jan 3, 2022

@fisx I think this can be closed in favor of #1943

@fisx fisx closed this Jan 4, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@jschaul jschaul jschaul left review comments

@fisx fisx fisx left review comments

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@battermann @fisx @jschaul