Добавил музеи
All checks were successful
Create and publish a Docker image / Publish image (push) Successful in 26s
Create and publish a Docker image / Deploy image (push) Successful in 3s

This commit is contained in:
Sergey Karmanov 2023-08-25 12:31:24 +03:00
parent 4d62eafccb
commit 577fa15fd7
Signed by: serega404
GPG Key ID: B6AD49C8C835460C
6 changed files with 51 additions and 3 deletions

View File

@ -30,10 +30,22 @@ public class MainController : ControllerBase
return await _publicDataService.GetAllCards();
}
[HttpGet("GetAllMoviesInCity/{cityName}")]
public async Task<IEnumerable<FilmDto>> GetAllMoviesInCityWithPuskinCard(string cityName)
[HttpGet("GetAllFilmsInCity/{cityName}")]
public async Task<ActionResult<IEnumerable<FilmDto>>> GetAllFilmsInCityWithPuskinCard(string cityName)
{
return await _publicDataService.GetAllFilmsInCity(cityName);
if (!_publicDataService.CityExsist(cityName))
return BadRequest("City does not exsist");
return Ok(await _publicDataService.GetAllFilmsInCity(cityName));
}
[HttpGet("GetAllMuseumsInCity/{cityName}")]
public async Task<ActionResult<IEnumerable<Museum>>> GetAllMuseumsInCity(string cityName)
{
if (!_publicDataService.CityExsist(cityName))
return BadRequest("City does not exsist");
return Ok(await _publicDataService.GetAllMuseumsInCity(cityName));
}
}

View File

@ -8,6 +8,7 @@ namespace FichaBackend
public DbSet<City> Cities { get; set; } = null!;
public DbSet<Film> Films { get; set; } = null!;
public DbSet<CardQuestion> CardQuestions { get; set; } = null!;
public DbSet<Museum> Museums { get; set; } = null!;
protected override void OnModelCreating(ModelBuilder modelBuilder)
{

View File

@ -0,0 +1,14 @@
using System.ComponentModel.DataAnnotations;
namespace FichaBackend.Models;
public class Museum
{
[Key]
public long Id { get; set; }
public City City { get; set; }
public string Name { get; set; }
public double Longtitude { get; set; }
public double Latitude { get; set; }
public float? Price { get; set; }
}

View File

@ -0,0 +1,13 @@
using System.ComponentModel.DataAnnotations;
namespace FichaBackend.Models;
public class MuseumDto
{
[Key]
public string City { get; set; }
public string Name { get; set; }
public double Longtitude { get; set; }
public double Latitude { get; set; }
public float? Price { get; set; }
}

View File

@ -9,6 +9,7 @@ public interface IPublicDataService
public Task<IEnumerable<City>> GetAllCity();
public Task<IEnumerable<FilmDto>> GetAllFilmsInCity(string cityName);
public Task<IEnumerable<CardQuestion>> GetAllCards();
public Task<IEnumerable<Museum>> GetAllMuseumsInCity(string cityName);
public Task UpdateFilmsInCity(IEnumerable<FilmDto> films);
public bool CityExsist(string cityName);
}
@ -41,6 +42,11 @@ public class PublicDataService : IPublicDataService
return await _databaseContext.CardQuestions.ToListAsync();
}
public async Task<IEnumerable<Museum>> GetAllMuseumsInCity(string cityName)
{
return await _databaseContext.Museums.Where(x => x.City.Name.ToLower() == cityName.ToLower()).ToListAsync();
}
public async Task UpdateFilmsInCity(IEnumerable<FilmDto> films)
{
await _databaseContext.Films.Where(x => x.City.Name == films.First().City).ForEachAsync(x => _databaseContext.Films.Remove(x));

View File

@ -9,5 +9,7 @@ public class MappingProfiles : Profile
{
CreateMap<FilmDto, Film>();
CreateMap<Film, FilmDto>();
CreateMap<Museum, MuseumDto>();
CreateMap<MuseumDto, Museum>();
}
}