Storing workshop to cache during creation

OutOfSchool/Directory.Packages.props

@@ -47,7 +47,7 @@
     <!--Elasticsearch-->
     <PackageVersion Include="Elastic.Clients.Elasticsearch" Version="8.15.6" />
     <!--Redis-->
-    <PackageVersion Include="Microsoft.Extensions.Caching.StackExchangeRedis" Version="$(RedisVersion)" />
+    <PackageVersion Include="Microsoft.Extensions.Caching.StackExchangeRedis" Version="8.0.11" />
     <PackageVersion Include="Microsoft.AspNetCore.SignalR.StackExchangeRedis" Version="$(RedisVersion)" />
     <!--Identity-->
     <PackageVersion Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="8.0.1" />

OutOfSchool/OutOfSchool.AdminInitializer/OutOfSchool.AdminInitializer.csproj

@@ -1,11 +1,13 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
         <TargetFramework>net8.0</TargetFramework>
+        <NuGetAuditMode>direct</NuGetAuditMode>
         <OutputType>Exe</OutputType>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
         <UserSecretsId>dd058b3f-d89a-4456-a6df-2f32568b56ea</UserSecretsId>
     </PropertyGroup>
+
     <ItemGroup>
         <PackageReference Include="Microsoft.Extensions.Hosting" />
         <PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" />

OutOfSchool/OutOfSchool.AuthCommon/OutOfSchool.AuthCommon.csproj

@@ -1,4 +1,10 @@
 <Project Sdk="Microsoft.NET.Sdk.Razor">
+
+    <PropertyGroup>
+      <TargetFramework>net8.0</TargetFramework>
+      <NuGetAuditMode>direct</NuGetAuditMode>
+    </PropertyGroup>    
+
     <PropertyGroup>
         <PackageId>auth</PackageId>
         <ImplicitUsings>enable</ImplicitUsings>

OutOfSchool/OutOfSchool.AuthServer.Tests/OutOfSchool.AuthServer.Tests.csproj

@@ -1,11 +1,12 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <IsPackable>false</IsPackable>
+        <TargetFramework>net8.0</TargetFramework>
+        <NuGetAuditMode>direct</NuGetAuditMode>
     </PropertyGroup>
-
+  
     <PropertyGroup>
-        <TargetFramework>net8.0</TargetFramework>
+        <IsPackable>false</IsPackable>
     </PropertyGroup>
 
     <ItemGroup>

OutOfSchool/OutOfSchool.AuthorizationServer/OutOfSchool.AuthorizationServer.csproj

@@ -2,6 +2,7 @@
 
     <PropertyGroup>
         <TargetFramework>net8.0</TargetFramework>
+        <NuGetAuditMode>direct</NuGetAuditMode>
         <UserSecretsId>23768b69-757e-4a20-894f-dcf7181971ca</UserSecretsId>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>

OutOfSchool/OutOfSchool.BackgroundJobs/OutOfSchool.BackgroundJobs.csproj

@@ -1,5 +1,10 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
+  <PropertyGroup>
+    <TargetFramework>net8.0</TargetFramework>
+    <NuGetAuditMode>direct</NuGetAuditMode>
+  </PropertyGroup>
+
   <PropertyGroup>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>

OutOfSchool/OutOfSchool.BusinessLogic/Models/Workshops/Drafts/WorkshopContactsDto.cs

@@ -0,0 +1,26 @@
+using System.ComponentModel.DataAnnotations;
+using Microsoft.AspNetCore.Mvc;
+using OutOfSchool.BusinessLogic.Util.JsonTools;
+
+namespace OutOfSchool.BusinessLogic.Models.Workshops.Drafts;
+public class WorkshopContactsDto : WorkshopDescriptionDto
+{
+    [DataType(DataType.Url)]
+    [MaxLength(Constants.MaxUnifiedUrlLength)]
+    public string Website { get; set; } = string.Empty;
+
+    [DataType(DataType.Url)]
+    [MaxLength(Constants.MaxUnifiedUrlLength)]
+    public string Facebook { get; set; } = string.Empty;
+
+    [DataType(DataType.Url)]
+    [MaxLength(Constants.MaxUnifiedUrlLength)]
+    public string Instagram { get; set; } = string.Empty;
+
+    [Required]
+    public long AddressId { get; set; }
+
+    [Required]
+    [ModelBinder(BinderType = typeof(JsonModelBinder))]
+    public AddressDto Address { get; set; }
+}

OutOfSchool/OutOfSchool.BusinessLogic/Models/Workshops/Drafts/WorkshopDescriptionDto.cs

