renalware-core 2.0.0.pre.beta4 → 2.0.0.pre.beta5

data/app/controllers/renalware/messaging/receipts_controller.rb

@@ -0,0 +1,55 @@
+require_dependency "renalware/messaging"
+
+# A Receipt is cross reference between Message and Recipient.
+# We can for instance mark on a receipt if/when it was read or viewed.
+module Renalware
+  module Messaging
+    class ReceiptsController < BaseController
+      include Renalware::Concerns::Pageable
+      include PresenterHelper
+
+      # GET aka inbox
+      def unread
+        render_receipts(receipts.unread)
+      end
+
+      # GET
+      def read
+        render_receipts(receipts)
+      end
+
+      # PATCH
+      def mark_as_read
+        authorize receipt
+        receipt.update(read_at: Time.zone.now)
+        render locals: {
+          receipt: Messaging::ReceiptPresenter.new(receipt)
+        }
+      end
+
+      private
+
+      def render_receipts(receipts)
+        authorize receipts
+        render locals: {
+          receipts: present(receipts, Messaging::ReceiptPresenter)
+        }
+      end
+
+      def receipts
+        @receipts ||= recipient.receipts.page(page).per(per_page)
+      end
+
+      def receipt
+        @receipt ||= recipient.receipts.find_by!(
+          message_id: params[:message_id],
+          id: params[:id]
+        )
+      end
+
+      def recipient
+        Messaging.cast_recipient(current_user)
+      end
+    end
+  end
+end

data/app/controllers/renalware/messaging/sent_messages_controller.rb

@@ -0,0 +1,22 @@
+require_dependency "renalware/messaging"
+require "collection_presenter"
+
+module Renalware
+  module Messaging
+    class SentMessagesController < BaseController
+      include Renalware::Concerns::Pageable
+
+      def index
+        messages = author.messages.page(page).per(per_page)
+        authorize messages
+        render locals: {
+          messages: CollectionPresenter.new(messages, Messaging::InternalMessagePresenter)
+        }
+      end
+
+      def author
+        Messaging.cast_author(current_user)
+      end
+    end
+  end
+end

data/app/controllers/renalware/modalities/descriptions_controller.rb

@@ -4,38 +4,43 @@ module Renalware
   module Modalities
     class DescriptionsController < BaseController
 
-      before_action :load_modality_description, only: [:edit, :update]
-
       def new
-        @modality_description = Description.new
-        authorize @modality_description
+        modality_description = Description.new
+        authorize modality_description
+        render_new(modality_description)
       end
 
       def create
-        @modality_description = Description.new(modality_description_params)
-        authorize @modality_description
+        modality_description = Description.new(modality_description_params)
+        authorize modality_description
 
-        if @modality_description.save
+        if modality_description.save
           redirect_to modalities_descriptions_path,
             notice: t(".success", model_name: "modality description")
         else
-          flash[:error] = t(".failed", model_name: "modality description")
-          render :new
+          flash.now[:error] = t(".failed", model_name: "modality description")
+          render_new(modality_description)
         end
       end
 
       def index
-        @modalilty_descriptions = Description.all
-        authorize @modalilty_descriptions
+        modality_descriptions = Description.all
+        authorize modality_descriptions
+        render locals: { modality_descriptions: modality_descriptions }
+      end
+
+      def edit
+        render_edit(find_and_authorize_modality_description)
       end
 
       def update
-        if @modality_description.update(modality_description_params)
+        modality_description = find_and_authorize_modality_description
+        if modality_description.update(modality_description_params)
           redirect_to modalities_descriptions_path,
             notice: t(".success", model_name: "modality description")
         else
-          flash[:error] = t(".failed", model_name: "modality description")
-          render :edit
+          flash.now[:error] = t(".failed", model_name: "modality description")
+          render_edit(modality_description)
         end
       end
 
@@ -47,13 +52,22 @@ module Renalware
 
       private
 
+      def render_new(modality_description)
+        render :new, locals: { modality_description: modality_description }
+      end
+
+      def render_edit(modality_description)
+        render :edit, locals: { modality_description: modality_description }
+      end
+
       def modality_description_params
         params.require(:modalities_description).permit(:name, :code, :site)
       end
 
