feat: add type to demo thing

hamed-shirbandi · hamed-shirbandi · commit aa4ecd506a04 · 2025-07-16T00:20:57.000+02:00
diff --git a/src/1-Libraries/Application/Application.csproj b/src/1-Libraries/Application/Application.csproj
@@ -8,6 +8,7 @@
   <ItemGroup>
     <PackageReference Include="CodeBlock.DevKit.Application" Version="1.3.5" />
     <PackageReference Include="CodeBlock.DevKit.Contracts" Version="1.3.5" />
+    <PackageReference Include="CodeBlock.DevKit.Identity" Version="1.3.5" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Core\Core.csproj" />
diff --git a/src/1-Libraries/Application/Dtos/CreateDemoThingDto.cs b/src/1-Libraries/Application/Dtos/CreateDemoThingDto.cs
@@ -1,13 +1,21 @@
 using System.ComponentModel.DataAnnotations;
+using CanBeYours.Core.Domain.DemoThings;
 using CanBeYours.Core.Resources;
+using CodeBlock.DevKit.Core.Resources;
 
 namespace CanBeYours.Application.Dtos;
 
 public class CreateDemoThingDto
 {
+    [Display(Name = nameof(SharedResource.DemoThing_Name), ResourceType = typeof(SharedResource))]
     [Required(ErrorMessageResourceType = typeof(SharedResource), ErrorMessageResourceName = nameof(SharedResource.DemoThing_Name))]
     public string Name { get; set; }
 
+    [Display(Name = nameof(SharedResource.DemoThing_Description), ResourceType = typeof(SharedResource))]
     [Required(ErrorMessageResourceType = typeof(SharedResource), ErrorMessageResourceName = nameof(SharedResource.DemoThing_Description))]
     public string Description { get; set; }
+
+    [Display(Name = nameof(SharedResource.DemoThing_Type), ResourceType = typeof(SharedResource))]
+    [Required(ErrorMessageResourceName = nameof(CoreResource.Required), ErrorMessageResourceType = typeof(CoreResource))]
+    public DemoThingType Type { get; set; }
 }
diff --git a/src/1-Libraries/Application/Dtos/GetDemoThingDto.cs b/src/1-Libraries/Application/Dtos/GetDemoThingDto.cs
@@ -1,3 +1,4 @@
+using CanBeYours.Core.Domain.DemoThings;
 using CodeBlock.DevKit.Contracts.Dtos;
 
 namespace CanBeYours.Application.Dtos;
@@ -6,4 +7,6 @@ public class GetDemoThingDto : GetEntityDto
 {
     public string Name { get; set; }
     public string Description { get; set; }
+    public DemoThingType Type { get; set; }
+    public string UserId { get; set; }
 }
diff --git a/src/1-Libraries/Application/Dtos/UpdateDemoThingDto.cs b/src/1-Libraries/Application/Dtos/UpdateDemoThingDto.cs
@@ -1,13 +1,21 @@
 using System.ComponentModel.DataAnnotations;
+using CanBeYours.Core.Domain.DemoThings;
 using CanBeYours.Core.Resources;
+using CodeBlock.DevKit.Core.Resources;
 
 namespace CanBeYours.Application.Dtos;
 
 public class UpdateDemoThingDto
 {
+    [Display(Name = nameof(SharedResource.DemoThing_Name), ResourceType = typeof(SharedResource))]
     [Required(ErrorMessageResourceType = typeof(SharedResource), ErrorMessageResourceName = nameof(SharedResource.DemoThing_Name))]
     public string Name { get; set; }
 
+    [Display(Name = nameof(SharedResource.DemoThing_Description), ResourceType = typeof(SharedResource))]
     [Required(ErrorMessageResourceType = typeof(SharedResource), ErrorMessageResourceName = nameof(SharedResource.DemoThing_Description))]
     public string Description { get; set; }
+
+    [Display(Name = nameof(SharedResource.DemoThing_Type), ResourceType = typeof(SharedResource))]
+    [Required(ErrorMessageResourceName = nameof(CoreResource.Required), ErrorMessageResourceType = typeof(CoreResource))]
+    public DemoThingType Type { get; set; }
 }
