add version 0.1.3.2

.version

@@ -1 +1 @@
-0.1.3.1
+0.1.3.2

Brizco.Api/Brizco.Api.csproj

@@ -6,8 +6,8 @@
     <ImplicitUsings>enable</ImplicitUsings>
     <DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
     <DockerComposeProjectPath>..\docker-compose.dcproj</DockerComposeProjectPath>
-    <AssemblyVersion>0.1.3.1</AssemblyVersion>
-    <FileVersion>0.1.3.1</FileVersion>
+    <AssemblyVersion>0.1.3.2</AssemblyVersion>
+    <FileVersion>0.1.3.2</FileVersion>
   </PropertyGroup>
 
 	<ItemGroup>

Brizco.Core/EntityServices/Abstracts/IActivityService.cs

@@ -0,0 +1,6 @@
+namespace Brizco.Core.EntityServices.Abstracts;
+
+public interface IActivityService : IScopedDependency
+{
+    Task CreateActivitiesByShiftPlan(Guid shiftPlanId, CancellationToken cancellationToken);
+}

Brizco.Core/EntityServices/ActivityService.cs

@@ -0,0 +1,31 @@
+using Brizco.Domain.CommandQueries.Queries;
+using Brizco.Domain.Entities.Task;
+
+namespace Brizco.Core.EntityServices;
+
+public class ActivityService : IActivityService
+{
+    private readonly IMediator _mediator;
+    private readonly IRepositoryWrapper _repositoryWrapper;
+
+    public ActivityService(IMediator mediator,IRepositoryWrapper repositoryWrapper)
+    {
+        _mediator = mediator;
+        _repositoryWrapper = repositoryWrapper;
+    }
+    public async System.Threading.Tasks.Task CreateActivitiesByShiftPlan(Guid shiftPlanId,CancellationToken cancellationToken)
+    {
+        var shiftPlan = await _mediator.Send(new GetShiftPlanQuery(shiftPlanId), cancellationToken);
+        var tasks = _repositoryWrapper.SetRepository<Brizco.Domain.Entities.Task.Task>()
+            .ExecuteCommand(
+                $@"SELECT t.Id, t.Type, t.Title t.Description t.IsDisposable t.SetFor t.HasDisposed t.ScheduleType t.Amount t.AmountType
+FROM Task t
+INNER JOIN TaskShifts t1 ON t.Id = t1.TaskId
+INNER JOIN TaskDays t2 ON t.Id = t1.TaskId
+INNER JOIN TaskRoutines t3 ON t.Id = t1.TaskId
+WHERE {shiftPlan.ShiftId} = t1.ShiftId
+AND {shiftPlan.PlanFor.DayOfWeek} = t2.DayOfWeek
+AND ON {shiftPlan.RoutineId} = t3.RoutineId ");
+
+    }
+}

Brizco.Domain/CommandQueries/Commands/ShiftPlanCommands.cs

@@ -1,9 +1,9 @@
 namespace Brizco.Domain.CommandQueries.Commands;
 
-public record CreateShiftPlanCommand(DateTime PlanDate,Guid ShiftId,Guid RoutineId, List<KeyValuePair<Guid,Guid>> UserAndPositionIds)
+public record CreateShiftPlanCommand(long PlanDate,Guid ShiftId,Guid RoutineId, List<KeyValuePair<Guid,Guid>> UserAndPositionIds)
     :IRequest<ShiftPlanLDto>;
 
-public record UpdateShiftPlanCommand(Guid Id,DateTime PlanDate, Guid ShiftId, Guid RoutineId, List<KeyValuePair<Guid, Guid>> UserAndPositionIds)
+public record UpdateShiftPlanCommand(Guid Id,long PlanDate, Guid ShiftId, Guid RoutineId, List<KeyValuePair<Guid, Guid>> UserAndPositionIds)
     : IRequest<bool>;
 
 public record DeleteShiftPlanCommand(Guid Id)

Brizco.Domain/Dtos/LargDtos/ShiftPlanLDto.cs

@@ -4,8 +4,8 @@ namespace Brizco.Domain.Dtos.LargDtos;
 
 public class ShiftPlanLDto : BaseDto<ShiftPlanLDto , ShiftPlan>
 {
-    public DateTime StartAt { get; set; }
-    public DateTime EndAt { get; set; }
+    public DateTime PlanFor { get; set; }
+    public Guid RoutineId { get; set; }
     public Guid ShiftId { get; set; }
-    public List<ShiftPlanUserSDto> Users { get; internal set; } = new();
+    public List<ShiftPlanUserSDto> Users { get; set; } = new();
 }

Brizco.Domain/Entities/Task/Activity.cs

@@ -37,4 +37,7 @@ public partial class Activity : Task
     public string PerformanceDescription { get; internal set; } = string.Empty;
     public Guid UserId { get; internal set; }
     public ApplicationUser? User { get; internal set; }
+
+    public Guid ShiftId { get; internal set; }
+    public Shift.Shift? Shift { get; internal set; }
 }

Brizco.Repository/Handlers/ShiftPlan/CreateShiftPlanCommandHandler.cs

