Modification des classes Lesson, ContentLesson, Paragraph et ajout des namespaces sans la portée via les crochets

API_SQLuedo/DbContextLib/UserDbContext.cs

@@ -30,7 +30,6 @@ namespace DbContextLib
         protected override void OnModelCreating(ModelBuilder modelBuilder)
         {
             modelBuilder.Entity<ContentLessonEntity>().HasKey(c => c.LessonId);
-            modelBuilder.Entity<ContentLessonEntity>().HasKey(c => c.LessonPartId);
             modelBuilder.Entity<SuccessEntity>().HasKey(s => s.UserId);
             modelBuilder.Entity<SuccessEntity>().HasKey(s => s.InquiryId);
             modelBuilder.Entity<InquiryEntity>().HasKey(s => s.Id);

API_SQLuedo/Dto/BlackListDTO.cs

@@ -1,14 +1,13 @@
-namespace Dto
+namespace Dto;
+
+public class BlackListDTO
 {
-    public class BlackListDTO
-    {
-        public string Email { get; set; }
-        public DateOnly ExpirationDate { get; set; }
+    public string Email { get; set; }
+    public DateOnly ExpirationDate { get; set; }
 
-        public BlackListDTO(string email, DateOnly expirationDate)
-        {
-            Email = email;
-            ExpirationDate = expirationDate;
-        }
+    public BlackListDTO(string email, DateOnly expirationDate)
+    {
+        Email = email;
+        ExpirationDate = expirationDate;
     }
-}
+}

API_SQLuedo/Dto/ContentLessonDTO.cs

@@ -1,14 +1,17 @@
-namespace Dto
+namespace Dto;
+
+public abstract class ContentLessonDTO
 {
-    public class ContentLessonDTO
-    {
-        public int LessonId { get; set; }
-        public int LessonPartId { get; set; }
+    public int Id { get; set; }
+    public string ContentContent { get; set; }
+    public string ContentTitle { get; set; }
+    public int LessonId { get; set; }
 
-        public ContentLessonDTO(int lessonId, int lessonPartId)
-        {
-            LessonId = lessonId;
-            LessonPartId = lessonPartId;
-        }
+    protected ContentLessonDTO(int id, string contentContent, string contentTitle, int lessonId)
+    {
+        Id = id;
+        ContentContent = contentContent;
+        ContentTitle = contentTitle;
+        LessonId = lessonId;
     }
 }

API_SQLuedo/Dto/InquiryDTO.cs

@@ -1,26 +1,25 @@
-namespace Dto
+namespace Dto;
+
+public class InquiryDTO
 {
-    public class InquiryDTO
-    {
-        public int Id { get;}
+    public int Id { get;}
 
-        public string Title { get; set; }
+    public string Title { get; set; }
 
-        public string Description { get; set; }
+    public string Description { get; set; }
 
-        public bool IsUser { get; set; }
+    public bool IsUser { get; set; }
 
-        public int Database { get; set; }
-        public int InquiryTable { get; set; }
+    public int Database { get; set; }
+    public int InquiryTable { get; set; }
 
-        public InquiryDTO(int id, string title, string description, bool isUser, int database, int inquiryTable)
-        {
-            Id = id;
-            Title = title;
-            Description = description;
-            IsUser = isUser;
-            Database = database;
-            InquiryTable = inquiryTable;
-        }
+    public InquiryDTO(int id, string title, string description, bool isUser, int database, int inquiryTable)
+    {
+        Id = id;
+        Title = title;
+        Description = description;
+        IsUser = isUser;
+        Database = database;
+        InquiryTable = inquiryTable;
     }
-}
+}

API_SQLuedo/Dto/InquiryTableDTO.cs

@@ -1,19 +1,18 @@
-namespace Dto
+namespace Dto;
+
+public class InquiryTableDTO
 {
-    public class InquiryTableDTO
-    {
 
-        public int OwnerId { get; set; }
-        public string DatabaseName { get; set; }
-        public string ConnectionInfo { get; set; }
+    public int OwnerId { get; set; }
+    public string DatabaseName { get; set; }
+    public string ConnectionInfo { get; set; }
 
-        public InquiryTableDTO() { }
+    public InquiryTableDTO() { }
 
-        public InquiryTableDTO(int ownerId, string databaseName, string connectionInfo)
-        {
-            OwnerId = ownerId;
-            DatabaseName = databaseName;
-            ConnectionInfo = connectionInfo;
-        }
+    public InquiryTableDTO(int ownerId, string databaseName, string connectionInfo)
+    {
+        OwnerId = ownerId;
+        DatabaseName = databaseName;
+        ConnectionInfo = connectionInfo;
     }
-}
+}

API_SQLuedo/Dto/LessonDTO.cs

@@ -1,26 +1,26 @@
-namespace Dto
+namespace Dto;
+
+public class LessonDTO
 {
-    public class LessonDTO
-    {
-        public int Id { get; }
-        public string? Title { get; set; }
-        public string? LastPublisher { get; set; }
-        public DateOnly? LastEdit { get; set; }
+    public int Id { get; }
+    public string? Title { get; set; }
+    public string? LastPublisher { get; set; }
+    public DateOnly? LastEdit { get; set; }
+    public ICollection<ContentLessonDTO> Content { get; set; } = new List<ContentLessonDTO>();
 
-        public LessonDTO() { }
-        public LessonDTO(int id, string title, string lastPublisher, DateOnly? lastEdit)
-        {
-            Id = id;
-            Title = title;
-            LastPublisher = lastPublisher;
-            LastEdit = lastEdit;
-        }
+    public LessonDTO() { }
+    public LessonDTO(int id, string title, string lastPublisher, DateOnly? lastEdit)
+    {
+        Id = id;
+        Title = title;
+        LastPublisher = lastPublisher;
+        LastEdit = lastEdit;
+    }
 
-        public LessonDTO(string title, string lastPublisher, DateOnly? lastEdit)
-        {
-            Title = title;
-            LastPublisher = lastPublisher;
-            LastEdit = lastEdit;
-        }
+    public LessonDTO(string title, string lastPublisher, DateOnly? lastEdit)
+    {
+        Title = title;
+        LastPublisher = lastPublisher;
+        LastEdit = lastEdit;
     }
-}
+}

API_SQLuedo/Dto/NotepadDTO.cs

@@ -1,26 +1,25 @@
-namespace Dto
+namespace Dto;
+
+public class NotepadDTO
 {
-    public class NotepadDTO
-    {
-        public int Id { get; set; }
-        public int UserId { get; set; }
-        public int InquiryId { get; set; }
-        public string Notes { get; set; }
+    public int Id { get; set; }
+    public int UserId { get; set; }
+    public int InquiryId { get; set; }
+    public string Notes { get; set; }
 
-        public NotepadDTO() { }
+    public NotepadDTO() { }
 
-        public NotepadDTO(int id, int userId, int inquiryId, string notes)
-        {
-            Id = id;
-            UserId = userId;
-            InquiryId = inquiryId;
-            Notes = notes;
-        }
-        public NotepadDTO(int userId, int inquiryId, string notes)
-        {
-            UserId = userId;
-            InquiryId = inquiryId;
-            Notes = notes;
-        }
+    public NotepadDTO(int id, int userId, int inquiryId, string notes)
+    {
+        Id = id;
+        UserId = userId;
+        InquiryId = inquiryId;
+        Notes = notes;
+    }
+    public NotepadDTO(int userId, int inquiryId, string notes)
+    {
+        UserId = userId;
+        InquiryId = inquiryId;
+        Notes = notes;
     }
-}
+}

API_SQLuedo/Dto/ParagraphDTO.cs

@@ -1,32 +1,17 @@
-namespace Dto
-{
-    public class ParagraphDTO
-    {
-        public int Id { get; }
-        public string Title { get; set; }
-        public string Content { get; set; }
-        public string Info { get; set; }
-        public string Query { get; set; }
-        public string Comment { get; set; }
+namespace Dto;
 
-        public ParagraphDTO() { }
+public class ParagraphDTO : ContentLessonDTO
+{
+    public string Info { get; set; }
+    public string Query { get; set; }
+    public string Comment { get; set; }
 
-        public ParagraphDTO(int id, string title, string content, string info, string query, string comment)
-        {
-            Id = id;
-            Title = title;
-            Content = content;
-            Info = info;
-            Query = query;
-            Comment = comment;
-        }
-        public ParagraphDTO(string title, string content, string info, string query, string comment)
-        {
-            Title = title;
-            Content = content;
-            Info = info;
-            Query = query;
-            Comment = comment;
-        }
+    public ParagraphDTO(int id, string title, string content, string info, string query, string comment, int lessonId) :
+        base(id, content,
+            title, lessonId)
+    {
+        Info = info;
+        Query = query;
+        Comment = comment;
     }
-}
+}

API_SQLuedo/Dto/SolutionDTO.cs

@@ -1,30 +1,29 @@
-namespace Dto
+namespace Dto;
+
+public class SolutionDTO
 {
-    public class SolutionDTO
+    public int OwnerId { get; set; }
+    public string MurdererFirstName { get; set; }
+    public string MurdererLastName { get; set; }
+    public string MurderPlace { get; set; }
+    public string MurderWeapon { get; set; }
+    public string Explanation { get; set; }
+    public SolutionDTO() { }
+    public SolutionDTO(int ownerId, string murdererFirstName, string murdererLastName, string murderPlace, string murderWeapon, string explanation)
     {
-        public int OwnerId { get; set; }
-        public string MurdererFirstName { get; set; }
-        public string MurdererLastName { get; set; }
-        public string MurderPlace { get; set; }
-        public string MurderWeapon { get; set; }
-        public string Explanation { get; set; }
-        public SolutionDTO() { }
-        public SolutionDTO(int ownerId, string murdererFirstName, string murdererLastName, string murderPlace, string murderWeapon, string explanation)
-        {
-            OwnerId = ownerId;
-            MurdererFirstName = murdererFirstName;
-            MurdererLastName = murdererLastName;
-            MurderPlace = murderPlace;
-            MurderWeapon = murderWeapon;
-            Explanation = explanation;
-        }
-        public SolutionDTO(string murdererFirstName, string murdererLastName, string murderPlace, string murderWeapon, string explanation)
-        {
-            MurdererFirstName = murdererFirstName;
-            MurdererLastName = murdererLastName;
-            MurderPlace = murderPlace;
-            MurderWeapon = murderWeapon;
-            Explanation = explanation;
-        }
+        OwnerId = ownerId;
+        MurdererFirstName = murdererFirstName;
+        MurdererLastName = murdererLastName;
+        MurderPlace = murderPlace;
+        MurderWeapon = murderWeapon;
+        Explanation = explanation;
     }
-}
+    public SolutionDTO(string murdererFirstName, string murdererLastName, string murderPlace, string murderWeapon, string explanation)
+    {
+        MurdererFirstName = murdererFirstName;
+        MurdererLastName = murdererLastName;
+        MurderPlace = murderPlace;
+        MurderWeapon = murderWeapon;
+        Explanation = explanation;
+    }
+}

API_SQLuedo/Dto/SuccessDTO.cs

@@ -1,18 +1,17 @@
-namespace Dto
+namespace Dto;
+
+public class SuccessDTO
 {
-    public class SuccessDTO
-    {
-        public int UserId { get; set; }
-        public int InquiryId { get; set; }
-        public bool IsFinished { get; set; }
+    public int UserId { get; set; }
+    public int InquiryId { get; set; }
+    public bool IsFinished { get; set; }
 
-        public SuccessDTO() { }
+    public SuccessDTO() { }
 
-        public SuccessDTO(int userId, int inquiryId, bool isFinished)
-        {
-            UserId = userId;
-            InquiryId = inquiryId;
-            IsFinished = isFinished;
-        }
+    public SuccessDTO(int userId, int inquiryId, bool isFinished)
+    {
+        UserId = userId;
+        InquiryId = inquiryId;
+        IsFinished = isFinished;
     }
-}
+}

API_SQLuedo/Dto/UserDTO.cs

@@ -1,34 +1,33 @@
-namespace Dto
+namespace Dto;
+
+public class UserDTO
 {
-    public class UserDTO
-    {
-        public int Id { get; set; }
-        public string Username { get; set; }
-        public string Password { get; set; }
-        public string Email { get; set; }
-        public bool IsAdmin { get; set; }
+    public int Id { get; set; }
+    public string Username { get; set; }
+    public string Password { get; set; }
+    public string Email { get; set; }
+    public bool IsAdmin { get; set; }
 
-        public UserDTO() { }
-        public UserDTO(int id, string username, string password, string email, bool isAdmin)
-        {
-            Id = id;
-            Username = username;
-            Password = password;
-            Email = email;
-            IsAdmin = isAdmin;
-        }
+    public UserDTO() { }
+    public UserDTO(int id, string username, string password, string email, bool isAdmin)
+    {
+        Id = id;
+        Username = username;
+        Password = password;
+        Email = email;
+        IsAdmin = isAdmin;
+    }
 
-        public UserDTO(string username, string password, string email, bool isAdmin)
-        {
-            Username = username;
-            Password = password;
-            Email = email;
-            IsAdmin = isAdmin;
-        }
+    public UserDTO(string username, string password, string email, bool isAdmin)
+    {
+        Username = username;
+        Password = password;
+        Email = email;
+        IsAdmin = isAdmin;
+    }
 
-        public override string ToString()
-        {
-            return $"{Id}\t{Username}\t{Email}\t{IsAdmin}";
-        }
+    public override string ToString()
+    {
+        return $"{Id}\t{Username}\t{Email}\t{IsAdmin}";
     }
-}
+}

API_SQLuedo/EntityFramework/ContentLessonEntity.cs

@@ -3,22 +3,37 @@
 namespace Entities;
 
 [Table("ContentLesson")]
-public class ContentLessonEntity
+public abstract class ContentLessonEntity
 {
-    [ForeignKey(nameof(Lesson))]
-    public int LessonId { get; set; }
-    public LessonEntity Lesson { get; set; }
+    public int Id { get; set; }
+    public string ContentContent { get; set; }
+    public string ContentTitle { get; set; }
+    [ForeignKey(nameof(Lesson))] public int LessonId { get; set; }
+    public LessonEntity Lesson { get; set; } = null!;
 
-    [ForeignKey(nameof(Paragraph))]
-    public int LessonPartId { get; set; }
-    public ParagraphEntity Paragraph { get; set; }
+    protected ContentLessonEntity()
+    {
+    }
 
-    public ContentLessonEntity(){}
-    public ContentLessonEntity(int lessonId, LessonEntity lesson, int lessonPartId, ParagraphEntity paragraph)
+    protected ContentLessonEntity(int id, string contentContent, string contentTitle)
     {
+        Id = id;
+        ContentContent = contentContent;
+        ContentTitle = contentTitle;
+    }
+
+
+    protected ContentLessonEntity(int id, int lessonId, string contentContent, string contentTitle)
+    {
+        Id = id;
         LessonId = lessonId;
-        Lesson = lesson;
-        LessonPartId = lessonPartId;
-        Paragraph = paragraph;
+        ContentContent = contentContent;
+        ContentTitle = contentTitle;
+    }
+
+    protected ContentLessonEntity(string contentContent, string contentTitle)
+    {
+        ContentContent = contentContent;
+        ContentTitle = contentTitle;
     }
 }

API_SQLuedo/EntityFramework/LessonEntity.cs

@@ -9,13 +9,8 @@ public class LessonEntity
     public string? Title { get; set; }
     public string? LastPublisher { get; set; }
     public DateOnly? LastEdit { get; set; }
+    public ICollection<ContentLessonEntity> Content { get; set; } = new List<ContentLessonEntity>();
 
-    public LessonEntity() { }
-
-    public LessonEntity(int id)
-    {
-        Id = id;
-    }
     public LessonEntity(int id, string title, string lastPublisher, DateOnly? lastEdit)
     {
         Id = id;

API_SQLuedo/EntityFramework/ParagraphEntity.cs

@@ -3,36 +3,31 @@
 namespace Entities;
 
 [Table("Paragraph")]
-public class ParagraphEntity
+public class ParagraphEntity : ContentLessonEntity
 {
-    public int Id { get; set; }
-    public string Title { get; set; }
-    public string Content { get; set; }
+    // ID
+    // ContentContent
+    // ContentTitle
+    // LessonId
     public string Info { get; set; }
     public string Query { get; set; }
     public string Comment { get; set; }
 
-    public ParagraphEntity() { }
-
-
-    public ParagraphEntity(int id)
+    public ParagraphEntity()
     {
-        Id = id;
     }
 
-    public ParagraphEntity(int id, string title, string content, string info, string query, string comment)
+    public ParagraphEntity(int id, string title, string content, string info, string query,
+        string comment, int idLesson) : base(id, idLesson, content, title)
     {
-        Id = id;
-        Title = title;
-        Content = content;
         Info = info;
         Query = query;
         Comment = comment;
     }
-    public ParagraphEntity(string title, string content, string info, string query, string comment)
+
+    public ParagraphEntity(string title, string content, string info, string query, string comment) : base(content,
+        title)
     {
-        Title = title;
-        Content = content;
         Info = info;
         Query = query;
         Comment = comment;

API_SQLuedo/Model/BlackList.cs

@@ -1,14 +1,13 @@
-namespace ModelToEntities.Business
+namespace Model;
+
+public class BlackList
 {
-    public class BlackList
-    {
-        public string Email { get; set; }
-        public DateOnly ExpirationDate { get; set; }
+    public string Email { get; set; }
+    public DateOnly ExpirationDate { get; set; }
 
-        public BlackList(string email, DateOnly expirationDate)
-        {
-            Email = email;
-            ExpirationDate = expirationDate;
-        }
+    public BlackList(string email, DateOnly expirationDate)
+    {
+        Email = email;
+        ExpirationDate = expirationDate;
     }
-}
+}

API_SQLuedo/Model/ContentLesson.cs

@@ -1,14 +1,24 @@
-namespace ModelToEntities.Business
+namespace Model;
+
+public abstract class ContentLesson
 {
-    public  class ContentLesson
+    public int Id { get; set; }
+    public string ContentContent { get; set; }
+    public string ContentTitle { get; set; }
+
+    public int LessonId { get; set; }
+
+    protected ContentLesson(string contentContent, string contentTitle)
+    {
+        ContentContent = contentContent;
+        ContentTitle = contentTitle;
+    }
+
+    protected ContentLesson(int id, string contentContent, string contentTitle, int lessonId)
     {
-        public ContentLesson(int lessonId, int lessonPartId)
-        {
-            LessonId = lessonId;
-            LessonPartId = lessonPartId;
-        }
-
-        public int LessonId { get; set; }
-        public int LessonPartId { get; set; }
+        Id = id;
+        ContentContent = contentContent;
+        ContentTitle = contentTitle;
+        LessonId = lessonId;
     }
-}
+}

API_SQLuedo/Model/Inquiry.cs

@@ -1,24 +1,23 @@
-namespace ModelToEntities.Business
+namespace Model;
+
+public class Inquiry
 {
-    public class Inquiry
-    {
-        public int Id { get; set; }
-        public string Title { get; set; }
-        public string Description { get; set; }
-        public bool IsUser { get; set; }
-        public int Database { get; set; }
-        public int InquiryTable { get; set; }
+    public int Id { get; set; }
+    public string Title { get; set; }
+    public string Description { get; set; }
+    public bool IsUser { get; set; }
+    public int Database { get; set; }
+    public int InquiryTable { get; set; }
 
-        public Inquiry() { }
+    public Inquiry() { }
 
-        public Inquiry(int id, string title, string description, bool isUser, int database, int inquiryTable)
-        {
-            Id = id;
-            Title = title;
-            Description = description;
-            IsUser = isUser;
-            Database = database;
-            InquiryTable = inquiryTable;
-        }
+    public Inquiry(int id, string title, string description, bool isUser, int database, int inquiryTable)
+    {
+        Id = id;
+        Title = title;
+        Description = description;
+        IsUser = isUser;
+        Database = database;
+        InquiryTable = inquiryTable;
     }
-}
+}

API_SQLuedo/Model/InquiryTable.cs

@@ -1,18 +1,17 @@
-namespace ModelToEntities.Business
-{
-    public class InquiryTable
-    {
-        public int OwnerId { get; set; }
-        public string DatabaseName { get; set; }
-        public string ConnectionInfo { get; set; }
+namespace Model;
 
-        public InquiryTable() { }
-        public InquiryTable(int inquiryId, string databaseName, string connectionInfo)
-        {
-            OwnerId = inquiryId;
-            DatabaseName = databaseName;
-            ConnectionInfo = connectionInfo;
-        }
+public class InquiryTable
+{
+    public int OwnerId { get; set; }
+    public string DatabaseName { get; set; }
+    public string ConnectionInfo { get; set; }
 
+    public InquiryTable() { }
+    public InquiryTable(int inquiryId, string databaseName, string connectionInfo)
+    {
+        OwnerId = inquiryId;
+        DatabaseName = databaseName;
+        ConnectionInfo = connectionInfo;
     }
-}
+
+}

API_SQLuedo/Model/Lesson.cs

@@ -1,31 +1,25 @@
-namespace ModelToEntities.Business
-{
-    public class Lesson
-    {
-        public int Id { get; }
-        public string? Title { get; set; }
-        public string? LastPublisher { get; set; }
-        public DateOnly? LastEdit { get; set; }
+namespace Model;
 
-        public Lesson() { }
+public class Lesson
+{
+    public int Id { get; }
+    public string? Title { get; set; }
+    public string? LastPublisher { get; set; }
+    public DateOnly? LastEdit { get; set; }
+    public ICollection<ContentLesson> Content { get; set; } = new List<ContentLesson>();
 
-        public Lesson(int id)
-        {
-            Id = id;
-        }
-        public Lesson(int id, string title, string lastPublisher, DateOnly? lastEdit)
-        {
-            Id = id;
-            Title = title;
-            LastPublisher = lastPublisher;
-            LastEdit = lastEdit;
-        }
+    public Lesson(int id, string title, string lastPublisher, DateOnly? lastEdit)
+    {
+        Id = id;
+        Title = title;
+        LastPublisher = lastPublisher;
+        LastEdit = lastEdit;
+    }
 
-        public Lesson(string title, string lastPublisher, DateOnly? lastEdit)
-        {
-            Title = title;
-            LastPublisher = lastPublisher;
-            LastEdit = lastEdit;
-        }
+    public Lesson(string title, string lastPublisher, DateOnly? lastEdit)
+    {
+        Title = title;
+        LastPublisher = lastPublisher;
+        LastEdit = lastEdit;
     }
-}
+}

API_SQLuedo/Model/Notepad.cs

@@ -1,26 +1,25 @@
-namespace ModelToEntities.Business
+namespace Model;
+
+public class Notepad
 {
-    public class Notepad
-    {
-        public int Id { get; set; }
-        public int UserId { get; set; }
-        public int InquiryId { get; set; }
-        public string Notes { get; set; }
+    public int Id { get; set; }
+    public int UserId { get; set; }
+    public int InquiryId { get; set; }
+    public string Notes { get; set; }
 
-        public Notepad() { }
+    public Notepad() { }
 
-        public Notepad(int id, int userId, int inquiryId, string notes)
-        {
-            Id = id;
-            UserId = userId;
-            InquiryId = inquiryId;
-            Notes = notes;
-        }
-        public Notepad(int userId,  int inquiryId,  string notes)
-        {
-            UserId = userId;
-            InquiryId = inquiryId;
-            Notes = notes;
-        }
+    public Notepad(int id, int userId, int inquiryId, string notes)
+    {
+        Id = id;
+        UserId = userId;
+        InquiryId = inquiryId;
+        Notes = notes;
+    }
+    public Notepad(int userId,  int inquiryId,  string notes)
+    {
+        UserId = userId;
+        InquiryId = inquiryId;
+        Notes = notes;
     }
-}
+}

API_SQLuedo/Model/Paragraph.cs

@@ -1,37 +1,24 @@
-namespace ModelToEntities.Business
-{
-    public class Paragraph
-    {
-        public int Id { get;  }
-        public string? Title { get; set; }
-        public string? Content { get; set; }
-        public string? Info { get; set; }
-        public string? Query { get; set; }
-        public string? Comment { get; set; }
+namespace Model;
 
-        public Paragraph() { }
+public class Paragraph : ContentLesson
+{
+    public string Info { get; set; }
+    public string Query { get; set; }
+    public string Comment { get; set; }
 
-        public Paragraph(int id)
-        {
-            Id = id;
-        }
+    public Paragraph(string title, string content, string info, string query, string comment) : base(content,
+        title)
+    {
+        Info = info;
+        Query = query;
+        Comment = comment;
+    }
 
-        public Paragraph(int id, string title, string content, string info, string query, string comment)
-        {
-            Id = id;
-            Title = title;
-            Content = content;
-            Info = info;
-            Query = query;
-            Comment = comment;
-        }
-        public Paragraph(string title, string content, string info, string query, string comment)
-        {
-            Title = title;
-            Content = content;
-            Info = info;
-            Query = query;
-            Comment = comment;
-        }
+    public Paragraph(int id, string title, string content, string info, string query, string comment, int lessonId) :
+        base(id, content, title, lessonId)
+    {
+        Info = info;
+        Query = query;
+        Comment = comment;
     }
-}
+}

API_SQLuedo/Model/Solution.cs

@@ -1,30 +1,29 @@
-namespace ModelToEntities.Business
+namespace Model;
+
+public class Solution
 {
-    public class Solution
+    public int OwnerId { get; set; }
+    public string MurdererFirstName { get; set; }
+    public string MurdererLastName { get; set; }
+    public string MurderPlace { get; set; }
+    public string MurderWeapon { get; set; }
+    public string Explanation { get; set; }
+    public Solution() { }
+    public Solution(int ownerId, string murdererFirstName, string murdererLastName, string murderPlace, string murderWeapon, string explanation)
     {
-        public int OwnerId { get; set; }
-        public string MurdererFirstName { get; set; }
-        public string MurdererLastName { get; set; }
-        public string MurderPlace { get; set; }
-        public string MurderWeapon { get; set; }
-        public string Explanation { get; set; }
-        public Solution() { }
-        public Solution(int ownerId, string murdererFirstName, string murdererLastName, string murderPlace, string murderWeapon, string explanation)
-        {
-            OwnerId = ownerId;
-            MurdererFirstName = murdererFirstName;
-            MurdererLastName = murdererLastName;
-            MurderPlace = murderPlace;
-            MurderWeapon = murderWeapon;
-            Explanation = explanation;
-        }
-        public Solution(string murdererFirstName, string murdererLastName, string murderPlace, string murderWeapon, string explanation)
-        {
-            MurdererFirstName = murdererFirstName;
-            MurdererLastName = murdererLastName;
-            MurderPlace = murderPlace;
-            MurderWeapon = murderWeapon;
-            Explanation = explanation;
-        }
+        OwnerId = ownerId;
+        MurdererFirstName = murdererFirstName;
+        MurdererLastName = murdererLastName;
+        MurderPlace = murderPlace;
+        MurderWeapon = murderWeapon;
+        Explanation = explanation;
     }
-}
+    public Solution(string murdererFirstName, string murdererLastName, string murderPlace, string murderWeapon, string explanation)
+    {
+        MurdererFirstName = murdererFirstName;
+        MurdererLastName = murdererLastName;
+        MurderPlace = murderPlace;
+        MurderWeapon = murderWeapon;
+        Explanation = explanation;
+    }
+}

API_SQLuedo/Model/Success.cs

@@ -1,18 +1,17 @@
-namespace ModelToEntities.Business
+namespace Model;
+
+public class Success
 {
-    public class Success
-    {
-        public int UserId { get; set; }
-        public int InquiryId { get; set; }
-        public bool IsFinished { get; set; }
+    public int UserId { get; set; }
+    public int InquiryId { get; set; }
+    public bool IsFinished { get; set; }
 
-        public Success() { }
+    public Success() { }
 
-        public Success(int userId, int inquiryId, bool isFinished)
-        {
-            UserId = userId;
-            InquiryId = inquiryId;
-            IsFinished = isFinished;
-        }
+    public Success(int userId, int inquiryId, bool isFinished)
+    {
+        UserId = userId;
+        InquiryId = inquiryId;
+        IsFinished = isFinished;
     }
-}
+}

API_SQLuedo/Model/User.cs

@@ -1,21 +1,20 @@
-namespace ModelToEntities.Business
+namespace Model;
+
+public class User
 {
-    public class User
-    {
-        public int Id { get; set; }
-        public string Username { get; set; }
-        public string Password { get; set; }
-        public string Email { get; set; }
-        public bool IsAdmin { get; set; }
+    public int Id { get; set; }
+    public string Username { get; set; }
+    public string Password { get; set; }
+    public string Email { get; set; }
+    public bool IsAdmin { get; set; }
 
-        public User() { }
-        public User(int id, string username, string password, string email, bool isAdmin)
-        {
-            Id = id;
-            Username = username;
-            Password = password;
-            Email = email;
-            IsAdmin = isAdmin;
-        }
+    public User() { }
+    public User(int id, string username, string password, string email, bool isAdmin)
+    {
+        Id = id;
+        Username = username;
+        Password = password;
+        Email = email;
+        IsAdmin = isAdmin;
     }
-}
+}

API_SQLuedo/Shared/Mapper/BlackListMapper.cs

@@ -1,6 +1,6 @@
 using Dto;
 using Entities;
-using ModelToEntities.Business;
+using Model;
 
 namespace Shared.Mapper;
 

API_SQLuedo/Shared/Mapper/ContentLessonMapper.cs

@@ -1,34 +0,0 @@
-using Dto;
-using Entities;
-using ModelToEntities.Business;
-
-namespace Shared.Mapper;
-
-public static class ContentLessonMapper
-{
-    public static ContentLesson FromDTOToModel(this ContentLessonDTO dto)
-    {
-        return new ContentLesson(dto.LessonId, dto.LessonPartId);
-    }
-
-    public static ContentLesson FromEntityToModel(this ContentLessonEntity ent)
-    {
-        return new ContentLesson(ent.LessonId, ent.LessonPartId);
-    }
-
-    public static ContentLessonDTO FromModelToDTO(this ContentLesson les)
-    {
-        return new ContentLessonDTO(les.LessonId, les.LessonPartId);
-    }
-
-    public static ContentLessonDTO FromEntityToDTO(this ContentLessonEntity ent)
-    {
-        return new ContentLessonDTO(ent.LessonId, ent.LessonPartId);
-    }
-
-    public static ContentLessonEntity FromModelToEntity(this ContentLesson les)
-    {
-        return new ContentLessonEntity(les.LessonId, new LessonEntity(les.LessonId), les.LessonPartId,
-            new ParagraphEntity(les.LessonPartId));
-    }
-}

API_SQLuedo/Shared/Mapper/InquiryMapper.cs

@@ -1,6 +1,6 @@
 using Dto;
 using Entities;
-using ModelToEntities.Business;
+using Model;
 
 namespace Shared.Mapper;
 

API_SQLuedo/Shared/Mapper/InquiryTableMapper.cs

@@ -1,6 +1,6 @@
 using Dto;
 using Entities;
-using ModelToEntities.Business;
+using Model;
 
 namespace Shared.Mapper;
 

API_SQLuedo/Shared/Mapper/LessonMapper.cs

@@ -1,6 +1,6 @@
 using Dto;
 using Entities;
-using ModelToEntities.Business;
+using Model;
 
 namespace Shared.Mapper;
 

API_SQLuedo/Shared/Mapper/NotepadMapper.cs

@@ -1,6 +1,6 @@
 using Dto;
 using Entities;
-using ModelToEntities.Business;
+using Model;
 
 namespace Shared.Mapper;
 

API_SQLuedo/Shared/Mapper/ParagraphMapper.cs

@@ -1,6 +1,6 @@
 using Dto;
 using Entities;
-using ModelToEntities.Business;
+using Model;
 
 namespace Shared.Mapper;
 
@@ -8,31 +8,35 @@ public static class ParagraphMapper
 {
     public static Paragraph FromDTOToModel(ParagraphDTO dto)
     {
-        return new Paragraph(dto.Id, dto.Title, dto.Content, dto.Info, dto.Query, dto.Comment);
+        return new Paragraph(dto.ContentTitle, dto.ContentContent, dto.Info, dto.Query, dto.Comment);
     }
 
     public static Paragraph FromEntityToModel(ParagraphEntity model)
     {
-        return new Paragraph(model.Id, model.Title, model.Content, model.Info, model.Query, model.Comment);
+        return new Paragraph(model.ContentTitle, model.ContentContent, model.Info, model.Query, model.Comment);
     }
 
     public static ParagraphDTO FromEntityToDTO(ParagraphEntity model)
     {
-        return new ParagraphDTO(model.Id, model.Title, model.Content, model.Info, model.Query, model.Comment);
+        return new ParagraphDTO(model.Id, model.ContentTitle, model.ContentContent, model.Info, model.Query,
+            model.Comment, model.LessonId);
     }
 
     public static ParagraphDTO FromModelToDTO(Paragraph model)
     {
-        return new ParagraphDTO(model.Id, model.Title, model.Content, model.Info, model.Query, model.Comment);
+        return new ParagraphDTO(model.Id, model.ContentTitle, model.ContentContent, model.Info, model.Query,
+            model.Comment, model.LessonId);
     }
 
     public static ParagraphEntity FromDTOToEntity(ParagraphDTO dto)
     {
-        return new ParagraphEntity(dto.Id, dto.Title, dto.Content, dto.Info, dto.Query, dto.Comment);
+        return new ParagraphEntity(dto.Id, dto.ContentTitle, dto.ContentContent, dto.Info, dto.Query, dto.Comment,
+            dto.LessonId);
     }
 
-    public static Paragraph FromModelToEntity(Paragraph model)
+    public static ParagraphEntity FromModelToEntity(Paragraph model)
     {
-        return new Paragraph(model.Id, model.Title, model.Content, model.Info, model.Query, model.Comment);
+        return new ParagraphEntity(model.Id, model.ContentTitle, model.ContentContent, model.Info, model.Query,
+            model.Comment, model.LessonId);
     }
 }

API_SQLuedo/Shared/Mapper/SolutionMapper.cs

@@ -1,6 +1,6 @@
 using Dto;
 using Entities;
-using ModelToEntities.Business;
+using Model;
 
 namespace Shared.Mapper;
 

API_SQLuedo/Shared/Mapper/SuccessMapper.cs

@@ -1,6 +1,6 @@
 using Dto;
 using Entities;
-using ModelToEntities.Business;
+using Model;
 
 namespace Shared.Mapper;
 

API_SQLuedo/Shared/Mapper/UserMapper.cs

@@ -1,6 +1,6 @@
 using Dto;
 using Entities;
-using ModelToEntities.Business;
+using Model;
 
 namespace Shared.Mapper;