diff --git a/src/1-Libraries/Application/Services/DemoThings/DemoThingService.cs b/src/1-Libraries/Application/Services/DemoThings/DemoThingService.cs
@@ -21,12 +21,12 @@ public async Task<Result<GetDemoThingDto>> GetDemoThing(string id)
 
     public async Task<Result<CommandResult>> CreateDemoThing(CreateDemoThingDto input)
     {
-        return await _requestDispatcher.SendCommand(new CreateDemoThingRequest(input.Name, input.Description));
+        return await _requestDispatcher.SendCommand(new CreateDemoThingRequest(input.Name, input.Description, input.Type));
     }
 
     public async Task<Result<CommandResult>> UpdateDemoThing(string id, UpdateDemoThingDto input)
     {
-        return await _requestDispatcher.SendCommand(new UpdateDemoThingRequest(id, input.Name, input.Description));
+        return await _requestDispatcher.SendCommand(new UpdateDemoThingRequest(id, input.Name, input.Description, input.Type));
     }
 
     public async Task<Result<SearchOutputDto<GetDemoThingDto>>> SearchDemoThings(SearchDemoThingsInputDto input)
diff --git a/src/1-Libraries/Application/UseCases/DemoThings/CreateDemoThing/CreateDemoThingRequest.cs b/src/1-Libraries/Application/UseCases/DemoThings/CreateDemoThing/CreateDemoThingRequest.cs
@@ -1,4 +1,5 @@
 using System.ComponentModel.DataAnnotations;
+using CanBeYours.Core.Domain.DemoThings;
 using CanBeYours.Core.Resources;
 using CodeBlock.DevKit.Application.Commands;
 using CodeBlock.DevKit.Core.Resources;
@@ -7,10 +8,11 @@ namespace CanBeYours.Application.UseCases.DemoThings.CreateDemoThing;
 
 internal class CreateDemoThingRequest : BaseCommand
 {
-    public CreateDemoThingRequest(string name, string description)
+    public CreateDemoThingRequest(string name, string description, DemoThingType type)
     {
         Name = name;
         Description = description;
+        Type = type;
     }
 
     [Display(Name = nameof(SharedResource.DemoThing_Name), ResourceType = typeof(SharedResource))]
@@ -20,4 +22,8 @@ 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; }
+
+    [Display(Name = nameof(SharedResource.DemoThing_Type), ResourceType = typeof(SharedResource))]
+    [Required(ErrorMessageResourceName = nameof(CoreResource.Required), ErrorMessageResourceType = typeof(CoreResource))]
+    public DemoThingType Type { get; }
 }
