end of tp2

2026-03-17 11:12:34 +01:00
parent d202d1541d
commit 90fcaca356
7 changed files with 76 additions and 40 deletions
--- a/.idea/.idea.BookHive/.idea/workspace.xml
+++ b/.idea/.idea.BookHive/.idea/workspace.xml
@@ -7,21 +7,12 @@
  <component name="ChangeListManager">
    <list default="true" id="4c0ad985-5b6e-4587-85a5-1b48273bdb1d" name="Changes" comment="">
      <change beforePath="$PROJECT_DIR$/.idea/.idea.BookHive/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/.idea.BookHive/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/BookHive/DTO/Book/GetBookDetailsDto.cs" beforeDir="false" afterPath="$PROJECT_DIR$/BookHive/DTO/Book/GetBookDetailsDto.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/BookHive/DTO/Loan/GetLoanDto.cs" beforeDir="false" afterPath="$PROJECT_DIR$/BookHive/DTO/Loan/GetLoanDto.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/BookHive/DTO/Review/GetReviewDto.cs" beforeDir="false" afterPath="$PROJECT_DIR$/BookHive/DTO/Review/GetReviewDto.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/BookHive/MappingProfiles/DtoToEntityMappings.cs" beforeDir="false" afterPath="$PROJECT_DIR$/BookHive/MappingProfiles/DtoToEntityMappings.cs" afterDir="false" />
      <change beforePath="$PROJECT_DIR$/BookHive/MappingProfiles/EntityToDtoMappings.cs" beforeDir="false" afterPath="$PROJECT_DIR$/BookHive/MappingProfiles/EntityToDtoMappings.cs" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/BookHive/obj/BookHive.csproj.nuget.dgspec.json" beforeDir="false" afterPath="$PROJECT_DIR$/BookHive/obj/BookHive.csproj.nuget.dgspec.json" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/BookHive/obj/BookHive.csproj.nuget.g.props" beforeDir="false" afterPath="$PROJECT_DIR$/BookHive/obj/BookHive.csproj.nuget.g.props" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/BookHive/obj/BookHive.csproj.nuget.g.targets" beforeDir="false" afterPath="$PROJECT_DIR$/BookHive/obj/BookHive.csproj.nuget.g.targets" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/BookHive/obj/Debug/net10.0/BookHive.AssemblyInfo.cs" beforeDir="false" afterPath="$PROJECT_DIR$/BookHive/obj/Debug/net10.0/BookHive.AssemblyInfo.cs" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/BookHive/obj/Debug/net10.0/BookHive.AssemblyInfoInputs.cache" beforeDir="false" afterPath="$PROJECT_DIR$/BookHive/obj/Debug/net10.0/BookHive.AssemblyInfoInputs.cache" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/BookHive/obj/Debug/net10.0/BookHive.GeneratedMSBuildEditorConfig.editorconfig" beforeDir="false" afterPath="$PROJECT_DIR$/BookHive/obj/Debug/net10.0/BookHive.GeneratedMSBuildEditorConfig.editorconfig" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/BookHive/obj/Debug/net10.0/BookHive.assets.cache" beforeDir="false" afterPath="$PROJECT_DIR$/BookHive/obj/Debug/net10.0/BookHive.assets.cache" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/BookHive/obj/Debug/net10.0/BookHive.csproj.AssemblyReference.cache" beforeDir="false" afterPath="$PROJECT_DIR$/BookHive/obj/Debug/net10.0/BookHive.csproj.AssemblyReference.cache" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/BookHive/obj/Debug/net10.0/SwaggerExportPathInitializer.g.cs" beforeDir="false" afterPath="$PROJECT_DIR$/BookHive/obj/Debug/net10.0/SwaggerExportPathInitializer.g.cs" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/BookHive/obj/project.assets.json" beforeDir="false" afterPath="$PROJECT_DIR$/BookHive/obj/project.assets.json" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/BookHive/obj/project.nuget.cache" beforeDir="false" afterPath="$PROJECT_DIR$/BookHive/obj/project.nuget.cache" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/BookHive/obj/project.packagespec.json" beforeDir="false" afterPath="$PROJECT_DIR$/BookHive/obj/project.packagespec.json" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/BookHive/obj/rider.project.model.nuget.info" beforeDir="false" afterPath="$PROJECT_DIR$/BookHive/obj/rider.project.model.nuget.info" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/BookHive/obj/rider.project.restore.info" beforeDir="false" afterPath="$PROJECT_DIR$/BookHive/obj/rider.project.restore.info" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/BookHive/Program.cs" beforeDir="false" afterPath="$PROJECT_DIR$/BookHive/Program.cs" afterDir="false" />
    </list>
    <option name="SHOW_DIALOG" value="false" />
    <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -130,7 +121,7 @@
      <workItem from="1773087846465" duration="527000" />
      <workItem from="1773088517368" duration="6491000" />
      <workItem from="1773126764051" duration="11148000" />
