[PM-1188] Move EF auth models for code ownership (#2859)

* [PM-1188] move ef auth files to auth folder * [PM-1188] rename ef models namespace * [PM-1188] fix auth ef model imports * [PM-1188] fix ef model usings
bitwarden · Apr 18, 2023 · 4f2fb2c · 4f2fb2c
1 parent 4e7b9d2
commit 4f2fb2c
Show file tree

Hide file tree

Showing 16 changed files with 20 additions and 12 deletions.
diff --git a/...ure.EntityFramework/Models/AuthRequest.cs → ...ntityFramework/Auth/Models/AuthRequest.cs b/...ure.EntityFramework/Models/AuthRequest.cs → ...ntityFramework/Auth/Models/AuthRequest.cs
@@ -1,6 +1,7 @@
 using AutoMapper;
+using Bit.Infrastructure.EntityFramework.Models;
 
-namespace Bit.Infrastructure.EntityFramework.Models;
+namespace Bit.Infrastructure.EntityFramework.Auth.Models;
 
 public class AuthRequest : Core.Auth.Entities.AuthRequest
 {

diff --git a/...EntityFramework/Models/EmergencyAccess.cs → ...yFramework/Auth/Models/EmergencyAccess.cs b/...EntityFramework/Models/EmergencyAccess.cs → ...yFramework/Auth/Models/EmergencyAccess.cs
@@ -1,6 +1,7 @@
 using AutoMapper;
+using Bit.Infrastructure.EntityFramework.Models;
 
-namespace Bit.Infrastructure.EntityFramework.Models;
+namespace Bit.Infrastructure.EntityFramework.Auth.Models;
 
 public class EmergencyAccess : Core.Auth.Entities.EmergencyAccess
 {

diff --git a/...structure.EntityFramework/Models/Grant.cs → ...ture.EntityFramework/Auth/Models/Grant.cs b/...structure.EntityFramework/Models/Grant.cs → ...ture.EntityFramework/Auth/Models/Grant.cs
@@ -1,6 +1,6 @@
 using AutoMapper;
 
-namespace Bit.Infrastructure.EntityFramework.Models;
+namespace Bit.Infrastructure.EntityFramework.Auth.Models;
 
 public class Grant : Core.Auth.Entities.Grant
 {

diff --git a/...cture.EntityFramework/Models/SsoConfig.cs → ....EntityFramework/Auth/Models/SsoConfig.cs b/...cture.EntityFramework/Models/SsoConfig.cs → ....EntityFramework/Auth/Models/SsoConfig.cs
@@ -1,6 +1,7 @@
 using AutoMapper;
+using Bit.Infrastructure.EntityFramework.Models;
 
-namespace Bit.Infrastructure.EntityFramework.Models;
+namespace Bit.Infrastructure.EntityFramework.Auth.Models;
 
 public class SsoConfig : Core.Auth.Entities.SsoConfig
 {

diff --git a/...ructure.EntityFramework/Models/SsoUser.cs → ...re.EntityFramework/Auth/Models/SsoUser.cs b/...ructure.EntityFramework/Models/SsoUser.cs → ...re.EntityFramework/Auth/Models/SsoUser.cs
@@ -1,6 +1,7 @@
 using AutoMapper;
+using Bit.Infrastructure.EntityFramework.Models;
 
-namespace Bit.Infrastructure.EntityFramework.Models;
+namespace Bit.Infrastructure.EntityFramework.Auth.Models;
 
 public class SsoUser : Core.Auth.Entities.SsoUser
 {

diff --git a/src/Infrastructure.EntityFramework/Auth/Repositories/AuthRequestRepository.cs b/src/Infrastructure.EntityFramework/Auth/Repositories/AuthRequestRepository.cs
@@ -1,6 +1,6 @@
 using AutoMapper;
 using Bit.Core.Repositories;
-using Bit.Infrastructure.EntityFramework.Models;
+using Bit.Infrastructure.EntityFramework.Auth.Models;
 using Bit.Infrastructure.EntityFramework.Repositories;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.DependencyInjection;

diff --git a/src/Infrastructure.EntityFramework/Auth/Repositories/EmergencyAccessRepository.cs b/src/Infrastructure.EntityFramework/Auth/Repositories/EmergencyAccessRepository.cs
@@ -2,8 +2,8 @@
 using Bit.Core.Auth.Enums;
 using Bit.Core.Auth.Models.Data;
 using Bit.Core.Repositories;
+using Bit.Infrastructure.EntityFramework.Auth.Models;
 using Bit.Infrastructure.EntityFramework.Auth.Repositories.Queries;
-using Bit.Infrastructure.EntityFramework.Models;
 using Bit.Infrastructure.EntityFramework.Repositories;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.DependencyInjection;

diff --git a/src/Infrastructure.EntityFramework/Auth/Repositories/GrantRepository.cs b/src/Infrastructure.EntityFramework/Auth/Repositories/GrantRepository.cs
@@ -1,6 +1,6 @@
 using AutoMapper;
 using Bit.Core.Auth.Repositories;
-using Bit.Infrastructure.EntityFramework.Models;
+using Bit.Infrastructure.EntityFramework.Auth.Models;
 using Bit.Infrastructure.EntityFramework.Repositories;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.DependencyInjection;

diff --git a/...ntityFramework/Auth/Repositories/Queries/EmergencyAccessReadCountByGrantorIdEmailQuery.cs b/...ntityFramework/Auth/Repositories/Queries/EmergencyAccessReadCountByGrantorIdEmailQuery.cs
@@ -1,4 +1,4 @@
-using Bit.Infrastructure.EntityFramework.Models;
+using Bit.Infrastructure.EntityFramework.Auth.Models;
 using Bit.Infrastructure.EntityFramework.Repositories;
 using Bit.Infrastructure.EntityFramework.Repositories.Queries;
 

diff --git a/src/Infrastructure.EntityFramework/Auth/Repositories/SsoConfigRepository.cs b/src/Infrastructure.EntityFramework/Auth/Repositories/SsoConfigRepository.cs
@@ -1,6 +1,6 @@
 using AutoMapper;
 using Bit.Core.Auth.Repositories;
-using Bit.Infrastructure.EntityFramework.Models;
+using Bit.Infrastructure.EntityFramework.Auth.Models;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.DependencyInjection;
 

diff --git a/src/Infrastructure.EntityFramework/Auth/Repositories/SsoUserRepository.cs b/src/Infrastructure.EntityFramework/Auth/Repositories/SsoUserRepository.cs
@@ -1,6 +1,6 @@
 using AutoMapper;
 using Bit.Core.Auth.Repositories;
-using Bit.Infrastructure.EntityFramework.Models;
+using Bit.Infrastructure.EntityFramework.Auth.Models;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.DependencyInjection;
 

diff --git a/src/Infrastructure.EntityFramework/Models/Organization.cs b/src/Infrastructure.EntityFramework/Models/Organization.cs
@@ -1,4 +1,5 @@
 using AutoMapper;
+using Bit.Infrastructure.EntityFramework.Auth.Models;
 using Bit.Infrastructure.EntityFramework.Vault.Models;
 
 namespace Bit.Infrastructure.EntityFramework.Models;

diff --git a/src/Infrastructure.EntityFramework/Models/User.cs b/src/Infrastructure.EntityFramework/Models/User.cs
@@ -1,4 +1,5 @@
 using AutoMapper;
+using Bit.Infrastructure.EntityFramework.Auth.Models;
 using Bit.Infrastructure.EntityFramework.Vault.Models;
 
 namespace Bit.Infrastructure.EntityFramework.Models;

diff --git a/src/Infrastructure.EntityFramework/Repositories/DatabaseContext.cs b/src/Infrastructure.EntityFramework/Repositories/DatabaseContext.cs
@@ -1,4 +1,5 @@
 using Bit.Core;
+using Bit.Infrastructure.EntityFramework.Auth.Models;
 using Bit.Infrastructure.EntityFramework.Converters;
 using Bit.Infrastructure.EntityFramework.Models;
 using Bit.Infrastructure.EntityFramework.SecretsManager.Models;

diff --git a/test/Infrastructure.EFIntegration.Test/Auth/AutoFixture/GrantFixtures.cs b/test/Infrastructure.EFIntegration.Test/Auth/AutoFixture/GrantFixtures.cs
@@ -2,8 +2,8 @@
 using AutoFixture.Kernel;
 using Bit.Infrastructure.EFIntegration.Test.AutoFixture;
 using Bit.Infrastructure.EFIntegration.Test.AutoFixture.Relays;
+using Bit.Infrastructure.EntityFramework.Auth.Models;
 using Bit.Infrastructure.EntityFramework.Auth.Repositories;
-using Bit.Infrastructure.EntityFramework.Models;
 using Bit.Test.Common.AutoFixture;
 using Bit.Test.Common.AutoFixture.Attributes;
 

diff --git a/test/Infrastructure.EFIntegration.Test/AutoFixture/EntityFrameworkRepositoryFixtures.cs b/test/Infrastructure.EFIntegration.Test/AutoFixture/EntityFrameworkRepositoryFixtures.cs
@@ -4,6 +4,7 @@
 using AutoMapper;
 using Bit.Core.Settings;
 using Bit.Infrastructure.EFIntegration.Test.Helpers;
+using Bit.Infrastructure.EntityFramework.Auth.Models;
 using Bit.Infrastructure.EntityFramework.Models;
 using Bit.Infrastructure.EntityFramework.Repositories;
 using Bit.Infrastructure.EntityFramework.Vault.Models;