Refactor and fix tests #716

bkd-mba-fbi · Dec 12, 2024 · d36ddc7 · d36ddc7
1 parent a40bdc1
commit d36ddc7
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 3 deletions.
diff --git a/src/app/events/services/events-students-state.service.spec.ts b/src/app/events/services/events-students-state.service.spec.ts
@@ -404,27 +404,31 @@ describe("EventsStudentsStateService", () => {
             lastName: "McCartney",
             email: "paul.mccartney@example.com",
             status: "Angemeldet",
+            subscriptionId: 12,
           },
           {
             id: 20,
             firstName: "John",
             lastName: "Lennon",
             email: "john.lennon@example.com",
             status: "Aufgenommen",
+            subscriptionId: 22,
           },
           {
             id: 30,
             firstName: "George",
             lastName: "Harrison",
             email: "george.harrison@example.com",
             status: "Aufgenommen",
+            subscriptionId: 32,
           },
           {
             id: 40,
             firstName: "Ringo",
             lastName: "Starr",
             email: "ringo.starr@example.com",
             status: "Aufgenommen",
+            subscriptionId: 42,
           },
         ];
 
@@ -487,27 +491,31 @@ describe("EventsStudentsStateService", () => {
             lastName: "McCartney",
             email: "paul.mccartney@example.com",
             status: "Angemeldet",
+            subscriptionId: 13,
           },
           {
             id: 20,
             firstName: "John",
             lastName: "Lennon",
             email: "john.lennon@example.com",
             status: "Aufgenommen",
+            subscriptionId: 23,
           },
           {
             id: 30,
             firstName: "George",
             lastName: "Harrison",
             email: "george.harrison@example.com",
             status: "Aufgenommen",
+            subscriptionId: 33,
           },
           {
             id: 40,
             firstName: "Ringo",
             lastName: "Starr",
             email: "ringo.starr@example.com",
             status: "Aufgenommen",
+            subscriptionId: 43,
           },
         ];
 

diff --git a/src/app/events/services/events-students-state.service.ts b/src/app/events/services/events-students-state.service.ts
@@ -38,13 +38,13 @@ export type StudentEntries = {
 
 export type StudentEntry = {
   id: number;
-  subscriptionId?: number;
   firstName: string;
   lastName: string;
   email?: string;
   status?: string;
   studyClass?: string;
   company?: string;
+  subscriptionId?: number;
 };
 
 export type PrimarySortKey = "name";

diff --git a/src/app/events/utils/events-students.ts b/src/app/events/utils/events-students.ts
@@ -71,12 +71,12 @@ export function convertPersonsToStudentEntries(
       (person) =>
         ({
           id: person.Id,
-          subscriptionId: subscriptions.find((s) => s.PersonId === person.Id)
-            ?.Id,
           firstName: person.FirstName,
           lastName: person.LastName,
           email: person.DisplayEmail ?? undefined,
           status: subscriptions.find((s) => s.PersonId === person.Id)?.Status,
+          subscriptionId: subscriptions.find((s) => s.PersonId === person.Id)
+            ?.Id,
         }) satisfies StudentEntry,
     ),
   };