Refactor event assignment structure and introduce new models for assignment parameters and requirements

This commit removes the obsolete EventAssignment class from Core.Entities and introduces new models in Core.Models, including AssignmentParameters, AssignmentRequirement, PartialTeam, and StudentEventStatistics. The changes enhance the organization of assignment-related data and improve the overall structure of the codebase. Additionally, several files have been updated to include references to the new Core.Models namespace, ensuring consistency across the application.

Core/Calculation/EventAssignment.cs

@@ -1,5 +1,6 @@
 using System.Diagnostics;
 using Core.Entities;
+using Core.Models;
 using Google.OrTools.Sat;
 
 namespace Core.Calculation

Core/Entities/EventAssignment.cs

@@ -1,7 +0,0 @@
-namespace Core.Entities;
-
-public class EventAssignment(EventDefinition eventDefinition, Student student)
-{
-	public EventDefinition EventDefinition { get; } = eventDefinition;
-    public Student Student { get; } = student;
-}

Core/Entities/Team.cs

@@ -1,4 +1,5 @@
 using System.ComponentModel.DataAnnotations;
+using Core.Models;
 
 namespace Core.Entities;
 public class Team

Core/Models/AssignmentParameters.cs

@@ -1,4 +1,6 @@
-namespace Core.Entities
+using Core.Entities;
+
+namespace Core.Models
 {
 	public class AssignmentParameters(
 		int effortLowerBound = 6, 
@@ -29,3 +31,4 @@
         }
     }
 }
+

Core/Models/AssignmentRequirement.cs

@@ -1,4 +1,6 @@
-namespace Core.Entities;
+using Core.Entities;
+
+namespace Core.Models;
 
 public class AssignmentRequirement(EventDefinition eventDefinition, Student student, Requirement requirement)
 {
@@ -6,3 +8,4 @@ public class AssignmentRequirement(EventDefinition eventDefinition, Student stud
 	public Student Student { get; } = student;
 	public Requirement Requirement { get; } = requirement;
 }
+

Core/Models/PartialTeam.cs

@@ -1,4 +1,6 @@
-namespace Core.Entities;
+using Core.Entities;
+
+namespace Core.Models;
 
 public class PartialTeam : Team
 {
@@ -11,3 +13,4 @@ public class PartialTeam : Team
 		return new PartialTeam{Identifier = Identifier, Event = Event, Students = remainingStudents, OmittedStudents = omittedStudents };
 	}
 }
+

Core/Models/StudentEventStatistics.cs

@@ -1,4 +1,6 @@
-namespace Core.Entities;
+using Core.Entities;
+
+namespace Core.Models;
 
 public class StudentEventStatistics
 {
@@ -30,3 +32,4 @@ public class StudentEventStatistics
         return statistics.Values.ToList();
     }
 }
+

Core/Parsers/AssignmentRequirementParser.cs

@@ -1,4 +1,5 @@
 using Core.Entities;
+using Core.Models;
 
 namespace Core.Parsers;
 

Core/Validation/Rules/BaseRules/EventCountThresholdRuleBase.cs

@@ -1,4 +1,5 @@
 using Core.Entities;
+using Core.Models;
 
 namespace Core.Validation.Rules.BaseRules;
 

Core/Validation/Rules/BaseRules/RequiredEventTypeAssignmentRuleBase.cs

@@ -1,4 +1,5 @@
 using Core.Entities;
+using Core.Models;
 
 namespace Core.Validation.Rules.BaseRules;
 

Core/Validation/Rules/StudentAssignmentRules/NoOnSiteActivityAssignmentRule.cs

@@ -1,4 +1,5 @@
 using Core.Entities;
+using Core.Models;
 using Core.Validation.Rules.BaseRules;
 
 namespace Core.Validation.Rules.StudentAssignmentRules;

Core/Validation/Rules/StudentAssignmentRules/NoRegionalEventAssignmentRule.cs

@@ -1,4 +1,5 @@
 using Core.Entities;
+using Core.Models;
 using Core.Validation.Rules.BaseRules;
 
 namespace Core.Validation.Rules.StudentAssignmentRules;

Core/Validation/Rules/StudentAssignmentRules/TooFewEventsRule.cs

@@ -1,4 +1,5 @@
 using Core.Entities;
+using Core.Models;
 using Core.Validation.Rules.BaseRules;
 
 namespace Core.Validation.Rules.StudentAssignmentRules;

Core/Validation/Rules/StudentAssignmentRules/TooManyEventsRule.cs

@@ -1,4 +1,5 @@
 using Core.Entities;
+using Core.Models;
 using Core.Validation.Rules.BaseRules;
 
 namespace Core.Validation.Rules.StudentAssignmentRules;

Core/Validation/Rules/StudentAssignmentRules/TooManyRegionalEventsAssignmentRule.cs

@@ -1,4 +1,5 @@
 using Core.Entities;
+using Core.Models;
 using Core.Validation.Rules.BaseRules;
 
 namespace Core.Validation.Rules.StudentAssignmentRules;

Core/Validation/ValidationConfiguration.cs

@@ -1,4 +1,5 @@
 using Core.Entities;
+using Core.Models;
 using System.Text.Json;
 
 namespace Core.Validation;

Core/Validation/ValidationService.cs

@@ -1,4 +1,5 @@
 using Core.Entities;
+using Core.Models;
 using System.Reflection;
 
 namespace Core.Validation;

Tests/Builders/AssignmentRequirementBuilder.cs

@@ -1,4 +1,5 @@
 using Core.Entities;
+using Core.Models;
 
 namespace Tests.Builders;
 

Tests/Calculation/EventAssignmentTests.cs

@@ -1,5 +1,6 @@
 using Core.Calculation;
 using Core.Entities;
+using Core.Models;
 using Tests.Builders;
 using Tests.Fixtures;
 using EventAssignment = Core.Calculation.EventAssignment;

Tests/Parsers/TestEntityHandler.cs

@@ -1,5 +1,6 @@
 using System.Collections;
 using Core.Entities;
+using Core.Models;
 using Core.Parsers;
 using Core.Utility;
 

Tests/Validation/Rules/StudentAssignmentRulesTests.cs

@@ -1,4 +1,5 @@
 using Core.Entities;
+using Core.Models;
 using Core.Validation;
 using Core.Validation.Rules.StudentAssignmentRules;
 using Tests.Builders;

Tests/Validation/ValidationConfigurationTests.cs

@@ -1,4 +1,5 @@
 using Core.Entities;
+using Core.Models;
 using Core.Validation;
 using System.Text.Json;
 

Tests/Validation/ValidationServiceTests.cs

@@ -1,4 +1,5 @@
 using Core.Entities;
+using Core.Models;
 using Core.Validation;
 using Tests.Builders;
 

WebApp/Components/_Imports.razor

@@ -25,5 +25,6 @@
 @using WebApp.Components.Features.Calendar
 @using MudBlazor
 @using Core.Entities
+@using Core.Models
 @using Data
 @using VisNetwork.Blazor