From b07e41e9a616fc61455a22598622e4721e8272b1 Mon Sep 17 00:00:00 2001 From: Sergey Karmanov Date: Fri, 25 Aug 2023 01:38:52 +0300 Subject: [PATCH] =?UTF-8?q?=D0=A4=D0=B8=D0=BA=D1=81=20=D0=B4=D0=BB=D1=8F?= =?UTF-8?q?=20=D0=BF=D1=80=D0=BE=D0=B4=D0=B0=D0=BA=D1=88=D0=B5=D0=BD=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- FichaBackend/Models/Film.cs | 10 +++++----- FichaBackend/Services/IPublicDataService.cs | 4 +++- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/FichaBackend/Models/Film.cs b/FichaBackend/Models/Film.cs index 256ee6a..00bbeee 100644 --- a/FichaBackend/Models/Film.cs +++ b/FichaBackend/Models/Film.cs @@ -6,10 +6,10 @@ public class Film { [Key] public long Id { get; set; } - public string FilmName { get; set; } - public string Cinema { get; set; } - public string Genre { get; set; } - public string Time { get; set; } - public float Price { get; set; } public City City { get; set; } + public string Cinema { get; set; } + public string FilmName { get; set; } + public string? Genre { get; set; } + public string? Time { get; set; } + public float Price { get; set; } = 0; } \ No newline at end of file diff --git a/FichaBackend/Services/IPublicDataService.cs b/FichaBackend/Services/IPublicDataService.cs index 3bb445a..13b6ad5 100644 --- a/FichaBackend/Services/IPublicDataService.cs +++ b/FichaBackend/Services/IPublicDataService.cs @@ -26,7 +26,7 @@ public class PublicDataService : IPublicDataService public async Task> GetAllFilmsInCity(string cityName) { - return await _databaseContext.Films.ToListAsync(); + return await _databaseContext.Films.Where(x => x.City.Name.ToLower() == cityName.ToLower()).ToListAsync(); } public async Task UpdateFilmsInCity(IEnumerable films) @@ -39,6 +39,8 @@ public class PublicDataService : IPublicDataService film.FilmName = filmDto.FilmName; film.Cinema = filmDto.Cinema; film.Price = filmDto.Price ?? 0; + film.Genre = filmDto.Genre; + film.Time = filmDto.Time; film.City = await _databaseContext.Cities.FirstOrDefaultAsync(x => x.Name == filmDto.City); await _databaseContext.Films.AddAsync(film); }