Cleanup discussed in code review #124

mensagymnazium · Apr 11, 2024 · fb01317 · fb01317
1 parent 5aba870
commit fb01317
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 17 deletions.
diff --git a/DataLayer/Repositories/IStudentSubjectRegistrationRepository.cs b/DataLayer/Repositories/IStudentSubjectRegistrationRepository.cs
@@ -5,7 +5,7 @@ namespace MensaGymnazium.IntranetGen3.DataLayer.Repositories;
 public partial interface IStudentSubjectRegistrationRepository
 {
 	public Task<List<StudentSubjectRegistration>> GetBySubjectAsync(
-		int id,
+		int subjectId,
 		CancellationToken cancellationToken = default);
 
 	//public Task<long> CountBySubjectAndTypeAsync(int subjectId, StudentRegistrationType type, CancellationToken cancellationToken = default);

diff --git a/Web.Client/Pages/Electives/StudentSubjectRegistrationComponent.razor.cs b/Web.Client/Pages/Electives/StudentSubjectRegistrationComponent.razor.cs
@@ -32,8 +32,6 @@ private async Task LoadStudentRegistrationAsync()
 		await StudentSubjectRegistrationsDataStore.EnsureDataAsync();
 		studentsRegistrationForThisSubject =
 			await StudentSubjectRegistrationsDataStore.GetByKeyOrDefaultAsync(SubjectId!.Value);
-
-		StateHasChanged();
 	}
 	private async Task HandleCancelRegistrationClicked()
 	{
@@ -49,7 +47,7 @@ private async Task HandleCancelRegistrationClicked()
 				await SubjectRegistrationsManagerFacade.CancelRegistrationAsync(Dto.FromValue(studentsRegistrationForThisSubject.Id));
 
 				// Invalidate data store
-				StudentSubjectRegistrationsDataStore.RegistrationsChanged();
+				StudentSubjectRegistrationsDataStore.Clear();
 
 				// Reload from cache (Xopa: maybe unnecessarily expensive?)
 				await LoadStudentRegistrationAsync();
@@ -77,7 +75,7 @@ await SubjectRegistrationsManagerFacade.CreateRegistrationAsync(
 					});
 
 				//Invalidate data store
-				StudentSubjectRegistrationsDataStore.RegistrationsChanged();
+				StudentSubjectRegistrationsDataStore.Clear();
 
 				// Reload from cache (Xopa: maybe unnecessarily expensive?)
 				await LoadStudentRegistrationAsync();

diff --git a/Web.Client/Services/DataStores/IStudentSubjectRegistrationsDataStore.cs b/Web.Client/Services/DataStores/IStudentSubjectRegistrationsDataStore.cs
@@ -5,8 +5,4 @@ namespace MensaGymnazium.IntranetGen3.Web.Client.Services.DataStores;
 
 public interface IStudentSubjectRegistrationsDataStore : IDictionaryStaticDataStore<int, StudentSubjectRegistrationDto>
 {
-	/// <summary>
-	/// Use this to invalidate the cache
-	/// </summary>
-	public void RegistrationsChanged();
 }
diff --git a/Web.Client/Services/DataStores/StudentSubjectRegistrationsDataStore.cs b/Web.Client/Services/DataStores/StudentSubjectRegistrationsDataStore.cs
@@ -16,19 +16,12 @@ public StudentSubjectRegistrationsDataStore(IStudentSubjectRegistrationFacade st
 	}
 
 	protected override Func<StudentSubjectRegistrationDto, int> KeySelector => registration => registration.SubjectId!.Value;
-	protected override bool ShouldRefresh() => hasUnresolvedChanges;
+	protected override bool ShouldRefresh() => false; // Cleared by component causing changes
 
 	protected override async Task<IEnumerable<StudentSubjectRegistrationDto>> LoadDataAsync()
 	{
 		var dto = await studentSubjectRegistrationFacade.GetAllRegistrationsOfCurrentStudent();
-		hasUnresolvedChanges = false;
 
 		return dto ?? new();
 	}
-
-	private bool hasUnresolvedChanges = false;
-	public void RegistrationsChanged()
-	{
-		hasUnresolvedChanges = true;
-	}
 }