rename database to data

celluj34 · celluj34 · commit 7da3ee92dd9a · 2025-03-30T22:17:12.000-05:00
diff --git a/api/Bartendro.Data/Bartendro.Data.csproj b/api/Bartendro.Data/Bartendro.Data.csproj
diff --git a/api/Bartendro.Data/Commands/Command.cs b/api/Bartendro.Data/Commands/Command.cs
@@ -2,13 +2,13 @@
 using System.Collections.Generic;
 using System.Threading.Tasks;
 using Bartendro.Common.Extensions;
-using Bartendro.Database.Entities;
-using Bartendro.Database.Models;
-using Bartendro.Database.Services;
+using Bartendro.Data.Entities;
+using Bartendro.Data.Models;
+using Bartendro.Data.Services;
 using FluentValidation.Results;
 using Microsoft.EntityFrameworkCore;
 
-namespace Bartendro.Database.Commands
+namespace Bartendro.Data.Commands
 {
     public interface ICommand<out T> where T : Entity, new()
     {
diff --git a/api/Bartendro.Data/Commands/CreateCommand.cs b/api/Bartendro.Data/Commands/CreateCommand.cs
@@ -1,11 +1,11 @@
 ﻿using System.Threading.Tasks;
 using Bartendro.Common.Services;
-using Bartendro.Database.Entities;
-using Bartendro.Database.Services;
+using Bartendro.Data.Entities;
+using Bartendro.Data.Services;
 using FluentValidation;
 using FluentValidation.Results;
 
-namespace Bartendro.Database.Commands
+namespace Bartendro.Data.Commands
 {
     internal class CreateCommand<T> : Command<T> where T : Entity, new()
     {
diff --git a/api/Bartendro.Data/Commands/DeleteCommand.cs b/api/Bartendro.Data/Commands/DeleteCommand.cs
@@ -1,11 +1,11 @@
 ﻿using System;
 using System.Threading.Tasks;
 using Bartendro.Common.Services;
-using Bartendro.Database.Entities;
-using Bartendro.Database.Services;
+using Bartendro.Data.Entities;
+using Bartendro.Data.Services;
 using FluentValidation.Results;
 
-namespace Bartendro.Database.Commands
+namespace Bartendro.Data.Commands
 {
     internal class DeleteCommand<T> : Command<T> where T : Entity, new()
     {
diff --git a/api/Bartendro.Data/Commands/UpdateCommand.cs b/api/Bartendro.Data/Commands/UpdateCommand.cs
@@ -1,12 +1,12 @@
 ﻿using System;
 using System.Threading.Tasks;
 using Bartendro.Common.Services;
-using Bartendro.Database.Entities;
-using Bartendro.Database.Services;
+using Bartendro.Data.Entities;
+using Bartendro.Data.Services;
 using FluentValidation;
 using FluentValidation.Results;
 
-namespace Bartendro.Database.Commands
+namespace Bartendro.Data.Commands
 {
     internal class UpdateCommand<T> : Command<T> where T : Entity, new()
     {
diff --git a/api/Bartendro.Data/Entities/Entity.cs b/api/Bartendro.Data/Entities/Entity.cs
@@ -2,7 +2,7 @@
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 
-namespace Bartendro.Database.Entities
+namespace Bartendro.Data.Entities
 {
     public abstract class Entity
     {
diff --git a/api/Bartendro.Data/Entities/Ingredient.cs b/api/Bartendro.Data/Entities/Ingredient.cs
@@ -1,7 +1,7 @@
 ﻿using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 
-namespace Bartendro.Database.Entities
+namespace Bartendro.Data.Entities
 {
     [Table("Ingredients")]
     public class Ingredient : Entity
diff --git a/api/Bartendro.Data/Entities/Recipe.cs b/api/Bartendro.Data/Entities/Recipe.cs
@@ -2,7 +2,7 @@
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 
-namespace Bartendro.Database.Entities
+namespace Bartendro.Data.Entities
 {
     [Table("Recipes")]
     public class Recipe : Entity
diff --git a/api/Bartendro.Data/Extensions/ServiceCollectionExtensions.cs b/api/Bartendro.Data/Extensions/ServiceCollectionExtensions.cs
@@ -1,11 +1,11 @@
 ﻿using System.Linq;
-using Bartendro.Database.Commands;
-using Bartendro.Database.Services;
-using Bartendro.Database.Validators;
+using Bartendro.Data.Commands;
+using Bartendro.Data.Services;
+using Bartendro.Data.Validators;
 using FluentValidation;
 using Microsoft.Extensions.DependencyInjection;
 
-namespace Bartendro.Database.Extensions
+namespace Bartendro.Data.Extensions
 {
     public static class ServiceCollectionExtensions
     {
diff --git a/api/Bartendro.Data/Migrations/20191011230035_InitialMigration.Designer.cs b/api/Bartendro.Data/Migrations/20191011230035_InitialMigration.Designer.cs
diff --git a/api/Bartendro.Data/Migrations/20191011230035_InitialMigration.cs b/api/Bartendro.Data/Migrations/20191011230035_InitialMigration.cs
diff --git a/api/Bartendro.Data/Migrations/20200103153832_AddAuditFields.Designer.cs b/api/Bartendro.Data/Migrations/20200103153832_AddAuditFields.Designer.cs
diff --git a/api/Bartendro.Data/Migrations/20200103153832_AddAuditFields.cs b/api/Bartendro.Data/Migrations/20200103153832_AddAuditFields.cs
diff --git a/api/Bartendro.Data/Migrations/20201222225416_DatabaseGenerated.Designer.cs b/api/Bartendro.Data/Migrations/20201222225416_DatabaseGenerated.Designer.cs
diff --git a/api/Bartendro.Data/Migrations/20201222225416_DatabaseGenerated.cs b/api/Bartendro.Data/Migrations/20201222225416_DatabaseGenerated.cs
diff --git a/api/Bartendro.Data/Migrations/DatabaseContextModelSnapshot.cs b/api/Bartendro.Data/Migrations/DatabaseContextModelSnapshot.cs
@@ -1,6 +1,6 @@
 ﻿// <auto-generated />
 using System;
-using Bartendro.Database.Services;
+using Bartendro.Data.Services;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
diff --git a/api/Bartendro.Data/Models/DatabaseResult.cs b/api/Bartendro.Data/Models/DatabaseResult.cs
@@ -1,4 +1,4 @@
-﻿namespace Bartendro.Database.Models
+﻿namespace Bartendro.Data.Models
 {
     public class DatabaseResult : EntityResult<EntityModel>
     {
diff --git a/api/Bartendro.Data/Models/EntityModel.cs b/api/Bartendro.Data/Models/EntityModel.cs
@@ -1,6 +1,6 @@
 ﻿using System;
 
-namespace Bartendro.Database.Models
+namespace Bartendro.Data.Models
 {
     public class EntityModel
     {
diff --git a/api/Bartendro.Data/Models/EntityResult.cs b/api/Bartendro.Data/Models/EntityResult.cs
@@ -1,6 +1,6 @@
 ﻿using FluentValidation.Results;
 
-namespace Bartendro.Database.Models
+namespace Bartendro.Data.Models
 {
     public class EntityResult<T> : ValidationResult
     {
diff --git a/api/Bartendro.Data/Services/CommandFactory.cs b/api/Bartendro.Data/Services/CommandFactory.cs
@@ -1,11 +1,11 @@
 ﻿using System;
 using System.Threading.Tasks;
-using Bartendro.Database.Commands;
-using Bartendro.Database.Entities;
+using Bartendro.Data.Commands;
+using Bartendro.Data.Entities;
 using FluentValidation.Results;
 using Microsoft.Extensions.DependencyInjection;
 
-namespace Bartendro.Database.Services
+namespace Bartendro.Data.Services
 {
     public interface ICommandFactory
     {
diff --git a/api/Bartendro.Data/Services/DatabaseContext.cs b/api/Bartendro.Data/Services/DatabaseContext.cs
@@ -1,9 +1,9 @@
 ﻿using System;
 using System.Threading.Tasks;
-using Bartendro.Database.Entities;
+using Bartendro.Data.Entities;
 using Microsoft.EntityFrameworkCore;
 
-namespace Bartendro.Database.Services
+namespace Bartendro.Data.Services
 {
     internal interface IDatabaseContext
     {
diff --git a/api/Bartendro.Data/Services/DatabaseMigrator.cs b/api/Bartendro.Data/Services/DatabaseMigrator.cs
@@ -2,7 +2,7 @@
 using System.Threading.Tasks;
 using Microsoft.Extensions.Logging;
 
-namespace Bartendro.Database.Services
+namespace Bartendro.Data.Services
 {
     public interface IDatabaseMigrator
     {
diff --git a/api/Bartendro.Data/Services/DatabaseSeeder.cs b/api/Bartendro.Data/Services/DatabaseSeeder.cs
@@ -3,10 +3,10 @@
 using System.Linq;
 using System.Threading.Tasks;
 using Bartendro.Common.Services;
-using Bartendro.Database.Entities;
+using Bartendro.Data.Entities;
 using Microsoft.Extensions.Logging;
 
-namespace Bartendro.Database.Services
+namespace Bartendro.Data.Services
 {
     public interface IDatabaseSeeder
     {
diff --git a/api/Bartendro.Data/Services/Reader.cs b/api/Bartendro.Data/Services/Reader.cs
@@ -1,8 +1,8 @@
 ﻿using System.Linq;
-using Bartendro.Database.Entities;
+using Bartendro.Data.Entities;
 using Microsoft.EntityFrameworkCore;
 
-namespace Bartendro.Database.Services
+namespace Bartendro.Data.Services
 {
     public interface IReader
     {
diff --git a/api/Bartendro.Data/Validators/DataAnnotationsValidator.cs b/api/Bartendro.Data/Validators/DataAnnotationsValidator.cs
@@ -7,7 +7,7 @@
 using FluentValidation.Results;
 using ValidationResult = FluentValidation.Results.ValidationResult;
 
-namespace Bartendro.Database.Validators
+namespace Bartendro.Data.Validators
 {
     /// <summary>
     ///     Wrapper around FluentValidation.AbstractValidator to run DataAnnotations validations in addition to regular
diff --git a/api/Bartendro.Data/Validators/IngredientValidator.cs b/api/Bartendro.Data/Validators/IngredientValidator.cs
@@ -1,6 +1,6 @@
-﻿using Bartendro.Database.Entities;
+﻿using Bartendro.Data.Entities;
 
-namespace Bartendro.Database.Validators
+namespace Bartendro.Data.Validators
 {
     internal class IngredientValidator : DataAnnotationsValidator<Ingredient> {}
 }
diff --git a/api/Bartendro.Data/Validators/RecipeValidator.cs b/api/Bartendro.Data/Validators/RecipeValidator.cs
@@ -0,0 +1,6 @@
+﻿using Bartendro.Data.Entities;
+
+namespace Bartendro.Data.Validators
+{
+    internal class RecipeValidator : DataAnnotationsValidator<Recipe> {}
+}
diff --git a/api/Bartendro.Database/Validators/RecipeValidator.cs b/api/Bartendro.Database/Validators/RecipeValidator.cs
diff --git a/api/Bartendro.Web/Pages/Recipes/Create.razor.cs b/api/Bartendro.Web/Pages/Recipes/Create.razor.cs
@@ -1,7 +1,7 @@
 ﻿using System.Threading.Tasks;
-using Bartendro.Database.Entities;
-using Bartendro.Database.Models;
-using Bartendro.Database.Services;
+using Bartendro.Data.Entities;
+using Bartendro.Data.Models;
+using Bartendro.Data.Services;
 using Blazor.Extensions.Storage.Interfaces;
 using Microsoft.AspNetCore.Components;
 
diff --git a/api/Bartendro.Web/Pages/Recipes/List.razor.cs b/api/Bartendro.Web/Pages/Recipes/List.razor.cs
@@ -2,8 +2,8 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
-using Bartendro.Database.Entities;
-using Bartendro.Database.Services;
+using Bartendro.Data.Entities;
+using Bartendro.Data.Services;
 using Microsoft.AspNetCore.Components;
 using Microsoft.EntityFrameworkCore;
 
diff --git a/api/Bartendro.Web/Pages/Recipes/Update.razor.cs b/api/Bartendro.Web/Pages/Recipes/Update.razor.cs
@@ -1,9 +1,9 @@
 ﻿using System;
 using System.Linq;
 using System.Threading.Tasks;
-using Bartendro.Database.Entities;
-using Bartendro.Database.Models;
-using Bartendro.Database.Services;
+using Bartendro.Data.Entities;
+using Bartendro.Data.Models;
+using Bartendro.Data.Services;
 using Microsoft.AspNetCore.Components;
 using Microsoft.EntityFrameworkCore;
 
diff --git a/api/Bartendro.Web/Program.cs b/api/Bartendro.Web/Program.cs
@@ -1,5 +1,5 @@
 using System.Threading.Tasks;
-using Bartendro.Database.Services;
+using Bartendro.Data.Services;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
diff --git a/api/Bartendro.Web/Startup.cs b/api/Bartendro.Web/Startup.cs
@@ -1,5 +1,5 @@
 using Bartendro.Common.Extensions;
-using Bartendro.Database.Extensions;
+using Bartendro.Data.Extensions;
 using Bartendro.Web.Extensions;
 using Blazor.Extensions.Storage;
 using Microsoft.AspNetCore.Builder;
diff --git a/api/Bartendro.sln b/api/Bartendro.sln
@@ -5,7 +5,7 @@ VisualStudioVersion = 17.13.35919.96
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Bartendro.Web", "Bartendro.Web\Bartendro.Web.csproj", "{10DB43C5-5AC4-4BE5-B698-E2E16F2429C6}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Bartendro.Database", "Bartendro.Database\Bartendro.Database.csproj", "{73851C55-D6F7-4C1B-8C0A-AF09735C4533}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Bartendro.Data", "Bartendro.Data\Bartendro.Data.csproj", "{73851C55-D6F7-4C1B-8C0A-AF09735C4533}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Bartendro.Common", "Bartendro.Common\Bartendro.Common.csproj", "{5E245FBC-57DB-434E-B3F9-1809F1FF6C74}"
 EndProject
@@ -16,6 +16,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		Directory.Packages.props = Directory.Packages.props
 	EndProjectSection
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BlazorApp2", "BlazorApp2\BlazorApp2.csproj", "{3DDD29FA-F9FB-4133-B2B5-B6F4088D813A}"
+EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Bartendro.Application", "Bartendro.Application\Bartendro.Application.csproj", "{1E26BA72-9569-4259-A330-CD8DC7404B5A}"
 EndProject
 Global
@@ -36,6 +38,10 @@ Global
 		{5E245FBC-57DB-434E-B3F9-1809F1FF6C74}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{5E245FBC-57DB-434E-B3F9-1809F1FF6C74}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{5E245FBC-57DB-434E-B3F9-1809F1FF6C74}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3DDD29FA-F9FB-4133-B2B5-B6F4088D813A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3DDD29FA-F9FB-4133-B2B5-B6F4088D813A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3DDD29FA-F9FB-4133-B2B5-B6F4088D813A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3DDD29FA-F9FB-4133-B2B5-B6F4088D813A}.Release|Any CPU.Build.0 = Release|Any CPU
 		{1E26BA72-9569-4259-A330-CD8DC7404B5A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{1E26BA72-9569-4259-A330-CD8DC7404B5A}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{1E26BA72-9569-4259-A330-CD8DC7404B5A}.Release|Any CPU.ActiveCfg = Release|Any CPU

Original file line number	Diff line number	Diff line change
`@@ -1,11 +1,11 @@`
`1`	`1`	`using System.Threading.Tasks;`
`2`	`2`	`using Bartendro.Common.Services;`
`3`		`-using Bartendro.Database.Entities;`
`4`		`-using Bartendro.Database.Services;`
	`3`	`+using Bartendro.Data.Entities;`
	`4`	`+using Bartendro.Data.Services;`
`5`	`5`	`using FluentValidation;`
`6`	`6`	`using FluentValidation.Results;`
`7`	`7`
`8`		`-namespace Bartendro.Database.Commands`
	`8`	`+namespace Bartendro.Data.Commands`
`9`	`9`	`{`
`10`	`10`	`internal class CreateCommand<T> : Command<T> where T : Entity, new()`
`11`	`11`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,11 +1,11 @@`
`1`	`1`	`using System;`
`2`	`2`	`using System.Threading.Tasks;`
`3`	`3`	`using Bartendro.Common.Services;`
`4`		`-using Bartendro.Database.Entities;`
`5`		`-using Bartendro.Database.Services;`
	`4`	`+using Bartendro.Data.Entities;`
	`5`	`+using Bartendro.Data.Services;`
`6`	`6`	`using FluentValidation.Results;`
`7`	`7`
`8`		`-namespace Bartendro.Database.Commands`
	`8`	`+namespace Bartendro.Data.Commands`
`9`	`9`	`{`
`10`	`10`	`internal class DeleteCommand<T> : Command<T> where T : Entity, new()`
`11`	`11`	`{`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`	`using System.ComponentModel.DataAnnotations;`
`3`	`3`	`using System.ComponentModel.DataAnnotations.Schema;`
`4`	`4`
`5`		`-namespace Bartendro.Database.Entities`
	`5`	`+namespace Bartendro.Data.Entities`
`6`	`6`	`{`
`7`	`7`	`public abstract class Entity`
`8`	`8`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`using System.ComponentModel.DataAnnotations;`
`2`	`2`	`using System.ComponentModel.DataAnnotations.Schema;`
`3`	`3`
`4`		`-namespace Bartendro.Database.Entities`
	`4`	`+namespace Bartendro.Data.Entities`
`5`	`5`	`{`
`6`	`6`	`[Table("Ingredients")]`
`7`	`7`	`public class Ingredient : Entity`