lesli_audit 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 243d721faa43b0cdba37a620455872fd0f515bbae81e18fc6bf49c4490c3e5aa
-  data.tar.gz: 983e1c3c7f1c44d2cea04996ca5f1060d797092c24c3e45c396fc1159ee8fda5
+  metadata.gz: ff9465d4d130455ae1ef9804d86e17e54754708857234684a0d99237f8545770
+  data.tar.gz: 3455cb58ed202920a07a0faacf21ced66b421201a2832206e22c0495bff8d05c
 SHA512:
-  metadata.gz: 24214a6c519ed8554cc81df0fdd045eae85a7195e7057fa20a87620d1af56c43eaf43d9dd7f638ef85c3edc14fa0c7232e1efbaf2a8120516ea6b6a24f69642b
-  data.tar.gz: f16f44e3ac62f688ce7aea3db2290ba5546175ce33cf511307382f22095af22d74cd0eafd93a253e9c63a22406fd77689de1fc0de38c1f061a0d33ec2bdf8c7c
+  metadata.gz: 32ea636b6528c49201ba30eb2e972deaeca0ea47bf625f5e8815a81fec5dbb83bdb3c4f450c014cb33f3eef2b9e5b040acaf8a887410d3117880e89a3736dfc6
+  data.tar.gz: 21ee15b705797e0f6871a7432b7044b85bdaee377b376b55f568d77a329e9be51bcfc6426c80290c4ec0c08dab47fa2b8da11024c59751d3af23e7ce0e8c9256

data/app/assets/images/lesli_audit/audit-logo.svg

