Merge pull request #124 from Xopabyteh/master

Zrušení SigningRules, zjednodušení logiky
mensagymnazium · Apr 9, 2024 · ff7887b · ff7887b
2 parents abdb130 + 976e66c
commit ff7887b
Show file tree

Hide file tree

Showing 99 changed files with 991 additions and 1,848 deletions.
diff --git a/.gitignore b/.gitignore
@@ -259,3 +259,4 @@ Web/.vscode/launch.json
 .vscode
 /WebAPI/App_Data
 .DS_Store
+/Web.Server/appsettings.WebServer.local.json
diff --git a/Contracts/Contracts.csproj b/Contracts/Contracts.csproj
@@ -8,10 +8,10 @@
 	</PropertyGroup>
 
 	<ItemGroup>
-		<PackageReference Include="FluentValidation" Version="11.5.2" />
-		<PackageReference Include="Havit.Blazor.Grpc.Core" Version="1.3.3" />
-		<PackageReference Include="Havit.Core" Version="2.0.26" />
-		<PackageReference Include="protobuf-net" Version="3.2.16" />
+		<PackageReference Include="FluentValidation" Version="11.9.0" />
+		<PackageReference Include="Havit.Blazor.Grpc.Core" Version="1.5.5" />
+		<PackageReference Include="Havit.Core" Version="2.0.29" />
+		<PackageReference Include="protobuf-net" Version="3.2.30" />
 		<PackageReference Include="protobuf-net.Grpc" Version="1.1.1" />
 	</ItemGroup>
 

diff --git a/Contracts/ISigningRuleFacade.cs b/Contracts/ISigningRuleFacade.cs
diff --git a/Contracts/IStudentSubjectRegistrationFacade.cs b/Contracts/IStudentSubjectRegistrationFacade.cs
@@ -1,10 +1,13 @@
-namespace MensaGymnazium.IntranetGen3.Contracts;
+using MensaGymnazium.IntranetGen3.Contracts.Security;
+
+namespace MensaGymnazium.IntranetGen3.Contracts;
 
 [ApiContract]
 public interface IStudentSubjectRegistrationFacade
 {
-	Task<DataFragmentResult<StudentSubjectRegistrationDto>> GetStudentSubjectRegistrationListAsync(DataFragmentRequest<StudentSubjectRegistrationListQueryFilter> studentSubjectRegistrationListRequest, CancellationToken cancellationToken = default);
 	Task<Dto<int>> CreateRegistrationAsync(StudentSubjectRegistrationDto registrationDto, CancellationToken cancellationToken = default);
 	Task UpdateRegistrationAsync(StudentSubjectRegistrationDto registrationDto, CancellationToken cancellationToken = default);
 	Task DeleteRegistrationAsync(Dto<int> registrationIdDto, CancellationToken cancellationToken = default);
+	Task<DataFragmentResult<StudentSubjectRegistrationDto>> GetStudentSubjectRegistrationListAsync(DataFragmentRequest<StudentSubjectRegistrationListQueryFilter> studentSubjectRegistrationListRequest, CancellationToken cancellationToken = default);
+	Task<List<StudentSubjectRegistrationDto>> GetAllRegistrationsOfCurrentStudent(); // Xopa: Todo? Change to query? It was too entangled with signing rules, but now it could be done? 
 }
diff --git a/Contracts/ISubjectRegistrationsManagerFacade.cs b/Contracts/ISubjectRegistrationsManagerFacade.cs
@@ -3,9 +3,6 @@
 [ApiContract]
 public interface ISubjectRegistrationsManagerFacade
 {
-	Task<List<SigningRuleWithRegistrationsDto>> GetCurrentUserSigningRulesWithRegistrationsAsync(Dto<int?> onlySubjectId, CancellationToken cancellationToken = default);
-	Task<List<SigningRuleStudentRegistrationsDto>> GetCurrentUserSubjectSigningRulesForRegistrationAsync(Dto<int> subjectId, CancellationToken cancellationToken = default);
 	Task CancelRegistrationAsync(Dto<int> studentSubjectRegistrationId, CancellationToken cancellationToken = default);
 	Task CreateRegistrationAsync(StudentSubjectRegistrationCreateDto studentSubjectRegistrationCreateDto, CancellationToken cancellationToken = default);
-	Task<DataFragmentResult<StudentWithSigningRuleListItemDto>> GetStudentWithSigningRuleListAsync(DataFragmentRequest<StudentWithSigningRuleListQueryFilter> facadeRequest, CancellationToken cancellationToken);
 }
