merge 3.x

Reviewed-on: #3

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,6 +1,6 @@
 {
   "name": "@mtlsz/common",
-  "version": "3.0.0",
+  "version": "3.2.1",
   "description": "MTLSZ frontend packages",
   "main": "dist/index.ts",
   "types": "dist/index.d.ts",

src/index.ts

@@ -18,3 +18,12 @@ export * from "./interfaces/tournament";
 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

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

src/interfaces/official.ts

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

src/interfaces/role.ts

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

src/interfaces/tag.ts

@@ -0,0 +1,4 @@
+export interface Tag {
+  id?: number;
+  label: string;
+}

src/interfaces/tournament.ts

@@ -1,6 +1,7 @@
 import { Category } from "./category";
 import { Club } from "./club";
 import { Official } from "./official";
+import { Tag } from "./tag";
 import { TeamCategory } from "./team-category";
 
 export interface Tournament {
@@ -24,4 +25,5 @@ export interface Tournament {
     drawUrl: string | null;
     notificationsSentAt?: Date | null;
     '@type'?: string;
+    tags?: Tag[];
 }