fix: compile errors

hamed-shirbandi · hamed-shirbandi · commit d5fd4261e9e2 · 2025-07-14T15:52:01.000+02:00
diff --git a/src/1-Libraries/Application/Dtos/CreateDemoThingDto.cs b/src/1-Libraries/Application/Dtos/CreateDemoThingDto.cs
@@ -1,14 +1,13 @@
 using System.ComponentModel.DataAnnotations;
 using CanBeYours.Core.Resources;
-using CodeBlock.DevKit.Contracts.Dtos;
 
 namespace CanBeYours.Application.Dtos;
 
-public class CreateDemoThingDto : BaseDto
+public class CreateDemoThingDto
 {
     [Required(ErrorMessageResourceType = typeof(SharedResource), ErrorMessageResourceName = nameof(SharedResource.DemoThing_Name))]
     public string Name { get; set; }
 
     [Required(ErrorMessageResourceType = typeof(SharedResource), ErrorMessageResourceName = nameof(SharedResource.DemoThing_Description))]
     public string Description { get; set; }
-} 
+}
diff --git a/src/1-Libraries/Application/Dtos/GetDemoThingDto.cs b/src/1-Libraries/Application/Dtos/GetDemoThingDto.cs
@@ -2,7 +2,7 @@
 
 namespace CanBeYours.Application.Dtos;
 
-public class GetDemoThingDto : BaseDto
+public class GetDemoThingDto : GetEntityDto
 {
     public string Name { get; set; }
     public string Description { get; set; }
diff --git a/src/1-Libraries/Application/Dtos/SearchDemoThingsInputDto.cs b/src/1-Libraries/Application/Dtos/SearchDemoThingsInputDto.cs
@@ -5,4 +5,4 @@ namespace CanBeYours.Application.Dtos;
 public class SearchDemoThingsInputDto : SearchInputDto
 {
     // Add any additional search filters here if needed in the future
-} 
+}
diff --git a/src/1-Libraries/Application/Dtos/UpdateDemoThingDto.cs b/src/1-Libraries/Application/Dtos/UpdateDemoThingDto.cs
@@ -1,14 +1,13 @@
 using System.ComponentModel.DataAnnotations;
 using CanBeYours.Core.Resources;
-using CodeBlock.DevKit.Contracts.Dtos;
 
 namespace CanBeYours.Application.Dtos;
 
-public class UpdateDemoThingDto : BaseDto
+public class UpdateDemoThingDto
 {
     [Required(ErrorMessageResourceType = typeof(SharedResource), ErrorMessageResourceName = nameof(SharedResource.DemoThing_Name))]
     public string Name { get; set; }
 
     [Required(ErrorMessageResourceType = typeof(SharedResource), ErrorMessageResourceName = nameof(SharedResource.DemoThing_Description))]
     public string Description { get; set; }
-} 
+}
diff --git a/src/1-Libraries/Application/Exceptions/DemoThingApplicationExceptions.cs b/src/1-Libraries/Application/Exceptions/DemoThingApplicationExceptions.cs
@@ -0,0 +1,25 @@
+// Copyright (c) CodeBlock.Dev. All rights reserved.
+// For more information visit https://codeblock.dev
+
+using CanBeYours.Core.Resources;
+using CodeBlock.DevKit.Core.Exceptions;
+using CodeBlock.DevKit.Core.Resources;
+using ApplicationException = CodeBlock.DevKit.Application.Exceptions.ApplicationException;
+
+namespace CanBeYours.Application.Exceptions;
+
+internal static class DemoThingApplicationExceptions
+{
+    public static ApplicationException DemoThingNotFound(string searchedKey)
+    {
+        return new ApplicationException(
+            nameof(CoreResource.Record_Not_Found),
+            typeof(CoreResource),
+            new List<MessagePlaceholder>
+            {
+                MessagePlaceholder.CreateResource(SharedResource.DemoThing, typeof(SharedResource)),
+                MessagePlaceholder.CreatePlainText(searchedKey),
+            }
+        );
+    }
+}
diff --git a/src/1-Libraries/Application/Services/DemoThings/DemoThingService.cs b/src/1-Libraries/Application/Services/DemoThings/DemoThingService.cs
@@ -31,8 +31,6 @@ public async Task<Result<CommandResult>> UpdateDemoThing(string id, UpdateDemoTh
 
     public async Task<Result<SearchOutputDto<GetDemoThingDto>>> SearchDemoThings(SearchDemoThingsInputDto input)
     {
-        return await _requestDispatcher.SendQuery(
-            new SearchDemoThingsRequest(input.Term, input.PageNumber, input.RecordsPerPage, input.SortOrder)
-        );
+        return await _requestDispatcher.SendQuery(new SearchDemoThingsRequest(input.Term, input.PageNumber, input.RecordsPerPage, input.SortOrder));
     }
 }