diff --git a/src/1-Libraries/Application/UseCases/DemoThings/CreateDemoThing/CreateDemoThingUseCase.cs b/src/1-Libraries/Application/UseCases/DemoThings/CreateDemoThing/CreateDemoThingUseCase.cs
@@ -10,20 +10,23 @@ namespace CanBeYours.Application.UseCases.DemoThings.CreateDemoThing;
 internal class CreateDemoThingUseCase : BaseCommandHandler, IRequestHandler<CreateDemoThingRequest, CommandResult>
 {
     private readonly IDemoThingRepository _demoThingRepository;
+    private readonly ICurrentUser _currentUser;
 
     public CreateDemoThingUseCase(
         IDemoThingRepository demoThingRepository,
         IRequestDispatcher requestDispatcher,
-        ILogger<CreateDemoThingUseCase> logger
+        ILogger<CreateDemoThingUseCase> logger,
+        ICurrentUser currentUser
     )
         : base(requestDispatcher, logger)
     {
         _demoThingRepository = demoThingRepository;
+        _currentUser = currentUser;
     }
 
     public async Task<CommandResult> Handle(CreateDemoThingRequest request, CancellationToken cancellationToken)
     {
-        var demoThing = DemoThing.Create(request.Name, request.Description);
+        var demoThing = DemoThing.Create(request.Name, request.Description, request.Type, _currentUser.GetUserId());
 
         await _demoThingRepository.AddAsync(demoThing);
 
diff --git a/src/1-Libraries/Application/UseCases/DemoThings/UpdateDemoThing/UpdateDemoThingRequest.cs b/src/1-Libraries/Application/UseCases/DemoThings/UpdateDemoThing/UpdateDemoThingRequest.cs
@@ -1,4 +1,5 @@
 using System.ComponentModel.DataAnnotations;
+using CanBeYours.Core.Domain.DemoThings;
 using CanBeYours.Core.Resources;
 using CodeBlock.DevKit.Application.Commands;
 using CodeBlock.DevKit.Core.Resources;
@@ -7,11 +8,12 @@ namespace CanBeYours.Application.UseCases.DemoThings.UpdateDemoThing;
 
 internal class UpdateDemoThingRequest : BaseCommand
 {
-    public UpdateDemoThingRequest(string id, string name, string description)
+    public UpdateDemoThingRequest(string id, string name, string description, DemoThingType type)
     {
         Id = id;
         Name = name;
         Description = description;
+        Type = type;
     }
 
     public string Id { get; }
@@ -23,4 +25,8 @@ public UpdateDemoThingRequest(string id, 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; }
-} 
+
+    [Display(Name = nameof(SharedResource.DemoThing_Type), ResourceType = typeof(SharedResource))]
+    [Required(ErrorMessageResourceName = nameof(CoreResource.Required), ErrorMessageResourceType = typeof(CoreResource))]
+    public DemoThingType Type { get; }
+}
diff --git a/src/1-Libraries/Application/UseCases/DemoThings/UpdateDemoThing/UpdateDemoThingUseCase.cs b/src/1-Libraries/Application/UseCases/DemoThings/UpdateDemoThing/UpdateDemoThingUseCase.cs
@@ -30,7 +30,7 @@ public async Task<CommandResult> Handle(UpdateDemoThingRequest request, Cancella
 
         var loadedVersion = demoThing.Version;
 
-        demoThing.Update(request.Name, request.Description);
+        demoThing.Update(request.Name, request.Description, request.Type);
 
         await _demoThingRepository.ConcurrencySafeUpdateAsync(demoThing, loadedVersion);
 
diff --git a/src/1-Libraries/Core/Domain/DemoThings/DemoThing.cs b/src/1-Libraries/Core/Domain/DemoThings/DemoThing.cs
@@ -1,14 +1,18 @@
-﻿using CodeBlock.DevKit.Core.Extensions;
+﻿using System.ComponentModel.DataAnnotations;
+using CanBeYours.Core.Resources;
+using CodeBlock.DevKit.Core.Extensions;
 using CodeBlock.DevKit.Domain.Entities;
 
 namespace CanBeYours.Core.Domain.DemoThings;
 
 public sealed class DemoThing : AggregateRoot
 {
-    private DemoThing(string name, string description)
+    private DemoThing(string name, string description, DemoThingType type, string userId)
     {
         Name = name;
         Description = description;
+        Type = type;
+        UserId = userId;
 
         CheckPolicies();
 
@@ -18,19 +22,22 @@ private DemoThing(string name, string description)
 
     public string Name { get; private set; }
     public string Description { get; private set; }
+    public DemoThingType Type { get; private set; }
+    public string UserId { get; private set; }
 
-    public static DemoThing Create(string name, string description)
+    public static DemoThing Create(string name, string description, DemoThingType type, string userId)
     {
-        return new DemoThing(name, description);
+        return new DemoThing(name, description, type, userId);
     }
 
-    public void Update(string name, string description)
+    public void Update(string name, string description, DemoThingType type)
     {
-        if (Name == name && Description == description)
+        if (Name == name && Description == description && Type == type)
             return;
 
         Name = name;
         Description = description;
+        Type = type;
 
         CheckPolicies();
 
@@ -47,5 +54,20 @@ private void CheckPolicies()
 
         if (Description.IsNullOrEmptyOrWhiteSpace())
             throw DemoThingDomainExceptions.DescriptionIsRequired();
+
+        if (UserId.IsNullOrEmptyOrWhiteSpace())
+            throw DemoThingDomainExceptions.UserIdIsRequired();
     }
 }
+
+public enum DemoThingType
+{
+    [Display(Name = nameof(SharedResource.DemoThingType_DemoType1), ResourceType = typeof(SharedResource))]
+    DemoType1 = 0,
+
+    [Display(Name = nameof(SharedResource.DemoThingType_DemoType2), ResourceType = typeof(SharedResource))]
+    DemoType2 = 1,
+
+    [Display(Name = nameof(SharedResource.DemoThingType_DemoType3), ResourceType = typeof(SharedResource))]
+    DemoType3 = 2,
+}
diff --git a/src/1-Libraries/Core/Domain/DemoThings/DemoThingDomainExceptions.cs b/src/1-Libraries/Core/Domain/DemoThings/DemoThingDomainExceptions.cs
@@ -27,4 +27,13 @@ public static DomainException DescriptionIsRequired()
             new List<MessagePlaceholder> { MessagePlaceholder.CreateResource(SharedResource.DemoThing_Description, typeof(SharedResource)) }
         );
     }
+
+    public static DomainException UserIdIsRequired()
+    {
+        return new DomainException(
+            nameof(CoreResource.Required),
+            typeof(CoreResource),
+            new List<MessagePlaceholder> { MessagePlaceholder.CreateResource(SharedResource.DemoThing_UserId, typeof(SharedResource)) }
+        );
+    }
 }
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.fa.resx b/src/1-Libraries/Core/Resources/SharedResource.fa.resx
@@ -117,10 +117,28 @@
   <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>مورد دمو</value>