@@ -19,7 +19,7 @@ public class CreateShiftPlanCommandHandler : IRequestHandler<CreateShiftPlanComm
         try
         {
             await _repositoryWrapper.BeginTransaction(cancellationToken);
-            var shiftPlan = shift.AddPlan(request.PlanDate,request.RoutineId);
+            var shiftPlan = shift.AddPlan(DateTimeExtensions.UnixTimeStampToDateTime(request.PlanDate),request.RoutineId);
 
             if (request.UserAndPositionIds.Count == 0)
                 throw new AppException("شیفت بندی مورد نظر باید حداقل متشکل از یک فرد باشد", ApiResultStatusCode.BadRequest);

Brizco.Repository/Handlers/ShiftPlan/UpdateShiftPlanCommandHandler.cs

@@ -24,7 +24,7 @@ public class UpdateShiftPlanCommandHandler : IRequestHandler<UpdateShiftPlanComm
             throw new AppException("Shift not found", ApiResultStatusCode.NotFound);
 
 
-        var newPlan = shift.AddPlan(request.PlanDate,request.RoutineId);
+        var newPlan = shift.AddPlan(DateTimeExtensions.UnixTimeStampToDateTime(request.PlanDate), request.RoutineId);
         newPlan.Id = request.Id;
 
 

Brizco.Repository/Migrations/20231120145837_editActivity.cs

@@ -0,0 +1,57 @@
+using System;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace Brizco.Repository.Migrations
+{
+    /// <inheritdoc />
+    public partial class editActivity : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<Guid>(
+                name: "ShiftId",
+                schema: "public",
+                table: "Tasks",
+                type: "uuid",
+                nullable: true);
+
+            migrationBuilder.CreateIndex(
+                name: "IX_Tasks_ShiftId",
+                schema: "public",
+                table: "Tasks",
+                column: "ShiftId");
+
+            migrationBuilder.AddForeignKey(
+                name: "FK_Tasks_Shifts_ShiftId",
+                schema: "public",
+                table: "Tasks",
+                column: "ShiftId",
+                principalSchema: "public",
+                principalTable: "Shifts",
+                principalColumn: "Id",
+                onDelete: ReferentialAction.Restrict);
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropForeignKey(
+                name: "FK_Tasks_Shifts_ShiftId",
+                schema: "public",
+                table: "Tasks");
+
+            migrationBuilder.DropIndex(
+                name: "IX_Tasks_ShiftId",
+                schema: "public",
+                table: "Tasks");
+
+            migrationBuilder.DropColumn(
+                name: "ShiftId",
+                schema: "public",
+                table: "Tasks");
+        }
+    }
+}

Brizco.Repository/Migrations/ApplicationContextModelSnapshot.cs

@@ -1054,12 +1054,17 @@ namespace Brizco.Repository.Migrations
                         .IsRequired()
                         .HasColumnType("text");
 
+                    b.Property<Guid>("ShiftId")
+                        .HasColumnType("uuid");
+
                     b.Property<int>("Status")
                         .HasColumnType("integer");
 
                     b.Property<Guid>("UserId")
                         .HasColumnType("uuid");
 
+                    b.HasIndex("ShiftId");
+
                     b.HasIndex("UserId");
 
                     b.HasDiscriminator().HasValue("Activity");
@@ -1372,12 +1377,20 @@ namespace Brizco.Repository.Migrations
 
             modelBuilder.Entity("Brizco.Domain.Entities.Task.Activity", b =>
                 {
+                    b.HasOne("Brizco.Domain.Entities.Shift.Shift", "Shift")
+                        .WithMany()
+                        .HasForeignKey("ShiftId")
+                        .OnDelete(DeleteBehavior.Restrict)
+                        .IsRequired();
+
                     b.HasOne("Brizco.Domain.Entities.User.ApplicationUser", "User")
                         .WithMany()
                         .HasForeignKey("UserId")
                         .OnDelete(DeleteBehavior.Restrict)
                         .IsRequired();
 
+                    b.Navigation("Shift");
+
                     b.Navigation("User");
                 });
 

Brizco.Repository/Repositories/Base/Contracts/IReadRepository.cs

@@ -3,6 +3,7 @@
     public interface IReadRepository<T> where T : class, IApiEntity
     {
         DbSet<T> Entities { get; }
+        IQueryable<T> ExecuteCommand(FormattableString command);
         IQueryable<T> Table { get; }
         IQueryable<T> TableNoTracking { get; }
         T GetById(params object[] ids);

Brizco.Repository/Repositories/Base/Contracts/IRepository.cs

@@ -5,5 +5,6 @@
         DbSet<T> Entities { get; }
         IQueryable<T> Table { get; }
         IQueryable<T> TableNoTracking { get; }
+        
     }
 }

Brizco.Repository/Repositories/Base/Repository.cs

@@ -1,4 +1,7 @@
-namespace Brizco.Repository.Repositories.Base
+using System.Text;
+using Microsoft.EntityFrameworkCore;
+
+namespace Brizco.Repository.Repositories.Base
 {
     public class Repository<T> : IRepository<T> where T : class, IApiEntity
     {
@@ -27,5 +30,10 @@
         {
             DbContext?.Dispose();
         }
+
+        public IQueryable<T> ExecuteCommand(FormattableString command)
+        {
+            return DbContext.Set<T>().FromSql(command);
+        }
     }
 }