-      def load_modality_description
-        @modality_description = Description.find(params[:id])
-        authorize @modality_description
+      def find_and_authorize_modality_description
+        Description.find(params[:id]).tap do |description|
+          authorize description
+        end
       end
     end
   end

data/app/controllers/renalware/modalities/modalities_controller.rb

@@ -12,42 +12,50 @@ module Renalware
       end
 
       def index
-        modalities = patient.modalities.ordered
+        modalities = patient
+                       .modalities
+                       .includes([:description, :created_by])
+                       .ordered
         render locals: { patient: patient, modalities: modalities }
       end
 
       def create
-        modality = Modality.new(modality_params.merge!(patient: patient))
-
-        if modality.valid?
-          patient.set_modality(modality_params)
+        result = change_patient_modality
+        if result.success?
           handle_valid_modality
         else
-          flash[:error] = t(".failed", model_name: "modality")
-          render :new, locals: { patient: patient, modality: modality }
+          flash.now[:error] = t(".failed", model_name: "modality")
+          render :new, locals: { patient: patient, modality: result.object }
         end
       end
 
       private
 
+      def change_patient_modality
+        Modalities::ChangePatientModality
+          .new(patient: patient, user: current_user)
+          .broadcasting_to_configured_subscribers
+          .call(modality_params)
+      end
+
       def params_are_valid?
         Modality.new(modality_params).valid?
       end
 
       def modality_params
         params.require(:modality)
-        .permit(
-          :description_id, :modal_change_type,
-          :reason_id, :notes, :started_on
-        ).merge(by: current_user)
+              .permit(:description_id, :modal_change_type, :reason_id, :notes, :started_on)
       end
 
+      # TODO: refactor
+      # rubocop:disable Metrics/MethodLength
       def handle_valid_modality
-        if patient.modality_description.is_a? Deaths::ModalityDescription
+        description = patient.modality_description
+        if description.is_a? Deaths::ModalityDescription
           redirect_to edit_patient_death_path(patient), flash: {
             warning: "Please make sure to update patient date of death and cause of death!"
           }
-        elsif patient.modality_description.is_a? Transplants::DonorModalityDescription
+        elsif description.is_a? Transplants::DonorModalityDescription
           redirect_to new_patient_transplants_donation_path(patient), flash: {
             warning: "If you have the information on-hand, please enter the potential donation."
           }

data/app/controllers/renalware/pathology/current_observation_results_controller.rb

@@ -6,7 +6,7 @@ module Renalware
       before_action :load_patient
 
       def index
-        table_view = CurrentObservationResults::HTMLTableView.new(self.view_context)
+        table_view = CurrentObservationResults::HTMLTableView.new(view_context)
         presenter = CurrentObservationResults::Presenter.new
         service = ViewCurrentObservationResults.new(@patient, presenter)
         service.call

data/app/controllers/renalware/pathology/historical_observation_results_controller.rb

@@ -6,7 +6,7 @@ module Renalware
       before_action :load_patient
 
       def index
-        table_view = HistoricalObservationResults::HTMLTableView.new(self.view_context)
+        table_view = HistoricalObservationResults::HTMLTableView.new(view_context)
         presenter = HistoricalObservationResults::Presenter.new
         service = ViewObservationResults.new(@patient.observations, presenter)
         service.call(params)

data/app/controllers/renalware/pathology/patient_rules_controller.rb

@@ -18,7 +18,7 @@ module Renalware
           redirect_to patient_pathology_required_observations_path(@patient),
             notice: t(".success", model_name: "Patient Rule")
         else
-          flash[:error] = t(".failed", model_name: "Patient Rule")
+          flash.now[:error] = t(".failed", model_name: "Patient Rule")
           render_new(patient_rule)
         end
       end
@@ -36,7 +36,7 @@ module Renalware
           redirect_to patient_pathology_required_observations_path(@patient),
             notice: t(".success", model_name: "patient rule")
         else
-          flash[:error] = t(".failed", model_name: "patient rule")
+          flash.now[:error] = t(".failed", model_name: "patient rule")
           render_edit(patient_rule)
         end
       end

data/app/controllers/renalware/pathology/recent_observation_results_controller.rb

@@ -6,7 +6,7 @@ module Renalware
       before_action :load_patient
 
       def index
