Merge pull request #272 from espoo-dev/fix-rename-payd

Rename all payd names to paid

Author: mattfeg

app/controllers/api/v1/event_procedures_controller.rb

@@ -19,8 +19,8 @@ def index
 
         render json: {
           total: total_amount_cents.total,
-          total_payd: total_amount_cents.payd,
-          total_unpayd: total_amount_cents.unpaid,
+          total_paid: total_amount_cents.paid,
+          total_unpaid: total_amount_cents.unpaid,
           event_procedures: serialized_event_procedures(event_procedures)
         }, status: :ok
       end
@@ -69,7 +69,7 @@ def event_procedure_permitted_params
           :date,
           :urgency,
           :amount_cents,
-          :payd,
+          :paid,
           :room_type,
           :payment,
           patient_attributes: %i[
@@ -90,7 +90,7 @@ def event_procedure_permitted_query_params
           :per_page,
           :month,
           :year,
-          :payd,
+          :paid,
           hospital: [:name],
           health_insurance: [:name]
         ).to_h

app/controllers/api/v1/medical_shifts_controller.rb

@@ -30,14 +30,14 @@ def index
         authorized_scope = policy_scope(MedicalShift)
         medical_shifts = MedicalShifts::List.result(
           scope: authorized_scope,
-          params: params.permit(:page, :per_page, :month, :year, :payd, :hospital_name).to_h
+          params: params.permit(:page, :per_page, :month, :year, :paid, :hospital_name).to_h
         ).medical_shifts
 
         amount_cents = MedicalShifts::TotalAmountCents.call(medical_shifts: medical_shifts)
 
         render json: {
           total: amount_cents.total,
-          total_payd: amount_cents.payd,
+          total_paid: amount_cents.paid,
           total_unpaid: amount_cents.unpaid,
           medical_shifts: serialized_medical_shifts(medical_shifts)
         }, status: :ok
@@ -84,7 +84,7 @@ def medical_shift
       end
 
       def medical_shift_params
-        params.permit(:hospital_name, :workload, :start_date, :start_hour, :amount_cents, :payd).to_h
+        params.permit(:hospital_name, :workload, :start_date, :start_hour, :amount_cents, :paid).to_h
       end
 
       def serialized_medical_shifts(medical_shifts)

app/controllers/api/v1/pdf_reports_controller.rb

@@ -68,7 +68,7 @@ def permitted_query_params
           :per_page,
           :month,
           :year,
-          :payd,
+          :paid,
           :entity_name,
           :disposition,
           hospital: [:name],

app/dashboards/event_procedure_dashboard.rb

@@ -16,7 +16,7 @@ class EventProcedureDashboard < Administrate::BaseDashboard
     hospital: Field::BelongsTo,
     patient: Field::BelongsTo,
     patient_service_number: Field::String,
-    payd: Field::Boolean,
+    paid: Field::Boolean,
     procedure: Field::BelongsTo,
     room_type: Field::String,
     total_amount_cents: Field::Number,
@@ -36,7 +36,7 @@ class EventProcedureDashboard < Administrate::BaseDashboard
     procedure
     user
     date
-    payd
+    paid
     total_amount_cents
   ].freeze
 
@@ -49,7 +49,7 @@ class EventProcedureDashboard < Administrate::BaseDashboard
     hospital
     patient
     patient_service_number
-    payd
+    paid
     procedure
     room_type
     total_amount_cents
@@ -68,7 +68,7 @@ class EventProcedureDashboard < Administrate::BaseDashboard
     hospital
     patient
     patient_service_number
-    payd
+    paid
     procedure
     room_type
     total_amount_cents

app/dashboards/medical_shift_dashboard.rb

@@ -16,7 +16,7 @@ class MedicalShiftDashboard < Administrate::BaseDashboard
     start_hour: Field::Time,
     hospital_name: Field::String,
     user: Field::BelongsTo,
