Merge branch 'dev' for release 6.4.2

Author: gnepud

CHANGELOG.md

@@ -2,6 +2,12 @@
 
 ## Next release
 
+## v6.4.2 2025 Jun 16
+
+- Fix a bug: reservation of training has auto canceled/refunded two times
+- Fix a bug: missing reservation of space in open api json
+- Fix a bug: unable to run rails db:migrate
+
 ## v6.4.1 2025 Avril 30
 
 - Fix a bug: unable to migrate coupon usages

app/services/trainings/auto_cancel_service.rb

@@ -17,7 +17,7 @@ def auto_cancel_reservations(training)
                      Time.current,
                      Time.current + training.auto_cancel_deadline.hours)
               .find_each do |availability|
-        next if availability.reservations.count >= training.auto_cancel_threshold
+        next if availability.slots_reservations.where(canceled_at: nil).count >= training.auto_cancel_threshold
 
         auto_refund = Setting.get('wallet_module')
 
@@ -27,14 +27,14 @@ def auto_cancel_reservations(training)
                                 meta_data: { auto_refund: auto_refund }
 
         availability.update(lock: true)
-        availability.slots_reservations.find_each do |sr|
+        availability.slots_reservations.where(canceled_at: nil).find_each do |sr|
           NotificationCenter.call type: 'notify_member_training_auto_cancelled',
                                   receiver: sr.reservation.user,
                                   attached_object: sr,
-                                  meta_data: { auto_refund: auto_refund }
+                                  meta_data: { auto_refund: auto_refund && !sr.offered? }
 
-          sr.update(canceled_at: Time.current)
-          refund_after_cancel(sr.reservation) if auto_refund
+          SlotsReservationsService.cancel(sr)
+          refund_after_cancel(sr.reservation) if auto_refund && !sr.offered?
         end
       end
     end

app/views/open_api/v1/reservations/index.json.jbuilder

@@ -18,6 +18,8 @@ json.reservations @reservations do |reservation|
       json.partial! 'open_api/v1/trainings/training', training: reservation.reservable
     when 'Machine'
       json.partial! 'open_api/v1/machines/machine', machine: reservation.reservable
+    when 'Space'
+      json.partial! 'open_api/v1/spaces/space', space: reservation.reservable
     when 'Event'
       json.partial! 'open_api/v1/events/event', event: reservation.reservable
     end

db/migrate/20230828073428_add_roles_to_notification_types.rb

@@ -2,6 +2,5 @@ class AddRolesToNotificationTypes < ActiveRecord::Migration[7.0]
   def change
     add_column :notification_types, :roles, :string, array: true, default: []
     add_index :notification_types, :roles
-    load Rails.root.join('db/seeds/notification_types.rb')
   end
 end

db/migrate/20231103093436_add_label_i18n_path_to_statistic_tables.rb

@@ -7,91 +7,92 @@ def change
 
     # StatisticIndex
 
-    statistic_index_subscription = StatisticIndex.find_by!(es_type_key: 'subscription')
-    statistic_index_subscription.update!(label: nil, label_i18n_path: 'statistics.subscriptions')
+    if StatisticIndex.count > 0
+      statistic_index_subscription = StatisticIndex.find_by!(es_type_key: 'subscription')
+      statistic_index_subscription.update!(label: nil, label_i18n_path: 'statistics.subscriptions')
 
-    statistic_index_machine = StatisticIndex.find_by!(es_type_key: 'machine')
-    statistic_index_machine.update!(label: nil, label_i18n_path: 'statistics.machines_hours')
+      statistic_index_machine = StatisticIndex.find_by!(es_type_key: 'machine')
+      statistic_index_machine.update!(label: nil, label_i18n_path: 'statistics.machines_hours')
 
-    statistic_index_training = StatisticIndex.find_by!(es_type_key: 'training')
-    statistic_index_training.update!(label: nil, label_i18n_path: 'statistics.trainings')
+      statistic_index_training = StatisticIndex.find_by!(es_type_key: 'training')
+      statistic_index_training.update!(label: nil, label_i18n_path: 'statistics.trainings')
 
-    statistic_index_event = StatisticIndex.find_by!(es_type_key: 'event')
-    statistic_index_event.update!(label: nil, label_i18n_path: 'statistics.events')
+      statistic_index_event = StatisticIndex.find_by!(es_type_key: 'event')
+      statistic_index_event.update!(label: nil, label_i18n_path: 'statistics.events')
 
-    statistic_index_account = StatisticIndex.find_by!(es_type_key: 'account')
-    statistic_index_account.update!(label: nil, label_i18n_path: 'statistics.registrations')
+      statistic_index_account = StatisticIndex.find_by!(es_type_key: 'account')
+      statistic_index_account.update!(label: nil, label_i18n_path: 'statistics.registrations')
 