-        table_view = RecentObservationResults::HTMLTableView.new(self.view_context)
+        table_view = RecentObservationResults::HTMLTableView.new(view_context)
         presenter = RecentObservationResults::Presenter.new
         service = ViewObservationResults.new(@patient.observations, presenter)
         service.call(params)

data/app/controllers/renalware/pathology/requests/requests_controller.rb

@@ -39,7 +39,7 @@ module Renalware
         end
 
         def create
-          requests.each { |request| request.print_form }
+          requests.each(&:print_form)
 
           render pdf: "create",
             layout: false,

data/app/controllers/renalware/patients/alerts_controller.rb

@@ -0,0 +1,61 @@
+require_dependency "renalware/patients"
+
+module Renalware
+  module Patients
+    class AlertsController < BaseController
+
+      # GET html
+      def new
+        alert = Alert.new
+        authorize alert
+        render_form(alert)
+      end
+
+      # POST js
+      def create
+        alert = Alert.new(alert_params.merge!(by: user, patient: patient))
+        authorize alert
+        if alert.save
+          render locals: { patient: patient, alert: alert }
+        else
+          render_form(alert, status: 422)
+        end
+      end
+
+      # POST js
+      # Idempotent
+      def destroy
+        alert = find_alert
+        if alert.present?
+          authorize alert
+          alert.destroy
+          render locals: { alert: alert }
+        else
+          skip_authorization
+          head :ok
+        end
+      end
+
+      private
+
+      def find_alert
+        Alert.find_by(id: params[:id])
+      end
+
+      def render_form(alert, status: 200)
+        render :new,
+               locals: { patient: patient, alert: alert },
+               layout: false,
+               status: status
+      end
+
+      def user
+        @user ||= Renalware::Patients.cast_user(current_user)
+      end
+
+      def alert_params
+        params.require(:patients_alert).permit(:notes, :urgent)
+      end
+    end
+  end
+end

data/app/controllers/renalware/patients/clinical_summaries_controller.rb

@@ -0,0 +1,15 @@
+require_dependency "renalware/patients"
+
+module Renalware
+  module Patients
+    class ClinicalSummariesController < BaseController
+      skip_after_action :verify_authorized
+      before_action :load_patient
+
+      def show
+        clinical_summary = Renal::ClinicalSummaryPresenter.new(patient)
+        render :show, locals: { clinical_summary: clinical_summary }
+      end
+    end
+  end
+end

data/app/controllers/renalware/patients/patients_controller.rb

@@ -0,0 +1,109 @@
+require_dependency "renalware/patients"
+
+module Renalware
+  module Patients
+    class PatientsController < BaseController
+      include PresenterHelper
+      include Renalware::Concerns::Pageable
+
+      def index
+        patients = patient_search.result.page(page).per(per_page)
+        authorize patients
+        render locals: {
+          patients: present(patients, PatientPresenter)
+        }
+      end
+
+      def search
+        skip_authorization
+        query = Patients::SearchQuery.new(term: params[:term])
+        render json: query.call.to_json
+      end
+
+      def new
+        patient = Patient.new
+        authorize patient
+        render locals: { patient: patient }
+      end
+
+      def create
+        patient = Patient.new(patient_params)
+        authorize patient
+
+        if patient.save
+          # Reload in order to let pg generate the secure id
+          redirect_to_patient_demographics(patient.reload)
+        else
+          flash.now[:error] = failed_msg_for("patient")
+          render :new, locals: { patient: patient }
+        end
+      end
+
+      def edit
+        authorize patient
+        render locals: { patient: patient }
+      end
+
+      def update
+        authorize patient
+        if patient.update(patient_params)
+          redirect_to_patient_demographics(patient)
+        else
+          flash.now[:error] = t(".failed", model_name: "patient")
+          render :edit, locals: { patient: patient }
+        end
+      end
+
+      def show
+        authorize patient
+        render locals: { patient: patient }
+      end
+
+      def patient
+        @patient ||= Renalware::Patient.find_by!(secure_id: params[:id])
+      end
+
+      private
+
+      def patient_params
+        params
+          .require(:patient)
+          .permit(patient_attributes)
+          .merge(document: document_attributes)
+          .merge(by: current_user)
+      end
+
+      # rubocop:disable Metrics/MethodLength
+      def patient_attributes
+        [
+          :nhs_number, :family_name, :given_name, :sex,
+          :ethnicity_id, :born_on, :paediatric_patient_indicator, :cc_on_all_letters,
+          :title, :suffix, :marital_status, :telephone1, :telephone2, :email, :religion_id,
+          :language_id, :cc_decision_on,
+          :local_patient_id, :local_patient_id_2, :local_patient_id_3,
+          :local_patient_id_4, :local_patient_id_5, :external_patient_id,
+          :send_to_renalreg, :send_to_rpv, :renalreg_decision_on, :rpv_decision_on,
+          :renalreg_recorded_by, :rpv_recorded_by,
+          current_address_attributes: address_params
+        ]
+      end
+      # rubocop:enable Metrics/MethodLength
+
+      def address_params
+        [:id, :name, :organisation_name, :street_1, :street_2, :street_3, :county, :country,
+          :town, :postcode, :telephone, :email]
+      end
+
+      def document_attributes
+        params
+          .require(:patient)
+          .fetch(:document, nil)
+          .try(:permit!)
+      end
+
+      def redirect_to_patient_demographics(patient)
+        redirect_to patient, notice: success_msg_for("patient")
+      end
+    end
+  end
+end

