From e5cc147bfaf11a53312e637f7b39f2fb99029c62 Mon Sep 17 00:00:00 2001 From: Sergey Karmanov Date: Fri, 25 Aug 2023 02:28:13 +0300 Subject: [PATCH] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8=D0=BB=20?= =?UTF-8?q?=D0=BA=D0=B0=D1=80=D1=82=D0=BE=D1=87=D0=BA=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- FichaBackend/Controllers/MainController.cs | 6 ++++++ FichaBackend/DatabaseContext.cs | 1 + FichaBackend/Models/CardQuestion.cs | 11 +++++++++++ FichaBackend/Services/IPublicDataService.cs | 6 ++++++ 4 files changed, 24 insertions(+) create mode 100644 FichaBackend/Models/CardQuestion.cs diff --git a/FichaBackend/Controllers/MainController.cs b/FichaBackend/Controllers/MainController.cs index 4fa6598..3db0632 100644 --- a/FichaBackend/Controllers/MainController.cs +++ b/FichaBackend/Controllers/MainController.cs @@ -24,6 +24,12 @@ public class MainController : ControllerBase return await _publicDataService.GetAllCity(); } + [HttpGet("GetAllCards")] + public async Task> GetAllCards() + { + return await _publicDataService.GetAllCards(); + } + [HttpGet("GetAllMoviesInCity/{cityName}")] public async Task> GetAllMoviesInCityWithPuskinCard(string cityName) { diff --git a/FichaBackend/DatabaseContext.cs b/FichaBackend/DatabaseContext.cs index 89a9ded..48bd0f0 100644 --- a/FichaBackend/DatabaseContext.cs +++ b/FichaBackend/DatabaseContext.cs @@ -7,6 +7,7 @@ namespace FichaBackend { public DbSet Cities { get; set; } = null!; public DbSet Films { get; set; } = null!; + public DbSet CardQuestions { get; set; } = null!; protected override void OnModelCreating(ModelBuilder modelBuilder) { diff --git a/FichaBackend/Models/CardQuestion.cs b/FichaBackend/Models/CardQuestion.cs new file mode 100644 index 0000000..41fe06d --- /dev/null +++ b/FichaBackend/Models/CardQuestion.cs @@ -0,0 +1,11 @@ +using System.ComponentModel.DataAnnotations; + +namespace FichaBackend.Models; + +public class CardQuestion +{ + [Key] + public long Id { get; set; } + public string Question { get; set; } + public string ImageURL { get; set; } +} \ No newline at end of file diff --git a/FichaBackend/Services/IPublicDataService.cs b/FichaBackend/Services/IPublicDataService.cs index 6baf88c..558a281 100644 --- a/FichaBackend/Services/IPublicDataService.cs +++ b/FichaBackend/Services/IPublicDataService.cs @@ -7,6 +7,7 @@ public interface IPublicDataService { public Task> GetAllCity(); public Task> GetAllFilmsInCity(string cityName); + public Task> GetAllCards(); public Task UpdateFilmsInCity(IEnumerable films); public bool CityExsist(string cityName); } @@ -30,6 +31,11 @@ public class PublicDataService : IPublicDataService return await _databaseContext.Films.Where(x => x.City.Name.ToLower() == cityName.ToLower()).ToListAsync(); } + public async Task> GetAllCards() + { + return await _databaseContext.CardQuestions.ToListAsync(); + } + public async Task UpdateFilmsInCity(IEnumerable films) { await _databaseContext.Films.Where(x => x.City.Name == films.First().City).ForEachAsync(x => _databaseContext.Films.Remove(x));