diff --git a/Contracts/SigningRuleDto.cs b/Contracts/SigningRuleDto.cs
diff --git a/Contracts/SigningRuleListQueryFilter.cs b/Contracts/SigningRuleListQueryFilter.cs
diff --git a/Contracts/SigningRuleReferenceDto.cs b/Contracts/SigningRuleReferenceDto.cs
diff --git a/Contracts/SigningRuleWithRegistrationsDto.cs b/Contracts/SigningRuleWithRegistrationsDto.cs
diff --git a/...cts/SigningRuleStudentRegistrationsDto.cs → Contracts/StudentRegistrationsDto.cs b/...cts/SigningRuleStudentRegistrationsDto.cs → Contracts/StudentRegistrationsDto.cs
@@ -1,6 +1,6 @@
 namespace MensaGymnazium.IntranetGen3.Contracts;
 
-public record SigningRuleStudentRegistrationsDto
+public record StudentRegistrationsDto
 {
 	public int Id { get; set; }
 	public string Name { get; set; }

diff --git a/Contracts/StudentSubjectRegistrationCreateDto.cs b/Contracts/StudentSubjectRegistrationCreateDto.cs
@@ -6,13 +6,11 @@ namespace MensaGymnazium.IntranetGen3.Contracts;
 public record StudentSubjectRegistrationCreateDto
 {
 	public int? SubjectId { get; set; }
-	public int? SigningRuleId { get; set; }
 	public StudentRegistrationType? RegistrationType { get; set; }
 
 	public virtual void UpdateFrom(StudentSubjectRegistrationDto model)
 	{
 		this.SubjectId = model.SubjectId;
-		this.SigningRuleId = model.SigningRuleId;
 		this.RegistrationType = model.RegistrationType;
 	}
 
@@ -21,7 +19,6 @@ public class StudentSubjectRegistrationCreateDtoValidator : AbstractValidator<St
 		public StudentSubjectRegistrationCreateDtoValidator()
 		{
 			RuleFor(x => x.SubjectId).NotNull();
-			RuleFor(x => x.SigningRuleId).NotNull();
 			RuleFor(x => x.RegistrationType).NotNull();
 		}
 	}

diff --git a/Contracts/StudentSubjectRegistrationDto.cs b/Contracts/StudentSubjectRegistrationDto.cs
@@ -22,7 +22,6 @@ public class StudentSubjectRegistrationDtoValidator : AbstractValidator<StudentS
 		public StudentSubjectRegistrationDtoValidator()
 		{
 			RuleFor(x => x.SubjectId).NotNull().WithName("Předmět");
-			RuleFor(x => x.SigningRuleId).NotNull().WithName("Zápisové pravidlo");
 			RuleFor(x => x.RegistrationType).NotNull().WithName("Typ zápisu");
 			RuleFor(x => x.StudentId).NotNull().WithName("Student");
 		}

diff --git a/Contracts/StudentSubjectRegistrationListQueryFilter.cs b/Contracts/StudentSubjectRegistrationListQueryFilter.cs
@@ -6,7 +6,6 @@ public record StudentSubjectRegistrationListQueryFilter
 {
 	public int? SubjectId { get; set; }
 	public int? GradeId { get; set; }
-	public int? SigningRuleId { get; set; }
 	public int? StudentId { get; set; }
 	public StudentRegistrationType? RegistrationType { get; set; }
 }
diff --git a/Contracts/StudentWithSigningRuleListItemDto.cs b/Contracts/StudentWithSigningRuleListItemDto.cs
diff --git a/Contracts/StudentWithSigningRuleListQueryFilter.cs b/Contracts/StudentWithSigningRuleListQueryFilter.cs
diff --git a/Contracts/SubjectListQueryFilter.cs b/Contracts/SubjectListQueryFilter.cs
@@ -6,5 +6,4 @@ public record SubjectListQueryFilter
 	public int? SubjectTypeId { get; set; }
 	public int? SubjectCategoryId { get; set; }
 	public int? TeacherId { get; set; }
-	public int? SigningRuleId { get; set; }
 }
diff --git a/Contracts/_generated/ModelMetadata/SigningRuleMetadata.cs b/Contracts/_generated/ModelMetadata/SigningRuleMetadata.cs
diff --git a/DataLayer.Tests/DataLayer.Tests.csproj b/DataLayer.Tests/DataLayer.Tests.csproj
@@ -10,6 +10,7 @@
 	</PropertyGroup>
 
 	<ItemGroup>
+		<PackageReference Include="Havit.Core" Version="2.0.29" />
 		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.6.0" />
 		<PackageReference Include="MSTest.TestAdapter" Version="3.0.2" />
 		<PackageReference Include="MSTest.TestFramework" Version="3.0.2" />