+  </data>
+  <data name="DemoThingType_DemoType1" xml:space="preserve">
+    <value>نوع دموی 1</value>
+  </data>
+  <data name="DemoThingType_DemoType2" xml:space="preserve">
+    <value>نوع دموی 2</value>
+  </data>
+  <data name="DemoThingType_DemoType3" xml:space="preserve">
+    <value>نوع دموی 3</value>
+  </data>
   <data name="DemoThing_Description" xml:space="preserve">
     <value>توضیحات</value>
   </data>
   <data name="DemoThing_Name" xml:space="preserve">
     <value>نام</value>
   </data>
+  <data name="DemoThing_Type" xml:space="preserve">
+    <value>نوع</value>
+  </data>
+  <data name="DemoThing_UserId" xml:space="preserve">
+    <value>شناسه ی کاربر</value>
+  </data>
 </root>
diff --git a/src/1-Libraries/Core/Resources/SharedResource.resx b/src/1-Libraries/Core/Resources/SharedResource.resx
@@ -120,10 +120,25 @@
   <data name="DemoThing" xml:space="preserve">
     <value>Demo Thing</value>
   </data>
+  <data name="DemoThingType_DemoType1" xml:space="preserve">
+    <value>Demo Type 1</value>
+  </data>
+  <data name="DemoThingType_DemoType2" xml:space="preserve">
+    <value>Demo Type 2</value>
+  </data>
+  <data name="DemoThingType_DemoType3" xml:space="preserve">
+    <value>Demo Type 3</value>
+  </data>
   <data name="DemoThing_Description" xml:space="preserve">
     <value>Description</value>
   </data>
   <data name="DemoThing_Name" xml:space="preserve">
     <value>Name</value>
   </data>
+  <data name="DemoThing_Type" xml:space="preserve">
+    <value>Type</value>
+  </data>
+  <data name="DemoThing_UserId" xml:space="preserve">
+    <value>User Id</value>
+  </data>
 </root>
