3.0.0

src/interfaces/generic-user.ts

@@ -0,0 +1,7 @@
+export interface GenericUser {
+  firstName: string | null;
+  lastName: string | null;
+  emai: string | null;
+  phone: string | null;
+  keycloakUserId: string | null;
+}

src/interfaces/official.ts

@@ -1,8 +1,9 @@
-export interface Official {
+import { GenericUser } from "./generic-user";
+
+export interface Official extends GenericUser {
   id?: number;
+  /** @deprecated since 3.0.0. Use lastName and firstName instead  */
   name: string;
-  email: string;
-  phone?: string;
   /** @deprecated Use referee and umpire booleans instead */
   type?: number;
   referee: boolean;

src/interfaces/player.ts

@@ -1,21 +1,18 @@
 import { Club } from "./club";
+import { GenericUser } from "./generic-user";
 import { RankingEntry } from "./ranking-entry";
 
-export interface Player {
-    id?: number;
-    firstName: string;
-    lastName: string;
-    gender: string;
-    birthDate: string;
-    birthPlace: string | null;
-    officialId?: number;
-    club: Club;
-    email?: string;
-    keycloakUserId?: string;
-    active?: boolean;
-    licenceFrom?: string;
-    licenceTo?: string;
-    disabledBecauseRanking?: boolean;
-    disabledBecauseSimilarEntry?: boolean;
-    rankingEntries?: RankingEntry[];
+export interface Player extends GenericUser {
+  id?: number;
+  gender: string;
+  birthDate: string;
+  birthPlace: string | null;
+  officialId?: number;
+  club: Club;
+  active?: boolean;
+  licenceFrom?: string;
+  licenceTo?: string;
+  disabledBecauseRanking?: boolean;
+  disabledBecauseSimilarEntry?: boolean;
+  rankingEntries?: RankingEntry[];
 }

src/interfaces/team-administrator.ts

@@ -1,11 +1,10 @@
 import { Club } from "./club";
+import { GenericUser } from "./generic-user";
 
-export interface TeamAdministrator {
-    id?: number;
-    keycloakId?: string;
-    lastName: string;
-    firstName: string;
-    email: string;
-    active?: boolean;
-    club: Club;
+export interface TeamAdministrator extends GenericUser {
+  id?: number;
+  /** @deprecated since 3.0.0. Use keycloakUserId instead  */
+  keycloakId?: string;
+  active?: boolean;
+  club: Club;
 }