-    statistic_index_project = StatisticIndex.find_by!(es_type_key: 'project')
-    statistic_index_project.update!(label: nil, label_i18n_path: 'statistics.projects')
+      statistic_index_project = StatisticIndex.find_by!(es_type_key: 'project')
+      statistic_index_project.update!(label: nil, label_i18n_path: 'statistics.projects')
 
-    statistic_index_user = StatisticIndex.find_by!(es_type_key: 'user')
-    statistic_index_user.update!(label: nil, label_i18n_path: 'statistics.users')
+      statistic_index_user = StatisticIndex.find_by!(es_type_key: 'user')
+      statistic_index_user.update!(label: nil, label_i18n_path: 'statistics.users')
 
-    statistic_index_space = StatisticIndex.find_by!(es_type_key: 'space')
-    statistic_index_space.update!(label: nil, label_i18n_path: 'statistics.spaces')
+      statistic_index_space = StatisticIndex.find_by!(es_type_key: 'space')
+      statistic_index_space.update!(label: nil, label_i18n_path: 'statistics.spaces')
 
-    statistic_index_order = StatisticIndex.find_by!(es_type_key: 'order')
-    statistic_index_order.update!(label: nil, label_i18n_path: 'statistics.orders')
+      statistic_index_order = StatisticIndex.find_by!(es_type_key: 'order')
+      statistic_index_order.update!(label: nil, label_i18n_path: 'statistics.orders')
 
-    # StatisticField
+      # StatisticField
 
-    if StatisticField.count > 0
-      StatisticField.find_by!(key: 'groupName', statistic_index_id: statistic_index_subscription.id).update!(label: nil, label_i18n_path: 'statistics.group')
+      if StatisticField.count > 0
+        StatisticField.find_by!(key: 'groupName', statistic_index_id: statistic_index_subscription.id).update!(label: nil, label_i18n_path: 'statistics.group')
 
-      StatisticField.find_by!(key: 'spaceDates', statistic_index_id: statistic_index_space.id).update!(label: nil, label_i18n_path: 'statistics.space_dates')
-      StatisticField.find_by!(key: 'groupName', statistic_index_id: statistic_index_space.id).update!(label: nil, label_i18n_path: 'statistics.group')
+        StatisticField.find_by!(key: 'spaceDates', statistic_index_id: statistic_index_space.id).update!(label: nil, label_i18n_path: 'statistics.space_dates')
+        StatisticField.find_by!(key: 'groupName', statistic_index_id: statistic_index_space.id).update!(label: nil, label_i18n_path: 'statistics.group')
 
-      StatisticField.find_by!(key: 'machineDates', statistic_index_id: statistic_index_machine.id).update!(label: nil, label_i18n_path: 'statistics.machine_dates')
-      StatisticField.find_by!(key: 'groupName', statistic_index_id: statistic_index_machine.id).update!(label: nil, label_i18n_path: 'statistics.group')
+        StatisticField.find_by!(key: 'machineDates', statistic_index_id: statistic_index_machine.id).update!(label: nil, label_i18n_path: 'statistics.machine_dates')
+        StatisticField.find_by!(key: 'groupName', statistic_index_id: statistic_index_machine.id).update!(label: nil, label_i18n_path: 'statistics.group')
 
+        StatisticField.find_by!(key: 'trainingId', statistic_index_id: statistic_index_training.id).update!(label: nil, label_i18n_path: 'statistics.training_id')
+        StatisticField.find_by!(key: 'trainingDate', statistic_index_id: statistic_index_training.id).update!(label: nil, label_i18n_path: 'statistics.training_date')
+        StatisticField.find_by!(key: 'groupName', statistic_index_id: statistic_index_training.id).update!(label: nil, label_i18n_path: 'statistics.group')
 
