mno-enterprise-api 3.3.1 → 3.3.2

data/lib/mno_enterprise/concerns/controllers/jpi/v1/impac/dashboards_controller.rb

@@ -74,14 +74,37 @@ module MnoEnterprise::Concerns::Controllers::Jpi::V1::Impac::DashboardsControlle
     end
   end
 
+  # Allows to create a dashboard using another dashboard as a source
+  # At the moment, only dashboards of type "template" can be copied
+  # Ultimately we could allow the creation of dashboards from any other dashboard
+  # ---------------------------------
+  # POST mnoe/jpi/v1/impac/dashboards/1/copy
+  def copy
+    return render_not_found('template') unless template
+
+    # Owner is the current user by default, can be overriden to something else (eg: current organization)
+    @dashboard = template.copy(current_user, dashboard_params[:name], dashboard_params[:organization_ids])
+    return render_bad_request('copy template', 'Unable to copy template') unless dashboard.present?
+
+    render 'show'
+  end
+
   private
 
+    def dashboards
+      @dashboards ||= current_user.dashboards
+    end
+
     def dashboard
       @dashboard ||= current_user.dashboards.find(params[:id].to_i)
     end
 
-    def dashboards
-      @dashboards ||= current_user.dashboards
+    def templates
+      @templates ||= MnoEnterprise::Impac::Dashboard.templates
+    end
+
+    def template
+      @template ||= templates.find(params[:id].to_i)
     end
 
     def whitelisted_params

data/lib/mno_enterprise/concerns/controllers/jpi/v1/impac/kpis_controller.rb

@@ -50,11 +50,14 @@ module MnoEnterprise::Concerns::Controllers::Jpi::V1::Impac::KpisController
   #   -> POST /api/mnoe/v1/dashboards/:id/kpis
   #   -> POST /api/mnoe/v1/users/:id/alerts
   def create
-    if widget.present?
+    if params[:kpi][:widget_id].present?
+      return render_not_found('widget') if widget.blank?
       authorize! :manage_widget, widget
     else
+      return render_not_found('dashboard') if dashboard.blank?
       authorize! :manage_dashboard, dashboard
-    end
+    end  
+
     # TODO: nest alert in as a param, with the current user as a recipient.
     @kpi = kpi_parent.kpis.create(kpi_create_params)
     unless kpi.errors?
@@ -76,6 +79,8 @@ module MnoEnterprise::Concerns::Controllers::Jpi::V1::Impac::KpisController
   # PUT /mnoe/jpi/v1/impac/kpis/:id
   #   -> PUT /api/mnoe/v1/kpis/:id
   def update
+    render_not_found('kpi') unless kpi.present?
+
     authorize! :manage_kpi, kpi
 
     params = kpi_update_params
@@ -107,6 +112,8 @@ module MnoEnterprise::Concerns::Controllers::Jpi::V1::Impac::KpisController
   # DELETE /mnoe/jpi/v1/impac/kpis/:id
   #   -> DELETE /api/mnoe/v1/kpis/:id
   def destroy
+    render_not_found('kpi') unless kpi.present?
+
     authorize! :manage_kpi, kpi
 
     if kpi.destroy
@@ -122,21 +129,16 @@ module MnoEnterprise::Concerns::Controllers::Jpi::V1::Impac::KpisController
   private
 
     def dashboard
-      @dashboard ||= MnoEnterprise::Impac::Dashboard.find(params.require(:dashboard_id))
-      return render_not_found('dashboard') unless @dashboard
-      @dashboard
+      @dashboard ||= MnoEnterprise::Impac::Dashboard.find(params.require(:dashboard_id).to_i)
     end
 
     def widget
-      return nil if (id = params.require(:kpi)[:widget_id]).blank?
-      @widget ||= MnoEnterprise::Impac::Widget.find(id)
-      return render_not_found('widget') unless @widget
-      @widget
+      widget_id = params.require(:kpi)[:widget_id]
+      @widget ||= (widget_id.present? && MnoEnterprise::Impac::Widget.find(widget_id.to_i))
     end
 
     def kpi
-      @kpi ||= MnoEnterprise::Impac::Kpi.find(params[:id])
-      return @kpi || render_not_found('kpi')
+      @kpi ||= MnoEnterprise::Impac::Kpi.find(params.require(:id).to_i)
     end
 
     def kpi_parent

data/lib/mno_enterprise/concerns/controllers/jpi/v1/marketplace_controller.rb