@@ -1,72 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   inkscape:version="1.0 (4035a4f, 2020-05-01)"
-   height="48.025002"
-   width="43.825001"
-   sodipodi:docname="iconfinder_186_2508414.svg"
-   xml:space="preserve"
-   viewBox="0 0 43.825001 48.025002"
-   version="1.1"
-   id="Layer_1"
-   enable-background="new 0 0 48 48"><metadata
-     id="metadata860"><rdf:RDF><cc:Work
-         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
-     id="defs858" /><sodipodi:namedview
-     inkscape:current-layer="Layer_1"
-     inkscape:window-maximized="1"
-     inkscape:window-y="23"
-     inkscape:window-x="0"
-     inkscape:cy="24"
-     inkscape:cx="18.731461"
-     inkscape:zoom="9.7781858"
-     showgrid="false"
-     id="namedview856"
-     inkscape:window-height="953"
-     inkscape:window-width="1680"
-     inkscape:pageshadow="2"
-     inkscape:pageopacity="0"
-     guidetolerance="10"
-     gridtolerance="10"
-     objecttolerance="10"
-     borderopacity="1"
-     bordercolor="#666666"
-     pagecolor="#ffffff" /><g
-     transform="translate(-2.1)"
-     id="g853"><g
-       id="g837"><path
-         id="path833"
-         fill="#e6e6e5"
-         d="M 26.4,0 H 6.5 C 4.1,0 2.1,2 2.1,4.4 v 39 c 0,2.4 2,4.4 4.4,4.4 h 30.7 c 2.4,0 4.4,-2 4.4,-4.4 V 15.3 C 36.7,10.3 30.3,3.9 26.4,0 Z" /><path
-         id="path835"
-         fill="#98d0f1"
-         d="m 26.4,0 v 10.8 c 0,2.4 2,4.4 4.4,4.4 H 41.6 C 37.6,11.3 31.2,4.9 26.4,0 Z" /></g><g
-       id="g841"><path
-         id="path839"
-         fill="#ec7b72"
-         d="m 21.2,40.7 c -0.2,0 -0.4,-0.2 -0.5,-0.4 l -5.1,-21.4 -4.1,8.4 c -0.1,0.2 -0.3,0.3 -0.4,0.3 h -8 c -0.3,0 -0.5,-0.2 -0.5,-0.5 0,-0.3 0.2,-0.5 0.5,-0.5 h 7.7 l 4.6,-9.4 c 0.1,-0.2 0.3,-0.3 0.5,-0.3 0.2,0 0.4,0.2 0.4,0.4 l 5,20.7 2.6,-11.1 c 0.1,-0.2 0.3,-0.4 0.5,-0.4 h 4.1 l 1.7,-4.4 c 0.1,-0.2 0.3,-0.3 0.5,-0.3 0.2,0 0.4,0.2 0.5,0.4 l 3.5,12 L 36,27 c 0,-0.2 0.2,-0.4 0.5,-0.4 h 4.3 c 0.3,0 0.5,0.2 0.5,0.5 0,0.3 -0.2,0.5 -0.5,0.5 h -3.9 l -1.6,8.9 c 0,0.2 -0.2,0.4 -0.5,0.4 -0.2,0 -0.4,-0.1 -0.5,-0.4 l -3.7,-12.6 -1.3,3.4 c -0.1,0.2 -0.3,0.3 -0.5,0.3 h -4 l -3,12.8 c -0.1,0.1 -0.3,0.3 -0.6,0.3 z" /></g><g
-       id="g851"><rect
-         id="rect843"
-         y="33.900002"
-         x="33.700001"
-         width="2.5"
-         transform="matrix(0.7071,-0.7071,0.7071,0.7071,-15.9478,35.568)"
-         height="6.3000002"
-         fill="#333333" /><path
-         id="path845"
-         fill="#525252"
-         d="m 18.5,20.6 c -4.2,4.2 -4.2,11 0,15.1 4.2,4.1 11,4.2 15.1,0 4.2,-4.2 4.2,-10.9 0,-15.1 -4.2,-4.2 -10.9,-4.2 -15.1,0 z m 13.2,13.2 c -3.1,3.1 -8.2,3.1 -11.3,0 -3.1,-3.1 -3.1,-8.2 0,-11.4 3.1,-3.1 8.2,-3.1 11.3,0 3.2,3.2 3.2,8.3 0,11.4 z" /><path
-         id="path847"
-         opacity="0.25"
-         fill="#ffffff"
-         d="m 30.6,23.9 c -2.4,-2.4 -6.3,-2.4 -8.7,0 0,0 0,0 0,0 l 1.7,1.7 c 0,0 0,0 0,0 2.1,-2.1 5.6,-2.1 7.7,0 0.4,0.4 0.8,0.9 1,1.4 -0.3,-1.1 -0.9,-2.2 -1.7,-3.1 z" /><path
-         id="path849"
-         fill="#ffcc67"
-         d="m 37.5,34.5 c -0.3,-0.3 -0.8,-0.3 -1.1,0 v 0 l -4,4 v 0 c -0.3,0.3 -0.3,0.8 0,1.1 0.3,0.3 0.8,0.3 1.1,0 l 7.6,7.6 c 1.1,1.1 2.9,1.1 4,0 1.1,-1.1 1.1,-2.9 0,-4 l -7.6,-7.6 c 0.3,-0.3 0.3,-0.8 0,-1.1 z" /></g></g></svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 43.8 48.09" fill="#0d52bf"><path stroke="#000" stroke-miterlimit="10" stroke-width=".25" d="M36.5 12.29c-4.3-4.3-9-9.1-12.2-12.2 3.7 3.8 8.4 8.5 12.2 12.2Z"/><path d="m19.2 38.09.1-.3q-.1 0-.2-.1z"/><path stroke="#000" stroke-miterlimit="10" stroke-width=".25" d="m39.5 15.29-3-3z"/><path d="m33.3 35.89.1-.4-.2.2z"/><path d="M31.26 40.61c-.13.04-.27.05-.41.05-.41 0-.79-.16-1.08-.45s-.44-.67-.44-1.08c0-.39.15-.75.4-1.03a11.2 11.2 0 0 1-5.7 1.55c-1.31 0-2.62-.24-3.88-.68l-.35 1.61c-.1.1-.3.3-.6.3-.2 0-.4-.2-.5-.4l-.56-2.45c-.8-.47-1.57-1.04-2.26-1.72a11.17 11.17 0 0 1-3.38-7.98c-.01-2.25.62-4.4 1.82-6.25l-.72-3.01-4.1 8.4c-.1.2-.3.3-.4.3H1c-.3 0-.5-.2-.5-.5s.2-.5.5-.5h7.7l4.6-9.4c.1-.2.3-.3.5-.3s.4.2.4.4l.86 3.58c.25-.31.52-.62.81-.91 4.45-4.46 11.7-4.46 16.16 0 1.82 1.82 2.95 4.14 3.27 6.63h3.4c.3 0 .5.2.5.5s-.2.5-.5.5h-3.32c0 .15.02.3.02.45 0 2.07-.57 4.06-1.61 5.81.6-.58 1.55-.58 2.14.01.29.29.44.67.44 1.08 0 .14-.02.28-.05.41l3.18 3.18V15.39l-.1-.1H28.7c-2.4 0-4.4-2-4.4-4.4V.09H4.4C2 .09 0 2.09 0 4.49v39c0 2.4 2 4.4 4.4 4.4h30.7c.95 0 1.82-.32 2.55-.89z"/><path d="m29.718 35.787 1.768-1.768 4.454 4.455-1.767 1.768z"/><path d="M16.37 20.66c-4.2 4.2-4.2 11 0 15.1s11 4.2 15.1 0c4.2-4.2 4.2-10.9 0-15.1s-10.9-4.2-15.1 0m13.2 13.2c-3.1 3.1-8.2 3.1-11.3 0s-3.1-8.2 0-11.4c3.1-3.1 8.2-3.1 11.3 0 3.2 3.2 3.2 8.3 0 11.4"/><path d="M28.47 23.96c-2.4-2.4-6.3-2.4-8.7 0l1.7 1.7c2.1-2.1 5.6-2.1 7.7 0 .4.4.8.9 1 1.4-.3-1.1-.9-2.2-1.7-3.1" style="isolation:isolate"/><path d="M35.37 34.56c-.3-.3-.8-.3-1.1 0l-4 4c-.3.3-.3.8 0 1.1s.8.3 1.1 0l7.6 7.6c1.1 1.1 2.9 1.1 4 0s1.1-2.9 0-4l-7.6-7.6c.3-.3.3-.8 0-1.1"/></svg>

