diff --git a/enterprise/app/policies/captain/assistant_policy.rb b/enterprise/app/policies/captain/assistant_policy.rb index 573c0400c..90d2118f0 100644 --- a/enterprise/app/policies/captain/assistant_policy.rb +++ b/enterprise/app/policies/captain/assistant_policy.rb @@ -31,6 +31,14 @@ class Captain::AssistantPolicy < ApplicationPolicy @account_user.administrator? end + def approve? + update? + end + + def dismiss? + update? + end + def destroy? @account_user.administrator? end diff --git a/enterprise/app/views/api/v1/models/captain/_faq_observation.json.jbuilder b/enterprise/app/views/api/v1/models/captain/_faq_observation.json.jbuilder index 4b1686081..50dc36d7f 100644 --- a/enterprise/app/views/api/v1/models/captain/_faq_observation.json.jbuilder +++ b/enterprise/app/views/api/v1/models/captain/_faq_observation.json.jbuilder @@ -1,6 +1,7 @@ json.id resource.id json.generated_question resource.generated_question json.generated_answer resource.generated_answer +json.language resource.language json.status resource.status json.created_at resource.created_at.to_i json.conversation do diff --git a/enterprise/app/views/api/v1/models/captain/_faq_suggestion.json.jbuilder b/enterprise/app/views/api/v1/models/captain/_faq_suggestion.json.jbuilder index 954f4216e..a3025b91f 100644 --- a/enterprise/app/views/api/v1/models/captain/_faq_suggestion.json.jbuilder +++ b/enterprise/app/views/api/v1/models/captain/_faq_suggestion.json.jbuilder @@ -2,6 +2,7 @@ json.id resource.id json.account_id resource.account_id json.question resource.question json.answer resource.answer +json.language resource.language json.source_count resource.source_count json.status resource.status json.created_at resource.created_at.to_i diff --git a/spec/enterprise/policies/captain/assistant_policy_spec.rb b/spec/enterprise/policies/captain/assistant_policy_spec.rb index e04b680e4..42206e234 100644 --- a/spec/enterprise/policies/captain/assistant_policy_spec.rb +++ b/spec/enterprise/policies/captain/assistant_policy_spec.rb @@ -22,7 +22,7 @@ RSpec.describe Captain::AssistantPolicy, type: :policy do end end - permissions :tools?, :create?, :update?, :destroy?, :sync?, :drilldown? do + permissions :tools?, :create?, :update?, :approve?, :dismiss?, :destroy?, :sync?, :drilldown? do context 'when administrator' do it { expect(assistant_policy).to permit(administrator_context, assistant) } end