diff --git a/src/1-Libraries/Application/UseCases/DemoThings/CreateDemoThing/CreateDemoThingRequest.cs b/src/1-Libraries/Application/UseCases/DemoThings/CreateDemoThing/CreateDemoThingRequest.cs
@@ -20,4 +20,4 @@ public CreateDemoThingRequest(string name, string description)
     [Display(Name = nameof(SharedResource.DemoThing_Description), ResourceType = typeof(SharedResource))]
     [Required(ErrorMessageResourceName = nameof(CoreResource.Required), ErrorMessageResourceType = typeof(CoreResource))]
     public string Description { get; }
-} 
+}
diff --git a/src/1-Libraries/Application/UseCases/DemoThings/CreateDemoThing/CreateDemoThingUseCase.cs b/src/1-Libraries/Application/UseCases/DemoThings/CreateDemoThing/CreateDemoThingUseCase.cs
@@ -11,7 +11,11 @@ internal class CreateDemoThingUseCase : BaseCommandHandler, IRequestHandler<Crea
 {
     private readonly IDemoThingRepository _demoThingRepository;
 
-    public CreateDemoThingUseCase(IDemoThingRepository demoThingRepository, IRequestDispatcher requestDispatcher, ILogger<CreateDemoThingUseCase> logger)
+    public CreateDemoThingUseCase(
+        IDemoThingRepository demoThingRepository,
+        IRequestDispatcher requestDispatcher,
+        ILogger<CreateDemoThingUseCase> logger
+    )
         : base(requestDispatcher, logger)
     {
         _demoThingRepository = demoThingRepository;
@@ -27,4 +31,4 @@ public async Task<CommandResult> Handle(CreateDemoThingRequest request, Cancella
 
         return CommandResult.Create(entityId: demoThing.Id);
     }
-} 
+}
diff --git a/src/1-Libraries/Application/UseCases/DemoThings/GetDemoThing/GetDemoThingRequest.cs b/src/1-Libraries/Application/UseCases/DemoThings/GetDemoThing/GetDemoThingRequest.cs
@@ -1,14 +1,16 @@
 using CanBeYours.Application.Dtos;
 using CodeBlock.DevKit.Application.Queries;
+using CodeBlock.DevKit.Core.Helpers;
 
 namespace CanBeYours.Application.UseCases.DemoThings.GetDemoThing;
 
 internal class GetDemoThingRequest : BaseQuery<GetDemoThingDto>
 {
-    public GetDemoThingRequest(string id)
+    public GetDemoThingRequest(string id, QueryOptions options = null)
+        : base(options)
     {
         Id = id;
     }
 
-    public string Id { get; }
-} 
+    public string Id { get; set; }
+}
diff --git a/src/1-Libraries/Application/UseCases/DemoThings/GetDemoThing/GetDemoThingUseCase.cs b/src/1-Libraries/Application/UseCases/DemoThings/GetDemoThing/GetDemoThingUseCase.cs
@@ -1,40 +1,29 @@
+using AutoMapper;
 using CanBeYours.Application.Dtos;
+using CanBeYours.Application.Exceptions;
 using CanBeYours.Core.Domain.DemoThings;
 using CodeBlock.DevKit.Application.Queries;
-using CodeBlock.DevKit.Application.Srvices;
-using CodeBlock.DevKit.Core.Helpers;
 using MediatR;
 using Microsoft.Extensions.Logging;
 
 namespace CanBeYours.Application.UseCases.DemoThings.GetDemoThing;
 
