From b0dff07310a2631205b1a0073c6d501330865b7b Mon Sep 17 00:00:00 2001
From: Suzanne Vogt <suzanne.vogt@datacite.org>
Date: Mon, 6 Feb 2023 23:11:56 -0500
Subject: [PATCH] Prefix-bug-1

---
 app/models/client.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/models/client.rb b/app/models/client.rb
index c0d12d1b9..f9c29e024 100644
--- a/app/models/client.rb
+++ b/app/models/client.rb
@@ -98,7 +98,7 @@ class Client < ApplicationRecord
   before_validation :set_defaults
   before_create { self.created = Time.zone.now.utc.iso8601 }
   before_save { self.updated = Time.zone.now.utc.iso8601 }
-  after_create :assign_prefix
+  after_create_commit :assign_prefix
   after_create_commit :create_reference_repository
   after_update_commit :update_reference_repository
   after_destroy_commit :destroy_reference_repository
@@ -955,7 +955,7 @@ def assign_prefix
         ClientPrefix.create(
           client_id: symbol,
           provider_prefix_id: provider_prefix.uid,
-          prefix_id: provider_prefix.prefix.uid,
+          prefix_id: (prefix ? prefix.uid : provider_prefix.prefix.uid),
         )
       end
     end