Change SoftDelete for AverageRatings, Ratings and QuartzJobs.

OutOfSchool/OutOfSchool.DataAccess/Models/AverageRating.cs

@@ -1,17 +1,14 @@
 using System;
-using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using OutOfSchool.Services.Enums;
 
 namespace OutOfSchool.Services.Models;
 
-public class AverageRating : IKeyedEntity<long>
+public class AverageRating : IKeyedEntity<long>, ISoftDeleted
 {
     public long Id { get; set; }
 
+    public bool IsDeleted { get; set; }
+
     public float Rate { get; set; }
 
     public int RateQuantity { get; set; }

OutOfSchool/OutOfSchool.DataAccess/Models/Configurations/AverageRatingConfiguration.cs

@@ -9,5 +9,9 @@ internal class AverageRatingConfiguration : IEntityTypeConfiguration<AverageRati
     public void Configure(EntityTypeBuilder<AverageRating> builder)
     {
         builder.HasIndex(x => x.EntityId);
+
+        builder.HasIndex(x => x.IsDeleted);
+
+        builder.Property(x => x.IsDeleted).HasDefaultValue(false);
     }
 }

OutOfSchool/OutOfSchool.DataAccess/Models/Configurations/QuartzJobConfiguration.cs

@@ -0,0 +1,12 @@
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Metadata.Builders;
+
+namespace OutOfSchool.Services.Models.Configurations;
+
+internal class QuartzJobConfiguration : IEntityTypeConfiguration<QuartzJob>
+{
+    public void Configure(EntityTypeBuilder<QuartzJob> builder)
+    {
+        builder.HasKey(x => x.Id);
+    }
+}

OutOfSchool/OutOfSchool.DataAccess/Models/Configurations/RatingConfiguration.cs

@@ -1,5 +1,4 @@
-
-using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Metadata.Builders;
 
 namespace OutOfSchool.Services.Models.Configurations;
@@ -9,5 +8,9 @@ internal class RatingConfiguration : IEntityTypeConfiguration<Rating>
     public void Configure(EntityTypeBuilder<Rating> builder)
     {
         builder.HasIndex(x => x.EntityId);
+
+        builder.HasIndex(x => x.IsDeleted);
+
+        builder.Property(x => x.IsDeleted).HasDefaultValue(false);
     }
 }

OutOfSchool/OutOfSchool.DataAccess/Models/IDto.cs

@@ -0,0 +1,7 @@
+namespace OutOfSchool.Services.Models;
+
+public interface IDto<TEntity, TKey>
+    where TEntity : IKeyedEntity<TKey>
+{
+    TKey Id { get; set; }
+}

OutOfSchool/OutOfSchool.DataAccess/Models/IKeyedEntity.cs

