Merge branch 'staging' of github.com:Children-in-Families/oscar-web i…

…nto staging

app/controllers/api/v1/case_notes_controller.rb

@@ -7,6 +7,11 @@ class CaseNotesController < Api::V1::BaseApiController
 
       before_action :find_client
 
+      def show
+        case_note = CaseNote.find(params[:id])
+        render json: case_note
+      end
+
       def create
         case_note = @client.case_notes.new(case_note_params)
         case_note.assessment = @client.assessments.custom_latest_record

app/serializers/case_note_serializer.rb

@@ -1,7 +1,16 @@
 class CaseNoteSerializer < ActiveModel::Serializer
-  attributes :id, :attendee, :meeting_date, :interaction_type, :note, :client_id, :assessment_id, :case_note_domain_groups, :selected_domain_group_ids, :attachments, :draft, :created_at, :updated_at
+  attributes :id, :attendee, :meeting_date, :interaction_type, :note, :client_id, :assessment_id, :case_note_domain_groups,
+             :selected_domain_group_ids, :attachments, :draft, :tasks, :created_at, :updated_at
+
+
+  private
 
   def case_note_domain_groups
     ActiveModel::ArraySerializer.new(object.case_note_domain_groups, each_serializer: CaseNoteDomainGroupSerializer)
   end
+
+  def tasks
+    tasks = Task.completed.where(case_note_id: object.id)
+    [*object.tasks, *tasks]
+  end
 end

config/routes.rb

@@ -394,7 +394,7 @@
       resources :clients, except: [:edit, :new] do
         get :listing, on: :collection
         resources :assessments, only: [:create, :update, :destroy, :delete]
-        resources :case_notes, only: [:create, :update, :destroy, :delete_attachment] do
+        resources :case_notes, only: [:show, :create, :update, :destroy, :delete_attachment] do
           delete 'attachments/:file_index', action: :delete_attachment, on: :member
         end
         resources :custom_field_properties, only: [:create, :update, :destroy]