-      StatisticField.find_by!(key: 'trainingId', statistic_index_id: statistic_index_training.id).update!(label: nil, label_i18n_path: 'statistics.training_id')
-      StatisticField.find_by!(key: 'trainingDate', statistic_index_id: statistic_index_training.id).update!(label: nil, label_i18n_path: 'statistics.training_date')
-      StatisticField.find_by!(key: 'groupName', statistic_index_id: statistic_index_training.id).update!(label: nil, label_i18n_path: 'statistics.group')
+        StatisticField.find_by!(key: 'name', statistic_index_id: statistic_index_event.id).update!(label: nil, label_i18n_path: 'statistics.event_name')
+        StatisticField.find_by!(key: 'eventId', statistic_index_id: statistic_index_event.id).update!(label: nil, label_i18n_path: 'statistics.event_id')
+        StatisticField.find_by!(key: 'eventDate', statistic_index_id: statistic_index_event.id).update!(label: nil, label_i18n_path: 'statistics.event_date')
+        StatisticField.find_by!(key: 'groupName', statistic_index_id: statistic_index_event.id).update!(label: nil, label_i18n_path: 'statistics.group')
+        StatisticField.find_by!(key: 'eventTheme', statistic_index_id: statistic_index_event.id).update!(label: nil, label_i18n_path: 'statistics.event_theme')
+        StatisticField.find_by!(key: 'ageRange', statistic_index_id: statistic_index_event.id).update!(label: nil, label_i18n_path: 'statistics.age_range')
 
-      StatisticField.find_by!(key: 'name', statistic_index_id: statistic_index_event.id).update!(label: nil, label_i18n_path: 'statistics.event_name')
-      StatisticField.find_by!(key: 'eventId', statistic_index_id: statistic_index_event.id).update!(label: nil, label_i18n_path: 'statistics.event_id')
-      StatisticField.find_by!(key: 'eventDate', statistic_index_id: statistic_index_event.id).update!(label: nil, label_i18n_path: 'statistics.event_date')
-      StatisticField.find_by!(key: 'groupName', statistic_index_id: statistic_index_event.id).update!(label: nil, label_i18n_path: 'statistics.group')
-      StatisticField.find_by!(key: 'eventTheme', statistic_index_id: statistic_index_event.id).update!(label: nil, label_i18n_path: 'statistics.event_theme')
-      StatisticField.find_by!(key: 'ageRange', statistic_index_id: statistic_index_event.id).update!(label: nil, label_i18n_path: 'statistics.age_range')
+        StatisticField.find_by!(key: 'groupName', statistic_index_id: statistic_index_account.id).update!(label: nil, label_i18n_path: 'statistics.group')
 
-      StatisticField.find_by!(key: 'groupName', statistic_index_id: statistic_index_account.id).update!(label: nil, label_i18n_path: 'statistics.group')
+        StatisticField.find_by!(key: 'themes', statistic_index_id: statistic_index_project.id).update!(label: nil, label_i18n_path: 'statistics.themes')
+        StatisticField.find_by!(key: 'components', statistic_index_id: statistic_index_project.id).update!(label: nil, label_i18n_path: 'statistics.components')
+        StatisticField.find_by!(key: 'machines', statistic_index_id: statistic_index_project.id).update!(label: nil, label_i18n_path: 'statistics.machines')
+        StatisticField.find_by!(key: 'status', statistic_index_id: statistic_index_project.id).update!(label: nil, label_i18n_path: 'statistics.project_status')
+        StatisticField.find_by!(key: 'name', statistic_index_id: statistic_index_project.id).update!(label: nil, label_i18n_path: 'statistics.project_name')
+        StatisticField.find_by!(key: 'projectUserNames', statistic_index_id: statistic_index_project.id).update!(label: nil, label_i18n_path: 'statistics.project_user_names')
 
-      StatisticField.find_by!(key: 'themes', statistic_index_id: statistic_index_project.id).update!(label: nil, label_i18n_path: 'statistics.themes')
-      StatisticField.find_by!(key: 'components', statistic_index_id: statistic_index_project.id).update!(label: nil, label_i18n_path: 'statistics.components')
-      StatisticField.find_by!(key: 'machines', statistic_index_id: statistic_index_project.id).update!(label: nil, label_i18n_path: 'statistics.machines')
-      StatisticField.find_by!(key: 'status', statistic_index_id: statistic_index_project.id).update!(label: nil, label_i18n_path: 'statistics.project_status')
-      StatisticField.find_by!(key: 'name', statistic_index_id: statistic_index_project.id).update!(label: nil, label_i18n_path: 'statistics.project_name')
-      StatisticField.find_by!(key: 'projectUserNames', statistic_index_id: statistic_index_project.id).update!(label: nil, label_i18n_path: 'statistics.project_user_names')
+        StatisticField.find_by!(key: 'userId', statistic_index_id: statistic_index_user.id).update!(label: nil, label_i18n_path: 'statistics.user_id')
 
-      StatisticField.find_by!(key: 'userId', statistic_index_id: statistic_index_user.id).update!(label: nil, label_i18n_path: 'statistics.user_id')
+        StatisticField.find_by!(key: 'groupName', statistic_index_id: statistic_index_order.id).update!(label: nil, label_i18n_path: 'statistics.group')
+      end
 
