From 5c56767b817447bb5e5d6ec664f07a2064e65bc2 Mon Sep 17 00:00:00 2001
From: Thomas Rittson <trittson@bitwarden.com>
Date: Sat, 27 Dec 2025 08:41:08 +1000
Subject: [PATCH] Rename DefaultCollectionOwner -> DefaultCollectionOwnerId

---
 src/Core/Entities/Collection.cs                    |  2 +-
 .../Repositories/CollectionRepository.cs           |  2 +-
 .../CollectionEntityTypeConfiguration.cs           |  6 +++---
 .../Repositories/OrganizationUserRepository.cs     |  2 +-
 .../Repositories/CollectionRepository.cs           |  4 ++--
 .../Collection_UpsertDefaultCollection.sql         |  6 +++---
 .../OrganizationUser_MigrateDefaultCollection.sql  |  2 +-
 src/Sql/dbo/Tables/Collection.sql                  |  8 ++++----
 .../OrganizationUserRepositoryTests.cs             | 10 +++++-----
 ...tion_AddDefaultCollectionOwnerAndConstraint.sql | 14 +++++++-------
 ...12-20_01_Collection_UpsertDefaultCollection.sql |  6 +++---
 ...2_OrganizationUser_MigrateDefaultCollection.sql |  4 ++--
 12 files changed, 33 insertions(+), 33 deletions(-)

diff --git a/src/Core/Entities/Collection.cs b/src/Core/Entities/Collection.cs
index 33f6935d3e..d156b3d121 100644
--- a/src/Core/Entities/Collection.cs
+++ b/src/Core/Entities/Collection.cs
@@ -66,7 +66,7 @@ public class Collection : ITableObject<Guid>
     /// Only populated for collections of type DefaultUserCollection.
     /// Set to null when the OrganizationUser entry is deleted.
     /// </remarks>
-    public Guid? DefaultCollectionOwner { get; set; }
+    public Guid? DefaultCollectionOwnerId { get; set; }
 
     public void SetNewId()
     {
diff --git a/src/Infrastructure.Dapper/Repositories/CollectionRepository.cs b/src/Infrastructure.Dapper/Repositories/CollectionRepository.cs
index 8e9156656a..bd5248bd58 100644
--- a/src/Infrastructure.Dapper/Repositories/CollectionRepository.cs
+++ b/src/Infrastructure.Dapper/Repositories/CollectionRepository.cs
@@ -463,7 +463,7 @@ public class CollectionRepository : Repository<Collection, Guid>, ICollectionRep
                 RevisionDate = DateTime.UtcNow,
                 Type = CollectionType.DefaultUserCollection,
                 DefaultUserCollectionEmail = null,
-                DefaultCollectionOwner = orgUserId
+                DefaultCollectionOwnerId = orgUserId
             });
 
             collectionUsers.Add(new CollectionUser
diff --git a/src/Infrastructure.EntityFramework/AdminConsole/Configurations/CollectionEntityTypeConfiguration.cs b/src/Infrastructure.EntityFramework/AdminConsole/Configurations/CollectionEntityTypeConfiguration.cs
index aaa86b6573..6d20390740 100644
--- a/src/Infrastructure.EntityFramework/AdminConsole/Configurations/CollectionEntityTypeConfiguration.cs
+++ b/src/Infrastructure.EntityFramework/AdminConsole/Configurations/CollectionEntityTypeConfiguration.cs
@@ -13,17 +13,17 @@ public class CollectionEntityTypeConfiguration : IEntityTypeConfiguration<Collec
             .ValueGeneratedNever();
 
         builder
-            .HasIndex(c => new { c.DefaultCollectionOwner, c.OrganizationId, c.Type })
+            .HasIndex(c => new { c.DefaultCollectionOwnerId, c.OrganizationId, c.Type })
             .IsUnique()
             .HasFilter("[Type] = 1")
-            .HasDatabaseName("IX_Collection_DefaultCollectionOwner_OrganizationId_Type");
+            .HasDatabaseName("IX_Collection_DefaultCollectionOwnerId_OrganizationId_Type");
 
         // Configure FK with NO ACTION delete behavior to prevent cascade conflicts
         // Cleanup is handled explicitly in OrganizationUserRepository.DeleteAsync
         builder
             .HasOne<OrganizationUser>()
             .WithMany()
-            .HasForeignKey(c => c.DefaultCollectionOwner)
+            .HasForeignKey(c => c.DefaultCollectionOwnerId)
             .OnDelete(DeleteBehavior.NoAction);
 
         builder.ToTable(nameof(Collection));
diff --git a/src/Infrastructure.EntityFramework/AdminConsole/Repositories/OrganizationUserRepository.cs b/src/Infrastructure.EntityFramework/AdminConsole/Repositories/OrganizationUserRepository.cs
index c8c453f224..0edd5e9ccd 100644
--- a/src/Infrastructure.EntityFramework/AdminConsole/Repositories/OrganizationUserRepository.cs
+++ b/src/Infrastructure.EntityFramework/AdminConsole/Repositories/OrganizationUserRepository.cs
@@ -115,7 +115,7 @@ public class OrganizationUserRepository : Repository<Core.Entities.OrganizationU
                         .SetProperty(c => c.RevisionDate, utcNow)
                         .SetProperty(c => c.DefaultUserCollectionEmail,
                             c => c.DefaultUserCollectionEmail == null ? email : c.DefaultUserCollectionEmail)
-                        .SetProperty(c => c.DefaultCollectionOwner, (Guid?)null));
+                        .SetProperty(c => c.DefaultCollectionOwnerId, (Guid?)null));
 
                 await dbContext.CollectionUsers
                     .Where(cu => cu.OrganizationUserId == organizationUser.Id)
