feat: reorganize interfaces & services

Author: ldonis

app/controllers/lesli/application_lesli_controller.rb

@@ -33,18 +33,18 @@
 module Lesli
     class ApplicationLesliController < ApplicationController        
 
-        include Lesli::LoggerInterface
         include Lesli::ResponderInterface
         include Lesli::RequesterInterface
         include Lesli::CustomizationInterface
+        include LesliAudit::LoggerInterface if defined?(LesliAudit)
         include LesliShield::AuthenticationInterface if defined?(LesliShield)
 
         protect_from_forgery with: :exception
 
         before_action :set_path
         before_action :set_locale
         before_action :authenticate_request if defined?(LesliShield)
-        before_action :authorize_privilege if defined?(LesliSecurity)
+        before_action :authorize_request if defined?(LesliSecurity)
         before_action :set_customizer
         before_action :set_requester
         after_action  :log_requests if defined?(LesliAudit)

app/interfaces/lesli/authorization_interface.rb

@@ -65,14 +65,14 @@ def set_locale
         # Set default query params for:
         def set_requester
             @query = {
-                search: params[:search] || nil,
-                pagination: {
-                    perPage: (params[:perPage] ? params[:perPage].to_i : 12),
-                    page: (params[:page] ? params[:page].to_i : 1)
+                :search => params[:search] || nil,
+                :pagination => {
+                    :perPage => (params[:perPage] ? params[:perPage].to_i : 12),
+                    :page => (params[:page] ? params[:page].to_i : 1)
                 },
-                order: {
-                    by: (params[:orderBy] || "id"),
-                    dir: (params[:order] || "desc")
+                :order => {
+                    :by => (params[:orderBy] || "id"),
+                    :dir => (params[:order] || "desc")
                 }
             }
         end

app/interfaces/lesli/logger_interface.rb

@@ -33,22 +33,9 @@
 module Lesli
     module ResponderInterface
 
-        def respond_with_pagination2(records, payload = nil)
-            {
-                pagination: {
-                    page: records.current_page,
-                    pages: records.total_pages,
-                    total: records.total_count,
-                    results: records.length
-                },
-                records: payload || records
-            }
-        end
-
         # Return an standard http 200 respond
-        def respond_with_successful(payload = nil)
-            # Response for modern Lesli 3 apps
-            respond_with_http(200, payload)
+        def respond_as_successful(payload = nil)
+            payload
         end
 
         # Usage example
@@ -57,39 +44,38 @@ def respond_with_successful(payload = nil)
         # .page(query[:pagination][:page])
         # .per(query[:pagination][:perPage])
         #
-        # respond_with_successful_pagination(tasks)
+        # respond_with_pagination(tasks)
         #
         # IMPORTANT: It is strictly necessary to use the pagination methods
         #            to make this work properly
-        def respond_with_pagination(records, payload = nil)
-            respond_with_http(200, {
+        def respond_as_pagination(payload)
+            {
                 pagination: {
-                    page: records.current_page,
-                    pages: records.total_pages,
-                    total: records.total_count,
-                    results: records.length
+                    page: payload.current_page,
+                    pages: payload.total_pages,
+                    total: payload.total_count,
+                    results: payload.length
                 },
-                records: payload || records
-            })
+                records: payload
+            }
+        end
+
+
+
+
+        def respond_with_successful(payload = nil)
+            respond_with_http(200, respond_as_successful(payload))
+        end
+
+        def respond_with_pagination(payload)
+            respond_with_http(200, respond_as_pagination(payload))
         end
 
         # JSON not found response
         def respond_with_not_found
-            # Keep compatibility with Deutsche Leibrenten
-            if defined? DeutscheLeibrenten
-                response_body = {
-                    successful: false,
-                    error: {
-                        message: I18n.t("core.shared.messages_danger_not_found"),
-                        details: []
-                    }
-                }
-                return render(status: 404, json: response_body.to_json)
-            end
-
             respond_with_http(404, {
-                                    message: I18n.t("core.shared.messages_danger_not_found")
-                                })
+                message: I18n.t("core.shared.messages_danger_not_found")
+            })
         end
 
         # JSON not found response