data/app/controllers/lesli_audit/analytics_controller.rb

@@ -3,13 +3,10 @@ module LesliAudit
 
         # GET /analytics
         def index
-            @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)
+            @visitors = AnalyticService.new(current_user, query).visitors
+            @requests = AnalyticService.new(current_user, query).requests
+            @browsers = AnalyticService.new(current_user, query).browsers
+            @platforms = AnalyticService.new(current_user, query).devices
         end
 
         private

data/app/controllers/lesli_audit/dashboards_controller.rb

@@ -32,7 +32,5 @@ 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/logs_controller.rb

@@ -0,0 +1,25 @@
+module LesliAudit
+    class LogsController < ApplicationController
+        before_action :set_log, only: %i[ show ]
+
+        # GET /logs
+        def index
+            @logs = respond_with_pagination(LesliAudit::LogService.new(current_user, query).index)
+        end
+
+        # GET /logs/1
+        def show
+        end
+
+        private
+
+        def set_log
+            @log = Log.find(params.expect(:id))
+        end
+
+        # Only allow a list of trusted parameters through.
+        def log_params
+            params.fetch(:log, {})
+        end
+    end
+end

data/app/controllers/lesli_audit/requests_controller.rb

@@ -35,7 +35,7 @@ module LesliAudit
 
         # GET /requests
         def index
-            @requests = respond_as_pagination(LesliAudit::RequestService.new(current_user, query).index)
+            @requests = respond_with_pagination(LesliAudit::RequestService.new(current_user, query).index)
         end
     end
 end

data/app/controllers/lesli_audit/user_journals_controller.rb

