Merge branch 'main' of https://github.com/espoo-dev/med_system_backend into feat/add-logout-button-views

Author: lucasleandro1

app/controllers/api/v1/event_procedures_controller.rb

@@ -8,12 +8,14 @@ class EventProceduresController < ApiController
 
       def index
         authorized_scope = policy_scope(EventProcedure)
-        event_procedures = EventProcedures::List.result(
+        listed_event_procedures = EventProcedures::List.result(
           scope: authorized_scope,
           params: event_procedure_permitted_query_params
-        ).event_procedures
+        )
+        event_procedures = listed_event_procedures.event_procedures
+        event_procedures_unpaginated = listed_event_procedures.event_procedures_unpaginated
 
-        total_amount_cents = EventProcedures::TotalAmountCents.call(event_procedures: event_procedures)
+        total_amount_cents = EventProcedures::TotalAmountCents.call(event_procedures: event_procedures_unpaginated)
 
         render json: {
           total: total_amount_cents.total,

app/operations/event_procedures/list.rb

@@ -6,9 +6,11 @@ class List < Actor
     input :params, type: Hash, default: -> { {} }
 
     output :event_procedures, type: Enumerable
+    output :event_procedures_unpaginated, type: Enumerable
 
     def call
-      self.event_procedures = filtered_query.order(date: :desc).page(params[:page]).per(params[:per_page])
+      self.event_procedures_unpaginated = filtered_query.order(date: :desc)
+      self.event_procedures = event_procedures_unpaginated.page(params[:page]).per(params[:per_page])
     end
 
     private

app/operations/event_procedures/total_amount_cents.rb

@@ -9,20 +9,19 @@ class TotalAmountCents < Actor
     output :unpaid, type: String
 
     def call
-      procedures_by_id = Procedure.where(id: event_procedures.pluck(:procedure_id)).index_by(&:id)
-
-      self.total = calculate_amount(event_procedures, procedures_by_id)
-      self.payd = calculate_amount(event_procedures.select(&:payd), procedures_by_id)
-      self.unpaid = calculate_amount(event_procedures.reject(&:payd), procedures_by_id)
+      self.total = calculate_amount(event_procedures)
+      self.payd = calculate_amount(event_procedures.select(&:payd))
+      self.unpaid = calculate_amount(event_procedures.reject(&:payd))
     end
 
     def convert_money(amount_cents)
       Money.new(amount_cents, "BRL").format
     end
 
-    def calculate_amount(filtered_event_procedures, procedures_by_id)
+    def calculate_amount(filtered_event_procedures)
       total_cents = filtered_event_procedures.sum do |event_procedure|
-        procedures_by_id[event_procedure.procedure_id]&.amount_cents.to_i
+        result = BuildTotalAmountCents.call(event_procedure: event_procedure)
+        result.total_amount_cents
       end
       convert_money(total_cents)
     end

config/initializers/prawn.rb

@@ -0,0 +1,3 @@
+# frozen_string_literal: true
+
+Prawn::Fonts::AFM.hide_m17n_warning = true if defined?(Prawn::Fonts::AFM)

lib/tasks/persist_in_database.rake

@@ -10,7 +10,7 @@ namespace :procedures do
     instance = Scripts::PopulateProcedures.new(path_file)
     instance.run!
 
-    puts "Procedures added in database"
+    Rails.logger.warn "Procedures added in database"
   rescue StandardError => e
     raise StandardError, e.message
   end

lib/tasks/port_values_2008.rake

@@ -17,6 +17,6 @@ namespace :port_values_2008 do
       )
     end
 
-    puts "Port values imported successfully"
+    Rails.logger.warn "Port values imported successfully"
   end
 end

spec/operations/event_procedures/list_spec.rb

@@ -103,5 +103,22 @@
 
       it { expect(result.event_procedures).to eq [EventProcedure.last] }
     end
+
+    describe "event_procedures_unpaginated" do
+      context "when there are event procedures outside of pagination" do
+        let!(:event_procedures) { create_list(:event_procedure, 11) }
+
+        it "returns all event procedures" do
+          result = described_class.result(
+            scope: EventProcedure.all,
+            params: { page: "1", per_page: "5" }
+          )
+          event_procedures_paginated = result.event_procedures
+          event_procedures_unpaginated = result.event_procedures_unpaginated
+          expect(event_procedures_unpaginated).to match_array(event_procedures)
+          expect(event_procedures_paginated.count).to eq(5)
+        end
+      end
+    end
   end
 end

spec/operations/event_procedures/total_amount_cents_spec.rb

@@ -10,24 +10,28 @@
       expect(described_class.result(event_procedures: [event_procedure])).to be_success
     end
 
-    it "returns the amount_cents total, paid and unpaid of event_procedures" do
+    it "correctly calculates total, paid and unpaid amounts" do
       user = create(:user)
-      procedure_5000 = create(:procedure, amount_cents: 5000)
-      procedure_2000 = create(:procedure, amount_cents: 2000)
-      payd_amount_cents = create_list(
+      procedure_5000 = create(:procedure, amount_cents: 5000, custom: true, user: user)
+      procedure_2000 = create(:procedure, amount_cents: 2000, custom: true, user: user)
+      paid_event_procedures = create_list(
         :event_procedure, 3,
         procedure: procedure_5000,
         user: user,
-        payd: true
+        payd: true,
+        urgency: false
       )
-      unpayd_event_procedure = create_list(
+      unpaid_event_procedures = create_list(
         :event_procedure, 2,
         procedure: procedure_2000,
         user: user,
-        payd: false
+        payd: false,
+        urgency: false
       )
-      event_procedures = payd_amount_cents + unpayd_event_procedure
+
+      event_procedures = paid_event_procedures + unpaid_event_procedures
       total_amount_cents = described_class.call(event_procedures: event_procedures)
+
       expect(total_amount_cents.total).to eq("R$190.00")
       expect(total_amount_cents.payd).to eq("R$150.00")
       expect(total_amount_cents.unpaid).to eq("R$40.00")

spec/requests/api/v1/event_procedures_dashboard_request_spec.rb

@@ -8,19 +8,9 @@
     let(:params) { { start_date: "01/06/2000", end_date: "05/06/2000" } }
 
     describe "authentication" do
-      context "when user is not authenticated" do
-        let(:params) { {} }
-        let(:headers) { {} }
-
-        it "returns unauthorized" do
-          do_request
-          expect(response).to have_http_status(:unauthorized)
-        end
-
-        it "returns error message" do
-          do_request
-          expect(response.parsed_body["error_description"]).to eq(["Invalid token"])
-        end
+      include_context "when user is not authenticated" do
+        let(:path) { "/api/v1/event_procedures_dashboard/amount_by_day" }
+        let(:http_method) { :get }
       end
 
       context "when user is authenticated as not admin" do