-internal class GetDemoThingUseCase : BaseQueryHandler, IRequestHandler<GetDemoThingRequest, Result<GetDemoThingDto>>
+internal class GetDemoThingUseCase : BaseQueryHandler, IRequestHandler<GetDemoThingRequest, GetDemoThingDto>
 {
     private readonly IDemoThingRepository _demoThingRepository;
 
-    public GetDemoThingUseCase(IDemoThingRepository demoThingRepository, IRequestDispatcher requestDispatcher, ILogger<GetDemoThingUseCase> logger)
-        : base(requestDispatcher, logger)
+    public GetDemoThingUseCase(IDemoThingRepository demoThingRepository, IMapper mapper, ILogger<GetDemoThingUseCase> logger)
+        : base(mapper, logger)
     {
         _demoThingRepository = demoThingRepository;
     }
 
-    public async Task<Result<GetDemoThingDto>> Handle(GetDemoThingRequest request, CancellationToken cancellationToken)
+    public async Task<GetDemoThingDto> Handle(GetDemoThingRequest request, CancellationToken cancellationToken)
     {
         var demoThing = await _demoThingRepository.GetByIdAsync(request.Id);
         if (demoThing == null)
-            return Result<GetDemoThingDto>.NotFound();
+            throw DemoThingApplicationExceptions.DemoThingNotFound(request.Id);
 
-        return Result<GetDemoThingDto>.Success(MapToDto(demoThing));
+        return _mapper.Map<GetDemoThingDto>(demoThing);
     }
-
-    private static GetDemoThingDto MapToDto(DemoThing demoThing)
-    {
-        return new GetDemoThingDto
-        {
-            Id = demoThing.Id,
-            Name = demoThing.Name,
-            Description = demoThing.Description,
-            CreationTime = demoThing.CreationTime
-        };
-    }
-} 
+}
diff --git a/src/1-Libraries/Application/UseCases/DemoThings/SearchDemoThings/SearchDemoThingsRequest.cs b/src/1-Libraries/Application/UseCases/DemoThings/SearchDemoThings/SearchDemoThingsRequest.cs
@@ -7,7 +7,8 @@ namespace CanBeYours.Application.UseCases.DemoThings.SearchDemoThings;
 
 internal class SearchDemoThingsRequest : BaseQuery<SearchOutputDto<GetDemoThingDto>>
 {
-    public SearchDemoThingsRequest(string term, int pageNumber, int recordsPerPage, SortOrder sortOrder)
+    public SearchDemoThingsRequest(string term, int pageNumber, int recordsPerPage, SortOrder sortOrder, QueryOptions options = null)
+        : base(options)
     {
         Term = term;
         PageNumber = pageNumber;
@@ -19,4 +20,4 @@ public SearchDemoThingsRequest(string term, int pageNumber, int recordsPerPage,
     public int PageNumber { get; }
     public int RecordsPerPage { get; }
     public SortOrder SortOrder { get; }
-} 
+}
diff --git a/src/1-Libraries/Application/UseCases/DemoThings/SearchDemoThings/SearchDemoThingsUseCase.cs b/src/1-Libraries/Application/UseCases/DemoThings/SearchDemoThings/SearchDemoThingsUseCase.cs
@@ -1,52 +1,35 @@
+using AutoMapper;
 using CanBeYours.Application.Dtos;
 using CanBeYours.Core.Domain.DemoThings;
 using CodeBlock.DevKit.Application.Queries;
-using CodeBlock.DevKit.Application.Srvices;
 using CodeBlock.DevKit.Contracts.Dtos;
-using CodeBlock.DevKit.Core.Helpers;
 using MediatR;
 using Microsoft.Extensions.Logging;
 
 namespace CanBeYours.Application.UseCases.DemoThings.SearchDemoThings;
 
-internal class SearchDemoThingsUseCase : BaseQueryHandler, IRequestHandler<SearchDemoThingsRequest, Result<SearchOutputDto<GetDemoThingDto>>>
+internal class SearchDemoThingsUseCase : BaseQueryHandler, IRequestHandler<SearchDemoThingsRequest, SearchOutputDto<GetDemoThingDto>>
 {
     private readonly IDemoThingRepository _demoThingRepository;
 
-    public SearchDemoThingsUseCase(IDemoThingRepository demoThingRepository, IRequestDispatcher requestDispatcher, ILogger<SearchDemoThingsUseCase> logger)
-        : base(requestDispatcher, logger)
+    public SearchDemoThingsUseCase(IDemoThingRepository demoThingRepository, IMapper mapper, ILogger<SearchDemoThingsUseCase> logger)
+        : base(mapper, logger)
     {
         _demoThingRepository = demoThingRepository;
     }
 
-    public async Task<Result<SearchOutputDto<GetDemoThingDto>>> Handle(SearchDemoThingsRequest request, CancellationToken cancellationToken)
+    public async Task<SearchOutputDto<GetDemoThingDto>> Handle(SearchDemoThingsRequest request, CancellationToken cancellationToken)
     {
-        var count = await _demoThingRepository.CountAsync(request.Term);
-        if (count == 0)
-            return Result<SearchOutputDto<GetDemoThingDto>>.Success(SearchOutputDto<GetDemoThingDto>.Empty());
-
         var demoThings = await _demoThingRepository.SearchAsync(request.Term, request.PageNumber, request.RecordsPerPage);
-        var dtos = demoThings.Select(MapToDto);
+        var totalRecords = await _demoThingRepository.CountAsync(request.Term);
 
-        return Result<SearchOutputDto<GetDemoThingDto>>.Success(
-            new SearchOutputDto<GetDemoThingDto>
-            {
-                Items = dtos,
-                TotalCount = count,
-                PageNumber = request.PageNumber,
-                RecordsPerPage = request.RecordsPerPage
-            }
-        );
-    }
+        var demoThingsDto = _mapper.Map<IEnumerable<GetDemoThingDto>>(demoThings);
 
-    private static GetDemoThingDto MapToDto(DemoThing demoThing)
-    {
-        return new GetDemoThingDto
-        {
-            Id = demoThing.Id,
-            Name = demoThing.Name,
-            Description = demoThing.Description,
-            CreationTime = demoThing.CreationTime
-        };
+        //foreach (var dto in demoThingsDto)
+        //{
+        //
+        //}
+
+        return new SearchOutputDto<GetDemoThingDto> { TotalRecords = totalRecords, Items = demoThingsDto };
     }
-} 
+}
diff --git a/src/1-Libraries/Application/UseCases/DemoThings/UpdateDemoThing/UpdateDemoThingUseCase.cs b/src/1-Libraries/Application/UseCases/DemoThings/UpdateDemoThing/UpdateDemoThingUseCase.cs
@@ -1,3 +1,4 @@
+using CanBeYours.Application.Exceptions;
 using CanBeYours.Core.Domain.DemoThings;
 using CodeBlock.DevKit.Application.Commands;
 using CodeBlock.DevKit.Application.Srvices;
