diff --git a/BrightGlimmer.Api/BrightGlimmer.Api.csproj b/BrightGlimmer.Api/BrightGlimmer.Api.csproj index 1707ad7..7babb03 100644 --- a/BrightGlimmer.Api/BrightGlimmer.Api.csproj +++ b/BrightGlimmer.Api/BrightGlimmer.Api.csproj @@ -17,7 +17,7 @@ - + diff --git a/BrightGlimmer.Api/Controllers/StudentController.cs b/BrightGlimmer.Api/Controllers/StudentController.cs index a965780..0c0e89c 100644 --- a/BrightGlimmer.Api/Controllers/StudentController.cs +++ b/BrightGlimmer.Api/Controllers/StudentController.cs @@ -13,9 +13,9 @@ namespace BrightGlimmer.Api.Controllers public class StudentController : ControllerBase { // private readonly IMediator mediator; - private readonly SqliteStudentRepository studentRepository; + private readonly StudentRepository studentRepository; - public StudentController(SqliteStudentRepository studentRepository) + public StudentController(StudentRepository studentRepository) { this.studentRepository = studentRepository; } diff --git a/BrightGlimmer.Api/Startup.cs b/BrightGlimmer.Api/Startup.cs index 772cc3d..9674410 100644 --- a/BrightGlimmer.Api/Startup.cs +++ b/BrightGlimmer.Api/Startup.cs @@ -32,10 +32,9 @@ namespace BrightGlimmer.Api services.AddMvc().SetCompatibilityVersion(CompatibilityVersion.Version_2_1); services.AddMediatR(); services.AddMediatR(typeof(Cqrs.Cqrs).Assembly); // Registers handlers in Cqrs project - services.AddScoped(); /* REMOVE LATER */ - services.AddScoped(); /* REMOVE LATER */ - services.AddDbContext(options => options.UseSqlite(Configuration.GetConnectionString("DefaultConnection"))); - services.AddTransient(); + services.AddScoped(); /* REMOVE LATER */ + services.AddDbContext(options => options.UseSqlite(Configuration.GetConnectionString("DefaultConnection"))); + services.AddTransient(); } // This method gets called by the runtime. Use this method to configure the HTTP request pipeline. @@ -56,7 +55,7 @@ namespace BrightGlimmer.Api // Makes sure that the database is in fact created using (var serviceScope = app.ApplicationServices.GetService().CreateScope()) { - var context = serviceScope.ServiceProvider.GetRequiredService(); + var context = serviceScope.ServiceProvider.GetRequiredService(); context.Database.EnsureCreated(); } } diff --git a/BrightGlimmer.CQRS/BrightGlimmer.Cqrs.csproj b/BrightGlimmer.CQRS/BrightGlimmer.Services.csproj similarity index 100% rename from BrightGlimmer.CQRS/BrightGlimmer.Cqrs.csproj rename to BrightGlimmer.CQRS/BrightGlimmer.Services.csproj diff --git a/BrightGlimmer.Data/BrightGlimmer.Data.csproj b/BrightGlimmer.Data/BrightGlimmer.Data.csproj index b770ae0..2e8c223 100644 --- a/BrightGlimmer.Data/BrightGlimmer.Data.csproj +++ b/BrightGlimmer.Data/BrightGlimmer.Data.csproj @@ -4,18 +4,14 @@ netstandard2.0 - - - - - - - - + + + + diff --git a/BrightGlimmer.Data/Domain/Phone.cs b/BrightGlimmer.Data/Domain/Phone.cs index 40d2dd6..e3858a7 100644 --- a/BrightGlimmer.Data/Domain/Phone.cs +++ b/BrightGlimmer.Data/Domain/Phone.cs @@ -1,5 +1,4 @@ -using MongoDB.Bson.Serialization.Attributes; -using System; +using System; using System.Collections.Generic; using System.Text; @@ -7,13 +6,9 @@ namespace BrightGlimmer.Data.Domain { public class Phone { - [BsonElement("Id")] public Guid Id { get; set; } - [BsonElement("Type")] public PhoneType Type { get; set; } - [BsonElement("AreaCode")] public int AreaCode { get; set; } - [BsonElement("Number")] public int Number { get; set; } } } diff --git a/BrightGlimmer.Data/Domain/Student.cs b/BrightGlimmer.Data/Domain/Student.cs index 638b2bb..7e3a2b1 100644 --- a/BrightGlimmer.Data/Domain/Student.cs +++ b/BrightGlimmer.Data/Domain/Student.cs @@ -1,5 +1,4 @@ -using MongoDB.Bson.Serialization.Attributes; -using System; +using System; using System.Collections.Generic; using System.Text; @@ -7,17 +6,11 @@ namespace BrightGlimmer.Data.Domain { public class Student { - [BsonElement("Id")] public Guid Id { get; set; } - [BsonElement("FirstName")] public string FirstName { get; set; } - [BsonElement("MiddleName")] public string MiddleName { get; set; } - [BsonElement("LastName")] public string LastName { get; set; } - [BsonElement("Email")] public string Email { get; set; } - [BsonElement("Phones")] public List Phones { get; set; } } } diff --git a/BrightGlimmer.Data/Migrations/20190420001348_CreateDatabase.Designer.cs b/BrightGlimmer.Data/Migrations/20190420001348_CreateDatabase.Designer.cs index 6e33439..403b2f5 100644 --- a/BrightGlimmer.Data/Migrations/20190420001348_CreateDatabase.Designer.cs +++ b/BrightGlimmer.Data/Migrations/20190420001348_CreateDatabase.Designer.cs @@ -8,7 +8,7 @@ using Microsoft.EntityFrameworkCore.Storage.ValueConversion; namespace BrightGlimmer.Data.Migrations { - [DbContext(typeof(SqliteDatabaseContext))] + [DbContext(typeof(SqliteContext))] [Migration("20190420001348_CreateDatabase")] partial class CreateDatabase { diff --git a/BrightGlimmer.Data/Migrations/SqliteDatabaseContextModelSnapshot.cs b/BrightGlimmer.Data/Migrations/SqliteDatabaseContextModelSnapshot.cs index a586045..41fe516 100644 --- a/BrightGlimmer.Data/Migrations/SqliteDatabaseContextModelSnapshot.cs +++ b/BrightGlimmer.Data/Migrations/SqliteDatabaseContextModelSnapshot.cs @@ -7,7 +7,7 @@ using Microsoft.EntityFrameworkCore.Storage.ValueConversion; namespace BrightGlimmer.Data.Migrations { - [DbContext(typeof(SqliteDatabaseContext))] + [DbContext(typeof(SqliteContext))] partial class SqliteDatabaseContextModelSnapshot : ModelSnapshot { protected override void BuildModel(ModelBuilder modelBuilder) diff --git a/BrightGlimmer.Data/Repositories/MongoStudentRepository.cs b/BrightGlimmer.Data/Repositories/MongoStudentRepository.cs deleted file mode 100644 index 05511e2..0000000 --- a/BrightGlimmer.Data/Repositories/MongoStudentRepository.cs +++ /dev/null @@ -1,53 +0,0 @@ -using BrightGlimmer.Data.Domain; -using MongoDB.Driver; -using System; -using System.Collections.Generic; -using System.Text; - -namespace BrightGlimmer.Data.Repositories -{ - public class MongoStudentRepository - { - private const string dbName = "bright_glimmer"; - private const string collectionName = "Students"; - private IMongoDatabase db; - - public MongoStudentRepository() - { - var client = new MongoClient("mongodb://localhost:27017"); /* REMOVE LATER */ - db = client.GetDatabase(dbName); - } - - public List GetStudents() - { - return db.GetCollection(collectionName).Find(x => true).ToList(); - } - - public Student GetStudent(Guid id) - { - return db.GetCollection(collectionName).Find(student => student.Id == id).SingleOrDefault(); - } - - public Student GetStudentByEmail(string email) - { - return db.GetCollection(collectionName).Find(student => student.Email == email).Single(); - } - - public void Create(Student student) - { - db.GetCollection(collectionName).InsertOne(student); - } - - public void Update(Student student) - { - var filter = Builders.Filter.Where(x => x.Id == student.Id); - db.GetCollection(collectionName).ReplaceOne(filter, student); - } - - public void Remove(Guid id) - { - var filter = Builders.Filter.Where(x => x.Id == id); - var operation = db.GetCollection(collectionName).DeleteOne(filter); - } - } -} diff --git a/BrightGlimmer.Data/Repositories/SqliteStudentRepository.cs b/BrightGlimmer.Data/Repositories/StudentRepository.cs similarity index 85% rename from BrightGlimmer.Data/Repositories/SqliteStudentRepository.cs rename to BrightGlimmer.Data/Repositories/StudentRepository.cs index 139cb5b..59a6704 100644 --- a/BrightGlimmer.Data/Repositories/SqliteStudentRepository.cs +++ b/BrightGlimmer.Data/Repositories/StudentRepository.cs @@ -7,12 +7,12 @@ using System.Text; namespace BrightGlimmer.Data.Repositories { - public class SqliteStudentRepository + public class StudentRepository { - private readonly SqliteDatabaseContext context; + private readonly SqliteContext context; - public SqliteStudentRepository(SqliteDatabaseContext context) + public StudentRepository(SqliteContext context) { this.context = context; } diff --git a/BrightGlimmer.Data/SqliteDatabaseContext.cs b/BrightGlimmer.Data/SqliteContext.cs similarity index 77% rename from BrightGlimmer.Data/SqliteDatabaseContext.cs rename to BrightGlimmer.Data/SqliteContext.cs index 8c203d9..7bdea95 100644 --- a/BrightGlimmer.Data/SqliteDatabaseContext.cs +++ b/BrightGlimmer.Data/SqliteContext.cs @@ -6,9 +6,9 @@ using System.Text; namespace BrightGlimmer.Data { - public class SqliteDatabaseContext : DbContext + public class SqliteContext : DbContext { - public SqliteDatabaseContext(DbContextOptions options) + public SqliteContext(DbContextOptions options) : base(options) { } diff --git a/BrightGlimmer.sln b/BrightGlimmer.sln index 1b7383a..65b0812 100644 --- a/BrightGlimmer.sln +++ b/BrightGlimmer.sln @@ -3,13 +3,11 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 16 VisualStudioVersion = 16.0.28803.156 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BrightGlimmer.Api", "BrightGlimmer.Api\BrightGlimmer.Api.csproj", "{3E910B69-E79C-4418-BD6B-7ABB72ECF463}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BrightGlimmer.Api", "BrightGlimmer.Api\BrightGlimmer.Api.csproj", "{3E910B69-E79C-4418-BD6B-7ABB72ECF463}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BrightGlimmer.Services", "BrightGlimmer.Services\BrightGlimmer.Services.csproj", "{AAB743E1-637F-45CF-A013-A1E612FF95C6}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BrightGlimmer.Data", "BrightGlimmer.Data\BrightGlimmer.Data.csproj", "{E14193BB-31C7-4E3B-81F0-A930B866EC5D}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BrightGlimmer.Data", "BrightGlimmer.Data\BrightGlimmer.Data.csproj", "{E14193BB-31C7-4E3B-81F0-A930B866EC5D}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BrightGlimmer.Cqrs", "BrightGlimmer.CQRS\BrightGlimmer.Cqrs.csproj", "{AA6A646D-C493-43DC-BBE4-FF253852D9BF}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BrightGlimmer.Services", "BrightGlimmer.CQRS\BrightGlimmer.Services.csproj", "{AA6A646D-C493-43DC-BBE4-FF253852D9BF}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -21,10 +19,6 @@ Global {3E910B69-E79C-4418-BD6B-7ABB72ECF463}.Debug|Any CPU.Build.0 = Debug|Any CPU {3E910B69-E79C-4418-BD6B-7ABB72ECF463}.Release|Any CPU.ActiveCfg = Release|Any CPU {3E910B69-E79C-4418-BD6B-7ABB72ECF463}.Release|Any CPU.Build.0 = Release|Any CPU - {AAB743E1-637F-45CF-A013-A1E612FF95C6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {AAB743E1-637F-45CF-A013-A1E612FF95C6}.Debug|Any CPU.Build.0 = Debug|Any CPU - {AAB743E1-637F-45CF-A013-A1E612FF95C6}.Release|Any CPU.ActiveCfg = Release|Any CPU - {AAB743E1-637F-45CF-A013-A1E612FF95C6}.Release|Any CPU.Build.0 = Release|Any CPU {E14193BB-31C7-4E3B-81F0-A930B866EC5D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {E14193BB-31C7-4E3B-81F0-A930B866EC5D}.Debug|Any CPU.Build.0 = Debug|Any CPU {E14193BB-31C7-4E3B-81F0-A930B866EC5D}.Release|Any CPU.ActiveCfg = Release|Any CPU