Merge branch 'master' into feature/64535-evaluator-employee-vacation-column

Author: Kagemaru

.reek.yml

@@ -1,5 +1,4 @@
 ### Generic smell configuration
-
 ---
 # detectors:
 ## You can disable smells completely
@@ -49,7 +48,6 @@
 #   - lib/rake/legacy_tasks
 #   - lib/smelly.rb
 
-
 # FIXME: Fix these, piece by piece
 
 # Auto generated by Reeks --todo flag
@@ -1955,21 +1953,17 @@ detectors:
       - WorkloadReportController#default_period
       - Apidocs::Setup#setup_property
       - Apidocs::Setup#setup_tags
-      - Crm::Highrise#airbrake?
       - Crm::Highrise#base_url
       - Crm::Highrise#contact_attributes
       - Crm::Highrise#existing_contact_crm_keys
       - Crm::Highrise#find_people_by_email
       - Crm::Highrise#record_to_params
-      - Crm::Highrise#sentry?
       - Crm::Highrise#sync_additional_order
-      - Crm::Odoo#airbrake?
       - Crm::Odoo#base_url
       - Crm::Odoo#contact_attributes
       - Crm::Odoo#existing_contact_crm_keys
       - Crm::Odoo#find_people_by_email
       - Crm::Odoo#record_to_params
-      - Crm::Odoo#sentry?
       - Crm::Odoo#sync_additional_order
       - Evaluations::AbsencesEval#divisions
       - Evaluations::ClientsEval#divisions
@@ -2094,8 +2088,6 @@ detectors:
       - WorktimeHelper#week_number
       - WorktimeHelper#worktime_account
       - WorktimeHelper#worktime_description
-      - ApplicationJob#airbrake?
-      - ApplicationJob#sentry?
       - CommitReminderJob#perform
       - CrmSyncJob#perform
       - InvoicingSyncJob#perform

.rubocop_todo.yml

@@ -1,41 +1,20 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2025-04-24 12:14:19 UTC using RuboCop version 1.72.2.
+# on 2025-12-03 15:37:34 UTC using RuboCop version 1.75.3.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
 # versions of RuboCop, may require this file to be generated again.
 
----
-# FIXME: Fix these, piece by piece
-
 # Offense count: 1
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: EnforcedStyle, EnforcedStyleForEmptyBrackets.
-# SupportedStyles: space, no_space, compact
-# SupportedStylesForEmptyBrackets: space, no_space
-Layout/SpaceInsideArrayLiteralBrackets:
-  Exclude:
-    - 'app/models/employment.rb'
-
-# Offense count: 2
-# This cop supports safe autocorrection (--autocorrect).
-Lint/AmbiguousOperator:
-  Exclude:
-    - 'test/models/employee_test.rb'
-
-# Offense count: 3
 # Configuration parameters: IgnoreLiteralBranches, IgnoreConstantBranches, IgnoreDuplicateElseBranch.
 Lint/DuplicateBranch:
   Exclude:
-    - 'app/controllers/concerns/worktimes_report.rb'
     - 'app/domain/plannings/employee_board.rb'
 
-# Offense count: 4
+# Offense count: 1
 Lint/DuplicateMethods:
   Exclude:
-    - 'app/domain/forms/multi_absence.rb'
-    - 'app/domain/order/copier.rb'
     - 'app/helpers/dry_crud/form/control.rb'
 
 # Offense count: 1
@@ -45,6 +24,8 @@ Lint/EmptyBlock:
     - 'test/helpers/table_helper_test.rb'
 
 # Offense count: 2
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: AutoCorrect.
 Lint/LiteralAsCondition:
   Exclude:
     - 'test/helpers/dry_crud/form/builder_test.rb'
@@ -80,44 +61,44 @@ Lint/UnreachableLoop:
   Exclude:
     - 'app/models/working_condition.rb'
 
-# Offense count: 98
+# Offense count: 110
 # Configuration parameters: AllowedMethods, AllowedPatterns, CountRepeatedAttributes.
 Metrics/AbcSize:
   Max: 282
 