diff --git a/src/1-Libraries/Infrastructure/DbContext/SettingsDbSeeder.cs b/src/1-Libraries/Infrastructure/DbContext/SettingsDbSeeder.cs

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+using CanBeYours.Core.Domain.DemoThings;`
`1`	`2`	`using CodeBlock.DevKit.Contracts.Dtos;`
`2`	`3`
`3`	`4`	`namespace CanBeYours.Application.Dtos;`
`@@ -6,4 +7,6 @@ public class GetDemoThingDto : GetEntityDto`
`6`	`7`	`{`
`7`	`8`	`public string Name { get; set; }`
`8`	`9`	`public string Description { get; set; }`
	`10`	`+ public DemoThingType Type { get; set; }`
	`11`	`+ public string UserId { get; set; }`
`9`	`12`	`}`
Original file line number	Diff line number	Diff line change
`@@ -21,12 +21,12 @@ public async Task<Result<GetDemoThingDto>> GetDemoThing(string id)`
`21`	`21`
`22`	`22`	`public async Task<Result<CommandResult>> CreateDemoThing(CreateDemoThingDto input)`
`23`	`23`	`{`
`24`		`- return await _requestDispatcher.SendCommand(new CreateDemoThingRequest(input.Name, input.Description));`
	`24`	`+ return await _requestDispatcher.SendCommand(new CreateDemoThingRequest(input.Name, input.Description, input.Type));`
`25`	`25`	`}`
`26`	`26`
`27`	`27`	`public async Task<Result<CommandResult>> UpdateDemoThing(string id, UpdateDemoThingDto input)`
`28`	`28`	`{`
`29`		`- return await _requestDispatcher.SendCommand(new UpdateDemoThingRequest(id, input.Name, input.Description));`
	`29`	`+ return await _requestDispatcher.SendCommand(new UpdateDemoThingRequest(id, input.Name, input.Description, input.Type));`
`30`	`30`	`}`
`31`	`31`
`32`	`32`	`public async Task<Result<SearchOutputDto<GetDemoThingDto>>> SearchDemoThings(SearchDemoThingsInputDto input)`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`using System.ComponentModel.DataAnnotations;`
	`2`	`+using CanBeYours.Core.Domain.DemoThings;`
`2`	`3`	`using CanBeYours.Core.Resources;`
`3`	`4`	`using CodeBlock.DevKit.Application.Commands;`
`4`	`5`	`using CodeBlock.DevKit.Core.Resources;`
`@@ -7,10 +8,11 @@ namespace CanBeYours.Application.UseCases.DemoThings.CreateDemoThing;`
`7`	`8`
`8`	`9`	`internal class CreateDemoThingRequest : BaseCommand`
`9`	`10`	`{`
`10`		`- public CreateDemoThingRequest(string name, string description)`
	`11`	`+ public CreateDemoThingRequest(string name, string description, DemoThingType type)`
`11`	`12`	`{`
`12`	`13`	`Name = name;`
`13`	`14`	`Description = description;`
	`15`	`+ Type = type;`
`14`	`16`	`}`
`15`	`17`
`16`	`18`	`[Display(Name = nameof(SharedResource.DemoThing_Name), ResourceType = typeof(SharedResource))]`
`@@ -20,4 +22,8 @@ public CreateDemoThingRequest(string name, string description)`
`20`	`22`	`[Display(Name = nameof(SharedResource.DemoThing_Description), ResourceType = typeof(SharedResource))]`
`21`	`23`	`[Required(ErrorMessageResourceName = nameof(CoreResource.Required), ErrorMessageResourceType = typeof(CoreResource))]`
`22`	`24`	`public string Description { get; }`
	`25`	`+`
	`26`	`+ [Display(Name = nameof(SharedResource.DemoThing_Type), ResourceType = typeof(SharedResource))]`
	`27`	`+ [Required(ErrorMessageResourceName = nameof(CoreResource.Required), ErrorMessageResourceType = typeof(CoreResource))]`
	`28`	`+ public DemoThingType Type { get; }`
`23`	`29`	`}`
Original file line number	Diff line number	Diff line change
`@@ -10,20 +10,23 @@ namespace CanBeYours.Application.UseCases.DemoThings.CreateDemoThing;`
`10`	`10`	`internal class CreateDemoThingUseCase : BaseCommandHandler, IRequestHandler<CreateDemoThingRequest, CommandResult>`
`11`	`11`	`{`
`12`	`12`	`private readonly IDemoThingRepository _demoThingRepository;`
	`13`	`+ private readonly ICurrentUser _currentUser;`
`13`	`14`
`14`	`15`	`public CreateDemoThingUseCase(`
`15`	`16`	`IDemoThingRepository demoThingRepository,`
`16`	`17`	`IRequestDispatcher requestDispatcher,`
`17`		`- ILogger<CreateDemoThingUseCase> logger`
	`18`	`+ ILogger<CreateDemoThingUseCase> logger,`
	`19`	`+ ICurrentUser currentUser`
`18`	`20`	`)`
`19`	`21`	`: base(requestDispatcher, logger)`
`20`	`22`	`{`
`21`	`23`	`_demoThingRepository = demoThingRepository;`
	`24`	`+ _currentUser = currentUser;`
`22`	`25`	`}`
`23`	`26`
`24`	`27`	`public async Task<CommandResult> Handle(CreateDemoThingRequest request, CancellationToken cancellationToken)`
`25`	`28`	`{`
`26`		`- var demoThing = DemoThing.Create(request.Name, request.Description);`
	`29`	`+ var demoThing = DemoThing.Create(request.Name, request.Description, request.Type, _currentUser.GetUserId());`
`27`	`30`
`28`	`31`	`await _demoThingRepository.AddAsync(demoThing);`
`29`	`32`