merge 3.x

package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "@mtlsz/common",
-  "version": "2.0.2",
+  "version": "3.2.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@mtlsz/common",
-      "version": "2.0.2",
+      "version": "3.2.0",
       "license": "ISC",
       "devDependencies": {
         "typescript": "^5.8.2"

package.json

@@ -1,13 +1,12 @@
 {
   "name": "@mtlsz/common",
-  "version": "2.1.1",
+  "version": "3.2.1",
   "description": "MTLSZ frontend packages",
   "main": "dist/index.ts",
   "types": "dist/index.d.ts",
   "scripts": {
     "build": "tsc",
-    "test": "echo \"Error: no test specified\" && exit 1",
+    "test": "echo \"Error: no test specified\" && exit 1"
-    "publish": "npm publish --registry http://registry.trweb.hu"
   },
   "repository": {
     "type": "git",

src/index.ts

@@ -19,3 +19,11 @@ export * from "./interfaces/guest-player-request";
 export * from "./interfaces/single-tournament";
 export * from "./interfaces/team-championship";
 export * from "./interfaces/tag";
+export * from "./interfaces/role";
+export * from "./interfaces/confirmation-request";
+export * from "./interfaces/confirmation-request/adult-confirmation-request";
+export * from "./interfaces/confirmation-request/official-confirmation-request";
+export * from "./interfaces/confirmation-request/player-confirmation-request";
+export * from "./interfaces/confirmation-request/team-admin-confirmation-request";
+export * from "./interfaces/confirmation-request/team-manager-confirmation-request";
+export * from "./interfaces/confirmation-requests";

src/interfaces/club.ts

@@ -9,4 +9,5 @@ export interface Club {
     address?: string;
     phone?: string;
     active: boolean;
+    hasManager?: boolean;
 }

src/interfaces/confirmation-request.ts

@@ -0,0 +1,17 @@
+import { AdultConfirmationRequest } from "./confirmation-request/adult-confirmation-request";
+import { OfficialConfirmationRequest } from "./confirmation-request/official-confirmation-request";
+import { PlayerConfirmationRequest } from "./confirmation-request/player-confirmation-request";
+import { TeamAdminConfirmationRequest } from "./confirmation-request/team-admin-confirmation-request";
+import { TeamManagerConfirmationRequest } from "./confirmation-request/team-manager-confirmation-request";
+
+export interface ConfirmationRequest {
+  id: number;
+  status: number;
+  roleString: string;
+  entity:
+    | PlayerConfirmationRequest
+    | AdultConfirmationRequest
+    | TeamManagerConfirmationRequest
+    | TeamAdminConfirmationRequest
+    | OfficialConfirmationRequest;
+}

src/interfaces/confirmation-request/adult-confirmation-request.ts

@@ -0,0 +1,5 @@
+import { Player } from "../player";
+
+export interface AdultConfirmationRequest {
+  kids: Player[];
+}

src/interfaces/confirmation-request/official-confirmation-request.ts

@@ -0,0 +1,4 @@
+export interface OfficialConfirmationRequest {
+  referee: boolean;
+  umpire: boolean;
+}

src/interfaces/confirmation-request/player-confirmation-request.ts

@@ -0,0 +1,5 @@
+import { Club } from "../club";
+
+export interface PlayerConfirmationRequest {
+    club: Club;
+}

src/interfaces/confirmation-request/team-admin-confirmation-request.ts

@@ -0,0 +1,6 @@
+import { Club } from "../club";
+
+export interface TeamAdminConfirmationRequest {
+    active: boolean;
+    club: Club;
+}

src/interfaces/confirmation-request/team-manager-confirmation-request.ts

@@ -0,0 +1,5 @@
+import { Club } from "../club";
+
+export interface TeamManagerConfirmationRequest {
+  club: Club;
+}

src/interfaces/confirmation-requests.ts

@@ -0,0 +1,6 @@
+import { ConfirmationRequest } from "./confirmation-request";
+
+export interface ConfirmationRequests {
+  roles: ConfirmationRequest[];
+  canAddNewRole: boolean;
+}

src/interfaces/generic-user.ts

@@ -0,0 +1,7 @@
+export interface GenericUser {
+  firstName: string;
+  lastName: string;
+  email: string;
+  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;
-  name: string;
+  /** @deprecated since 3.0.0. Use lastName and firstName instead  */
-  email: string;
+  name?: 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 {
+export interface Player extends GenericUser {
-    id?: number;
+  id?: number;
-    firstName: string;
+  gender: string;
-    lastName: string;
+  birthDate: string;
-    gender: string;
+  birthPlace: string | null;
-    birthDate: string;
+  officialId?: number;
-    birthPlace: string | null;
+  club: Club;
-    officialId?: number;
+  active?: boolean;
-    club: Club;
+  licenceFrom?: string;
-    email?: string;
+  licenceTo?: string;
-    keycloakUserId?: string;
+  disabledBecauseRanking?: boolean;
-    active?: boolean;
+  disabledBecauseSimilarEntry?: boolean;
-    licenceFrom?: string;
+  rankingEntries?: RankingEntry[];
-    licenceTo?: string;
-    disabledBecauseRanking?: boolean;
-    disabledBecauseSimilarEntry?: boolean;
-    rankingEntries?: RankingEntry[];
 }

src/interfaces/role.ts

@@ -0,0 +1,4 @@
+export interface Role {
+  role: string;
+  status: number;
+}

src/interfaces/team-administrator.ts

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