@@ -16,7 +16,7 @@ module MnoEnterprise::Concerns::Controllers::Jpi::V1::MarketplaceController
   # GET /mnoe/jpi/v1/marketplace
   def index
     expires_in 0, public: true, must_revalidate: true
-    @last_modified = app_relation.order_by('updated_at.desc').limit(1).first.updated_at
+    @last_modified = app_relation.order_by('updated_at.desc').limit(1).first.try(:updated_at)
 
     if stale?(last_modified: @last_modified)
       @apps = Rails.cache.fetch("marketplace/index-apps-#{@last_modified}") do

data/lib/mno_enterprise/concerns/controllers/pages_controller.rb

@@ -65,7 +65,9 @@ module MnoEnterprise::Concerns::Controllers::PagesController
     ts = MnoEnterprise::App.order_by("updated_at.desc").first.try(:updated_at)
     @apps = if ts
       Rails.cache.fetch(['pages/terms/app-list', ts]) do
-        MnoEnterprise::App.order_by("name.ac").reject{|i| i.terms_url.blank?}
+        # Temp solution as translated fields can not be filtered or sorted
+        # MnoEnterprise::App.order_by("name.ac").reject{|i| i.terms_url.blank?}
+        MnoEnterprise::App.all.reject{ |i| i.terms_url.blank? }.sort_by{ |a| a.name.downcase }
       end
     else
       []

data/spec/controllers/mno_enterprise/impersonate_controller_spec.rb

@@ -21,17 +21,26 @@ module MnoEnterprise
       end
 
       describe "#create" do
+        subject { get :create, user_id: user2.id }
         it do
           expect(controller.current_user.id).to eq(user.id)
-          get :create, user_id: user2.id
+          subject
           expect(controller.current_user.id).to eq(user2.id)
         end
 
         context 'with an organisation id in parameters' do
-          before { get :create, user_id: user.id, dhbRefId: 10 }
+          subject { get :create, user_id: user.id, dhbRefId: 10 }
 
           it { is_expected.to redirect_to('/dashboard/#!?dhbRefId=10') }
         end
+
+        context 'when the user is a staff member' do
+          let(:user2) { build(:user, admin_role: 'staff') }
+          it do
+            subject
+            expect(controller).to set_flash[:notice].to('User is a staff member')
+          end
+        end
       end
 
       describe "#destroy" do

data/spec/controllers/mno_enterprise/jpi/v1/admin/impac/dashboard_templates_controller_spec.rb