diff --git a/src/Infrastructure.EntityFramework/Repositories/CollectionRepository.cs b/src/Infrastructure.EntityFramework/Repositories/CollectionRepository.cs
index bbb0de743b..e00fd8d7af 100644
--- a/src/Infrastructure.EntityFramework/Repositories/CollectionRepository.cs
+++ b/src/Infrastructure.EntityFramework/Repositories/CollectionRepository.cs
@@ -842,7 +842,7 @@ public class CollectionRepository : Repository<Core.Entities.Collection, Collect
                 RevisionDate = now,
                 Type = CollectionType.DefaultUserCollection,
                 DefaultUserCollectionEmail = null,
-                DefaultCollectionOwner = organizationUserId
+                DefaultCollectionOwnerId = organizationUserId
             };
 
             var collectionUser = new CollectionUser
@@ -919,7 +919,7 @@ public class CollectionRepository : Repository<Core.Entities.Collection, Collect
                 RevisionDate = DateTime.UtcNow,
                 Type = CollectionType.DefaultUserCollection,
                 DefaultUserCollectionEmail = null,
-                DefaultCollectionOwner = orgUserId
+                DefaultCollectionOwnerId = orgUserId
             });
 
             collectionUsers.Add(new CollectionUser
diff --git a/src/Sql/dbo/Stored Procedures/Collection_UpsertDefaultCollection.sql b/src/Sql/dbo/Stored Procedures/Collection_UpsertDefaultCollection.sql
index 1a8c2a4df0..14da7c32a9 100644
--- a/src/Sql/dbo/Stored Procedures/Collection_UpsertDefaultCollection.sql	
+++ b/src/Sql/dbo/Stored Procedures/Collection_UpsertDefaultCollection.sql	
@@ -1,5 +1,5 @@
 -- This procedure prevents duplicate "My Items" collections for users using
--- a filtered unique constraint on (DefaultCollectionOwner, OrganizationId, Type) WHERE Type = 1.
+-- a filtered unique constraint on (DefaultCollectionOwnerId, OrganizationId, Type) WHERE Type = 1.
 
 CREATE PROCEDURE [dbo].[Collection_UpsertDefaultCollection]
     @CollectionId UNIQUEIDENTIFIER,
@@ -18,7 +18,7 @@ BEGIN
     BEGIN TRY
         SET @WasCreated = 1
 
-        -- Insert Collection with DefaultCollectionOwner populated for constraint enforcement
+        -- Insert Collection with DefaultCollectionOwnerId populated for constraint enforcement
         INSERT INTO [dbo].[Collection]
         (
             [Id],
@@ -29,7 +29,7 @@ BEGIN
             [RevisionDate],
             [DefaultUserCollectionEmail],
             [Type],
-            [DefaultCollectionOwner]
+            [DefaultCollectionOwnerId]
         )
         VALUES
         (
diff --git a/src/Sql/dbo/Stored Procedures/OrganizationUser_MigrateDefaultCollection.sql b/src/Sql/dbo/Stored Procedures/OrganizationUser_MigrateDefaultCollection.sql
index 16be582485..354cd32576 100644
--- a/src/Sql/dbo/Stored Procedures/OrganizationUser_MigrateDefaultCollection.sql	
+++ b/src/Sql/dbo/Stored Procedures/OrganizationUser_MigrateDefaultCollection.sql	
@@ -10,7 +10,7 @@ BEGIN
         [DefaultUserCollectionEmail] = CASE WHEN c.[DefaultUserCollectionEmail] IS NULL THEN u.[Email] ELSE c.[DefaultUserCollectionEmail] END,
         [RevisionDate] = @UtcNow,
         [Type] = 0,
-        [DefaultCollectionOwner] = NULL
+        [DefaultCollectionOwnerId] = NULL
     FROM
         [dbo].[Collection] c
         INNER JOIN [dbo].[CollectionUser] cu ON c.[Id] = cu.[CollectionId]
diff --git a/src/Sql/dbo/Tables/Collection.sql b/src/Sql/dbo/Tables/Collection.sql
index 9b3009d4fe..40057c1bcf 100644
--- a/src/Sql/dbo/Tables/Collection.sql
+++ b/src/Sql/dbo/Tables/Collection.sql
@@ -7,10 +7,10 @@
     [RevisionDate]                  DATETIME2 (7)       NOT NULL,
     [DefaultUserCollectionEmail]    NVARCHAR(256)       NULL,
     [Type]                          TINYINT             NOT NULL DEFAULT(0),
-    [DefaultCollectionOwner]        UNIQUEIDENTIFIER    NULL,
+    [DefaultCollectionOwnerId]      UNIQUEIDENTIFIER    NULL,
     CONSTRAINT [PK_Collection] PRIMARY KEY CLUSTERED ([Id] ASC),
     CONSTRAINT [FK_Collection_Organization] FOREIGN KEY ([OrganizationId]) REFERENCES [dbo].[Organization] ([Id]) ON DELETE CASCADE,
-    CONSTRAINT [FK_Collection_OrganizationUser] FOREIGN KEY ([DefaultCollectionOwner]) REFERENCES [dbo].[OrganizationUser] ([Id]) ON DELETE NO ACTION
+    CONSTRAINT [FK_Collection_OrganizationUser] FOREIGN KEY ([DefaultCollectionOwnerId]) REFERENCES [dbo].[OrganizationUser] ([Id]) ON DELETE NO ACTION
 );
 GO
 
@@ -19,8 +19,8 @@ CREATE NONCLUSTERED INDEX [IX_Collection_OrganizationId_IncludeAll]
     INCLUDE([CreationDate], [Name], [RevisionDate], [Type]);
 GO
 
-CREATE UNIQUE NONCLUSTERED INDEX [IX_Collection_DefaultCollectionOwner_OrganizationId_Type]
-    ON [dbo].[Collection]([DefaultCollectionOwner], [OrganizationId], [Type])
+CREATE UNIQUE NONCLUSTERED INDEX [IX_Collection_DefaultCollectionOwnerId_OrganizationId_Type]
+    ON [dbo].[Collection]([DefaultCollectionOwnerId], [OrganizationId], [Type])
     WHERE [Type] = 1;
 GO
 
diff --git a/test/Infrastructure.IntegrationTest/AdminConsole/Repositories/OrganizationUserRepository/OrganizationUserRepositoryTests.cs b/test/Infrastructure.IntegrationTest/AdminConsole/Repositories/OrganizationUserRepository/OrganizationUserRepositoryTests.cs
index 717eafc430..64f7107bdf 100644
--- a/test/Infrastructure.IntegrationTest/AdminConsole/Repositories/OrganizationUserRepository/OrganizationUserRepositoryTests.cs
+++ b/test/Infrastructure.IntegrationTest/AdminConsole/Repositories/OrganizationUserRepository/OrganizationUserRepositoryTests.cs
@@ -147,13 +147,13 @@ public class OrganizationUserRepositoryTests
         Assert.NotNull(updatedCollection1);
         Assert.Equal(CollectionType.SharedCollection, updatedCollection1.Type);
         Assert.Equal(user1.Email, updatedCollection1.DefaultUserCollectionEmail);
-        Assert.Null(updatedCollection1.DefaultCollectionOwner);
+        Assert.Null(updatedCollection1.DefaultCollectionOwnerId);
 
         var updatedCollection2 = await collectionRepository.GetByIdAsync(defaultUserCollection2.Id);
         Assert.NotNull(updatedCollection2);
         Assert.Equal(CollectionType.SharedCollection, updatedCollection2.Type);
         Assert.Equal(user2.Email, updatedCollection2.DefaultUserCollectionEmail);
-        Assert.Null(updatedCollection2.DefaultCollectionOwner);
+        Assert.Null(updatedCollection2.DefaultCollectionOwnerId);
     }
 
     [DatabaseTheory, DatabaseData]
