Merge branch 'dev' for release 6.3.33

sleede · Oct 2, 2024 · 71c94bf · 71c94bf
2 parents 791e188 + 1e74afd
commit 71c94bf
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 8 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,13 @@
 
 ## Next release
 
+## v6.3.33 2024 October 2
+
+- Fix a bug: unable to reset OpenApi token
+- Fix a bug: unable to sync projects with openprojects
+- [TODO DEPLOY] `rails fablab:openlab:bulk_export`
+- [TODO DEPLOY] `rails fablab:openlab:bulk_update`
+
 ## v6.3.32 2024 July 22
 
 - Fix a bug: manager cannot pay a subscription(payment schedule) with a wallet

diff --git a/app/models/concerns/openlab_sync.rb b/app/models/concerns/openlab_sync.rb
@@ -5,18 +5,17 @@ module OpenlabSync
   extend ActiveSupport::Concern
 
   included do
-    after_create :openlab_create, if: :openlab_sync_active?
-    after_update :openlab_update, if: :openlab_sync_active?
+    after_save :openlab_create_or_update, if: :openlab_sync_active?
     after_destroy :openlab_destroy, if: :openlab_sync_active?
 
     def openlab_create
       OpenlabWorker.perform_in(2.seconds, :create, id) if published?
     end
 
-    def openlab_update
+    def openlab_create_or_update
       return unless published?
 
-      if state_was == 'draft'
+      if state_was == 'draft' || state_was.nil?
         OpenlabWorker.perform_async(:create, id)
       else
         OpenlabWorker.perform_async(:update, id)

diff --git a/app/models/open_api/client.rb b/app/models/open_api/client.rb
@@ -3,16 +3,16 @@
 # OpenAPI::Client keeps track of the authorized accesses to the 3-rd party API (aka. OpenAPI)
 class OpenAPI::Client < ApplicationRecord
   validates :name, presence: true
-  validates_uniqueness_of :token
+  validates :token, uniqueness: true
 
   before_create :set_initial_token
 
   def increment_calls_count
-    update_column(:calls_count, calls_count+1)
+    update_column(:calls_count, calls_count + 1)
   end
 
   def regenerate_token
-    update_attributes(token: generate_unique_secure_token)
+    update(token: generate_unique_secure_token)
   end
 
   private

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "fab-manager",
-  "version": "6.3.32",
+  "version": "6.3.33",
   "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",