-    payd: Field::Boolean,
+    paid: Field::Boolean,
     shift: Field::String,
     title: Field::String,
     workload: Field::String,
@@ -47,7 +47,7 @@ class MedicalShiftDashboard < Administrate::BaseDashboard
     start_hour
     hospital_name
     user
-    payd
+    paid
     shift
     workload
     title
@@ -64,7 +64,7 @@ class MedicalShiftDashboard < Administrate::BaseDashboard
     start_hour
     hospital_name
     user
-    payd
+    paid
     workload
   ].freeze
 

app/models/event_procedure.rb

@@ -20,7 +20,7 @@ class EventProcedure < ApplicationRecord
   accepts_nested_attributes_for :health_insurance
 
   scope :by_month, EventProcedures::ByMonthQuery
-  scope :by_payd, EventProcedures::ByPaydQuery
+  scope :by_paid, EventProcedures::ByPaidQuery
   scope :by_year, EventProcedures::ByYearQuery
   scope :date_between, EventProcedures::ByDateBetween
   scope :by_hospital_name, EventProcedures::ByHospitalNameQuery

app/models/medical_shift.rb

@@ -10,7 +10,7 @@ class MedicalShift < ApplicationRecord
   scope :by_hospital, MedicalShifts::ByHospitalQuery
   scope :by_month, MedicalShifts::ByMonthQuery
   scope :by_year, MedicalShifts::ByYearQuery
-  scope :by_payd, MedicalShifts::ByPaydQuery
+  scope :by_paid, MedicalShifts::ByPaidQuery
 
   validates :workload, presence: true
   validates :start_date, presence: true

app/operations/event_procedures/list.rb

@@ -25,7 +25,7 @@ def apply_all_filters(query)
       query = apply_year_filter(query)
       query = apply_hospital_filter(query)
       query = apply_health_insurance_filter(query)
-      apply_payd_filter(query)
+      apply_paid_filter(query)
     end
 
     def apply_month_filter(query)
@@ -36,8 +36,8 @@ def apply_year_filter(query)
       params[:year].present? ? query.by_year(year: params[:year]) : query
     end
 
-    def apply_payd_filter(query)
-      %w[true false].include?(params[:payd]) ? query.by_payd(payd: params[:payd]) : query
+    def apply_paid_filter(query)
+      %w[true false].include?(params[:paid]) ? query.by_paid(paid: params[:paid]) : query
     end
 
     def apply_hospital_filter(query)

app/operations/event_procedures/total_amount_cents.rb

@@ -5,13 +5,13 @@ class TotalAmountCents < Actor
     input :event_procedures
 
     output :total, type: String
-    output :payd, type: String
+    output :paid, type: String
     output :unpaid, type: String
 
     def call
       self.total = calculate_amount(event_procedures)
-      self.payd = calculate_amount(event_procedures.select(&:payd))
-      self.unpaid = calculate_amount(event_procedures.reject(&:payd))
+      self.paid = calculate_amount(event_procedures.select(&:paid))
+      self.unpaid = calculate_amount(event_procedures.reject(&:paid))
     end
 
     def convert_money(amount_cents)

app/operations/medical_shifts/list.rb

@@ -18,7 +18,7 @@ def filtered_query
       query = apply_month_filter(query)
       query = apply_year_filter(query)
       query = apply_hospital_filter(query)
-      apply_payd_filter(query)
+      apply_paid_filter(query)
     end
 
     def apply_month_filter(query)
@@ -33,8 +33,8 @@ def apply_hospital_filter(query)
       params[:hospital_name].present? ? query.by_hospital(hospital_name: params[:hospital_name]) : query
     end
 
-    def apply_payd_filter(query)
-      %w[true false].include?(params[:payd]) ? query.by_payd(payd: params[:payd]) : query
+    def apply_paid_filter(query)
+      %w[true false].include?(params[:paid]) ? query.by_paid(paid: params[:paid]) : query
     end
   end
 end