@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace OutOfSchool.Services.Models;
+namespace OutOfSchool.Services.Models;
 
 public interface IKeyedEntity<TKey> : IKeyedEntity
 {

OutOfSchool/OutOfSchool.DataAccess/Models/QuartzJob.cs

@@ -1,10 +1,7 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace OutOfSchool.Services.Models;
+
 public class QuartzJob : IKeyedEntity<long>
 {
     public long Id { get; set; }

OutOfSchool/OutOfSchool.DataAccess/Models/Rating.cs

@@ -1,14 +1,14 @@
 using System;
 using System.ComponentModel.DataAnnotations;
 
-using OutOfSchool.Services.Enums;
-
 namespace OutOfSchool.Services.Models;
 
-public class Rating : IKeyedEntity<long>
+public class Rating : IKeyedEntity<long>, ISoftDeleted
 {
     public long Id { get; set; }
 
+    public bool IsDeleted { get; set; }
+
     [Range(1, 5)]
     public int Rate { get; set; }
 

OutOfSchool/OutOfSchool.DataAccess/OutOfSchoolDbContext.SoftDelete.cs

@@ -46,7 +46,6 @@ private void ApplySoftDelete(ModelBuilder builder)
             .ApplySoftDelete<User>()
             .ApplySoftDelete<Address>()
             .ApplySoftDelete<Application>()
-            .ApplySoftDelete<AverageRating>()
             .ApplySoftDelete<BlockedProviderParent>()
             .ApplySoftDelete<ChatMessageWorkshop>()
             .ApplySoftDelete<ChatRoomWorkshop>()
@@ -59,11 +58,9 @@ private void ApplySoftDelete(ModelBuilder builder)
             .ApplySoftDelete<Provider>()
             .ApplySoftDelete<ProviderAdmin>()
             .ApplySoftDelete<ProviderSectionItem>()
-            .ApplySoftDelete<Rating>()
             .ApplySoftDelete<RegionAdmin>()
             .ApplySoftDelete<SocialGroup>()
             .ApplySoftDelete<Workshop>()
-            .ApplySoftDelete<WorkshopDescriptionItem>()
-            .ApplySoftDelete<QuartzJob>();
+            .ApplySoftDelete<WorkshopDescriptionItem>();
     }
 }

OutOfSchool/OutOfSchool.DataAccess/OutOfSchoolDbContext.cs

@@ -144,6 +144,7 @@ protected override void OnModelCreating(ModelBuilder builder)
         builder.ApplyConfiguration(new OperationWithObjectConfiguration());
         builder.ApplyConfiguration(new ProviderConfiguration());
         builder.ApplyConfiguration(new ProviderAdminConfiguration());
+        builder.ApplyConfiguration(new QuartzJobConfiguration());
         builder.ApplyConfiguration(new RatingConfiguration());
         builder.ApplyConfiguration(new TeacherConfiguration());
         builder.ApplyConfiguration(new WorkshopConfiguration());

OutOfSchool/OutOfSchool.DataAccess/Repository/EntityRepositoryBase.cs

@@ -171,6 +171,22 @@ public virtual async Task<TEntity> Update(TEntity entity)
         return entity;
     }
 
+    public async Task<TEntity> ReadAndUpdateWith<TDto>(TDto dto, Func<TDto, TEntity, TEntity> map)
+        where TDto : IDto<TEntity, TKey>
+    {
+        ArgumentNullException.ThrowIfNull(dto);
+
+        var entity = await GetById(dto.Id).ConfigureAwait(false);
+
+        if (entity is null)
+        {
+            var name = typeof(TEntity).Name;
+            throw new DbUpdateConcurrencyException($"Updating failed. {name} with Id = {dto.Id} doesn't exist in the system.");
+        }
+
+        return await Update(map(dto, entity)).ConfigureAwait(false);
+    }
+
     /// <inheritdoc/>
     public virtual Task<int> Count(Expression<Func<TEntity, bool>> whereExpression = null)
     {

OutOfSchool/OutOfSchool.DataAccess/Repository/IEntityRepository.cs

@@ -50,6 +50,18 @@ public interface IEntityRepositoryBase<TKey, TEntity>
     /// <returns>A <see cref="Task"/> representing the result of the asynchronous operation.</returns>
     Task RunInTransaction(Func<Task> operation);
 
+    /// <summary>
+    /// Read element from database by id and update information.
+    /// </summary>
+    /// <param name="dto">New data with information.</param>
+    /// <param name="map">Method that represents mapping operation.</param>
+    /// <returns>A <see cref="Task{TResult}"/> representing the result of the asynchronous operation.
+    /// The task result contains the entity that was updated.</returns>
+    /// <exception cref="DbUpdateException">An exception that is thrown when an error is encountered while saving to the database.</exception>
+    /// <exception cref="DbUpdateConcurrencyException">If a concurrency violation is encountered while saving to database.</exception>
+    Task<TEntity> ReadAndUpdateWith<TDto>(TDto dto, Func<TDto, TEntity, TEntity> map)
+        where TDto : IDto<TEntity, TKey>;
+
     /// <summary>
     /// Update information about element.
     /// </summary>