-      <workItem from="1773739163277" duration="475000" />
+      <workItem from="1773739163277" duration="2829000" />
    </task>
    <task id="LOCAL-00001" summary="first commit">
      <option name="closed" value="true" />
@@ -188,7 +179,15 @@
      <option name="project" value="LOCAL" />
      <updated>1773135809527</updated>
    </task>
-    <option name="localTasksCounter" value="8" />
+    <task id="LOCAL-00008" summary="Cleaned code">
+      <option name="closed" value="true" />
+      <created>1773739675537</created>
+      <option name="number" value="00008" />
+      <option name="presentableId" value="LOCAL-00008" />
+      <option name="project" value="LOCAL" />
+      <updated>1773739675537</updated>
+    </task>
+    <option name="localTasksCounter" value="9" />
    <servers />
  </component>
  <component name="TypeScriptGeneratedFilesManager">
@@ -204,7 +203,8 @@
    <MESSAGE value="insert datas" />
    <MESSAGE value="added validators in project" />
    <MESSAGE value="Created all validators" />
-    <option name="LAST_COMMIT_MESSAGE" value="Created all validators" />
+    <MESSAGE value="Cleaned code" />
+    <option name="LAST_COMMIT_MESSAGE" value="Cleaned code" />
  </component>
  <component name="XDebuggerManager">
    <breakpoint-manager>
--- a/BookHive/DTO/Book/GetBookDetailsDto.cs
+++ b/BookHive/DTO/Book/GetBookDetailsDto.cs
@@ -12,8 +12,11 @@ public class GetBookDetailsDto
    public int PageCount { get; set; }
    public DateOnly PublishedDate { get; set; }
    public string? Genre { get; set; }
+    public decimal? AverageRating  { get; set; }
+    public int? ReviewCount { get; set; }

    public int AuthorId { get; set; }
+    public string? AuthorNationality { get; set; }
    public GetAuthorDto? Author { get; set; }

    public List<GetReviewDto>? Reviews { get; set; }
--- a/BookHive/DTO/Loan/GetLoanDto.cs
+++ b/BookHive/DTO/Loan/GetLoanDto.cs
@@ -8,12 +8,11 @@ public class GetLoanDto
    public int Id { get; set; }

    public int BookId { get; set; }
+    public string? BookTitle { get; set; }
    public int MemberId { get; set; }
+    public string? MemberFullName  { get; set; }

    public DateOnly LoanDate { get; set; }
    public DateOnly DueDate { get; set; }
    public DateOnly? ReturnDate { get; set; }
-
-    public GetBookDto? Book { get; set; }
-    public GetMemberDto? Member { get; set; }
 }
--- a/BookHive/DTO/Review/GetReviewDto.cs
+++ b/BookHive/DTO/Review/GetReviewDto.cs
@@ -8,12 +8,12 @@ public class GetReviewDto
    public int Id { get; set; }

    public int BookId { get; set; }
+    public string? BookTitle { get; set; }
+    
    public int MemberId { get; set; }
+    public string? MemberFullName { get; set; }

    public int Rating { get; set; }
    public string? Comment { get; set; }
    public DateTime CreatedAt { get; set; }
-
-    public GetBookDto? Book { get; set; }
-    public GetMemberDto? Member { get; set; }
 }