-      StatisticField.find_by!(key: 'groupName', statistic_index_id: statistic_index_order.id).update!(label: nil, label_i18n_path: 'statistics.group')
-    end
-
-    # StatisticType
-    if StatisticType.count > 0
-      StatisticType.find_by!(key: 'booking', statistic_index_id: statistic_index_machine.id).update!(label: nil, label_i18n_path: 'statistics.bookings')
-      StatisticType.find_by!(key: 'hour', statistic_index_id: statistic_index_machine.id).update!(label: nil, label_i18n_path: 'statistics.hours_number')
+      # StatisticType
+      if StatisticType.count > 0
+        StatisticType.find_by!(key: 'booking', statistic_index_id: statistic_index_machine.id).update!(label: nil, label_i18n_path: 'statistics.bookings')
+        StatisticType.find_by!(key: 'hour', statistic_index_id: statistic_index_machine.id).update!(label: nil, label_i18n_path: 'statistics.hours_number')
 
-      StatisticType.find_by!(key: 'booking', statistic_index_id: statistic_index_training.id).update!(label: nil, label_i18n_path: 'statistics.bookings')
-      StatisticType.find_by!(key: 'hour', statistic_index_id: statistic_index_training.id).update!(label: nil, label_i18n_path: 'statistics.hours_number')
+        StatisticType.find_by!(key: 'booking', statistic_index_id: statistic_index_training.id).update!(label: nil, label_i18n_path: 'statistics.bookings')
+        StatisticType.find_by!(key: 'hour', statistic_index_id: statistic_index_training.id).update!(label: nil, label_i18n_path: 'statistics.hours_number')
 
-      StatisticType.find_by!(key: 'booking', statistic_index_id: statistic_index_event.id).update!(label: nil, label_i18n_path: 'statistics.tickets_number')
-      StatisticType.find_by!(key: 'hour', statistic_index_id: statistic_index_event.id).update!(label: nil, label_i18n_path: 'statistics.hours_number')
+        StatisticType.find_by!(key: 'booking', statistic_index_id: statistic_index_event.id).update!(label: nil, label_i18n_path: 'statistics.tickets_number')
+        StatisticType.find_by!(key: 'hour', statistic_index_id: statistic_index_event.id).update!(label: nil, label_i18n_path: 'statistics.hours_number')
 
-      StatisticType.find_by!(key: 'member', statistic_index_id: statistic_index_account.id).update!(label: nil, label_i18n_path: 'statistics.users')
+        StatisticType.find_by!(key: 'member', statistic_index_id: statistic_index_account.id).update!(label: nil, label_i18n_path: 'statistics.users')
 
-      StatisticType.find_by!(key: 'project', statistic_index_id: statistic_index_project.id).update!(label: nil, label_i18n_path: 'statistics.projects')
+        StatisticType.find_by!(key: 'project', statistic_index_id: statistic_index_project.id).update!(label: nil, label_i18n_path: 'statistics.projects')
 
-      StatisticType.find_by!(key: 'revenue', statistic_index_id: statistic_index_user.id).update!(label: nil, label_i18n_path: 'statistics.revenue')
+        StatisticType.find_by!(key: 'revenue', statistic_index_id: statistic_index_user.id).update!(label: nil, label_i18n_path: 'statistics.revenue')
 
-      StatisticType.find_by!(key: 'booking', statistic_index_id: statistic_index_space.id).update!(label: nil, label_i18n_path: 'statistics.bookings')
-      StatisticType.find_by!(key: 'hour', statistic_index_id: statistic_index_space.id).update!(label: nil, label_i18n_path: 'statistics.hours_number')
+        StatisticType.find_by!(key: 'booking', statistic_index_id: statistic_index_space.id).update!(label: nil, label_i18n_path: 'statistics.bookings')
+        StatisticType.find_by!(key: 'hour', statistic_index_id: statistic_index_space.id).update!(label: nil, label_i18n_path: 'statistics.hours_number')
 
-      StatisticType.find_by!(key: 'store', statistic_index_id: statistic_index_order.id).update!(label: nil, label_i18n_path: 'statistics.store')
+        StatisticType.find_by!(key: 'store', statistic_index_id: statistic_index_order.id).update!(label: nil, label_i18n_path: 'statistics.store')
+      end
     end
 
     # StatisticSubType

package.json

@@ -1,6 +1,6 @@
 {
   "name": "fab-manager",
-  "version": "6.4.1",
+  "version": "6.4.2",
   "description": "Fab-manager is the FabLab management solution. It provides a comprehensive, web-based, open-source tool to simplify your administrative tasks and your marker's projects.",
   "keywords": [
     "fablab",