-# Offense count: 51
+# Offense count: 55
 # Configuration parameters: CountComments, CountAsOne, AllowedMethods, AllowedPatterns.
 # AllowedMethods: refine
 Metrics/BlockLength:
   Max: 97
 
-# Offense count: 36
+# Offense count: 38
 # Configuration parameters: CountComments, CountAsOne.
 Metrics/ClassLength:
   Max: 314
 
-# Offense count: 17
+# Offense count: 18
 # Configuration parameters: AllowedMethods, AllowedPatterns.
 Metrics/CyclomaticComplexity:
   Max: 13
 
-# Offense count: 110
+# Offense count: 129
 # Configuration parameters: CountComments, CountAsOne, AllowedMethods, AllowedPatterns.
 Metrics/MethodLength:
   Max: 312
 
 # Offense count: 5
 # Configuration parameters: CountComments, CountAsOne.
 Metrics/ModuleLength:
-  Max: 205
+  Max: 157
 
 # Offense count: 2
 # Configuration parameters: CountKeywordArgs.
 Metrics/ParameterLists:
   Max: 6
   MaxOptionalParameters: 4
 
-# Offense count: 7
+# Offense count: 8
 # Configuration parameters: AllowedMethods, AllowedPatterns.
 Metrics/PerceivedComplexity:
   Max: 13
@@ -145,7 +126,7 @@ Naming/HeredocDelimiterNaming:
   Exclude:
     - 'lib/tasks/license.rake'
 
-# Offense count: 14
+# Offense count: 13
 # This cop supports unsafe autocorrection (--autocorrect-all).
 # Configuration parameters: EnforcedStyleForLeadingUnderscores.
 # SupportedStylesForLeadingUnderscores: disallowed, required, optional
@@ -160,7 +141,6 @@ Naming/MemoizedInstanceVariableName:
     - 'app/controllers/ordertimes_controller.rb'
     - 'app/controllers/plannings/employees_controller.rb'
     - 'app/controllers/plannings/orders_controller.rb'
-    - 'app/domain/order/cockpit/accounting_post_row.rb'
     - 'app/domain/order/report/entry.rb'
     - 'app/models/util/period.rb'
 
@@ -187,30 +167,23 @@ Naming/MethodParameterName:
 
 # Offense count: 3
 # Configuration parameters: NamePrefix, ForbiddenPrefixes, AllowedMethods, MethodDefinitionMacros, UseSorbetSigs.
-# NamePrefix: is_, has_, have_
-# ForbiddenPrefixes: is_, has_, have_
+# NamePrefix: is_, has_, have_, does_
+# ForbiddenPrefixes: is_, has_, have_, does_
 # AllowedMethods: is_a?
 # MethodDefinitionMacros: define_method, define_singleton_method
 Naming/PredicateName:
   Exclude:
     - 'app/helpers/dry_crud/form/builder.rb'
     - 'app/models/concerns/belonging_to_work_item.rb'
 
-# Offense count: 5
-# Configuration parameters: EnforcedStyle, AllowedIdentifiers, AllowedPatterns.
-# SupportedStyles: snake_case, camelCase
-Naming/VariableName:
-  Exclude:
-    - 'test/models/worktime_test.rb'
-
 # Offense count: 15
 # Configuration parameters: EnforcedStyle, CheckMethodNames, CheckSymbols, AllowedIdentifiers, AllowedPatterns.
 # SupportedStyles: snake_case, normalcase, non_integer
-# AllowedIdentifiers: capture3, iso8601, rfc1123_date, rfc822, rfc2822, rfc3339, x86_64
+# AllowedIdentifiers: TLS1_1, TLS1_2, capture3, iso8601, rfc1123_date, rfc822, rfc2822, rfc3339, x86_64
 Naming/VariableNumber:
   Exclude:
+    - 'test/controllers/clients_controller_test.rb'
     - 'test/controllers/contacts_controller_test.rb'