@@ -0,0 +1,40 @@
+using System.ComponentModel.DataAnnotations;
+using Microsoft.AspNetCore.Mvc;
+using OutOfSchool.BusinessLogic.Util.CustomValidation;
+using OutOfSchool.BusinessLogic.Util.JsonTools;
+
+namespace OutOfSchool.BusinessLogic.Models.Workshops.Drafts;
+
+public class WorkshopDescriptionDto : WorkshopRequiredPropertiesDto
+{
+    [ModelBinder(BinderType = typeof(JsonModelBinder))]
+    [CollectionNotEmpty(ErrorMessage = "At least one description item is required")]
+    public IEnumerable<WorkshopDescriptionItemDto> WorkshopDescriptionItems { get; set; }
+
+    public bool WithDisabilityOptions { get; set; } = default;
+
+    [MaxLength(200)]
+    public string DisabilityOptionsDesc { get; set; } = string.Empty;
+
+    public Guid? InstitutionId { get; set; }
+
+    public Guid? InstitutionHierarchyId { get; set; }
+
+    public List<long> DirectionIds { get; set; }
+
+    [ModelBinder(BinderType = typeof(JsonModelBinder))]
+    public IEnumerable<string> Keywords { get; set; } = default;
+
+    [MaxLength(500)]
+    public string AdditionalDescription { get; set; }
+
+    public bool AreThereBenefits { get; set; } = default;
+
+    [MaxLength(500)]
+    public string PreferentialTermsOfParticipation { get; set; }
+
+    public uint CoverageId { get; set; } = 0;
+
+    [ModelBinder(BinderType = typeof(JsonModelBinder))]
+    public List<long> TagIds { get; set; } = [];
+}

OutOfSchool/OutOfSchool.BusinessLogic/Models/Workshops/Drafts/WorkshopMainRequiredPropertiesDto.cs

@@ -0,0 +1,107 @@
+using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations.Schema;
+using System.Text.Json.Serialization;
+using Microsoft.AspNetCore.Mvc;
+using OutOfSchool.BusinessLogic.Util.CustomValidation;
+using OutOfSchool.BusinessLogic.Util.JsonTools;
+using OutOfSchool.Common.Enums;
+using OutOfSchool.Common.Validators;
+using OutOfSchool.Services.Enums;
+
+namespace OutOfSchool.BusinessLogic.Models.Workshops.Drafts;
+
+[JsonDerivedType(typeof(WorkshopMainRequiredPropertiesDto), typeDiscriminator: "withMainProperties")]
+[JsonDerivedType(typeof(WorkshopRequiredPropertiesDto), typeDiscriminator: "withOtherRequiredProperties")]
+[JsonDerivedType(typeof(WorkshopDescriptionDto), typeDiscriminator: "withDescription")]
+[JsonDerivedType(typeof(WorkshopContactsDto), typeDiscriminator: "withContacts")]
+[JsonDerivedType(typeof(WorkshopCreateRequestDto), typeDiscriminator: "withStaff")]
+[JsonDerivedType(typeof(WorkshopV2CreateRequestDto), typeDiscriminator: "withImages")]
+public class WorkshopMainRequiredPropertiesDto : IValidatableObject
+{
+    public Guid Id { get; set; }
+
+    [Required(ErrorMessage = "Workshop title is required")]
+    [MinLength(Constants.MinWorkshopTitleLength)]
+    [MaxLength(Constants.MaxWorkshopTitleLength)]
+    public string Title { get; set; } = string.Empty;
+
+    [Required(ErrorMessage = "Workshop short title is required")]
+    [MinLength(Constants.MinWorkshopShortTitleLength)]
+    [MaxLength(Constants.MaxWorkshopShortTitleLength)]
+    public string ShortTitle { get; set; } = string.Empty;
+
+    [DataType(DataType.PhoneNumber)]
+    [Required(ErrorMessage = "Phone number is required")]
+    [CustomPhoneNumber(ErrorMessage = Constants.PhoneErrorMessage)]
+    [DisplayFormat(DataFormatString = Constants.PhoneNumberFormat)]
+    public string Phone { get; set; } = string.Empty;
+
+    [DataType(DataType.EmailAddress)]
+    [Required(ErrorMessage = "Email is required")]
+    [MaxLength(256)]
+    public string Email { get; set; } = string.Empty;
+
+    [Required(ErrorMessage = "Children's min age is required")]
+    [Range(0, 120, ErrorMessage = "Min age should be a number from 0 to 120")]
+    public int MinAge { get; set; }
+
+    [Required(ErrorMessage = "Children's max age is required")]
+    [Range(0, 120, ErrorMessage = "Max age should be a number from 0 to 120")]
+    public int MaxAge { get; set; }
+
+    [ModelBinder(BinderType = typeof(JsonModelBinder))]
+    [CollectionNotEmpty(ErrorMessage = "At least one DateTime range is required")]
+    public List<DateTimeRangeDto> DateTimeRanges { get; set; }
+
+    [Required(ErrorMessage = "Form of learning is required")]
+    [EnumDataType(typeof(FormOfLearning), ErrorMessage = Constants.EnumErrorMessage)]
+    public FormOfLearning FormOfLearning { get; set; } = FormOfLearning.Offline;
+
+    [Required(ErrorMessage = "Property IsPaid is required")]
+    public bool IsPaid { get; set; } = false;
+
+    [Column(TypeName = "decimal(18,2)")]
+    [Range(0, 100000, ErrorMessage = "Field value should be in a range from 1 to 100 000")]
+    public decimal? Price { get; set; } = default;
+
+    [EnumDataType(typeof(PayRateType), ErrorMessage = Constants.EnumErrorMessage)]
+    public PayRateType? PayRate { get; set; } = PayRateType.Classes;
+
+    [Required(ErrorMessage = "Available seats are required")]
+    public uint? AvailableSeats { get; set; } = uint.MaxValue;
+
+    [Required(ErrorMessage = "Property CompetitiveSelection is required")]
+    public bool CompetitiveSelection { get; set; }
+
+    [MaxLength(500)]
+    public string CompetitiveSelectionDescription { get; set; }
+
+    [Required]
+    public Guid ProviderId { get; set; }
+
+    public IEnumerable<ValidationResult> Validate(ValidationContext validationContext)
+    {
+        // TODO: Validate DateTimeRanges are not empty when frontend is ready
+        foreach (var dateTimeRange in DateTimeRanges)
+        {
+            if (dateTimeRange.StartTime > dateTimeRange.EndTime)
+            {
+                yield return new ValidationResult(
+                    "End date can't be earlier that start date");
+            }
+
+            if (dateTimeRange.Workdays.IsNullOrEmpty() || dateTimeRange.Workdays.Any(workday => workday == DaysBitMask.None))
+            {
+                yield return new ValidationResult(
+                    "Workdays are required");
+            }
+
+            var daysHs = new HashSet<DaysBitMask>();
+            if (!dateTimeRange.Workdays.All(daysHs.Add))
+            {
+                yield return new ValidationResult(
+                    "Workdays contain duplications");
+            }
+        }
+    }
+}