@@ -216,7 +216,7 @@ public class OrganizationUserRepositoryTests
         Assert.NotNull(updatedCollection);
         Assert.Equal(CollectionType.SharedCollection, updatedCollection.Type);
         Assert.Equal(user.Email, updatedCollection.DefaultUserCollectionEmail);
-        Assert.Null(updatedCollection.DefaultCollectionOwner);
+        Assert.Null(updatedCollection.DefaultCollectionOwnerId);
     }
 
 
@@ -1358,7 +1358,7 @@ public class OrganizationUserRepositoryTests
         Assert.NotNull(updatedCollection);
         Assert.Equal(CollectionType.SharedCollection, updatedCollection.Type);
         Assert.Equal(user.Email, updatedCollection.DefaultUserCollectionEmail);
-        Assert.Null(updatedCollection.DefaultCollectionOwner);
+        Assert.Null(updatedCollection.DefaultCollectionOwnerId);
     }
 
     [DatabaseTheory, DatabaseData]
@@ -1416,7 +1416,7 @@ public class OrganizationUserRepositoryTests
         Assert.NotNull(updatedCollection);
         Assert.Equal(CollectionType.SharedCollection, updatedCollection.Type);
         Assert.Equal(user.Email, updatedCollection.DefaultUserCollectionEmail);