-    - 'test/controllers/employments_controller_test.rb'
     - 'test/controllers/invoices_controller_test.rb'
     - 'test/controllers/orders_controller_test.rb'
     - 'test/controllers/overtime_vacations_controller_test.rb'
@@ -219,12 +192,6 @@ Naming/VariableNumber:
     - 'test/models/invoice_test.rb'
     - 'test/models/order_test.rb'
 
-# Offense count: 1
-# Configuration parameters: MinSize.
-Performance/CollectionLiteralInLoop:
-  Exclude:
-    - 'test/controllers/evaluator_controller_test.rb'
-
 # Offense count: 1
 Performance/FixedSize:
   Exclude:
@@ -236,14 +203,6 @@ Performance/MethodObjectAsBlock:
     - 'app/domain/apidocs/setup.rb'
     - 'app/helpers/order_helper.rb'
 
-# Offense count: 2
-# This cop supports unsafe autocorrection (--autocorrect-all).
-# Configuration parameters: EnforcedStyle, AllowToTime.
-# SupportedStyles: strict, flexible
-Rails/Date:
-  Exclude:
-    - 'test/models/employee_test.rb'
-
 # Offense count: 3
 # Configuration parameters: Include.
 # Include: app/models/**/*.rb
@@ -269,7 +228,7 @@ Rails/HasManyOrHasOneDependent:
     - 'app/models/service.rb'
     - 'app/models/work_item.rb'
 
-# Offense count: 55
+# Offense count: 61
 # Configuration parameters: Include.
 # Include: app/helpers/**/*.rb
 Rails/HelperInstanceVariable:
@@ -426,7 +385,7 @@ Style/ConditionalAssignment:
   Exclude:
     - 'app/controllers/concerns/worktimes_report.rb'
 
-# Offense count: 315
+# Offense count: 324
 # Configuration parameters: AllowedConstants.
 Style/Documentation:
   Enabled: false
@@ -440,21 +399,11 @@ Style/FrozenStringLiteralComment:
     - 'app/models/application_record.rb'
     - 'test/models/employee_test.rb'
 
-# Offense count: 2
-# Configuration parameters: MinBranchesCount.
-Style/HashLikeCase:
-  Exclude:
-    - 'app/domain/order/report.rb'
-    - 'app/helpers/order_helper.rb'
-
-# Offense count: 4
+# Offense count: 1
 # This cop supports safe autocorrection (--autocorrect).
 Style/IfUnlessModifier:
   Exclude:
-    - 'app/controllers/order_targets_controller.rb'
-    - 'app/domain/forms/worktime_edit.rb'
     - 'app/domain/plannings/employee_board.rb'
-    - 'app/models/accounting_post.rb'
 
 # Offense count: 2
 Style/MissingRespondToMissing:
@@ -473,25 +422,15 @@ Style/OpenStructUse:
     - 'app/controllers/order_services_controller.rb'
     - 'test/controllers/employees_controller_test.rb'
 
-# Offense count: 25
+# Offense count: 27
 # Configuration parameters: AllowedMethods.
 # AllowedMethods: respond_to_missing?
 Style/OptionalBooleanParameter:
   Enabled: false
 
-# Offense count: 3
-# This cop supports unsafe autocorrection (--autocorrect-all).
-# Configuration parameters: Mode.
-Style/StringConcatenation:
-  Exclude:
-    - 'app/controllers/evaluator_controller.rb'
-    - 'app/domain/order/services/csv_filename_generator.rb'
-    - 'lib/tasks/license.rake'
-
-# Offense count: 38
+# Offense count: 66
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, AllowedPatterns, SplitStrings.
 # URISchemes: http, https
 Layout/LineLength:
   Max: 234
-...

Gemfile

@@ -72,9 +72,11 @@ gem 'validates_by_schema'
 gem 'validates_timeliness'
 gem 'xmlrpc'
 