@@ -11,7 +12,11 @@ internal class UpdateDemoThingUseCase : BaseCommandHandler, IRequestHandler<Upda
 {
     private readonly IDemoThingRepository _demoThingRepository;
 
-    public UpdateDemoThingUseCase(IDemoThingRepository demoThingRepository, IRequestDispatcher requestDispatcher, ILogger<UpdateDemoThingUseCase> logger)
+    public UpdateDemoThingUseCase(
+        IDemoThingRepository demoThingRepository,
+        IRequestDispatcher requestDispatcher,
+        ILogger<UpdateDemoThingUseCase> logger
+    )
         : base(requestDispatcher, logger)
     {
         _demoThingRepository = demoThingRepository;
@@ -21,14 +26,16 @@ public async Task<CommandResult> Handle(UpdateDemoThingRequest request, Cancella
     {
         var demoThing = await _demoThingRepository.GetByIdAsync(request.Id);
         if (demoThing == null)
-            return CommandResult.NotFound();
+            throw DemoThingApplicationExceptions.DemoThingNotFound(request.Id);
+
+        var loadedVersion = demoThing.Version;
 
         demoThing.Update(request.Name, request.Description);
 
-        await _demoThingRepository.UpdateAsync(demoThing);
+        await _demoThingRepository.ConcurrencySafeUpdateAsync(demoThing, loadedVersion);
 
         await PublishDomainEventsAsync(demoThing.GetDomainEvents());
 
         return CommandResult.Create(entityId: demoThing.Id);
     }
-} 
+}
diff --git a/src/1-Libraries/Core/Domain/DemoThings/DemoThing.cs b/src/1-Libraries/Core/Domain/DemoThings/DemoThing.cs
@@ -43,9 +43,9 @@ protected override void CheckInvariants() { }
     private void CheckPolicies()
     {
         if (Name.IsNullOrEmptyOrWhiteSpace())
-            throw DemoThingExceptions.NameIsRequired();
+            throw DemoThingDomainExceptions.NameIsRequired();
 
         if (Description.IsNullOrEmptyOrWhiteSpace())
-            throw DemoThingExceptions.DescriptionIsRequired();
+            throw DemoThingDomainExceptions.DescriptionIsRequired();
     }
 }
diff --git a/src/1-Libraries/Core/Domain/DemoThings/DemoThingDomainExceptions.cs b/src/1-Libraries/Core/Domain/DemoThings/DemoThingDomainExceptions.cs
@@ -8,7 +8,7 @@
 
 namespace CanBeYours.Core.Domain.DemoThings;
 