-        Assert.Null(updatedCollection.DefaultCollectionOwner);
+        Assert.Null(updatedCollection.DefaultCollectionOwnerId);
     }
 
     [DatabaseTheory, DatabaseData]
diff --git a/util/Migrator/DbScripts/2025-12-20_00_Collection_AddDefaultCollectionOwnerAndConstraint.sql b/util/Migrator/DbScripts/2025-12-20_00_Collection_AddDefaultCollectionOwnerAndConstraint.sql
index 486aca6a21..af7498b873 100644
--- a/util/Migrator/DbScripts/2025-12-20_00_Collection_AddDefaultCollectionOwnerAndConstraint.sql
+++ b/util/Migrator/DbScripts/2025-12-20_00_Collection_AddDefaultCollectionOwnerAndConstraint.sql
@@ -1,5 +1,5 @@
 -- TODO! Handle existing data in MSSQL (and EF if releasing before this). This assumes the column is populated, if it isn't then it'll create at least 1 duplicate.
--- Add DefaultCollectionOwner column to Collection table for Type=1 collections
+-- Add DefaultCollectionOwnerId column to Collection table for Type=1 collections
 -- This enables a filtered unique constraint to prevent duplicate default collections
 
 IF NOT EXISTS (
@@ -7,11 +7,11 @@ IF NOT EXISTS (
     FROM INFORMATION_SCHEMA.COLUMNS
     WHERE TABLE_SCHEMA = 'dbo'
       AND TABLE_NAME = 'Collection'
-      AND COLUMN_NAME = 'DefaultCollectionOwner'
+      AND COLUMN_NAME = 'DefaultCollectionOwnerId'
 )
 BEGIN
     ALTER TABLE [dbo].[Collection]
-        ADD [DefaultCollectionOwner] UNIQUEIDENTIFIER NULL
+        ADD [DefaultCollectionOwnerId] UNIQUEIDENTIFIER NULL
 END
 GO
 
@@ -25,7 +25,7 @@ IF NOT EXISTS (
 BEGIN
     ALTER TABLE [dbo].[Collection]
         ADD CONSTRAINT [FK_Collection_OrganizationUser]
-        FOREIGN KEY ([DefaultCollectionOwner])
+        FOREIGN KEY ([DefaultCollectionOwnerId])
         REFERENCES [dbo].[OrganizationUser] ([Id])
         ON DELETE NO ACTION
 END
@@ -35,12 +35,12 @@ GO
 IF NOT EXISTS (
     SELECT *
     FROM sys.indexes
-    WHERE name = 'IX_Collection_DefaultCollectionOwner_OrganizationId_Type'
+    WHERE name = 'IX_Collection_DefaultCollectionOwnerId_OrganizationId_Type'
       AND object_id = OBJECT_ID('[dbo].[Collection]')
 )
 BEGIN
-    CREATE UNIQUE NONCLUSTERED INDEX [IX_Collection_DefaultCollectionOwner_OrganizationId_Type]
-        ON [dbo].[Collection]([DefaultCollectionOwner], [OrganizationId], [Type])
+    CREATE UNIQUE NONCLUSTERED INDEX [IX_Collection_DefaultCollectionOwnerId_OrganizationId_Type]
+        ON [dbo].[Collection]([DefaultCollectionOwnerId], [OrganizationId], [Type])
         WHERE [Type] = 1;
 END
 GO
diff --git a/util/Migrator/DbScripts/2025-12-20_01_Collection_UpsertDefaultCollection.sql b/util/Migrator/DbScripts/2025-12-20_01_Collection_UpsertDefaultCollection.sql
index 044c53d405..495f89d626 100644
--- a/util/Migrator/DbScripts/2025-12-20_01_Collection_UpsertDefaultCollection.sql
+++ b/util/Migrator/DbScripts/2025-12-20_01_Collection_UpsertDefaultCollection.sql
@@ -1,6 +1,6 @@
 -- Create the idempotent stored procedure for creating default collections
 -- This procedure prevents duplicate "My Items" collections for users using
--- a filtered unique constraint on (DefaultCollectionOwner, OrganizationId, Type) WHERE Type = 1.
+-- a filtered unique constraint on (DefaultCollectionOwnerId, OrganizationId, Type) WHERE Type = 1.
 
 CREATE OR ALTER PROCEDURE [dbo].[Collection_UpsertDefaultCollection]
     @CollectionId UNIQUEIDENTIFIER,
@@ -19,7 +19,7 @@ BEGIN
     BEGIN TRY
         SET @WasCreated = 1
 
-        -- Insert Collection with DefaultCollectionOwner populated for constraint enforcement
+        -- Insert Collection with DefaultCollectionOwnerId populated for constraint enforcement
         INSERT INTO [dbo].[Collection]
         (
             [Id],
@@ -30,7 +30,7 @@ BEGIN
             [RevisionDate],
             [DefaultUserCollectionEmail],
             [Type],
-            [DefaultCollectionOwner]
+            [DefaultCollectionOwnerId]
         )
         VALUES
         (
diff --git a/util/Migrator/DbScripts/2025-12-20_02_OrganizationUser_MigrateDefaultCollection.sql b/util/Migrator/DbScripts/2025-12-20_02_OrganizationUser_MigrateDefaultCollection.sql
index 4f90b6d251..c40f3f7b0f 100644
--- a/util/Migrator/DbScripts/2025-12-20_02_OrganizationUser_MigrateDefaultCollection.sql
+++ b/util/Migrator/DbScripts/2025-12-20_02_OrganizationUser_MigrateDefaultCollection.sql
@@ -1,4 +1,4 @@
--- Update OrganizationUser_MigrateDefaultCollection to set DefaultCollectionOwner = NULL
+-- Update OrganizationUser_MigrateDefaultCollection to set DefaultCollectionOwnerId = NULL
 -- when migrating default collections to shared collections during OrganizationUser deletion
 
 CREATE OR ALTER PROCEDURE [dbo].[OrganizationUser_MigrateDefaultCollection]
@@ -13,7 +13,7 @@ BEGIN
         [DefaultUserCollectionEmail] = CASE WHEN c.[DefaultUserCollectionEmail] IS NULL THEN u.[Email] ELSE c.[DefaultUserCollectionEmail] END,
         [RevisionDate] = @UtcNow,
         [Type] = 0,
-        [DefaultCollectionOwner] = NULL
+        [DefaultCollectionOwnerId] = NULL
     FROM
         [dbo].[Collection] c
         INNER JOIN [dbo].[CollectionUser] cu ON c.[Id] = cu.[CollectionId]