-# Error reporting, they are required in their respective initializers
-gem 'airbrake', require: false
-gem 'sentry-raven', require: false
+# Error reporting
+gem 'airbrake', require: false # required in its respective initializers
+gem 'sentry-delayed_job'
+gem 'sentry-rails'
+gem 'sentry-ruby'
 
 ## assets
 gem 'autoprefixer-rails'

Gemfile.lock

@@ -604,8 +604,15 @@ GEM
       rexml (~> 3.2, >= 3.2.5)
       rubyzip (>= 1.2.2, < 3.0)
       websocket (~> 1.0)
-    sentry-raven (3.1.2)
-      faraday (>= 1.0)
+    sentry-delayed_job (6.2.0)
+      delayed_job (>= 4.0)
+      sentry-ruby (~> 6.2.0)
+    sentry-rails (6.2.0)
+      railties (>= 5.2.0)
+      sentry-ruby (~> 6.2.0)
+    sentry-ruby (6.2.0)
+      bigdecimal
+      concurrent-ruby (~> 1.0, >= 1.0.2)
     simpleidn (0.2.3)
     snaky_hash (2.0.1)
       hashie
@@ -770,7 +777,9 @@ DEPENDENCIES
   seed-fu
   selectize-rails
   selenium-webdriver
-  sentry-raven
+  sentry-delayed_job
+  sentry-rails
+  sentry-ruby
   spring
   swagger-blocks
   terser

app/controllers/application_controller.rb

@@ -9,14 +9,14 @@
 # Likewise, all the methods added will be available for all controllers.
 
 class ApplicationController < ActionController::Base
-  before_action :set_sentry_request_context
   protect_from_forgery with: :exception
   skip_forgery_protection if: :saml_callback_path? # HACK: https://github.com/heartcombo/devise/issues/5210
 
   # before_action :authenticate
+  before_action :set_error_tracker_request_context
   before_action :store_employee_location!, if: :storable_location?
   before_action :authenticate_employee!
-  before_action :set_sentry_user_context
+  before_action :set_error_tracker_user_context
   before_action :set_paper_trail_whodunnit
   check_authorization unless: :devise_controller?
 
@@ -71,12 +71,22 @@ def not_found
     raise ActionController::RoutingError, 'Not Found'
   end
 
-  def set_sentry_request_context
-    Raven.extra_context(params: params.to_unsafe_h, url: request.url) if ENV['SENTRY_DSN']
+  def set_error_tracker_request_context
+    commit = Settings.puzzletime.build.commit
+    project = Settings.puzzletime.run.project
+    customer = Settings.puzzletime.run.customer
+
+    ErrorTracker.set_tags(commit:) if commit
+    ErrorTracker.set_tags(project:) if project
+    ErrorTracker.set_tags(customer:) if customer
   end
 
-  def set_sentry_user_context
-    Raven.user_context(id: current_user.try(:id), name: current_user.try(:shortname)) if ENV['SENTRY_DSN']
+  def set_error_tracker_user_context
+    ErrorTracker.set_user(
+      id: current_user.try(:id),
+      username: current_user.try(:shortname),
+      email: current_user.try(:email)
+    )
   end
 
   def saml_callback_path?

app/controllers/concerns/cockpit_csv.rb

@@ -19,9 +19,10 @@ def send_cockpit_csv(cockpit, filename)
 
   def cockpit_csv(cockpit)
     CSV.generate do |csv|
-      csv << ['Position', 'Budget', 'Geleistete Stunden', 'Nicht verrechenbar', 'Offenes Budget', 'Geplantes Budget']
+      csv << ['Position', 'Name der Position', 'Budget', 'Geleistete Stunden', 'Nicht verrechenbar', 'Offenes Budget', 'Geplantes Budget']
       cockpit.rows.each do |row|
         csv << [row.respond_to?(:shortnames) ? row.shortnames : 'Total',
+                row.respond_to?(:name) ? row.name : '',
                 row.cells[:budget].hours,
                 row.cells[:supplied_services].hours,
                 row.cells[:not_billable].hours,