correction merge

WF_EF_Api/Contextlib/DbQuoteManager.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
 using System.Security.Cryptography;
@@ -49,10 +50,11 @@ namespace Contextlib
             return new PaginationResult<Quote>(quotes.Count, index, pageSize, quotes);
         }
 
-        public async Task<Quote> GetDailyQuote(DateOnly date, int lang)
+        public async Task<Quote?> GetDailyQuote(DateOnly date, int lang)
         {
             List<Quote> quotes = await _context.quotes.Where(item => item.IsValid && item.Langage == (LangEnum)lang)
                                 .Include(q => q.Source).Include(q => q.Character).ThenInclude(c => c.Images).Include(q => q.Favorite)
+<<<<<<< HEAD
                                 .ToListAsync();
 
             Quote quote = quotes[date.DayNumber % quotes.Count()];
@@ -61,6 +63,11 @@ namespace Contextlib
                                 .FirstOrDefaultAsync() ?? quotes.First();*/
 
             //Quote quote = _repo.GetById(date.DayNumber % quotes.Count()) ?? quotes.First();
+=======
+                                .ToList();
+            if (quotes.Count() == 0) return null;
+            Quote quote = quotes[ date.DayNumber % quotes.Count() ] ;
+>>>>>>> 8471e6cfd50227037555f6650ed659ac091cc613
 
             return  quote;
         }
@@ -127,10 +134,11 @@ namespace Contextlib
             return new PaginationResult<Quote>(quotes.Count, index, pageSize, quotes);
         }
 
-        public async Task<PaginationResult<Quote>> GetSuggestions(int index, int pageSize, int lang)
+        public async Task<PaginationResult<Quote>> GetSuggestions(int index, int pageSize, int lang) // A changer Suggestion Random 
         {
             List<Quote> quotes = _context.quotes.Where(item => item.IsValid && item.Langage == (LangEnum)lang)
-                                .Include(q => q.Source).Include(q => q.Character).ThenInclude(c => c.Images) // rajouter un mélange random
+                                .Include(q => q.Source).Include(q => q.Character).ThenInclude(c => c.Images)
+                                //.OrderBy(q=> new Random() )
                                 .Skip(index * pageSize).Take(pageSize).ToList();
 
             return new PaginationResult<Quote>(quotes.Count, index, pageSize, quotes);
@@ -145,39 +153,91 @@ namespace Contextlib
             return new PaginationResult<Quote>(quotes.Count, index, pageSize, quotes);
         }
         
+        public async Task<PaginationResult<Quote>> SearchByCharacter(string character, int index, int pageSize, int lang)
+        {
+            List<Quote> quotes = _context.quotes.Where(item => item.IsValid && item.Langage==(LangEnum)lang && (item.Character.Name).Contains(character))
+                                .Include(q => q.Source).Include(q => q.Character).ThenInclude(c => c.Images)
+                                .Skip(index * pageSize).Take(pageSize).ToList();
+
+            return new PaginationResult<Quote>(quotes.Count, index, pageSize, quotes);
+        }
+
+        public async Task<PaginationResult<Quote>> SearchByContent(string content, int index, int pageSize, int lang)
+        {
+            List<Quote> quotes = _context.quotes.Where(item => item.IsValid && item.Langage == (LangEnum)lang && (item.Content).Contains(content))
+                                .Include(q => q.Source).Include(q => q.Character).ThenInclude(c => c.Images)
+                                .Skip(index * pageSize).Take(pageSize).ToList();
+
+            return new PaginationResult<Quote>(quotes.Count, index, pageSize, quotes);
+        }
+
+        public async Task<PaginationResult<Quote>> SearchBySource(string source, int index, int pageSize, int lang)
+        {
+            List<Quote> quotes = _context.quotes.Where(item => item.IsValid && item.Langage == (LangEnum)lang && (item.Source.Title).Contains(source))
+                                .Include(q => q.Source).Include(q => q.Character).ThenInclude(c => c.Images)
+                                .Skip(index * pageSize).Take(pageSize).ToList();
+
+            return new PaginationResult<Quote>(quotes.Count, index, pageSize, quotes);
+        }
+
 
 
 
 
         public async Task RemoveQuote(int quoteId)
         {
-            _repo.Delete(quoteId);
+
+            _repo.Delete( _repo.GetById(quoteId) );
             await _context.SaveChangesAsync();
         }
 
