Khasanov/TimeRanges

Config/initDbServer.bat

@@ -1,2 +1,2 @@
-docker run -d --name sql_server -e "ACCEPT_EULA=Y" -e "SA_PASSWORD=Oos-password1" -p 1433:1433 -d mcr.microsoft.com/mssql/server:2019-latest
+docker run -d --name sql_server -e "ACCEPT_EULA=Y" -e MSSQL_COLLATION="Ukrainian_100_CI_AS" -e "SA_PASSWORD=Oos-password1" -p 1433:1433 -d mcr.microsoft.com/mssql/server:2019-latest
 pause

Config/initDbServer.sh

@@ -0,0 +1,4 @@
+#!/bin/sh
+
+docker run -d --name sql_server -e "ACCEPT_EULA=Y" -e MSSQL_COLLATION="Ukrainian_100_CI_AS" -e "SA_PASSWORD=Oos-password1" -p 1433:1433 -d mcr.microsoft.com/mssql/server:2019-latest
+

OutOfSchool/OutOfSchool.DataAccess/Enums/ApplicationStatus.cs

@@ -1,10 +1,11 @@
-using System.Text.Json.Serialization;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
 
 namespace OutOfSchool.Services.Enums
 {
     // TODO: Swagger ignores this attribute on model property in webapi layer
     // TODO: Ask Frontend if we can just make all enums as strings instead of magic numbers
-    [JsonConverter(typeof(JsonStringEnumConverter))]
+    [JsonConverter(typeof(StringEnumConverter))]
     public enum ApplicationStatus
     {
         Pending = 1,

OutOfSchool/OutOfSchool.DataAccess/Enums/DaysBitMask.cs

@@ -0,0 +1,20 @@
+using System;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+
+namespace OutOfSchool.Services.Enums
+{
+    [JsonConverter(typeof(StringEnumConverter))]
+    [Flags]
+    public enum DaysBitMask
+    {
+        None = 0,
+        Monday = 1,
+        Tuesday = 2,
+        Wednesday = 4,
+        Thursday = 8,
+        Friday = 16,
+        Saturday = 32,
+        Sunday = 64,
+    }
+}

OutOfSchool/OutOfSchool.DataAccess/IUnitOfWork.cs

@@ -0,0 +1,11 @@
+using System.Threading.Tasks;
+
+namespace OutOfSchool.Services
+{
+    public interface IUnitOfWork
+    {
+        public Task<int> CompleteAsync();
+
+        public int Complete();
+    }
+}

OutOfSchool/OutOfSchool.DataAccess/Models/DateTimeRange.cs

@@ -0,0 +1,21 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+using OutOfSchool.Services.Enums;
+
+namespace OutOfSchool.Services.Models
+{
+    public class DateTimeRange
+    {
+        public long Id { get; set; }
+
+        public TimeSpan StartTime { get; set; }
+
+        public TimeSpan EndTime { get; set; }
+
+        public long WorkshopId { get; set; }
+
+        [Required] 
+        public List<DaysBitMask> Workdays { get; set; }
+    }
+}

OutOfSchool/OutOfSchool.DataAccess/Models/Workshop.cs

@@ -3,6 +3,7 @@
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 using Microsoft.EntityFrameworkCore.Metadata.Internal;
+using Newtonsoft.Json;
 
 namespace OutOfSchool.Services.Models
 {
@@ -47,10 +48,6 @@ public class Workshop
         [Range(0, 18, ErrorMessage = "Max age should be a number from 0 to 18")]
         public int MaxAge { get; set; }
 
-        [Required(ErrorMessage = "Specify how many times per week lessons will be held")]
-        [Range(1, 7, ErrorMessage = "Field should be a digit from 1 to 7")]
-        public int DaysPerWeek { get; set; }
-
         [Column(TypeName = "decimal(18,2)")]
         [Range(0, 10000, ErrorMessage = "Field value should be in a range from 1 to 10 000")]
         public decimal Price { get; set; } = default;
@@ -113,6 +110,8 @@ public class Workshop
 
         public virtual List<Application> Applications { get; set; }
 
+        public virtual List<DateTimeRange> DateTimeRanges { get; set; }
+
         // These properties are only for navigation EF Core.
         public virtual ICollection<ChatRoom> ChatRooms { get; set; }
     }

OutOfSchool/OutOfSchool.DataAccess/OutOfSchool.DataAccess.csproj

@@ -37,5 +37,5 @@
         <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       </PackageReference>
     </ItemGroup>
-
+  
 </Project>

OutOfSchool/OutOfSchool.DataAccess/OutOfSchoolDbContext.cs

@@ -1,12 +1,18 @@
 using Microsoft.AspNetCore.DataProtection.EntityFrameworkCore;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
 using Microsoft.AspNetCore.Identity.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.ChangeTracking;
+using OutOfSchool.Services.Enums;
 using OutOfSchool.Services.Extensions;
 using OutOfSchool.Services.Models;
 
 namespace OutOfSchool.Services
 {
-    public class OutOfSchoolDbContext : IdentityDbContext<User>, IDataProtectionKeyContext
+    public class OutOfSchoolDbContext : IdentityDbContext<User>, IDataProtectionKeyContext, IUnitOfWork
     {
         public OutOfSchoolDbContext(DbContextOptions<OutOfSchoolDbContext> options)
             : base(options)
@@ -47,6 +53,12 @@ public OutOfSchoolDbContext(DbContextOptions<OutOfSchoolDbContext> options)
 
         public DbSet<Favorite> Favorites { get; set; }
 
+        public DbSet<DateTimeRange> DateTimeRanges { get; set; }
+
+        public async Task<int> CompleteAsync() => await this.SaveChangesAsync();
+
+        public int Complete() => this.SaveChanges();
+
         protected override void OnModelCreating(ModelBuilder builder)
         {
             base.OnModelCreating(builder);
@@ -67,16 +79,16 @@ protected override void OnModelCreating(ModelBuilder builder)
                 .HasMany(r => r.Users)
                 .WithMany(u => u.ChatRooms)
                 .UsingEntity<ChatRoomUser>(
-                j => j
-                    .HasOne(cru => cru.User)
-                    .WithMany(u => u.ChatRoomUsers)
-                    .HasForeignKey(cru => cru.UserId)
-                    .OnDelete(DeleteBehavior.Cascade),
-                j => j
-                    .HasOne(cru => cru.ChatRoom)
-                    .WithMany(r => r.ChatRoomUsers)
-                    .HasForeignKey(cru => cru.ChatRoomId)
-                    .OnDelete(DeleteBehavior.Cascade));
+                    j => j
+                        .HasOne(cru => cru.User)
+                        .WithMany(u => u.ChatRoomUsers)
+                        .HasForeignKey(cru => cru.UserId)
+                        .OnDelete(DeleteBehavior.Cascade),
+                    j => j
+                        .HasOne(cru => cru.ChatRoom)
+                        .WithMany(r => r.ChatRoomUsers)
+                        .HasForeignKey(cru => cru.ChatRoomId)
+                        .OnDelete(DeleteBehavior.Cascade));
 
             builder.Entity<ChatRoom>()
                 .HasOne(r => r.Workshop)
@@ -107,6 +119,18 @@ protected override void OnModelCreating(ModelBuilder builder)
                 .HasForeignKey(x => x.ActualAddressId)
                 .IsRequired(false);
 
+            builder.Entity<DateTimeRange>()
+                .HasCheckConstraint("CK_DateTimeRanges_EndTimeIsAfterStartTime", "[EndTime] >= [StartTime]");
+
+            builder.Entity<DateTimeRange>()
+                .Property(range => range.Workdays)
+                .HasConversion(
+                    list => (byte)list.Aggregate((prev, next) => prev | next),
+                    mask =>
+                        Enum.GetValues(typeof(DaysBitMask)).Cast<DaysBitMask>().ToList()
+                            .Where(amenity => amenity != 0 && ((DaysBitMask) mask).HasFlag(amenity)).ToList(),
+                    ValueComparer.CreateDefault(typeof(List<DaysBitMask>), true));
+
             builder.Seed();
             builder.UpdateIdentityTables();
         }

OutOfSchool/OutOfSchool.DataAccess/Repository/IWorkshopRepository.cs

@@ -8,11 +8,15 @@ namespace OutOfSchool.Services.Repository
 {
     public interface IWorkshopRepository : IEntityRepository<Workshop>
     {
+        IUnitOfWork UnitOfWork { get; }
+
         /// <summary>
         /// Checks entity classId existence.
         /// </summary>
         /// <param name="id">Class id.</param>
         /// <returns>True if Class exists, otherwise false.</returns>
         bool ClassExists(long id);
+
+        Task<Workshop> GetWithNavigations(long id);
     }
-}
+}

OutOfSchool/OutOfSchool.DataAccess/Repository/WorkshopRepository.cs

@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
+using System.Linq;
 using System.Threading.Tasks;
 using Microsoft.EntityFrameworkCore;
 using OutOfSchool.Services.Models;
@@ -13,11 +10,13 @@ public class WorkshopRepository : EntityRepository<Workshop>, IWorkshopRepositor
         private readonly OutOfSchoolDbContext db;
 
         public WorkshopRepository(OutOfSchoolDbContext dbContext)
-         : base(dbContext)
+            : base(dbContext)
         {
             db = dbContext;
         }
 
+        public IUnitOfWork UnitOfWork => db;
+
         /// <inheritdoc/>
         public new async Task Delete(Workshop entity)
         {
@@ -43,6 +42,15 @@ public WorkshopRepository(OutOfSchoolDbContext dbContext)
             await db.SaveChangesAsync();
         }
 
+        public async Task<Workshop> GetWithNavigations(long id)
+        {
+            return await db.Workshops
+                .Include(ws => ws.Address)
+                .Include(ws => ws.Teachers)
+                .Include(ws => ws.DateTimeRanges)
+                .SingleOrDefaultAsync(ws => ws.Id == id);
+        }
+
         /// <inheritdoc/>
         public bool ClassExists(long id) => db.Classes.Any(x => x.Id == id);
     }