@@ -0,0 +1,60 @@
+module LesliAudit
+  class UserJournalsController < ApplicationController
+    before_action :set_user_journal, only: %i[ show edit update destroy ]
+
+    # GET /user_journals
+    def index
+      @user_journals = UserJournal.all
+    end
+
+    # GET /user_journals/1
+    def show
+    end
+
+    # GET /user_journals/new
+    def new
+      @user_journal = UserJournal.new
+    end
+
+    # GET /user_journals/1/edit
+    def edit
+    end
+
+    # POST /user_journals
+    def create
+      @user_journal = UserJournal.new(user_journal_params)
+
+      if @user_journal.save
+        redirect_to @user_journal, notice: "User journal was successfully created."
+      else
+        render :new, status: :unprocessable_content
+      end
+    end
+
+    # PATCH/PUT /user_journals/1
+    def update
+      if @user_journal.update(user_journal_params)
+        redirect_to @user_journal, notice: "User journal was successfully updated.", status: :see_other
+      else
+        render :edit, status: :unprocessable_content
+      end
+    end
+
+    # DELETE /user_journals/1
+    def destroy
+      @user_journal.destroy!
+      redirect_to user_journals_path, notice: "User journal was successfully destroyed.", status: :see_other
+    end
+
+    private
+      # Use callbacks to share common setup or constraints between actions.
+      def set_user_journal
+        @user_journal = UserJournal.find(params.expect(:id))
+      end
+
+      # Only allow a list of trusted parameters through.
+      def user_journal_params
+        params.fetch(:user_journal, {})
+      end
+  end
+end

data/app/controllers/lesli_audit/users_controller.rb

@@ -34,7 +34,9 @@ module LesliAudit
 
         # GET /users
         def index
-            @users = respond_as_successful(UserService.new(current_user, query).registrations)
+            @requests = UserService.new(current_user, query).requests
+            @registrations = UserService.new(current_user, query).registrations
+            @working_hours = UserService.new(current_user, query).working_hours
         end
     end
 end

data/app/helpers/lesli_audit/logs_helper.rb

@@ -0,0 +1,4 @@
+module LesliAudit
+  module LogsHelper
+  end
+end

data/app/helpers/lesli_audit/user_journals_helper.rb

@@ -0,0 +1,4 @@
+module LesliAudit
+  module UserJournalsHelper
+  end
+end

data/app/interfaces/lesli_audit/logger_interface.rb

@@ -61,8 +61,7 @@ module LesliAudit
         end 
 
         def log_account_requests
-            return unless Lesli.config.security.dig(:enable_analytics)
-            return unless defined?(LesliAudit)
+            return unless Lesli.config.audit.dig(:enable_analytics)
             return unless current_user
 
             # Try to save a unique record for this request configuration
@@ -85,11 +84,20 @@ module LesliAudit
         # 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]
+
+            current_user.account.audit.user_journals.create({
+                request_controller: controller_path,
+                request_action: action_name,
+                session_id: session[:user_session_id],
+                user_id: current_user.id,
+                date: Date2.new.date.to_s
+            }) if Lesli.config.audit.dig(:enable_journals)
             
+            # Determine the correct SQL "now" keyword based on the database connection
+            now_func = ActiveRecord::Base.connection.adapter_name =~ /sqlite/i ? 'CURRENT_TIMESTAMP' : 'NOW()'
+
             # Try to save a unique record for this request configuration
             current_user.account.audit.user_requests.upsert(
                 {
@@ -97,18 +105,45 @@ module LesliAudit
                     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
+                    date: Date2.new.date.to_s,
+                    request_count: 1
                 },
                         
                 # group of columns to consider a request as unique
-                unique_by: %i[request_controller request_action created_at user_id session_id],
+                unique_by: %i[request_controller request_action date 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,updated_at = #{LesliDate::Compatibility.db_now}"
+                )
+            ) if Lesli.config.audit.dig(:enable_analytics)
+        end
+
+        def log_devices
+            return unless Lesli.config.audit.dig(:enable_analytics)
+            return unless current_user
+            
+            user_agent = get_user_agent(false)
+            
+            # Try to save a unique record for this request configuration
+            current_user.account.audit.account_devices.upsert(
+                {
+                    :created_at => Date2.new.date.to_s,
+                    :agent_platform => user_agent&.dig(:platform) || "unknown",
+                    :agent_browser => user_agent&.dig(:browser) || "unknown",
+                    :agent_count => 1
+                },
+
+                # group of columns to consider a request as unique
+                unique_by: %i[agent_platform agent_browser created_at account_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'
+                    'agent_count = lesli_audit_account_devices.agent_count + 1'
                 )
             )
         end