-        public async Task<PaginationResult<Quote>> SearchByCharacter(string character, int index, int pageSize, int lang)
+        public async Task UpdateQuote(int quoteId, Quote quote)
+        {
+            Quote? q = _repo.GetById(quoteId);
+            if (q != null)
             {
-            throw new NotImplementedException();
+                bool change = false;
+                if (quote.IdSource != 0)
+                {
+                    q.IdSource = quote.IdSource;
+                    change = true;
                 }
-
+                if (quote.IdCharacter != 0)
-        public async Task<PaginationResult<Quote>> SearchByContent(string content, int index, int pageSize, int lang)
                 {
-            throw new NotImplementedException();
+                    q.IdCharacter = quote.IdCharacter;
+                    change = true;
                 }
-
+                if (quote.IdSource != 0)
-        public async Task<PaginationResult<Quote>> SearchBySource(string source, int index, int pageSize, int lang)
                 {
-            throw new NotImplementedException();
+                    q.IdSource = quote.IdSource;
+                    change = true;
                 }
-
+                if (quote.IdUsersPropose !=0)
-        public async Task UpdateQuote(int quoteId, Quote quote)
                 {
-            throw new NotImplementedException();
+                    q.IdUsersPropose = quote.IdUsersPropose;
+                    change = true;
+                }
+                if (quote.Content != null || quote.Content =="")
+                {
+                    q.Content = quote.Content;
+                    change = true;
+                }
+                _repo.Update(q);
+                if (change) _context.SaveChanges();
+            }
+            return ;
         }
 
         public async Task ValidateQuote(int quoteId, bool isValidate)
         {
-            throw new NotImplementedException();
+            Quote? q = _repo.GetById(quoteId);
+            if (q != null)
+            {
+                q.IsValid = isValidate;
+                _repo.Update(q);
+                _context.SaveChanges();
+            }
+            return;
         }
     }
 }

WF_EF_Api/Contextlib/WTFContext.cs

@@ -14,7 +14,6 @@ namespace Contextlib
         //public DbSet<Admin> admins {  get; set; }
         public DbSet<Character> characters { get; set; }
         public DbSet<Commentary> comments { get; set; }
-        public DbSet<DailyQuote> dailyquotes { get; set; }
         public DbSet<Favorite> favorites { get; set; }
         public DbSet<Images> images { get; set; }
         public DbSet<Question> question { get; set; }

WF_EF_Api/DTO/TypeLangageDTO.cs

@@ -9,7 +9,6 @@ namespace DTO
     public enum TypeLangageDTO
     {
         vo,
-        vf,
+        vf
-        ve
     }
 }

WF_EF_Api/Dto2Entities/Extention.cs

@@ -226,7 +226,6 @@ namespace Dto2Entities
             {
                 case LangEnum.vf: return TypeLangageDTO.vf;
                 case LangEnum.vo: return TypeLangageDTO.vo;
-                case LangEnum.ve: return TypeLangageDTO.ve;
                 default: return TypeLangageDTO.vo;
             }
         }
@@ -457,7 +456,6 @@ namespace Dto2Entities
             {
                 case TypeLangageDTO.vf: return LangEnum.vf;
                 case TypeLangageDTO.vo: return LangEnum.vo;
-                case TypeLangageDTO.ve: return LangEnum.ve;
                 default: return LangEnum.vo;
             }
         }

WF_EF_Api/Entity/DailyQuote.cs

@@ -1,19 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel.DataAnnotations;
-using System.ComponentModel.DataAnnotations.Schema;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace Entity
-{
-    public class DailyQuote
-    {
-        [Key]
-        [ForeignKey(nameof(Quote))]
-        public int IdQuote { get; set; }
-
-        public Quote Quote { get; set; } = null!;
-    }
-}

WF_EF_Api/Entity/LangEnum.cs

@@ -9,7 +9,6 @@ namespace Entity
     public enum LangEnum
     {
         vo,
-        vf,
+        vf
-        ve
     }
 }

WF_EF_Api/Entity/Quote.cs

@@ -46,8 +46,6 @@ namespace Entity
 
         public Character Character { get; set; } = null!;
 
-        public ICollection<DailyQuote> DailyQuotes { get; set; } = new List<DailyQuote>();
-
         public ICollection<Commentary> Commentarys { get; set; } = new List<Commentary>();
 
         public ICollection<Users> Favorite { get; } = new List<Users>();

WF_EF_Api/StubbedContextLib/Migrations/20250401141906_suprDailyQuote.cs

@@ -0,0 +1,61 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace StubbedContextLib.Migrations
+{
+    /// <inheritdoc />
+    public partial class suprDailyQuote : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropTable(
+                name: "dailyquotes");
+
+            migrationBuilder.UpdateData(
+                table: "quotes",
+                keyColumn: "Id",
+                keyValue: 10,
+                column: "IsValid",
+                value: false);
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.CreateTable(
+                name: "dailyquotes",
+                columns: table => new
+                {
+                    IdQuote = table.Column<int>(type: "int", nullable: false)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_dailyquotes", x => x.IdQuote);
+                    table.ForeignKey(
+                        name: "FK_dailyquotes_quotes_IdQuote",
+                        column: x => x.IdQuote,
+                        principalTable: "quotes",
+                        principalColumn: "Id",
+                        onDelete: ReferentialAction.Cascade);
+                });
+
+            migrationBuilder.InsertData(
+                table: "dailyquotes",
+                column: "IdQuote",
+                values: new object[]
+                {
+                    1,
+                    5
+                });
+
+            migrationBuilder.UpdateData(
+                table: "quotes",
+                keyColumn: "Id",
+                keyValue: 10,
+                column: "IsValid",
+                value: true);
+        }
+    }
+}