-internal static class DemoThingExceptions
+internal static class DemoThingDomainExceptions
 {
     public static DomainException NameIsRequired()
     {
diff --git a/src/1-Libraries/Core/Resources/SharedResource.Designer.cs b/src/1-Libraries/Core/Resources/SharedResource.Designer.cs
diff --git a/src/1-Libraries/Core/Resources/SharedResource.resx b/src/1-Libraries/Core/Resources/SharedResource.resx
@@ -117,6 +117,9 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
+  <data name="DemoThing" xml:space="preserve">
+    <value>Demo Thing</value>
+  </data>
   <data name="DemoThing_Description" xml:space="preserve">
     <value>Description</value>
   </data>

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`
`3`	`3`	`namespace CanBeYours.Application.Dtos;`
`4`	`4`
`5`		`-public class GetDemoThingDto : BaseDto`
	`5`	`+public class GetDemoThingDto : GetEntityDto`
`6`	`6`	`{`
`7`	`7`	`public string Name { get; set; }`
`8`	`8`	`public string Description { get; set; }`
Original file line number	Diff line number	Diff line change
`@@ -5,4 +5,4 @@ namespace CanBeYours.Application.Dtos;`
`5`	`5`	`public class SearchDemoThingsInputDto : SearchInputDto`
`6`	`6`	`{`
`7`	`7`	`// Add any additional search filters here if needed in the future`
`8`		`-}`
	`8`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -31,8 +31,6 @@ public async Task<Result<CommandResult>> UpdateDemoThing(string id, UpdateDemoTh`
`31`	`31`
`32`	`32`	`public async Task<Result<SearchOutputDto<GetDemoThingDto>>> SearchDemoThings(SearchDemoThingsInputDto input)`
`33`	`33`	`{`
`34`		`- return await _requestDispatcher.SendQuery(`
`35`		`- new SearchDemoThingsRequest(input.Term, input.PageNumber, input.RecordsPerPage, input.SortOrder)`
`36`		`- );`
	`34`	`+ return await _requestDispatcher.SendQuery(new SearchDemoThingsRequest(input.Term, input.PageNumber, input.RecordsPerPage, input.SortOrder));`
`37`	`35`	`}`
`38`	`36`	`}`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,11 @@ internal class CreateDemoThingUseCase : BaseCommandHandler, IRequestHandler<Crea`
`11`	`11`	`{`
`12`	`12`	`private readonly IDemoThingRepository _demoThingRepository;`
`13`	`13`
`14`		`- public CreateDemoThingUseCase(IDemoThingRepository demoThingRepository, IRequestDispatcher requestDispatcher, ILogger<CreateDemoThingUseCase> logger)`
	`14`	`+ public CreateDemoThingUseCase(`
	`15`	`+ IDemoThingRepository demoThingRepository,`
	`16`	`+ IRequestDispatcher requestDispatcher,`
	`17`	`+ ILogger<CreateDemoThingUseCase> logger`
	`18`	`+ )`
`15`	`19`	`: base(requestDispatcher, logger)`
`16`	`20`	`{`
`17`	`21`	`_demoThingRepository = demoThingRepository;`
`@@ -27,4 +31,4 @@ public async Task<CommandResult> Handle(CreateDemoThingRequest request, Cancella`
`27`	`31`
`28`	`32`	`return CommandResult.Create(entityId: demoThing.Id);`
`29`	`33`	`}`
`30`		`-}`
	`34`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -1,14 +1,16 @@`
`1`	`1`	`using CanBeYours.Application.Dtos;`
`2`	`2`	`using CodeBlock.DevKit.Application.Queries;`
	`3`	`+using CodeBlock.DevKit.Core.Helpers;`
`3`	`4`
`4`	`5`	`namespace CanBeYours.Application.UseCases.DemoThings.GetDemoThing;`
`5`	`6`
`6`	`7`	`internal class GetDemoThingRequest : BaseQuery<GetDemoThingDto>`
`7`	`8`	`{`
`8`		`- public GetDemoThingRequest(string id)`
	`9`	`+ public GetDemoThingRequest(string id, QueryOptions options = null)`
	`10`	`+ : base(options)`
`9`	`11`	`{`
`10`	`12`	`Id = id;`
`11`	`13`	`}`
`12`	`14`
`13`		`- public string Id { get; }`
`14`		`-}`
	`15`	`+ public string Id { get; set; }`
	`16`	`+}`