--- a/BookHive/MappingProfiles/DtoToEntityMappings.cs
+++ b/BookHive/MappingProfiles/DtoToEntityMappings.cs
@@ -13,18 +13,26 @@ public class DtoToEntityMappings : Profile
    public DtoToEntityMappings()
    {
        CreateMap<CreateBookDto, Book>();
-        CreateMap<UpdateBookDto, Book>();
+        CreateMap<UpdateBookDto, Book>()
+            .ForMember(dest => dest.Id, opt => opt.Ignore());

        CreateMap<CreateAuthorDto, Author>();
-        CreateMap<UpdateAuthorDto, Author>();
+        CreateMap<UpdateAuthorDto, Author>()
+            .ForMember(dest => dest.Id, opt => opt.Ignore());

        CreateMap<CreateMemberDto, Member>();
-        CreateMap<UpdateMemberDto, Member>();
+        CreateMap<UpdateMemberDto, Member>()
+            .ForMember(dest => dest.Id, opt => opt.Ignore())
+            .ForMember(
+                dest => dest.Email,
+                opt => opt.PreCondition(src => !string.IsNullOrEmpty(src.Email)));

        CreateMap<CreateReviewDto, Review>();
-        CreateMap<UpdateReviewDto, Review>();
+        CreateMap<UpdateReviewDto, Review>()
+            .ForMember(dest => dest.Id, opt => opt.Ignore());

        CreateMap<CreateLoanDto, Loan>();
-        CreateMap<UpdateLoanDto, Loan>();
+        CreateMap<UpdateLoanDto, Loan>()
+            .ForMember(dest => dest.Id, opt => opt.Ignore());
    }
 }
--- a/BookHive/MappingProfiles/EntityToDtoMappings.cs
+++ b/BookHive/MappingProfiles/EntityToDtoMappings.cs
@@ -19,16 +19,40 @@ public class EntityToDtoMappings : Profile
                    opt.MapFrom(src =>
                        src.Author!.FirstName + " " + src.Author.LastName)
            );
-        CreateMap<Book, GetBookDetailsDto>();
+        CreateMap<Book, GetBookDetailsDto>()
+            .ForMember(
+                dest => dest.AverageRating,
+                opt => opt.MapFrom(src => src.Reviews.Any() ? src.Reviews.Average(r => r.Rating) : 0)
+            )
+            .ForMember(
+                dest => dest.ReviewCount,
+                opt => opt.MapFrom(src => src.Reviews.Count)
+            );

        CreateMap<Author, GetAuthorDto>();
        CreateMap<Author, GetAuthorDetailsDto>();

-        CreateMap<Loan, GetLoanDto>();
+        CreateMap<Loan, GetLoanDto>()
+            .ForMember(
+                dest => dest.BookTitle,
+                opt =>
+                    opt.MapFrom(src => src.Book!.Title))
+            .ForMember(
+                dest => dest.MemberFullName,
+                opt =>
+                    opt.MapFrom(src => src.Member!.FirstName + ' ' + src.Member!.LastName));

        CreateMap<Member, GetMemberDto>();
        CreateMap<Member, GetMemberDetailsDto>();

-        CreateMap<Review, GetReviewDto>();
+        CreateMap<Review, GetReviewDto>()
+            .ForMember(
+                dest => dest.BookTitle,
+                opt =>
+                    opt.MapFrom(src => src.Book!.Title))
+            .ForMember(
+                dest => dest.MemberFullName,
+                opt =>
+                    opt.MapFrom(src => src.Member!.FirstName + ' ' + src.Member!.LastName));
    }
 }
--- a/BookHive/Program.cs
+++ b/BookHive/Program.cs
@@ -1,7 +1,5 @@
-using AutoMapper;
 using AutoMapper.EquivalencyExpression;
 using BookHive;
-using BookHive.MappingProfiles;
 using BookHive.Repositories;
 using FastEndpoints;
 using FastEndpoints.Security;
@@ -38,16 +36,20 @@ builder.Services.AddScoped<LoanRepository>();

 builder.Services.AddHttpContextAccessor();

-MapperConfiguration mappingConfig = new(mc =>
+builder.Services.AddAutoMapper(cfg =>
 {
-    mc.AddCollectionMappers();
-    mc.AddProfile(new DtoToEntityMappings());
-    mc.AddProfile(new EntityToDtoMappings());
-}, new LoggerFactory());
+    cfg.AddCollectionMappers();
+}, typeof(Program).Assembly);

+// MapperConfiguration mappingConfig = new(mc =>
+// {
+//     mc.AddCollectionMappers();
+//     mc.AddProfile(new DtoToEntityMappings());
+//     mc.AddProfile(new EntityToDtoMappings());
+// }, new LoggerFactory());

-AutoMapper.IMapper mapper = mappingConfig.CreateMapper();
-builder.Services.AddSingleton(mapper);
+// AutoMapper.IMapper mapper = mappingConfig.CreateMapper();
+// builder.Services.AddSingleton(mapper);

 WebApplication app = builder.Build();
 app.UseAuthentication()