WF_EF_Api/StubbedContextLib/Migrations/StubWTFContextModelSnapshot.cs

@@ -173,26 +173,6 @@ namespace StubbedContextLib.Migrations
                         });
                 });
 
-            modelBuilder.Entity("Entity.DailyQuote", b =>
-                {
-                    b.Property<int>("IdQuote")
-                        .HasColumnType("int");
-
-                    b.HasKey("IdQuote");
-
-                    b.ToTable("dailyquotes");
-
-                    b.HasData(
-                        new
-                        {
-                            IdQuote = 1
-                        },
-                        new
-                        {
-                            IdQuote = 5
-                        });
-                });
-
             modelBuilder.Entity("Entity.Favorite", b =>
                 {
                     b.Property<int>("IdQuote")
@@ -976,17 +956,6 @@ namespace StubbedContextLib.Migrations
                     b.Navigation("User");
                 });
 
-            modelBuilder.Entity("Entity.DailyQuote", b =>
-                {
-                    b.HasOne("Entity.Quote", "Quote")
-                        .WithMany("DailyQuotes")
-                        .HasForeignKey("IdQuote")
-                        .OnDelete(DeleteBehavior.Cascade)
-                        .IsRequired();
-
-                    b.Navigation("Quote");
-                });
-
             modelBuilder.Entity("Entity.Favorite", b =>
                 {
                     b.HasOne("Entity.Quote", "Quote")
@@ -1085,8 +1054,6 @@ namespace StubbedContextLib.Migrations
             modelBuilder.Entity("Entity.Quote", b =>
                 {
                     b.Navigation("Commentarys");
-
-                    b.Navigation("DailyQuotes");
                 });
 
             modelBuilder.Entity("Entity.Source", b =>

WF_EF_Api/StubbedContextLib/StubWTFContext.cs

@@ -77,10 +77,6 @@ namespace StubbedContextLib
                 new Commentary() { Id = 2, Comment = "Very good", DateCommentary = new DateTime(2025, 3, 11), IdQuote = 1, IdUser = 3 }
                 );
 
-            modelBuilder.Entity<DailyQuote>().HasData(
-                new DailyQuote() { IdQuote = 1},
-                new DailyQuote() { IdQuote = 5}
-                );
 
             modelBuilder.Entity<Favorite>().HasData(
                 new Favorite() { IdQuote = 2, IdUsers = 8 },

WF_EF_Api/WfApi/Controllers/QuotesController.cs

@@ -197,7 +197,7 @@ namespace WfApi.Controllers
                 return StatusCode((int)HttpStatusCode.InternalServerError, new { message = "Internal Server Error" });
             }
         }
-        [HttpGet("searchByCharac")]
+        [HttpGet("searchBySource")]
         [ProducesResponseType(StatusCodes.Status200OK)]
         [ProducesResponseType(StatusCodes.Status204NoContent)]
         [ProducesResponseType(StatusCodes.Status500InternalServerError)]

WF_EF_Api/WfApi/Program.cs

@@ -5,6 +5,7 @@ using Contextlib;
 using Entity;
 using StubbedContextLib;
 using ServicesApi;
+using Microsoft.EntityFrameworkCore;
 
 //API
 var builder = WebApplication.CreateBuilder(args);
@@ -14,8 +15,8 @@ builder.Services.AddScoped<IQuoteService<QuoteDTO>, QuoteService>();
 builder.Services.AddScoped<ICommentaryService<CommentaryDTO>, CommentaryService>();
 builder.Services.AddScoped<ICharacterService<CharacterDTO>, CharacterService>();
 builder.Services.AddScoped<IImagesService<ImageDTO>, ImageService>();
-/*builder.Services.AddScoped<ISourceService<SourceDTO>, SourceService>();
+//builder.Services.AddScoped<ISourceService<SourceDTO>, SourceService>();
-builder.Services.AddScoped<IQuestionService<QuestionDTO>, QuestionService>();*/
+builder.Services.AddScoped<IQuestionService<QuestionDTO>, QuestionService>();
 
 
 //EF
@@ -27,8 +28,8 @@ builder.Services.AddScoped<IQuoteService<Quote>, DbQuoteManager>();
 builder.Services.AddScoped<ICommentaryService<Commentary>, DbCommentaryManager>();
 builder.Services.AddScoped<ICharacterService<Character>, DbCharacterManager>();
 builder.Services.AddScoped<IImagesService<Images>, DbImagesManager>();
-/*builder.Services.AddScoped<ISourceService<SourceDTO>, SourceService>();
+//builder.Services.AddScoped<ISourceService<Source>, DbSourceManager>();
-builder.Services.AddScoped<IQuestionService<QuestionDTO>, QuestionService>();*/
+builder.Services.AddScoped<IQuestionService<Question>, DbQuestionManager>();
 //...
 
 // Add services to the container.