diff --git a/DataLayer/DataLayer.csproj b/DataLayer/DataLayer.csproj
@@ -8,6 +8,7 @@
 	</PropertyGroup>
 
 	<ItemGroup>
+		<PackageReference Include="Havit.Core" Version="2.0.29" />
 		<PackageReference Include="Havit.Data.EntityFrameworkCore.CodeGenerator" Version="2.7.1" />
 		<PackageReference Include="Havit.Data.EntityFrameworkCore.Patterns" Version="2.7.3" />
 		<PackageReference Include="Havit.Extensions.DependencyInjection.Abstractions" Version="2.0.5" />

diff --git a/DataLayer/Queries/ISigningRuleListQuery.cs b/DataLayer/Queries/ISigningRuleListQuery.cs
diff --git a/DataLayer/Queries/IStudentSigningRulesWithRegistrationsQuery.cs b/DataLayer/Queries/IStudentSigningRulesWithRegistrationsQuery.cs
diff --git a/DataLayer/Queries/IStudentWithSigningRuleListQuery.cs b/DataLayer/Queries/IStudentWithSigningRuleListQuery.cs
diff --git a/DataLayer/Queries/SigningRuleListQuery.cs b/DataLayer/Queries/SigningRuleListQuery.cs
diff --git a/DataLayer/Queries/StudentRegistrationsQuery.cs b/DataLayer/Queries/StudentRegistrationsQuery.cs
@@ -0,0 +1,65 @@
+//using Havit.Data.Patterns.DataLoaders;
+//using MensaGymnazium.IntranetGen3.Contracts;
+//using MensaGymnazium.IntranetGen3.DataLayer.DataSources;
+//using MensaGymnazium.IntranetGen3.Model;
+//using MensaGymnazium.IntranetGen3.Model.Security;
+//using MensaGymnazium.IntranetGen3.Primitives;
+
+//namespace MensaGymnazium.IntranetGen3.DataLayer.Queries;
+
+//[Service]
+//public class StudentRegistrationsQuery : QueryBase<RegistrationsDto>, IStudentRegistrationsQuery
+//{
+//	protected Student Student { get; set; }
+//	protected Subject SubjectFilter { get; set; }
+
+//	protected override IQueryable<RegistrationsDto> Query()
+//	{
+//		Contract.Requires<ArgumentException>(Student is not null);
+
+//		//var studentNextGrade = ((GradeEntry)this.Student.GradeId).NextGrade();
+
+//		//var signingRulesData = signingRuleDataSource.Data
+//			//.Where(x => x.GradeId == (int)studentNextGrade);
+
+//		//if (this.SubjectFilter is not null)
+//		//{
+//		//	signingRulesData = signingRulesData.Where(sr => this.SubjectFilter.GradeRelations.Select(gr => gr.GradeId).Contains(sr.GradeId));
+//		//	signingRulesData = signingRulesData.Where(sr => sr.SubjectTypeRelations.Any(str => this.SubjectFilter.TypeRelations.Select(tr => tr.SubjectTypeId).Contains(str.SubjectTypeId)));
+//		//	signingRulesData = signingRulesData.Where(sr => sr.SubjectCategoryRelations.Any(scr => scr.SubjectCategoryId == this.SubjectFilter.CategoryId));
+//		//}
+
+
+
+//		return signingRulesData.Select(sr => new RegistrationsDto()
+//		{
+//			Id = sr.Id,
+//			GradeId = (GradeEntry)sr.GradeId,
+//			Name = sr.Name,
+//			Quantity = sr.Quantity,
+//			SubjectCategoryIds = sr.SubjectCategoryRelations.Select(scr => scr.SubjectCategoryId).ToList(),
+//			SubjectTypeIds = sr.SubjectTypeRelations.Select(str => str.SubjectTypeId).ToList(),
+//			Registrations = sr.RegistrationsWithDeleted.Where(r => (r.StudentId == this.Student.Id) && (r.Deleted == null))
+//								.Select(ssr => new StudentSubjectRegistrationDto()
+//								{
+//									Id = ssr.Id,
+//									StudentId = ssr.StudentId,
+//									SigningRuleId = ssr.UsedSigningRuleId,
+//									SubjectId = ssr.SubjectId,
+//									RegistrationType = ssr.RegistrationType,
+//									Created = ssr.Created,
+//								})
+//								.ToList()
+//		});
+//	}
+
+//	public Task<List<RegistrationsDto>> GetDataAsync(Student student, Subject subjectFilter = null, CancellationToken cancellationToken = default)
+//	{
+//		Contract.Requires<ArgumentException>(student is not null);
+
+//		this.Student = student;
+//		this.SubjectFilter = subjectFilter;
+
+//		return this.SelectAsync(cancellationToken);
+//	}
+//}