@@ -0,0 +1,225 @@
+require 'rails_helper'
+
+module MnoEnterprise
+  describe Jpi::V1::Admin::Impac::DashboardTemplatesController, type: :controller do
+    # include MnoEnterprise::TestingSupport::JpiV1TestHelper
+    include MnoEnterprise::TestingSupport::SharedExamples::JpiV1Admin
+    render_views
+    routes { MnoEnterprise::Engine.routes }
+    before { request.env["HTTP_ACCEPT"] = 'application/json' }
+
+    RSpec.shared_context "#{described_class}: dashboard dependencies stubs" do
+      before do
+        api_stub_for(
+          get: "/users/#{user.id}/organizations",
+          response: from_api([org])
+        )
+        api_stub_for(
+          get: "/dashboards/#{template.id}/widgets",
+          response: from_api([widget])
+        )
+        api_stub_for(
+          get: "/dashboards/#{template.id}/kpis",
+          response: from_api([d_kpi])
+        )
+        api_stub_for(
+          get: "/widgets/#{widget.id}/kpis",
+          response: from_api([w_kpi])
+        )
+      end
+    end
+
+    let(:user) { build(:user, :admin, :with_organizations) }
+    let(:org) { build(:organization, users: [user]) }
+    let(:metadata) { { hist_parameters: { from: '2015-01-01', to: '2015-03-31', period: 'MONTHLY' } } }
+    let(:template) { build(:impac_dashboard, dashboard_type: 'template', organization_ids: [org.uid], currency: 'EUR', settings: metadata, owner_type: nil, owner_id: nil, published: true) }
+    let(:widget) { build(:impac_widget, dashboard: template) }
+    let(:d_kpi) { build(:impac_kpi, dashboard: template) }
+    let(:w_kpi) { build(:impac_kpi, widget: widget) }
+
+    def hash_for_kpi(kpi)
+      {
+        "id" => kpi.id,
+        "element_watched" => kpi.element_watched,
+        "endpoint" => kpi.endpoint
+      }
+    end
+    let(:hash_for_widget) do
+      {
+        "id" => widget.id,
+        "name" => widget.name,
+        "endpoint" => widget.widget_category,
+        "width" => widget.width,
+        "kpis" => [hash_for_kpi(w_kpi)]
+      }
+    end
+    let(:hash_for_template) do
+      {
+        "id" => template.id,
+        "name" => template.name,
+        "full_name" => template.full_name,
+        "currency" => 'EUR',
+        "metadata" => metadata.deep_stringify_keys,
+        "data_sources" => [{ "id" => org.id, "uid" => org.uid, "label" => org.name}],
+        "kpis" => [hash_for_kpi(d_kpi)],
+        "widgets" => [hash_for_widget],
+        "published" => true
+      }
+    end
+
+    before do
+      api_stub_for(get: "/users/#{user.id}", response: from_api(user))
+      sign_in user
+    end
+      
+    describe '#index' do
+      subject { get :index }
+      
+      before do
+        api_stub_for(
+          get: '/dashboards',
+          params: { filter: { 'dashboard_type' => 'template' } },
+          response: from_api([template])
+        )
+      end
+      include_context "#{described_class}: dashboard dependencies stubs"
+
+      it_behaves_like "a jpi v1 admin action"
+
+      it 'returns a list of dashboard templates' do
+        subject
+        expect(JSON.parse(response.body)).to eq([hash_for_template])
+      end
+    end
+
+    describe '#show' do
+      subject { get :show, id: template.id }
+      
+      before do
+        api_stub_for(
+          get: "/dashboards/#{template.id}",
+          params: { filter: { 'dashboard_type' => 'template' } },
+          response: from_api(template)
+        )
+      end
+      include_context "#{described_class}: dashboard dependencies stubs"
+
+      it_behaves_like "a jpi v1 admin action"
+
+      it 'returns a dashboard template' do
+        subject
+        expect(JSON.parse(response.body)).to eq(hash_for_template)
+      end
+
+      # api_stub should be modified to allow this case to be stubbed
+      context 'when the template cannot be found' do
+        xit 'spec to be described'
+      end
+    end
+
+    describe '#create' do
+      let(:template_params) do
+        {
+          name: template.name,
+          currency: template.currency,
+          widgets_order: [3, 2, 1],
+          organization_ids: [4, 5],
+          metadata: metadata,
+          forbidden: 'param'
+        }
+      end
+
+      subject { post :create, dashboard: template_params }
+      
+      before do
+        api_stub_for(
+          post: "/dashboards",
+          response: from_api(template)
+        )
+      end
+      include_context "#{described_class}: dashboard dependencies stubs"
+
+      it_behaves_like "a jpi v1 admin action"
+
+      it 'returns a dashboard template' do
+        subject
+        expect(JSON.parse(response.body)).to eq(hash_for_template)
+      end
+
+      # api_stub should be modified to allow this case to be stubbed
+      context 'when the dashboard creation is unsuccessful' do
+        xit 'spec to be described'
+      end
+    end
+
+    describe '#update' do
+      let(:template_params) do
+        {
+          name: template.name,
+          currency: template.currency,
+          widgets_order: [3, 2, 1],
+          organization_ids: [4, 5],
+          metadata: metadata,
+          forbidden: 'param',
+          published: true
+        }
+      end
+
+      subject { put :update, id: template.id, dashboard: template_params }
+      
+      before do
+        api_stub_for(
+          get: "/dashboards/#{template.id}",
+          params: { filter: { 'dashboard_type' => 'template' } },
+          response: from_api(template)
+        )
+        api_stub_for(
+          put: "/dashboards/#{template.id}",
+          response: from_api(template)
+        )
+      end
+      include_context "#{described_class}: dashboard dependencies stubs"
+      
+      it_behaves_like "a jpi v1 admin action"
+
+      it 'returns a dashboard template' do
+        subject
+        expect(JSON.parse(response.body)).to eq(hash_for_template)
+      end
+
+      # api_stub should be modified to allow these cases to be stubbed
+      context 'when the template cannot be found' do
+        xit 'spec to be described'
+      end
+      context 'when the dashboard update is unsuccessful' do
+        xit 'spec to be described'
+      end
+    end
+
+    describe '#destroy' do
+      subject { delete :destroy, id: template.id }
+
+      before do
+        api_stub_for(
+          get: "/dashboards/#{template.id}",
+          params: { filter: { 'dashboard_type' => 'template' } },
+          response: from_api(template)
+        )
+        api_stub_for(
+          delete: "/dashboards/#{template.id}",
+          response: from_api(nil)
+        )
+      end
+      
+      it_behaves_like "a jpi v1 admin action"
+
+      # api_stub should be modified to allow these cases to be stubbed
+      context 'when the template cannot be found' do
+        xit 'spec to be described'
+      end
+      context 'when the dashboard destruction is unsuccessful' do
+        xit 'spec to be described'
+      end
+    end
+  end
+end

