lesli_audit 0.6.0 → 1.0.1

data/app/assets/stylesheets/lesli_audit/application.css

@@ -1,6 +1,6 @@
-/*!*********************************************************************************************************************************************************!*\
-  !*** css ./node_modules/css-loader/dist/cjs.js??clonedRuleSet-11.use[1]!./node_modules/sass-loader/dist/cjs.js!../LesliAudit/lib/scss/application.scss ***!
-  \*********************************************************************************************************************************************************/
+/*!************************************************************************************************************************************************************!*\
+  !*** css ./node_modules/css-loader/dist/cjs.js??ruleSet[1].rules[0].use[1]!./node_modules/sass-loader/dist/cjs.js!../LesliAudit/lib/scss/application.scss ***!
+  \************************************************************************************************************************************************************/
 @charset "UTF-8";
 /*
 

data/app/controllers/lesli_audit/analytics_controller.rb

@@ -3,25 +3,15 @@ module LesliAudit
 
         # GET /analytics
         def index
-        end
-
-        def visitors
-            respond_with_successful(AnalyticService.new(current_user, query).visitors)
-        end
-
-        def users 
-            respond_with_successful(AnalyticService.new(current_user, query).users)
+            @visitors = respond_as_successful(AnalyticService.new(current_user, query).visitors)
+            @controllers = respond_as_successful(AnalyticService.new(current_user, query).controllers)
+            @users = respond_as_successful(AnalyticService.new(current_user, query).users)
         end
 
         def devices 
             respond_with_successful(AnalyticService.new(current_user, query).devices)
         end
 
-        def controllers 
-            respond_with_successful(AnalyticService.new(current_user, query).controllers)
-        end
-
-
         private
 
         # Use callbacks to share common setup or constraints between actions.

data/app/controllers/lesli_audit/dashboards_controller.rb

@@ -32,5 +32,7 @@ Building a better future, one line of code at a time.
 
 module LesliAudit
     class DashboardsController < Lesli::Shared::DashboardsController
+        def show 
+        end
     end
 end

data/app/controllers/lesli_audit/requests_controller.rb

@@ -35,12 +35,7 @@ module LesliAudit
 
         # GET /requests
         def index
-            respond_to do |format|
-                format.html
-                format.json { 
-                    respond_with_pagination(LesliAudit::RequestService.new(current_user, query).index)
-                }
-            end
+            @requests = respond_as_pagination(LesliAudit::RequestService.new(current_user, query).index)
         end
     end
 end

data/app/controllers/lesli_audit/users_controller.rb

@@ -2,7 +2,7 @@
 
 Lesli
 
-Copyright (c) 2023, Lesli Technologies, S. A.
+Copyright (c) 2025, Lesli Technologies, S. A.
 
 This program is free software: you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -17,9 +17,9 @@ GNU General Public License for more details.
 You should have received a copy of the GNU General Public License
 along with this program. If not, see http://www.gnu.org/licenses/.
 
-Lesli · Ruby on Rails SaaS development platform.
+Lesli · Ruby on Rails SaaS Development Framework.
 
-Made with ♥ by https://www.lesli.tech
+Made with ♥ by LesliTech
 Building a better future, one line of code at a time.
 
 @contact  hello@lesli.tech
@@ -34,14 +34,7 @@ module LesliAudit
 
         # GET /users
         def index
+            @users = respond_as_successful(UserService.new(current_user, query).registrations)
         end
-
-        def registrations
-            respond_with_successful(UserService.new(current_user, query).registrations)
-        end
-
-
-        private
-
     end
 end

data/app/interfaces/lesli_audit/logger_interface.rb

@@ -0,0 +1,132 @@
+=begin
+
+Lesli
+
+Copyright (c) 2023, Lesli Technologies, S. A.
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program. If not, see http://www.gnu.org/licenses/.
+
+Lesli · Ruby on Rails SaaS Development Framework.
+
+Made with ♥ by https://www.lesli.tech
+Building a better future, one line of code at a time.
+
+@contact  hello@lesli.tech
+@website  https://www.lesli.tech
+@license  GPLv3 http://www.gnu.org/licenses/gpl-3.0.en.html
+
+// · ~·~     ~·~     ~·~     ~·~     ~·~     ~·~     ~·~     ~·~     ~·~
+// · 
+=end
+
+module LesliAudit
+    module LoggerInterface
+        def get_user_agent(as_string=true)
+
+            http_user_agent = request.env["HTTP_USER_AGENT"]
+
+            # parse user agent
+            user_agent = UserAgent.parse(http_user_agent)
+
+            user_agent_version = user_agent.version.to_a.first(2).join(".")
+
+            # return user agent as object
+            if as_string == false
+                return {
+                    platform: user_agent.platform,
+                    os: user_agent.os,
+                    browser: user_agent.browser,
+                    version: user_agent_version
+                }
+            end
+
+            # return user agent info as string
+            "#{user_agent.platform} #{user_agent.os} - #{user_agent.browser} #{user_agent_version}"
+        end
+
+        def log_requests
+            log_account_requests
+            log_user_requests
+        end 
+
+        def log_account_requests
+            return unless Lesli.config.security.dig(:enable_analytics)
+            return unless defined?(LesliAudit)
+            return unless current_user
+
+            # Try to save a unique record for this request configuration
+            current_user.account.audit.account_requests.upsert(
+                {
+                    request_controller: controller_path,
+                    request_action: action_name,
+                    request_count: 1,
+                    created_at: Date2.new.date.to_s
+                },
+                
+                # group of columns to consider a request as unique
+                unique_by: %i[request_controller request_action created_at account_id],
+
+                # if request id is not unique, increase the counter for this configuration
+                on_duplicate: Arel.sql("request_count = lesli_audit_account_requests.request_count + 1")
+            )
+        end
+
+        # Track all user activity
+        # this is disabled by default in the settings file
+        def log_user_requests
+            return unless Lesli.config.security.dig(:enable_analytics)
+            return unless defined?(LesliAudit)
+            return unless current_user
+            return unless session[:user_session_id]
+            
+            # Try to save a unique record for this request configuration
+            current_user.account.audit.user_requests.upsert(
+                {
+                    request_controller: controller_path,
+                    request_action: action_name,
+                    session_id: session[:user_session_id],
+                    user_id: current_user.id,
+                    request_count: 1,
+                    created_at: Date2.new.date.to_s
+                },
+                        
+                # group of columns to consider a request as unique
+                unique_by: %i[request_controller request_action created_at user_id session_id],
+
+                # if request id is not unique
+                #   - increase the counter for this configuration
+                #   - update the datetime of the last request
+                on_duplicate: Arel.sql(
+                    'request_count = lesli_audit_user_requests.request_count + 1'
+                )
+            )
+        end
+
+        # Track specific account activity
+        # this is disabled by default in the settings file
+        def log_account_activity(system_module, system_process, title = nil, payload = nil, description = nil)
+            # return unless Rails.application.config.lesli.dig(:security, :enable_analytics)
+
+            # account = Account.first
+
+            # account.activities.create({
+            #     system_module:,
+            #     system_process:,
+            #     description:,
+            #     payload:,
+            #     title:
+            # })
+        end
+    end
+end

data/app/models/lesli_audit/account.rb

@@ -8,7 +8,6 @@ module LesliAudit
         after_create :initialize_account
 
         def initialize_account
-            Dashboard.initialize_account(self)
         end
     end
 end

data/app/models/lesli_audit/dashboard.rb

@@ -1,32 +1,6 @@
 module LesliAudit
-    #class Dashboard < Lesli::ApplicationLesliRecord
     class Dashboard < Lesli::Shared::Dashboard
         self.table_name = "lesli_audit_dashboards"
         belongs_to :account
-
-        has_many :components, inverse_of: :dashboard, autosave: true, dependent: :destroy
-        accepts_nested_attributes_for :components, allow_destroy: true
-
-        def self.initialize_account(account)
-            self.create!(
-                account: account,
-                name: "Audit Default Dashboard",
-                default: true,
-                main: false,
-                components_attributes: [{
-                    name: "Total users",
-                    component_id: "audit-users",
-                    layout: 3,
-                    query_configuration: {},
-                    custom_configuration: {}
-                }, {
-                    name: "Roles",
-                    component_id: "audit-roles",
-                    layout: 3,
-                    query_configuration: {},
-                    custom_configuration: {}
-                }]
-            )
-        end
     end
 end

data/app/services/lesli_audit/analytic_service.rb

@@ -48,19 +48,24 @@ module LesliAudit
             # only the users of the account
             usrs = current_user.account.users
 
+            group_by = "DATE_TRUNC('month', created_at)" if group == 'month'
+            group_by = "DATE_TRUNC('week', created_at)" if group == 'week'
+            group_by = "DATE_TRUNC('day', created_at)" if group == 'day'
 
-            requests = current_user.account.audit.account_requests
-            requests = requests.group("DATE_TRUNC('month', created_at)") if group == 'month'
-            requests = requests.group("DATE_TRUNC('week', created_at)") if group == 'week'
-            requests = requests.group("DATE_TRUNC('day', created_at)") if group == 'day'
+            # compatibility for SQLite
+            if ActiveRecord::Base.connection.adapter_name == "SQLite"
+                group_by = "strftime('%Y-%m-%d', created_at)"
+            end
+
+            requests = current_user.account.audit.account_requests.group(group_by)
 
             requests = apply_filters(requests, query)
             
-            requests.limit(30).order("date DESC").select(
+            requests.limit(10).order("date desc").select(
                 "count(id) resources", 
                 "sum(request_count) requests",
-                "DATE_TRUNC('day', created_at) date"
-            )
+                "#{group_by} date"
+            ).as_json
         end
 
         def users 

data/app/services/lesli_audit/analytics/visitor_service.rb

@@ -1,170 +1,172 @@
-=begin
+# =begin
 
-Lesli
+# Lesli
 
-Copyright (c) 2023, Lesli Technologies, S. A.
+# Copyright (c) 2023, Lesli Technologies, S. A.
 
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
 
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-GNU General Public License for more details.
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
 
-You should have received a copy of the GNU General Public License
-along with this program. If not, see http://www.gnu.org/licenses/.
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see http://www.gnu.org/licenses/.
 
-Lesli · Ruby on Rails SaaS development platform.
+# Lesli · Ruby on Rails SaaS development platform.
 
-Made with ♥ by https://www.lesli.tech
-Building a better future, one line of code at a time.
+# Made with ♥ by https://www.lesli.tech
+# Building a better future, one line of code at a time.
 
-@contact  hello@lesli.tech
-@website  https://www.lesli.tech
-@license  GPLv3 http://www.gnu.org/licenses/gpl-3.0.en.html
+# @contact  hello@lesli.tech
+# @website  https://www.lesli.tech
+# @license  GPLv3 http://www.gnu.org/licenses/gpl-3.0.en.html
 
-// · ~·~     ~·~     ~·~     ~·~     ~·~     ~·~     ~·~     ~·~     ~·~
-// · 
-=end
+# // · ~·~     ~·~     ~·~     ~·~     ~·~     ~·~     ~·~     ~·~     ~·~
+# // · 
+# =end
 
 module LesliAudit
     class Analytics::VisitorService < Lesli::ApplicationLesliService
 
-        LIMIT=5
-
-        # @overwrite
-        # @return {Hash} Paginated list of the records
-        # @param {query} Has of the formated queries/filters that will be applied to filter data
-        # @description
-        # @example
-        def visits 
-
-            return Lesli::User::Request
-            .group("DATE_TRUNC('day', created_at)").limit(30)
-            .order("date DESC")
-            .limit(30)
-            .select(
-                "count(id) resources", 
-                "sum(request_count) requests",
-                "DATE_TRUNC('day', created_at) date"
-            ).map do |request|
-                { 
-                    :requests => request[:requests],
-                    :resources => request[:resources],
-                    :date => Date2.new(request[:date]).date.to_s
-                }
-            end  
-
-            group = 'day' 
-            #group = params[:bygroup] if ['month','week','day'].include?(params[:bygroup])
-
-            # only the users of the account
-            usrs = current_user.account.users
-
-            requests = ::User::Request.where(user: usrs).group("DATE_TRUNC('month', created_at)") if group == 'month'
-            requests = ::User::Request.where(user: usrs).group("DATE_TRUNC('week', created_at)") if group == 'week'
-            requests = ::User::Request.where(user: usrs).group("DATE_TRUNC('day', created_at)") if group == 'day'
-
-            requests = apply_filters(requests, query)
+#         LIMIT=5
+
+#         # @overwrite
+#         # @return {Hash} Paginated list of the records
+#         # @param {query} Has of the formated queries/filters that will be applied to filter data
+#         # @description
+#         # @example
+#         def visits 
+
+#             return "hola"
+
+#             return Lesli::User::Request
+#             .group("DATE_TRUNC('day', created_at)").limit(30)
+#             .order("date DESC")
+#             .limit(30)
+#             .select(
+#                 "count(id) resources", 
+#                 "sum(request_count) requests",
+#                 "DATE_TRUNC('day', created_at) date"
+#             ).map do |request|
+#                 { 
+#                     :requests => request[:requests],
+#                     :resources => request[:resources],
+#                     :date => Date2.new(request[:date]).date.to_s
+#                 }
+#             end  
+
+#             group = 'day' 
+#             #group = params[:bygroup] if ['month','week','day'].include?(params[:bygroup])
+
+#             # only the users of the account
+#             usrs = current_user.account.users
+
+#             requests = ::User::Request.where(user: usrs).group("DATE_TRUNC('month', created_at)") if group == 'month'
+#             requests = ::User::Request.where(user: usrs).group("DATE_TRUNC('week', created_at)") if group == 'week'
+#             requests = ::User::Request.where(user: usrs).group("DATE_TRUNC('day', created_at)") if group == 'day'
+
+#             requests = apply_filters(requests, query)
             
-            requests.limit(30).order("date DESC").select(
-                "count(id) resources", 
-                "sum(request_count) requests",
-                "DATE_TRUNC('day', created_at) date"
-            ).map do |request|
-                { 
-                    :requests => request[:requests],
-                    :resources => request[:resources],
-                    :date => Date2.new(request[:date]).date.to_s
-                }
-            end  
-        end
-
-        def users 
-            requests = ::User::Request
-            .joins(:user)
-            .where(user: current_user.account.users)
-            .group(:email)
-
-            requests = apply_filters(requests, query)
-
-            requests = requests.limit(LIMIT).order("requests DESC").select(
-                :email,
-                "count(user_requests.id) resources", 
-                "sum(user_requests.request_count) requests"
-            ).map do |request|
-                { 
-                    :requests => request[:requests],
-                    :resources => request[:resources],
-                    :email => request[:email]
-                }
-            end  
-
-            return requests
-        end
-
-        def devices 
-            agents = ::User::Agent.where(user: current_user.account.users)
-            agents = agents.group("platform", "browser") 
-            agents = agents.limit(LIMIT).order(sum_count: :desc).sum(:count).map do |req|
-                {
-                    :device => req[0].join("/"),
-                    :visits => req[1]
-                }
-            end
-
-            return agents
-        end
-
-        def controllers 
-            requests = Lesli::User::Request.where(lesli_user: current_user.account.users).group("request_controller") 
-
-            requests = apply_filters(requests, query)
-
-            requests = requests.limit(LIMIT).order("requests DESC").select(
-                :request_controller,
-                "sum(request_count) requests"
-            )
+#             requests.limit(30).order("date DESC").select(
+#                 "count(id) resources", 
+#                 "sum(request_count) requests",
+#                 "DATE_TRUNC('day', created_at) date"
+#             ).map do |request|
+#                 { 
+#                     :requests => request[:requests],
+#                     :resources => request[:resources],
+#                     :date => Date2.new(request[:date]).date.to_s
+#                 }
+#             end  
+#         end
+
+#         def users 
+#             requests = ::User::Request
+#             .joins(:user)
+#             .where(user: current_user.account.users)
+#             .group(:email)
+
+#             requests = apply_filters(requests, query)
+
+#             requests = requests.limit(LIMIT).order("requests DESC").select(
+#                 :email,
+#                 "count(user_requests.id) resources", 
+#                 "sum(user_requests.request_count) requests"
+#             ).map do |request|
+#                 { 
+#                     :requests => request[:requests],
+#                     :resources => request[:resources],
+#                     :email => request[:email]
+#                 }
+#             end  
+
+#             return requests
+#         end
+
+#         def devices 
+#             agents = ::User::Agent.where(user: current_user.account.users)
+#             agents = agents.group("platform", "browser") 
+#             agents = agents.limit(LIMIT).order(sum_count: :desc).sum(:count).map do |req|
+#                 {
+#                     :device => req[0].join("/"),
+#                     :visits => req[1]
+#                 }
+#             end
+
+#             return agents
+#         end
+
+#         def controllers 
+#             requests = Lesli::User::Request.where(lesli_user: current_user.account.users).group("request_controller") 
+
+#             requests = apply_filters(requests, query)
+
+#             requests = requests.limit(LIMIT).order("requests DESC").select(
+#                 :request_controller,
+#                 "sum(request_count) requests"
+#             )
             
-            return requests
-        end
-
-        private 
-
-        def apply_filters requests, params
-
-            return requests
-
-            # filter by search string
-            unless params[:search].blank?
-                requests = requests.where(
-                    "lower(request_agent) like :search_string or lower(request_controller) like :search_string or lower(request_action) like :search_string", 
-                    { 
-                        search_string: "%#{params[:search].downcase.gsub(" ","%")}%"
-                    }
-                ) 
-            end
-
-            # filter by time
-            unless params[:bytime].blank? && params[:bytime] != 'all'
-                requests = requests.where(created_at: (Time.now.beginning_of_day)..) if params[:bytime] == 'day'
-                requests = requests.where(created_at: (Time.now.beginning_of_day - 7.day)..) if params[:bytime] == 'week'
-                requests = requests.where(created_at: (Time.now.beginning_of_day - 30.day)..) if params[:bytime] == 'month'
-                requests = requests.where(created_at: (Time.now.beginning_of_day - 6.month)..) if params[:bytime] == 'sixmonth'
-                requests = requests.where(created_at: (Time.now.beginning_of_day - 1.year)..) if params[:bytime] == 'year'
-            end
-
-            # filter by request format
-            if (!params[:byformat].blank? && ['html', 'json'].include?(params[:byformat]))
-                requests = requests.where(:request_action => 'show') if params[:byformat] == 'html'
-                requests = requests.where(:request_format => params[:byformat])
-            end
-
-            requests
-
-        end
+#             return requests
+#         end
+
+#         private 
+
+#         def apply_filters requests, params
+
+#             return requests
+
+#             # filter by search string
+#             unless params[:search].blank?
+#                 requests = requests.where(
+#                     "lower(request_agent) like :search_string or lower(request_controller) like :search_string or lower(request_action) like :search_string", 
+#                     { 
+#                         search_string: "%#{params[:search].downcase.gsub(" ","%")}%"
+#                     }
+#                 ) 
+#             end
+
+#             # filter by time
+#             unless params[:bytime].blank? && params[:bytime] != 'all'
+#                 requests = requests.where(created_at: (Time.now.beginning_of_day)..) if params[:bytime] == 'day'
+#                 requests = requests.where(created_at: (Time.now.beginning_of_day - 7.day)..) if params[:bytime] == 'week'
+#                 requests = requests.where(created_at: (Time.now.beginning_of_day - 30.day)..) if params[:bytime] == 'month'
+#                 requests = requests.where(created_at: (Time.now.beginning_of_day - 6.month)..) if params[:bytime] == 'sixmonth'
+#                 requests = requests.where(created_at: (Time.now.beginning_of_day - 1.year)..) if params[:bytime] == 'year'
+#             end
+
+#             # filter by request format
+#             if (!params[:byformat].blank? && ['html', 'json'].include?(params[:byformat]))
+#                 requests = requests.where(:request_action => 'show') if params[:byformat] == 'html'
+#                 requests = requests.where(:request_format => params[:byformat])
+#             end
+
+#             requests
+
+#         end
     end
 end