Extract registrations (#309)

* extract Registrations * libs: upgrade System.Data.SqlClient to 4.8.6
kgrzybek · Feb 18, 2024 · 6e8063f · 6e8063f
1 parent 7bf832a
commit 6e8063f
Show file tree

Hide file tree

Showing 171 changed files with 3,501 additions and 383 deletions.
diff --git a/README.md b/README.md
@@ -305,7 +305,7 @@ As can be found on the website of the author of this model ([Simon Brown](https:
 
 #### 3.0.2 C2 Container
 
-![](http://www.plantuml.com/plantuml/png/5OrDgiCm30RtxnIl1uW5fQkk0Zr8SIoHcDXIq0-XFNtZpVTjXfdPFAj7Rt-togK5KcZxtzmFUm9eFjDQVOibZBG8Ex6d8XtsLR-VXNReWj6oJbrOseLEvnX4X9xDIG6b6BmUKExl8SYLITCnYZCnNly3)
+![](http://www.plantuml.com/plantuml/png/dPDBZvim4CVlV0etfqJg1bNggQTbasWtLRAbUQZgAJ8mJInX6_dH2bNxtMi3DG-PYfG3DkFv_yQUFtwK2WkbQHwy8opDTGRefbGXFuMXmB-MLw9kEj4IHCgP0gQMAQTXaMDcDGzIPJb9mjN7XzY6pljTIB5K84peikAquCng2iiFZgLPePSdhbc6HJbFFxn7its9zW2AiAj4TS9iWNu7o3mhKn4J1c8k2snIZt4qCyC1SAe-7-tq-Rn5FxX0wWO85qLEKgm8PxD5fQzUhXej_zQ92Z8e7CLRLzK-RkTpNENQTJCiNpSdioQW5dZIQKFSyqpdOAiq0IVVaKHWGK1wzJYZX16fH7KEHubwuOaiQrgKfY3RtPnD2DMnYP02bzICBIAk0rFr0gvktotaq8rE8ttLe64EFstj9osDPbFDaVcmX2r352WNPKVi9kudoB322PPs3-jcsXe_BBbE1dvQISTJP6csjanlGB4jxCSCRAqmGrEdmrfVBQZlwcIACzOoMbkd0_hEMihGrt7KMr2_tuBW07bzkt51wgDKRhwSJh4HsDLgeUz3azXDw7TuDCtrRfpKD6OyeNTmNzPmizsVDjP9JkGDP1r5YgCGIPt8L9344VodkP_J7lV_6SD-t4_mDkm-ZBUltijvL5o0aGjGWXZSFplQZuuJ_Bri8sDAVmURxt7LUDTwmN6z1LmEViJu5GXsqVSlvzFbs_RqSjbjdZUlw_aYU0IMQPh_0G00)
 
 #### 3.0.3 C3 Component (high-level)
 
@@ -330,7 +330,8 @@ As can be found on the website of the author of this model ([Simon Brown](https:
   2. Authenticate and authorize request (using User Access module)
   3. Delegate work to specific module sending Command or Query
   4. Return response
-- **User Access** - responsible for user authentication, authorization and registration
+- **User Access** - responsible for user authentication and authorization
+- **Registrations** - responsible for user registration
 - **Meetings** - implements Meetings Bounded Context: creating meeting groups, meetings
 - **Administration** - implements Administration Bounded Context: implements administrative tasks like meeting group proposal verification
 - **Payments** - implements Payments Bounded Context: implements all functionalities associated with payments

diff --git a/build/_build.csproj b/build/_build.csproj
@@ -14,7 +14,7 @@
   <ItemGroup>
     <PackageReference Include="Dapper" Version="2.1.24" />
     <PackageReference Include="Nuke.Common" Version="7.0.6" />
-    <PackageReference Include="System.Data.SqlClient" Version="4.8.5" />
+    <PackageReference Include="System.Data.SqlClient" Version="4.8.6" />
   </ItemGroup>
 
 </Project>
diff --git a/docs/C4/c3_components.puml b/docs/C4/c3_components.puml
@@ -10,13 +10,15 @@ System_Boundary(c1, "My Meetings System") {
         Component(administrationModule, "Administration", ".NET Libraries")
         Component(userAccessModule, "User Access", ".NET Libraries")
         Component(paymentsModule, "Payments", ".NET Libraries")
+        Component(registrationsModule, "Registrations", ".NET Libraries")
         ComponentQueue(eventsBus, "Events Bus", "In memory")
 
         Boundary(database, "Database") {
             ComponentDb(meetingsModuleData, "Meetings data", "schema")
             ComponentDb(administrationData, "Administration data", "schema")
             ComponentDb(userAccessData, "User Access data", "schema")
             ComponentDb(paymentsData, "Payments data", "schema")
+            ComponentDb(registrationsData, "Registrations data", "schema")
         }
     }
 }
@@ -26,15 +28,20 @@ Rel(api, meetingsModule, "Uses")
 Rel(api, administrationModule, "Uses")
 Rel(api, userAccessModule, "Uses")
 Rel(api, paymentsModule, "Uses")
+Rel(api, registrationsModule, "Uses")
 Rel(meetingsModule, eventsBus, "Publishes event to / subscribes")
 Rel(administrationModule, eventsBus, "Publishes event to / subscribes")
 Rel(userAccessModule, eventsBus, "Publishes event to / subscribes")
 Rel(paymentsModule, eventsBus, "Publishes event to / subscribes")
+Rel(registrationsModule, eventsBus, "Publishes event to / subscribes")
 
 Rel(meetingsModule, meetingsModuleData, "Store / retrieve")
 Rel(administrationModule, administrationData, "Store / retrieve")
 Rel(userAccessModule, userAccessData, "Store / retrieve")
 Rel(paymentsModule, paymentsData, "Store / retrieve")
+Rel(registrationsModule, registrationsData, "Store / retrieve")
+
+Rel_R(registrationsModule, userAccessModule, "Uses")
 
 LAYOUT_WITH_LEGEND()
 

diff --git a/docs/Images/Architecture_high_level.png b/docs/Images/Architecture_high_level.png
diff --git a/docs/Project/MyMeetings.vpp b/docs/Project/MyMeetings.vpp
diff --git a/src/API/CompanyName.MyMeetings.API/CompanyName.MyMeetings.API.csproj b/src/API/CompanyName.MyMeetings.API/CompanyName.MyMeetings.API.csproj
@@ -5,6 +5,9 @@
     <DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
     <DockerfileContext>..\..</DockerfileContext>
   </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
+    <DocumentationFile>bin\Debug\CompanyName.MyMeetings.API.xml</DocumentationFile>
+  </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="IdentityServer4.AccessTokenValidation" Version="3.0.1" />
   </ItemGroup>

diff --git a/src/API/CompanyName.MyMeetings.API/Modules/UserAccess/UserRegistrationsController.cs b/src/API/CompanyName.MyMeetings.API/Modules/UserAccess/UserRegistrationsController.cs
@@ -1,7 +1,8 @@
 using CompanyName.MyMeetings.API.Configuration.Authorization;
+using CompanyName.MyMeetings.Modules.Registrations.Application.Contracts;
+using CompanyName.MyMeetings.Modules.Registrations.Application.UserRegistrations.ConfirmUserRegistration;
+using CompanyName.MyMeetings.Modules.Registrations.Application.UserRegistrations.RegisterNewUser;
 using CompanyName.MyMeetings.Modules.UserAccess.Application.Contracts;
-using CompanyName.MyMeetings.Modules.UserAccess.Application.UserRegistrations.ConfirmUserRegistration;
-using CompanyName.MyMeetings.Modules.UserAccess.Application.UserRegistrations.RegisterNewUser;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 
@@ -11,11 +12,11 @@ namespace CompanyName.MyMeetings.API.Modules.UserAccess
     [ApiController]
     public class UserRegistrationsController : ControllerBase
     {
-        private readonly IUserAccessModule _userAccessModule;
+        private readonly IRegistrationsModule _registrationsModule;
 
-        public UserRegistrationsController(IUserAccessModule userAccessModule)
+        public UserRegistrationsController(IRegistrationsModule registrationsModule)
         {
-            _userAccessModule = userAccessModule;
+            _registrationsModule = registrationsModule;
         }
 
         [NoPermissionRequired]
@@ -24,7 +25,7 @@ public UserRegistrationsController(IUserAccessModule userAccessModule)
         [ProducesResponseType(StatusCodes.Status200OK)]
         public async Task<IActionResult> RegisterNewUser(RegisterNewUserRequest request)
         {
-            await _userAccessModule.ExecuteCommandAsync(new RegisterNewUserCommand(
+            await _registrationsModule.ExecuteCommandAsync(new RegisterNewUserCommand(
                 request.Login,
                 request.Password,
                 request.Email,
@@ -41,7 +42,7 @@ await _userAccessModule.ExecuteCommandAsync(new RegisterNewUserCommand(
         [ProducesResponseType(StatusCodes.Status200OK)]
         public async Task<IActionResult> ConfirmRegistration(Guid userRegistrationId)
         {
-            await _userAccessModule.ExecuteCommandAsync(new ConfirmUserRegistrationCommand(userRegistrationId));
+            await _registrationsModule.ExecuteCommandAsync(new ConfirmUserRegistrationCommand(userRegistrationId));
 
             return Ok();
         }

diff --git a/src/API/CompanyName.MyMeetings.API/Startup.cs b/src/API/CompanyName.MyMeetings.API/Startup.cs
@@ -14,6 +14,7 @@
 using CompanyName.MyMeetings.Modules.Administration.Infrastructure.Configuration;
 using CompanyName.MyMeetings.Modules.Meetings.Infrastructure.Configuration;
 using CompanyName.MyMeetings.Modules.Payments.Infrastructure.Configuration;
+using CompanyName.MyMeetings.Modules.Registrations.Infrastructure.Configuration;
 using CompanyName.MyMeetings.Modules.UserAccess.Infrastructure.Configuration;
 using CompanyName.MyMeetings.Modules.UserAccess.Infrastructure.Configuration.Identity;
 using Hellang.Middleware.ProblemDetails;
@@ -172,6 +173,15 @@ private void InitializeModules(ILifetimeScope container)
                 _logger,
                 emailsConfiguration,
                 null);
+
+            RegistrationsStartup.Initialize(
+                _configuration[MeetingsConnectionString],
+                executionContextAccessor,
+                _logger,
+                emailsConfiguration,
+                _configuration["Security:TextEncryptionKey"],
+                null,
+                null);
         }
     }
 }
diff --git a/src/BuildingBlocks/Infrastructure/StronglyTypedIdValueConverterSelector.cs b/src/BuildingBlocks/Infrastructure/StronglyTypedIdValueConverterSelector.cs
@@ -5,7 +5,7 @@
 namespace CompanyName.MyMeetings.BuildingBlocks.Infrastructure
 {
     /// <summary>
-    /// Based on https://andrewlock.net/strongly-typed-ids-in-ef-core-using-strongly-typed-entity-ids-to-avoid-primitive-obsession-part-4/
+    /// Based on https://andrewlock.net/strongly-typed-ids-in-ef-core-using-strongly-typed-entity-ids-to-avoid-primitive-obsession-part-4/.
     /// </summary>
     public class StronglyTypedIdValueConverterSelector : ValueConverterSelector
     {

diff --git a/src/CompanyName.MyMeetings.sln b/src/CompanyName.MyMeetings.sln
@@ -136,6 +136,24 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "RequestExamples", "RequestE
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CompanyName.MyMeetings.SUT", "Tests\SUT\CompanyName.MyMeetings.SUT.csproj", "{1853847F-9988-43A1-B3E1-DDBE4B2F3365}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Registrations", "Registrations", "{8F0598A5-2F0C-4FA6-82F6-938F1830ADB7}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CompanyName.MyMeetings.Modules.Registrations.Application", "Modules\Registrations\Application\CompanyName.MyMeetings.Modules.Registrations.Application.csproj", "{3D5E4893-E48A-4553-B036-724A8F809656}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CompanyName.MyMeetings.Modules.Registrations.Domain", "Modules\Registrations\Domain\CompanyName.MyMeetings.Modules.Registrations.Domain.csproj", "{98CE491C-8A52-4FC9-87BD-36FE63CB37E6}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CompanyName.MyMeetings.Modules.Registrations.Infrastructure", "Modules\Registrations\Infrastructure\CompanyName.MyMeetings.Modules.Registrations.Infrastructure.csproj", "{5F24D649-5684-458E-8C67-CCEC85E271A0}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{646E463D-F0E2-4BA4-9B5E-434ABE26EC07}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CompanyName.MyMeetings.Modules.Registrations.ArchTests", "Modules\Registrations\Tests\ArchTests\CompanyName.MyMeetings.Modules.Registrations.ArchTests.csproj", "{96639493-5D2D-4F61-B399-600673D6912D}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CompanyNames.MyMeetings.Modules.Registrations.IntegrationTests", "Modules\Registrations\Tests\IntegrationTests\CompanyNames.MyMeetings.Modules.Registrations.IntegrationTests.csproj", "{9AB969B5-4215-4ACF-8D48-EC0A6F35BC46}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CompanyName.MyMeetings.Modules.Registrations.Domain.UnitTests", "Modules\Registrations\Tests\UnitTests\CompanyName.MyMeetings.Modules.Registrations.Domain.UnitTests.csproj", "{0535D1F2-FA8B-4093-9987-7533F8D07605}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CompanyName.MyMeetings.Modules.Registrations.IntegrationEvents", "Modules\Registrations\IntegrationEvents\CompanyName.MyMeetings.Modules.Registrations.IntegrationEvents.csproj", "{2E71D2B2-516D-4B0D-8DE6-B9F3105B9C95}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -385,6 +403,48 @@ Global
 		{1853847F-9988-43A1-B3E1-DDBE4B2F3365}.Production|Any CPU.Build.0 = Debug|Any CPU
 		{1853847F-9988-43A1-B3E1-DDBE4B2F3365}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{1853847F-9988-43A1-B3E1-DDBE4B2F3365}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3D5E4893-E48A-4553-B036-724A8F809656}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3D5E4893-E48A-4553-B036-724A8F809656}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3D5E4893-E48A-4553-B036-724A8F809656}.Production|Any CPU.ActiveCfg = Production|Any CPU
+		{3D5E4893-E48A-4553-B036-724A8F809656}.Production|Any CPU.Build.0 = Production|Any CPU
+		{3D5E4893-E48A-4553-B036-724A8F809656}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3D5E4893-E48A-4553-B036-724A8F809656}.Release|Any CPU.Build.0 = Release|Any CPU
+		{98CE491C-8A52-4FC9-87BD-36FE63CB37E6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{98CE491C-8A52-4FC9-87BD-36FE63CB37E6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{98CE491C-8A52-4FC9-87BD-36FE63CB37E6}.Production|Any CPU.ActiveCfg = Production|Any CPU
+		{98CE491C-8A52-4FC9-87BD-36FE63CB37E6}.Production|Any CPU.Build.0 = Production|Any CPU
+		{98CE491C-8A52-4FC9-87BD-36FE63CB37E6}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{98CE491C-8A52-4FC9-87BD-36FE63CB37E6}.Release|Any CPU.Build.0 = Release|Any CPU
+		{5F24D649-5684-458E-8C67-CCEC85E271A0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5F24D649-5684-458E-8C67-CCEC85E271A0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5F24D649-5684-458E-8C67-CCEC85E271A0}.Production|Any CPU.ActiveCfg = Production|Any CPU
+		{5F24D649-5684-458E-8C67-CCEC85E271A0}.Production|Any CPU.Build.0 = Production|Any CPU
+		{5F24D649-5684-458E-8C67-CCEC85E271A0}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{5F24D649-5684-458E-8C67-CCEC85E271A0}.Release|Any CPU.Build.0 = Release|Any CPU
+		{96639493-5D2D-4F61-B399-600673D6912D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{96639493-5D2D-4F61-B399-600673D6912D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{96639493-5D2D-4F61-B399-600673D6912D}.Production|Any CPU.ActiveCfg = Production|Any CPU
+		{96639493-5D2D-4F61-B399-600673D6912D}.Production|Any CPU.Build.0 = Production|Any CPU
+		{96639493-5D2D-4F61-B399-600673D6912D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{96639493-5D2D-4F61-B399-600673D6912D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9AB969B5-4215-4ACF-8D48-EC0A6F35BC46}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9AB969B5-4215-4ACF-8D48-EC0A6F35BC46}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9AB969B5-4215-4ACF-8D48-EC0A6F35BC46}.Production|Any CPU.ActiveCfg = Production|Any CPU
+		{9AB969B5-4215-4ACF-8D48-EC0A6F35BC46}.Production|Any CPU.Build.0 = Production|Any CPU
+		{9AB969B5-4215-4ACF-8D48-EC0A6F35BC46}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9AB969B5-4215-4ACF-8D48-EC0A6F35BC46}.Release|Any CPU.Build.0 = Release|Any CPU
+		{0535D1F2-FA8B-4093-9987-7533F8D07605}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{0535D1F2-FA8B-4093-9987-7533F8D07605}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{0535D1F2-FA8B-4093-9987-7533F8D07605}.Production|Any CPU.ActiveCfg = Production|Any CPU
+		{0535D1F2-FA8B-4093-9987-7533F8D07605}.Production|Any CPU.Build.0 = Production|Any CPU
+		{0535D1F2-FA8B-4093-9987-7533F8D07605}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{0535D1F2-FA8B-4093-9987-7533F8D07605}.Release|Any CPU.Build.0 = Release|Any CPU
+		{2E71D2B2-516D-4B0D-8DE6-B9F3105B9C95}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2E71D2B2-516D-4B0D-8DE6-B9F3105B9C95}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2E71D2B2-516D-4B0D-8DE6-B9F3105B9C95}.Production|Any CPU.ActiveCfg = Production|Any CPU
+		{2E71D2B2-516D-4B0D-8DE6-B9F3105B9C95}.Production|Any CPU.Build.0 = Production|Any CPU
+		{2E71D2B2-516D-4B0D-8DE6-B9F3105B9C95}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2E71D2B2-516D-4B0D-8DE6-B9F3105B9C95}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -440,6 +500,15 @@ Global
 		{165E76B9-DB0C-49B7-B3DC-52DFBEA55A79} = {C733D087-7051-4E35-BCDB-081252A108E5}
 		{00B904C6-D29A-4F26-B7AD-116C701DB73F} = {BC9DDFD1-FB81-4996-812A-68BEBCA33A97}
 		{1853847F-9988-43A1-B3E1-DDBE4B2F3365} = {8B08A9EE-CE27-4CC3-ACB3-3BD9628E5479}
+		{8F0598A5-2F0C-4FA6-82F6-938F1830ADB7} = {BCE1EE3C-ADB1-48CC-9FD1-C7324D886964}
+		{3D5E4893-E48A-4553-B036-724A8F809656} = {8F0598A5-2F0C-4FA6-82F6-938F1830ADB7}
+		{98CE491C-8A52-4FC9-87BD-36FE63CB37E6} = {8F0598A5-2F0C-4FA6-82F6-938F1830ADB7}
+		{5F24D649-5684-458E-8C67-CCEC85E271A0} = {8F0598A5-2F0C-4FA6-82F6-938F1830ADB7}
+		{646E463D-F0E2-4BA4-9B5E-434ABE26EC07} = {8F0598A5-2F0C-4FA6-82F6-938F1830ADB7}
+		{96639493-5D2D-4F61-B399-600673D6912D} = {646E463D-F0E2-4BA4-9B5E-434ABE26EC07}
+		{9AB969B5-4215-4ACF-8D48-EC0A6F35BC46} = {646E463D-F0E2-4BA4-9B5E-434ABE26EC07}
+		{0535D1F2-FA8B-4093-9987-7533F8D07605} = {646E463D-F0E2-4BA4-9B5E-434ABE26EC07}
+		{2E71D2B2-516D-4B0D-8DE6-B9F3105B9C95} = {8F0598A5-2F0C-4FA6-82F6-938F1830ADB7}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {6B94C21A-AA6D-4D82-963E-C69C0353B938}

diff --git a/src/Database/CompanyName.MyMeetings.Database/CompanyName.MyMeetings.Database.sqlproj b/src/Database/CompanyName.MyMeetings.Database/CompanyName.MyMeetings.Database.sqlproj
@@ -69,7 +69,6 @@
   <Import Condition="'$(SQLDBExtensionsRefPath)' == ''" Project="$(MSBuildExtensionsPath)\Microsoft\VisualStudio\v$(VisualStudioVersion)\SSDT\Microsoft.Data.Tools.Schema.SqlTasks.targets" />
   <ItemGroup>
     <Folder Include="Properties" />
-    <Folder Include="Structure" />
     <Folder Include="Scripts" />
     <Folder Include="Scripts\Migrations" />
     <Folder Include="Scripts\Seeds" />
@@ -89,6 +88,9 @@
     <Folder Include="Structure\users\" />
     <Folder Include="Structure\users\Tables\" />
     <Folder Include="Structure\users\Views\" />
+    <Folder Include="Structure\registrations\" />
+    <Folder Include="Structure\registrations\Tables\" />
+    <Folder Include="Structure\registrations\Views\" />
   </ItemGroup>
   <ItemGroup>
     <Build Include="Structure\administration\Tables\InboxMessages.sql" />
@@ -139,17 +141,17 @@
     <Build Include="Structure\payments\Tables\SubscriptionDetails.sql" />
     <Build Include="Structure\payments\Tables\SubscriptionPayments.sql" />
     <Build Include="Structure\payments\Types\NewStreamMessages.sql" />
+    <Build Include="Structure\registrations\Tables\UserRegistrations.sql" />
+    <Build Include="Structure\registrations\Views\v_UserRegistrations.sql" />
     <Build Include="Structure\Security\Schemas.sql" />
     <Build Include="Structure\users\Tables\InboxMessages.sql" />
     <Build Include="Structure\users\Tables\InternalCommands.sql" />
     <Build Include="Structure\users\Tables\OutboxMessages.sql" />
     <Build Include="Structure\users\Tables\Permissions.sql" />
     <Build Include="Structure\users\Tables\RolesToPermissions.sql" />
-    <Build Include="Structure\users\Tables\UserRegistrations.sql" />
     <Build Include="Structure\users\Tables\UserRoles.sql" />
     <Build Include="Structure\users\Tables\Users.sql" />
     <Build Include="Structure\users\Views\v_UserPermissions.sql" />
-    <Build Include="Structure\users\Views\v_UserRegistrations.sql" />
     <Build Include="Structure\users\Views\v_UserRoles.sql" />
     <Build Include="Structure\users\Views\v_Users.sql" />
     <None Include="Scripts\CreateStructure.sql" />

diff --git a/src/Database/CompanyName.MyMeetings.Database/Scripts/ClearDatabase.sql b/src/Database/CompanyName.MyMeetings.Database/Scripts/ClearDatabase.sql
@@ -66,12 +66,12 @@ DELETE FROM [users].[InternalCommands]
 
 DELETE FROM [users].[OutboxMessages]
 
-DELETE FROM [users].[UserRegistrations]
-
 DELETE FROM [users].[Users]
 
 DELETE FROM [users].[RolesToPermissions]
 
 DELETE FROM [users].[UserRoles]
 
-DELETE FROM [users].[Permissions]
+DELETE FROM [users].[Permissions]
+
+DELETE FROM [registrations].[UserRegistrations]