data/spec/controllers/mno_enterprise/jpi/v1/admin/impac/kpis_controller_spec.rb

@@ -0,0 +1,134 @@
+require 'rails_helper'
+
+module MnoEnterprise
+  describe Jpi::V1::Admin::Impac::KpisController, type: :controller do
+    # include MnoEnterprise::TestingSupport::JpiV1TestHelper
+    include MnoEnterprise::TestingSupport::SharedExamples::JpiV1Admin
+    render_views
+    routes { MnoEnterprise::Engine.routes }
+    before { request.env["HTTP_ACCEPT"] = 'application/json' }
+
+    let(:user) { build(:user, :admin, :with_organizations) }
+    let(:org) { build(:organization, users: [user]) }
+    let(:template) { build(:impac_dashboard, dashboard_type: 'template') }
+    let(:metadata) { { hist_parameters: { from: '2015-01-01', to: '2015-03-31', period: 'MONTHLY' } } }
+    let(:kpi) { build(:impac_kpi, dashboard: template, settings: metadata) }
+
+    let(:hash_for_kpi) do
+      {
+        "id" => kpi.id,
+        'settings' => metadata.deep_stringify_keys,
+        "element_watched" => kpi.element_watched,
+        "endpoint" => kpi.endpoint
+      }
+    end
+
+    before do
+      api_stub_for(get: "/users/#{user.id}", response: from_api(user))
+      sign_in user
+    end
+
+    describe '#create' do
+      let(:kpi_params) do
+        {
+          dashboard_id: template.id,
+          endpoint: kpi.endpoint,
+          source: kpi.source,
+          element_watched: kpi.element_watched,
+          extra_watchables: kpi.extra_watchables,
+          metadata: metadata,
+          forbidden: 'param'
+        }
+      end
+
+      subject { post :create, dashboard_template_id: template.id, kpi: kpi_params }
+      
+      before do
+        api_stub_for(
+          get: "/dashboards/#{template.id}",
+          params: { filter: { 'dashboard_type' => 'template' } },
+          response: from_api(template)
+        )
+        api_stub_for(
+          post: "dashboards/#{template.id}/kpis",
+          response: from_api(kpi)
+        )
+        # Why is Her doing a GET /kpis after doing a POST /kpis?
+        api_stub_for(
+          get: "dashboards/#{template.id}/kpis",
+          response: from_api([kpi])
+        )
+      end
+
+      it_behaves_like "a jpi v1 admin action"
+
+      it 'returns a kpi' do
+        subject
+        expect(JSON.parse(response.body)).to eq(hash_for_kpi)
+      end
+
+      # api_stub should be modified to allow this case to be stubbed
+      context 'when the template cannot be found' do
+        xit 'spec to be described'
+      end
+    end
+
+    describe '#update' do
+      let(:kpi_params) do
+        {
+          element_watched: kpi.element_watched,
+          extra_watchables: kpi.extra_watchables,
+          metadata: metadata,
+          forbidden: 'param'
+        }
+      end
+
+      subject { put :update, id: kpi.id, kpi: kpi_params }
+      
+      before do
+        api_stub_for(
+          get: "kpis/#{kpi.id}",
+          response: from_api(kpi)
+        )
+        api_stub_for(
+          put: "/kpis/#{kpi.id}",
+          response: from_api(kpi)
+        )
+      end
+
+      it_behaves_like "a jpi v1 admin action"
+
+      it 'returns a kpi' do
+        subject
+        expect(JSON.parse(response.body)).to eq(hash_for_kpi)
+      end
+
+      # api_stub should be modified to allow this case to be stubbed
+      context 'when the kpi update is unsuccessful' do
+        xit 'spec to be described'
+      end
+    end
+
+    describe '#destroy' do
+      subject { delete :destroy, id: kpi.id }
+      
+      before do
+        api_stub_for(
+          get: "kpis/#{kpi.id}",
+          response: from_api(kpi)
+        )
+        api_stub_for(
+          delete: "/kpis/#{kpi.id}",
+          response: from_api(nil)
+        )
+      end
+
+      it_behaves_like "a jpi v1 admin action"
+
+      # api_stub should be modified to allow this case to be stubbed
+      context 'when the kpi destruction is unsuccessful' do
+        xit 'spec to be described'
+      end
+    end
+  end
+end