data/app/models/lesli_audit/account.rb

@@ -1,9 +1,15 @@
 module LesliAudit
     class Account < ApplicationRecord
         belongs_to :account, class_name: "Lesli::Account"
+        has_many :dashboards
+
+        has_many :account_logs
+        has_many :account_devices
         has_many :account_requests
+
+        has_many :user_logs
+        has_many :user_journals
         has_many :user_requests
-        has_many :dashboards
 
         after_create :initialize_account
 

data/app/models/lesli_audit/account_device.rb

@@ -0,0 +1,5 @@
+module LesliAudit
+    class AccountDevice < ApplicationRecord
+        belongs_to :account, class_name: 'Lesli::Account'
+    end
+end

data/app/models/lesli_audit/account_log.rb

@@ -0,0 +1,11 @@
+module LesliAudit
+    class AccountLog < ApplicationRecord
+        belongs_to :account, optional: true
+        belongs_to :user, class_name: "Lesli::User", optional: true
+        
+        enum :operation, { 
+            :account_creation => 'account_creation',
+            :account_initialization => 'account_initialization'
+        }
+    end
+end

data/app/models/lesli_audit/dashboard.rb

@@ -1,6 +1,5 @@
 module LesliAudit
     class Dashboard < Lesli::Shared::Dashboard
-        self.table_name = "lesli_audit_dashboards"
-        belongs_to :account
+        COMPONENTS = %i[calendar]
     end
 end

data/app/models/lesli_audit/user_journal.rb

@@ -0,0 +1,7 @@
+module LesliAudit
+    class UserJournal < ApplicationRecord
+        belongs_to :account
+        belongs_to :user, class_name: "Lesli::User"
+        belongs_to :session, class_name: "LesliShield::User::Session"
+    end
+end

data/app/models/lesli_audit/user_log.rb

@@ -0,0 +1,7 @@
+module LesliAudit
+    class UserLog < ApplicationRecord
+        belongs_to :account, optional: true
+        belongs_to :user, class_name: "Lesli::User"
+        belongs_to :session, class_name: "LesliShield::User::Session", optional: true
+    end
+end

data/app/models/lesli_audit/user_request.rb

@@ -2,6 +2,6 @@ module LesliAudit
     class UserRequest < ApplicationRecord
         belongs_to :account
         belongs_to :user, class_name: "Lesli::User"
-        belongs_to :session, class_name: "Lesli::User::Session"
+        belongs_to :session, class_name: "LesliShield::User::Session"
     end
 end

data/app/services/lesli_audit/analytic_service.rb

@@ -41,46 +41,34 @@ module LesliAudit
         # @description
         # @example
         def visitors 
-
-            group = 'day' 
-            #group = params[:bygroup] if ['month','week','day'].include?(params[:bygroup])
-
-            # 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'
-
-            # 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(10).order("date desc").select(
-                "count(id) resources", 
-                "sum(request_count) requests",
-                "#{group_by} date"
-            ).as_json
-        end
-
-        def users 
-
-            current_user.account.audit.user_requests
-            .joins(:user)
-            .group(:email)
-            .limit(LIMIT).order("requests DESC").select(
-                :email,
-                "count(lesli_audit_user_requests.id) resources", 
-                "sum(lesli_audit_user_requests.request_count) requests"
-            )
-        end
-
-        def controllers 
+            #Rails.cache.fetch(cache_key_for_account(__method__), expires_in: 1.hour) do 
+                group = 'day' 
+                #group = params[:bygroup] if ['month','week','day'].include?(params[:bygroup])
+
+                # 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'
+
+                # 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(10).order("xaxiskey desc").select(
+                    "sum(request_count) yaxiskey",
+                    "#{group_by} xaxiskey"
+                ).as_json
+            #end
+        end 
+
+        def requests
             requests = current_user.account.audit.account_requests
             .group("request_controller").limit(30)
 
