Skip to content

Commit

Permalink
Merge pull request #3 from PanHNE/KL-67-BE-Entity_word_mistake
Browse files Browse the repository at this point in the history
Correct mistake in word entity and clean code from unnused usings
  • Loading branch information
PanHNE authored Feb 9, 2024
2 parents 146d7c0 + 9155e93 commit b8e474c
Show file tree
Hide file tree
Showing 33 changed files with 44 additions and 50 deletions.
8 changes: 4 additions & 4 deletions src/Application/Common/Interfaces/IKeepLearningDbContext.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@

public interface IKeepLearningDbContext
{
DbSet<Domain.Enteties.Continent> Continents { get; }
DbSet<Domain.Enteties.Country> Countries { get; }
DbSet<Domain.Enteties.Question> Questions { get; }
DbSet<Domain.Enteties.Exam> Exams { get; }
DbSet<Domain.Entities.Continent> Continents { get; }
DbSet<Domain.Entities.Country> Countries { get; }
DbSet<Domain.Entities.Question> Questions { get; }
DbSet<Domain.Entities.Exam> Exams { get; }

Task<int> SaveChangesAsync(CancellationToken cancellationToken);
}
2 changes: 1 addition & 1 deletion src/Application/Common/Mappings/ContinentMappingProfile.cs
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@ public class ContinentMappingProfile : Profile
{
public ContinentMappingProfile()
{
CreateMap<Domain.Enteties.Continent, ContinentDto>();
CreateMap<Domain.Entities.Continent, ContinentDto>();
}
}
2 changes: 1 addition & 1 deletion src/Application/Common/Mappings/CountryMappingProfile.cs
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ public class CountryMappingProfile : Profile
{
public CountryMappingProfile()
{
CreateMap<Domain.Enteties.Country, CountryDto>()
CreateMap<Domain.Entities.Country, CountryDto>()
.ForMember( countryDto => countryDto.ContinentDto, opt => opt.MapFrom(src => src.Continent));
}
}
2 changes: 1 addition & 1 deletion src/Application/Common/Mappings/ExamMappingProfile.cs
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ public class ExamMappingProfile : Profile
{
public ExamMappingProfile()
{
CreateMap<SaveExamCountryCommand, Domain.Enteties.Exam>()
CreateMap<SaveExamCountryCommand, Domain.Entities.Exam>()
.ForMember(dest =>
dest.ExtraInformations,
opt => opt.MapFrom(src => CreateJsonForExamCountryExtraInformations(src.Category, src.Continents)));
Expand Down
2 changes: 1 addition & 1 deletion src/Application/Common/Mappings/QuestionMappingProfile.cs
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@ public class QuestionMappingProfile : Profile
{
public QuestionMappingProfile()
{
CreateMap<QuestionDto, Domain.Enteties.Question>();
CreateMap<QuestionDto, Domain.Entities.Question>();
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ public async Task<PagedList<CountryDto>> Handle(GetCountriesByContinentsQuery re
return await result;
}

private IQueryable<CountryDto> GetQueryableCountries(List<Domain.Enteties.Continent> continents)
private IQueryable<CountryDto> GetQueryableCountries(List<Domain.Entities.Continent> continents)
{

if (continents.Count() == 0)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ public async Task<Guid> Handle(SaveExamCountryCommand request, CancellationToken
throw new InvalidDataException("Countries from wrong continents");
}

var entity = _mapper.Map<Domain.Enteties.Exam>(request);
var entity = _mapper.Map<Domain.Entities.Exam>(request);

entity.AddDomainEvent(new SaveExamCountryEvent(entity));

Expand All @@ -63,7 +63,7 @@ public async Task<Guid> Handle(SaveExamCountryCommand request, CancellationToken
return entity.Id;
}

private bool IsCantriesAreFromContientns(IEnumerable<Domain.Enteties.Country> countries, IEnumerable<Domain.Enteties.Continent> continents)
private bool IsCantriesAreFromContientns(IEnumerable<Domain.Entities.Country> countries, IEnumerable<Domain.Entities.Continent> continents)
{
return countries.Select(c => c.ContinentId).Distinct().Count() == continents.Count();
}
Expand Down
4 changes: 2 additions & 2 deletions src/Application/Services/CountryService.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using Domain.Enteties;
using Domain.Entities;
using Domain.Interfaces;
using Domain.Models.Enums;
using static Domain.Models.Enums.GuessType;
Expand Down Expand Up @@ -41,7 +41,7 @@ public async Task<IEnumerable<Country>> RandomCountries(IEnumerable<Guid> contin
return randomCountries;
}

public async Task<IEnumerable<Domain.Enteties.Country>> GetgCountriesByQuestionsAndCategory(List<string> questionText, GuessType.Category category)
public async Task<IEnumerable<Domain.Entities.Country>> GetgCountriesByQuestionsAndCategory(List<string> questionText, GuessType.Category category)
{
if (category == GuessType.Category.CapitalCity)
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
namespace Domain.Enteties;
namespace Domain.Entities;

public class Continent : BaseAuditableEntity
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
namespace Domain.Enteties;
namespace Domain.Entities;

public class Country: BaseAuditableEntity
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
namespace Domain.Enteties;
namespace Domain.Entities;

public class Exam : BaseAuditableEntity
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
namespace Domain.Enteties;
namespace Domain.Entities;

public class Question : BaseAuditableEntity
{
Expand Down
2 changes: 1 addition & 1 deletion src/Domain/Events/SaveExamCountryEvent.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using Domain.Enteties;
using Domain.Entities;

namespace Domain.Events;

Expand Down
2 changes: 1 addition & 1 deletion src/Domain/Interfaces/Repositories/IContinentRepository.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using Domain.Enteties;
using Domain.Entities;

namespace Domain.Interfaces;

Expand Down
2 changes: 1 addition & 1 deletion src/Domain/Interfaces/Repositories/ICountryRepository.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using Domain.Enteties;
using Domain.Entities;

namespace Domain.Interfaces;

Expand Down
2 changes: 1 addition & 1 deletion src/Domain/Interfaces/Repositories/IExamRepository.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using Domain.Enteties;
using Domain.Entities;

namespace Domain.Interfaces;

Expand Down
2 changes: 1 addition & 1 deletion src/Domain/Interfaces/Services/ICountryService.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using Domain.Enteties;
using Domain.Entities;
using Domain.Models.Enums;

public interface ICountryService
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using Domain.Enteties;
using Domain.Entities;
using Microsoft.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore.Metadata.Builders;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using Domain.Enteties;
using Domain.Entities;
using Microsoft.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore.Metadata.Builders;

Expand Down
2 changes: 1 addition & 1 deletion src/Infrastructure/Data/KeepLearningDbContext.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
using Application.Common.Interfaces;
using Domain.Enteties;
using Domain.Entities;
using Infrastructure.Identity;
using Microsoft.AspNetCore.Identity.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore;
Expand Down
2 changes: 1 addition & 1 deletion src/Infrastructure/Data/Seeders/ContinentSeeder.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
using Domain.Enteties;
using Domain.Entities;

namespace Infrastructure.Data.Seeders;

Expand Down
2 changes: 1 addition & 1 deletion src/Infrastructure/Data/Seeders/CountrySeeder.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using Application.Common.Models.Continent;
using Application.Common.Models.Country;
using Domain.Enteties;
using Domain.Entities;
using Microsoft.EntityFrameworkCore;

namespace Infrastructure.Data.Seeders;
Expand Down
2 changes: 1 addition & 1 deletion src/Infrastructure/Repositories/ContinentRepository.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
using Application.Common.Interfaces;
using Domain.Enteties;
using Domain.Entities;
using Domain.Interfaces;
using Microsoft.EntityFrameworkCore;

Expand Down
2 changes: 1 addition & 1 deletion src/Infrastructure/Repositories/CountryRepository.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
using Application.Common.Interfaces;
using Domain.Enteties;
using Domain.Entities;
using Domain.Interfaces;
using Microsoft.EntityFrameworkCore;

Expand Down
2 changes: 1 addition & 1 deletion src/Infrastructure/Repositories/ExamRepository.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
using Application.Common.Interfaces;
using Domain.Enteties;
using Domain.Entities;
using Domain.Interfaces;
using Microsoft.EntityFrameworkCore;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
using Application.Common.Interfaces;
using Microsoft.EntityFrameworkCore;
using EntityContinent = Domain.Enteties.Continent;
using EntityCountry = Domain.Enteties.Country;
using EntityExam = Domain.Enteties.Exam;
using EntityQuestion = Domain.Enteties.Question;
using EntityContinent = Domain.Entities.Continent;
using EntityCountry = Domain.Entities.Country;
using EntityExam = Domain.Entities.Exam;
using EntityQuestion = Domain.Entities.Question;

namespace Application.UnitTests.Helper;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
using Application.Common.Interfaces;
using EContinent = Domain.Enteties.Continent;
using EContinent = Domain.Entities.Continent;

namespace Application.Helper.Seeders.IntegrationTests
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
using Application.Common.Interfaces;
using Application.Common.Models.Continent;
using Application.Common.Models.Country;
using EContinent = Domain.Enteties.Continent;
using ECountry = Domain.Enteties.Country;
using EContinent = Domain.Entities.Continent;
using ECountry = Domain.Entities.Country;

namespace Application.Helper.Seeders.IntegrationTests
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,6 @@
using Application.Common.Mappings;
using Application.Helper.Seeders.IntegrationTests;
using Application.UnitTests.Helper;
using AutoMapper;
using Infrastructure.Services;
using Microsoft.EntityFrameworkCore;
using static Domain.Models.Enums.GuessType;
using EntityCountry = Domain.Enteties.Country;
using EntityCountry = Domain.Entities.Country;

namespace Application.Services.UnitTests;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
using Application.Exam.Queries.GetCategoryCountryExam;
using static Domain.Models.Enums.GuessType;

namespace Application.Country.Queries.GetCategoryCountryExam.UnitTest;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
using Application.Common.Interfaces;
using Microsoft.EntityFrameworkCore;
using EntityContinent = Domain.Enteties.Continent;
using EntityCountry = Domain.Enteties.Country;
using EntityExam = Domain.Enteties.Exam;
using EntityQuestion = Domain.Enteties.Question;
using EntityContinent = Domain.Entities.Continent;
using EntityCountry = Domain.Entities.Country;
using EntityExam = Domain.Entities.Exam;
using EntityQuestion = Domain.Entities.Question;

namespace Application.UnitTests.Helper;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
using Application.UnitTests.Helper;
using Domain.Enteties;
using Domain.Entities;

namespace Infrastructure.Helper.Seeders.UnitTests;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
using Application.Common.Models.Continent;
using Application.Common.Models.Country;
using Application.UnitTests.Helper;
using Domain.Enteties;
using Domain.Entities;

namespace Infrastructure.Helper.Seeders.UnitTests;

Expand Down

0 comments on commit b8e474c

Please sign in to comment.