data/app/controllers/renalware/patients/primary_care_physicians_controller.rb

@@ -11,6 +11,7 @@ module Renalware
 
       def index
         primary_care_physicians = PrimaryCarePhysician.order(:family_name)
+                                                      .eager_load(practices: :address)
                                                       .page(page)
                                                       .per(per_page)
         authorize primary_care_physicians
@@ -36,7 +37,7 @@ module Renalware
             notice: t(".success", model_name: "primary_care_physician")
         else
           @alternative_address = alternative_address
-          flash[:error] = t(".failed", model_name: "primary_care_physician")
+          flash.now[:error] = t(".failed", model_name: "primary_care_physician")
           render :new
         end
       end
@@ -68,7 +69,7 @@ module Renalware
       end
 
       def update_primary_care_physician_failed(primary_care_physician)
-        flash[:error] = t(".failed", model_name: "primary_care_physician")
+        flash.now[:error] = t(".failed", model_name: "primary_care_physician")
         render_form(primary_care_physician, :edit)
       end
 

data/app/controllers/renalware/patients/worry_controller.rb

@@ -5,9 +5,10 @@ module Renalware
 
       # idempotent
       def create
-        Worry.find_or_create_by!(patient: patient) do |worry|
-          worry.by = user
+        worry = Worry.find_or_create_by!(patient: patient) do |wor|
+          wor.by = user
         end
+        update_worry_notes_if_supplied(worry)
         redirect_back(fallback_location: patient_path(patient),
                       notice: t(".success", patient: patient))
       end
@@ -26,9 +27,19 @@ module Renalware
 
       private
 
+      def update_worry_notes_if_supplied(worry)
+        if worry_params[:notes].present?
+          worry.update_attributes(worry_params.merge!(by: current_user))
+        end
+      end
+
       def user
         @user ||= Renalware::Patients.cast_user(current_user)
       end
+
+      def worry_params
+        params.require(:patients_worry).permit(:notes)
+      end
     end
   end
 end

data/app/controllers/renalware/patients/worryboard_controller.rb

@@ -7,7 +7,21 @@ module Renalware
 
       def show
         authorize Worry, :index?
-        render locals: { worries: Worry.all.page(page).per(per_page) }
+        query = WorryQuery.new(query_params)
+        worries = query.call
+        render locals: {
+          query: query.search,
+          worries: worries,
+          modalities: Modalities::Description.order(:name)
+        }
+      end
+
+      private
+
+      def query_params
+        params
+          .fetch(:q, {})
+          .merge(page: page, per_page: per_page)
       end
     end
   end

data/app/controllers/renalware/pd/bag_types_controller.rb

@@ -18,7 +18,7 @@ module Renalware
           redirect_to pd_bag_types_path,
             notice: t(".success", model_name: "bag type")
         else