@@ -89,7 +77,31 @@ module LesliAudit
             requests = requests.limit(LIMIT).order("requests DESC").select(
                 :request_controller,
                 "sum(request_count) requests"
-            )
+            ).as_json
+        end
+
+        def devices 
+            #Rails.cache.fetch(cache_key_for_account(__method__), expires_in: 4.hour) do 
+                current_user.account.audit.account_devices
+                .group(:agent_platform, :created_at)
+                .select(
+                    'created_at as xaxiskey',
+                    'agent_platform as dataname',
+                    'sum(agent_count) as yaxiskey'
+                ).as_json
+            #end
+        end 
+
+        def browsers
+            #Rails.cache.fetch(cache_key_for_account(__method__), expires_in: 4.hour) do 
+                current_user.account.audit.account_devices
+                .group(:agent_browser, :created_at)
+                .select(
+                    'created_at as xaxiskey',
+                    'agent_browser as dataname',
+                    'sum(agent_count) as yaxiskey'
+                ).as_json
+            #end
         end
 
         private 

data/{db/migrate/v1.0/0503050110_create_lesli_audit_dashboards.rb → app/services/lesli_audit/log_service.rb}

@@ -17,7 +17,7 @@ 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.
+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.
@@ -30,8 +30,14 @@ Building a better future, one line of code at a time.
 // · 
 =end
 
-class CreateLesliAuditDashboards < ActiveRecord::Migration[6.1]
-    def change
-        create_table_lesli_shared_dashboards_10(:lesli_audit)
+module LesliAudit
+    class LogService < Lesli::ApplicationLesliService
+
+        def index
+            current_user.logs.all
+            .order(created_at: :desc)
+            .page(query[:pagination][:page])
+            .per(query[:pagination][:perPage])
+        end
     end
 end

data/app/services/lesli_audit/request_service.rb

@@ -41,9 +41,8 @@ module LesliAudit
         def index 
 
 
-            requests = Account::Request.all
+            requests = current_user.requests
             .order(created_at: :desc)
-            .order(request_count: :desc)
             .page(query[:pagination][:page])
             .per(query[:pagination][:perPage])
 

data/app/services/lesli_audit/user_service.rb

@@ -33,6 +33,57 @@ Building a better future, one line of code at a time.
 module LesliAudit
     class UserService < Lesli::ApplicationLesliService
 
+        def requests
+            current_user.account.audit.user_requests
+            .joins(:user)
+            .group(:email)
+            .limit(5)
+            .order("requests DESC")
+            .select(
+                :email,
+                "count(lesli_audit_user_requests.id) resources", 
+                "sum(lesli_audit_user_requests.request_count) requests"
+            )
+        end
+
+        def working_hours
+
+            group = 'day' 
+
+            group_by = "DATE_TRUNC('month', lesli_audit_user_requests.date)" if group == 'month'
+            group_by = "DATE_TRUNC('week', lesli_audit_user_requests.date)" if group == 'week'
+            group_by = "DATE_TRUNC('day', lesli_audit_user_requests.date)" if group == 'day'
+
+            # compatibility for SQLite
+            if ActiveRecord::Base.connection.adapter_name == "SQLite"
+                group_by = "strftime('%Y-%m-%d', lesli_audit_user_requests.date)"
+            end
+
+            user_requests = current_user.account.users.joins(:requests)
+
+            user_requests = user_requests.select(
+                :id,
+                "lesli_users.id as user_id",
+                "lesli_users.email as user_email",
+                "#{group_by} date",
+                "min(lesli_audit_user_requests.created_at) as first_activity", 
+                "max(lesli_audit_user_requests.updated_at) as last_activity",
+                "count(lesli_audit_user_requests.id) resources", 
+                "sum(lesli_audit_user_requests.request_count) requests"
+            )
+           
+            user_requests = user_requests
+                .group(:user_id, group_by)
+
+            user_requests.map do |request|
+                request[:first_activity] = Date2.new(request[:first_activity]).time
+                request[:last_activity] = Date2.new(request[:last_activity]).time
+                request
+            end
+            
+            user_requests.reverse
+        end
+
         def registrations
 
             #Get filters from the request     
@@ -59,8 +110,8 @@ module LesliAudit
                 .group(group_by)
                 .count.map do |request|
                     {
-                        :date => request[0],
-                        :count => request[1]
+                        :xaxiskey => request[0],
+                        :yaxiskey => request[1]
                     }
                 end
             end