Skip to content
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

Jump to bottom

chore: Update data format for platform API feature management #5718

Merged
merged 11 commits into from
Nov 8, 2022
Merged

chore: Update data format for platform API feature management #5718

Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
7b0b9d7
data format updates for account creation & update api with features f…
smartdev58 Oct 23, 2022
d541351
minor fix
smartdev58 Oct 23, 2022
dda9574
restore test for default config feature flags
smartdev58 Oct 25, 2022
ee617b0
accounts test spec updates to check disabled default feature flag
smartdev58 Nov 3, 2022
35a8b37
Merge branch 'develop' into chore/accounts-api-with-feature-flags-false
smartdev58 Nov 3, 2022
9072313
fix
smartdev58 Nov 3, 2022
599e257
Merge branch 'develop' into chore/accounts-api-with-feature-flags-false
smartdev58 Nov 3, 2022
f6f35bb
fix
smartdev58 Nov 3, 2022
3107a9b
Merge remote-tracking branch 'origin/chore/accounts-api-with-feature-…
smartdev58 Nov 3, 2022
cd369d5
chore: refactor the feature update logic
sojan-official Nov 8, 2022
fe45323
Merge branch 'develop' into chore/accounts-api-with-feature-flags-false
sojan-official Nov 8, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
11 changes: 6 additions & 5 deletions app/controllers/platform/api/v1/accounts_controller.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,14 +23,15 @@ def set_resource
end

def account_params
if permitted_params[:enabled_features]
return permitted_params.except(:enabled_features).merge(selected_feature_flags: permitted_params[:enabled_features].map(&:to_sym))
if permitted_params[:features].present?
feature_flags = permitted_params[:features].select { |_key, value| value }.keys.map { |name| "feature_#{name}".to_sym }
permitted_params.except(:features).merge(selected_feature_flags: feature_flags)
else
permitted_params
end

permitted_params
end

def permitted_params
params.permit(:name, :locale, enabled_features: [], limits: {})
params.permit(:name, :locale, :domain, :support_email, :status, features: {}, limits: {}, custom_attributes: {})
end
end
35 changes: 19 additions & 16 deletions spec/controllers/platform/api/v1/accounts_controller_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,29 +42,27 @@
json_response = JSON.parse(response.body)
expect(json_response['name']).to eq('Test Account')
expect(json_response['locale']).to eq('es')
expect(json_response['enabled_features']).to eq(
sojan-official marked this conversation as resolved.
Show resolved Hide resolved
{
'agent_management' => true
}
)
expect(json_response['enabled_features']['agent_management']).to be(true)
sojan-official marked this conversation as resolved.
Show resolved Hide resolved
end

it 'creates an account with feature flags' do
InstallationConfig.where(name: 'ACCOUNT_LEVEL_FEATURE_DEFAULTS').first_or_create!(value: [{ 'name' => 'inbox_management',
smartdev58 marked this conversation as resolved.
Show resolved Hide resolved
'enabled' => true }])
'enabled' => true },
{ 'name' => 'disable_branding',
'enabled' => false }])

post '/platform/api/v1/accounts', params: { name: 'Test Account', enabled_features: %w[feature_ip_lookup feature_help_center] },
headers: { api_access_token: platform_app.access_token.token }, as: :json
post '/platform/api/v1/accounts', params: { name: 'Test Account', features: {
ip_lookup: true,
help_center: true,
disable_branding: false
} }, headers: { api_access_token: platform_app.access_token.token }, as: :json

json_response = JSON.parse(response.body)
expect(json_response['name']).to include('Test Account')
expect(json_response['enabled_features']).to eq(
{
'inbox_management' => true,
'ip_lookup' => true,
'help_center' => true
}
)
expect(json_response['enabled_features']['inbox_management']).to be(true)
expect(json_response['enabled_features']['ip_lookup']).to be(true)
expect(json_response['enabled_features']['help_center']).to be(true)
expect(json_response['enabled_features']['disable_branding']).to be_nil
end

it 'creates an account with limits settings' do
Expand Down Expand Up @@ -144,14 +142,19 @@

patch "/platform/api/v1/accounts/#{account.id}", params: {
name: 'Test Account',
enabled_features: %w[feature_ip_lookup feature_help_center],
features: {
smartdev58 marked this conversation as resolved.
Show resolved Hide resolved
ip_lookup: true,
help_center: true,
channel_facebook: false
smartdev58 marked this conversation as resolved.
Show resolved Hide resolved
},
limits: { agents: 5, inboxes: 10 }
}, headers: { api_access_token: platform_app.access_token.token }, as: :json

expect(response).to have_http_status(:success)
expect(account.reload.name).to eq('Test Account')
expect(account.reload.enabled_features['ip_lookup']).to be(true)
expect(account.reload.enabled_features['help_center']).to be(true)
expect(account.reload.enabled_features['channel_facebook']).to be_nil
expect(account.reload.limits['agents']).to eq(5)
expect(account.reload.limits['inboxes']).to eq(10)
end
Expand Down