bullet_train 1.4.7 → 1.4.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b37d49a851243ce6ee4762eb3939db28bbe9566fc7897f3dde6f46639d41cf6b
-  data.tar.gz: 54e743ef8e8859657bd43e0294c96d7c9f9b91eae5b08f49e7f3c5350d189ca4
+  metadata.gz: 86b25cd3f8b935ed66013d2f4f906a58f50445a1d0250fc92f661d96478c9798
+  data.tar.gz: 2020c0ee2cc8d7e14f96f4ff00976729227b434d0c94ba216e8eeeb2ab93c6df
 SHA512:
-  metadata.gz: 7a694f756dcb9f8defd2f3a731ac981328f22e793937b68b5117600c83f880d60e9fb092714de7da50da03cf9167e11ad4c25ada0776062b165e6976b087a7ea
-  data.tar.gz: 38ebed0df0636b49bda73a1d5d11a2f5edf2db7e01a4e9a16882a7efbc4bdee1fbc139bcb4cd7a1f4533ea5d5b55d3f299ac892d35b6f80288186f77d44e65dd
+  metadata.gz: 75b39744eeffb426ad00c56dc257ab48f3039914f4372093ea49b2a50ec7ec64fac89876f5e0e4856fb179273ba7949f472699147d9a9d8cc01ae0c101304b1c
+  data.tar.gz: 1f4ed96750b8261f799f7aff62e64356360319039a71292f18ac51e004de902e8d40cea5dea28c6ce1bc6a3d8dd345564841132bf3a19e6322fa918ee0f7a517

data/app/controllers/concerns/account/teams/controller_base.rb

@@ -111,17 +111,14 @@ module Account::Teams::ControllerBase
   # # DELETE /teams/1
   # # DELETE /teams/1.json
   def destroy
-    if current_user.teams.size == 1
-      respond_to do |format|
-        format.html { redirect_to edit_account_team_url(@team), alert: t("account.teams.notifications.cannot_delete_last_team") }
-        format.json { head :no_content }
-      end
-    else
+    respond_to do |format|
+      raise RemovingLastTeamException if current_user.one_team?
       @team.destroy
-      respond_to do |format|
-        format.html { redirect_to account_teams_url, notice: t("account.teams.notifications.destroyed") }
-        format.json { head :no_content }
-      end
+      format.html { redirect_to account_teams_url, notice: t("account.teams.notifications.destroyed") }
+      format.json { head :no_content }
+    rescue RemovingLastTeamException => _
+      format.html { redirect_to edit_account_team_url(@team), alert: t("account.teams.notifications.cannot_delete_last_team") }
+      format.json { head :no_content }
     end
   end
 

data/app/models/concerns/teams/base.rb

@@ -7,6 +7,10 @@ module Teams::Base
       has_many :scaffolding_absolutely_abstract_creative_concepts, class_name: "Scaffolding::AbsolutelyAbstract::CreativeConcept", dependent: :destroy, enable_cable_ready_updates: true
     end
 
+    # added_by_id is a foreign_key to other Memberships on the same team,
+    # so we nullify this to remove the constraint to delete the team.
+    before_destroy { Membership.where(team: self).update_all(added_by_id: nil) }
+
     # memberships and invitations
     has_many :memberships, dependent: :destroy
     has_many :users, through: :memberships

data/lib/bullet_train/version.rb

@@ -1,3 +1,3 @@
 module BulletTrain
-  VERSION = "1.4.7"
+  VERSION = "1.4.8"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bullet_train
 version: !ruby/object:Gem::Version
-  version: 1.4.7
+  version: 1.4.8
 platform: ruby
 authors:
 - Andrew Culver
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-09-21 00:00:00.000000000 Z
+date: 2023-09-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: standard