OutOfSchool/OutOfSchool.BusinessLogic/Models/Workshops/Drafts/WorkshopRequiredPropertiesDto.cs

@@ -0,0 +1,40 @@
+using System.ComponentModel.DataAnnotations;
+
+namespace OutOfSchool.BusinessLogic.Models.Workshops.Drafts;
+
+public class WorkshopRequiredPropertiesDto : WorkshopMainRequiredPropertiesDto
+{
+    [Required(ErrorMessage = "Short stay is required")]
+    public bool ShortStay { get; set; } = false;
+
+    [Required(ErrorMessage = "Should be indicated if the Workshop operates with funds from parents or benefactors")]
+    public bool IsSelfFinanced { get; set; } = false;
+
+    [Required(ErrorMessage = "Property IsSpecial is required")]
+    public bool IsSpecial { get; set; } = false;
+
+    public uint SpecialNeedsId { get; set; } = 0;
+
+    [Required(ErrorMessage = "Property IsInclusive is required")]
+    public bool IsInclusive { get; set; } = false;
+
+    [Required(ErrorMessage = "Educational shift is required")]
+    public uint EducationalShiftId { get; set; } = 0;
+
+    [Required(ErrorMessage = "Language of education is required")]
+    public uint LanguageOfEducationId { get; set; } = 0;
+
+    [Required(ErrorMessage = "Type of age composition is required")]
+    public uint TypeOfAgeCompositionId { get; set; } = 0;
+
+    [Required(ErrorMessage = "Educational disciplines is required")]
+    public Guid EducationalDisciplines { get; set; } = Guid.Empty;
+
+    [Required(ErrorMessage = "Category is required")]
+    public uint CategoryId { get; set; } = 0;
+
+    [Required(ErrorMessage = "GropeType is required")]
+    public uint GropeTypeId { get; set; } = 0;
+
+    public Guid? MemberOfWorkshopId { get; set; }
+}