-          flash[:error] = t(".failed", model_name: "bag type")
+          flash.now[:error] = t(".failed", model_name: "bag type")
           render :new, locals: { bag_type: bag_type }
         end
       end
@@ -39,7 +39,7 @@ module Renalware
           redirect_to pd_bag_types_path,
             notice: t(".success", model_name: "bag type")
         else
-          flash[:error] = t(".failed", model_name: "bag type")
+          flash.now[:error] = t(".failed", model_name: "bag type")
           render :edit, locals: { bag_type: bag_type }
         end
       end

data/app/controllers/renalware/pd/exit_site_infections_controller.rb

@@ -28,7 +28,7 @@ module Renalware
           redirect_to patient_pd_exit_site_infection_path(patient, esi),
             notice: t(".success", model_name: "exit site infection")
         else
-          flash[:error] = t(".failed", model_name: "exit site infection")
+          flash.now[:error] = t(".failed", model_name: "exit site infection")
           render_new(esi)
         end
       end
@@ -44,7 +44,7 @@ module Renalware
           redirect_to patient_pd_exit_site_infection_path(patient, exit_site_infection),
             notice: t(".success", model_name: "exit site infection")
         else
-          flash[:error] = t(".failed", model_name: "exit site infection")
+          flash.now[:error] = t(".failed", model_name: "exit site infection")
           render_edit
         end
       end

data/app/controllers/renalware/pd/peritonitis_episodes_controller.rb

@@ -54,7 +54,7 @@ module Renalware
       end
 
       def save_failure(episode)
-        flash[:error] = t(".failed", model_name: "peritonitis episode")
+        flash.now[:error] = t(".failed", model_name: "peritonitis episode")
         action = action_name.to_sym == :create ? :new : :edit
         render action, locals: {
           peritonitis_episode: episode,

data/app/controllers/renalware/pd/pet_adequacy_results_controller.rb

@@ -18,7 +18,7 @@ module Renalware
         if result.save
           redirect_to patient_pd_dashboard_path(patient), notice: success_msg_for("PET Adequacy")
         else
-          flash[:error] = failed_msg_for("PET Adequacy")
+          flash.now[:error] = failed_msg_for("PET Adequacy")
           render :new, locals: { pet_adequacy_result: result, patient: patient }
         end
       end
@@ -32,7 +32,7 @@ module Renalware
         if pet_adequacy_result.save
           redirect_to patient_pd_dashboard_path(patient), notice: success_msg_for("PET Adequacy")
         else
-          flash[:error] = failed_msg_for("PET Adequacy")
+          flash.now[:error] = failed_msg_for("PET Adequacy")
           render :edit, locals: { pet_adequacy_result: pet_adequacy_result, patient: patient }
         end
       end

data/app/controllers/renalware/pd/regimes_controller.rb

@@ -23,7 +23,7 @@ module Renalware
         if result.success?
           redirect_to patient_pd_dashboard_path(patient), notice: success_msg_for("PD regime")
         else
-          flash[:error] = failed_msg_for("PD Regime")
+          flash.now[:error] = failed_msg_for("PD Regime")
           render :new, locals: {
             regime: result.object,
             patient: patient
@@ -45,7 +45,7 @@ module Renalware
           redirect_to patient_pd_dashboard_path(patient),
             notice: t(".success", model_name: "PD regime")
         else
-          flash[:error] = t(".failed", model_name: "PD regime")
+          flash.now[:error] = t(".failed", model_name: "PD regime")
           render :edit, locals: {
             regime: result.object,
             patient: patient

data/app/controllers/renalware/problems/problems_controller.rb

@@ -38,7 +38,7 @@ module Renalware
         if update_problem(problem)
           redirect_to patient_problem_path(patient, problem), notice: success_msg_for("problem")
         else
-          flash[:error] = failed_msg_for("problem")
+          flash.now[:error] = failed_msg_for("problem")
           render :edit, locals: {
             patient: patient,
             problem: problem
@@ -59,7 +59,7 @@ module Renalware
         if problem.save
           redirect_to patient_problems_url(patient), notice: success_msg_for("problem")
         else
-          flash[:error] = failed_msg_for("problem")
+          flash.now[:error] = failed_msg_for("problem")
           render :new, locals: { patient: patient, problem: problem }
         end
       end