Review

app/controllers/api/internal/admin/agenda/absences_controller.rb → app/controllers/admin/api/agenda/absences_controller.rb

@@ -1,4 +1,4 @@
-class Api::Internal::Admin::Agenda::AbsencesController < Api::Internal::BaseController
+class Admin::Api::Agenda::AbsencesController < Admin::Api::BaseController
   def index
     agent = Agent.find(params[:agent_id])
     @organisation = Organisation.find(params[:organisation_id])

app/controllers/api/internal/admin/agenda/plage_ouvertures_controller.rb → app/controllers/admin/api/agenda/plage_ouvertures_controller.rb

@@ -1,4 +1,4 @@
-class Api::Internal::Admin::Agenda::PlageOuverturesController < Api::Internal::BaseController
+class Admin::Api::Agenda::PlageOuverturesController < Admin::Api::BaseController
   def index
     @agent = Agent.find(params[:agent_id])
     @organisation = Organisation.find(params[:organisation_id])

app/controllers/api/internal/admin/agenda/rdvs_controller.rb → app/controllers/admin/api/agenda/rdvs_controller.rb

@@ -1,4 +1,4 @@
-class Api::Internal::Admin::Agenda::RdvsController < Api::Internal::BaseController
+class Admin::Api::Agenda::RdvsController < Admin::Api::BaseController
   def index
     agent = Agent.find(params[:agent_id])
     @organisation = Organisation.find(params[:organisation_id])

app/controllers/admin/api/base_controller.rb

@@ -0,0 +1,22 @@
+class Admin::Api::BaseController < ApplicationController
+  include Admin::AuthenticatedControllerConcern
+
+  respond_to :json
+
+  private
+
+  def time_range_params
+    start_time = params.require(:start)
+    end_time = params.require(:end)
+    Time.zone.parse(start_time)..Time.zone.parse(end_time)
+  end
+
+  def date_range_params
+    (time_range_params.begin.to_date)..(time_range_params.end.to_date)
+  end
+  helper_method :date_range_params
+
+  def pundit_user
+    AgentContext.new(current_agent)
+  end
+end

app/views/admin/agent_agendas/show.html.slim

@@ -18,7 +18,7 @@
       data-selected-event-id="#{@selected_event_id}"
       data-organisation-id="#{@organisation.id}"
       data-display-saturdays="#{current_agent.display_saturdays}"
-      data-event-sources-json="#{[api_internal_admin_agenda_rdvs_path(agent_id: @agent, organisation_id: current_organisation.id), api_internal_admin_agenda_absences_path(agent_id: @agent, organisation_id: current_organisation.id), api_internal_admin_agenda_plage_ouvertures_path(agent_id: @agent, organisation_id: current_organisation.id, in_background: true), OffDays.to_full_calendar_array].to_json}"
+      data-event-sources-json="#{[admin_api_agenda_absences_path(agent_id: @agent, organisation_id: current_organisation.id, format: :json), admin_api_agenda_rdvs_path(agent_id: @agent, organisation_id: current_organisation.id, format: :json), admin_api_agenda_plage_ouvertures_path(agent_id: @agent, organisation_id: current_organisation.id, in_background: true, format: :json), OffDays.to_full_calendar_array].to_json}"
     ]
     .mt-3.flex-grow-1.text-right
       .m-2

config/routes.rb

@@ -121,6 +121,13 @@
 
   authenticate :agent do
     namespace "admin" do
+      namespace :api, defaults: { format: :json } do
+        namespace :agenda do
+          resources :plage_ouvertures, only: [:index]
+          resources :rdvs, only: [:index]
+          resources :absences, only: [:index]
+        end
+      end
       resources :territories, only: %i[edit update show] do
         scope module: "territories" do
           resources :agent_roles, only: %i[update create destroy]

config/routes/api.rb

@@ -63,16 +63,6 @@
     end
   end
 
-  namespace :internal do
-    namespace :admin do
-      namespace :agenda do
-        resources :plage_ouvertures, only: [:index]
-        resources :rdvs, only: [:index]
-        resources :absences, only: [:index]
-      end
-    end
-  end
-
   post "/coop-mediation-numerique/accounts", to: "coop_mediation_numerique/accounts#create"
 end