merge 3.x

Reviewed-on: #3

package-lock.json

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

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mtlsz/common",
-  "version": "1.0.2",
+  "version": "3.2.1",
   "description": "MTLSZ frontend packages",
   "main": "dist/index.ts",
   "types": "dist/index.d.ts",

src/index.ts

@@ -1,17 +1,29 @@
-export * from './interfaces/club';
-export * from './interfaces/player';
-export * from './interfaces/api-pagination';
-export * from './interfaces/api-result';
-export * from './interfaces/category';
-export * from './interfaces/entry';
-export * from './interfaces/in-memory-cache';
-export * from './interfaces/official';
-export * from './interfaces/pagination';
-export * from './interfaces/ranking-entry';
-export * from './interfaces/ranking';
-export * from './interfaces/system-data';
-export * from './interfaces/team-administrator';
-export * from './interfaces/team-category';
-export * from './interfaces/team-entry';
-export * from './interfaces/team';
-export * from './interfaces/tournament';
+export * from "./interfaces/club";
+export * from "./interfaces/player";
+export * from "./interfaces/api-pagination";
+export * from "./interfaces/api-result";
+export * from "./interfaces/category";
+export * from "./interfaces/entry";
+export * from "./interfaces/in-memory-cache";
+export * from "./interfaces/official";
+export * from "./interfaces/pagination";
+export * from "./interfaces/ranking-entry";
+export * from "./interfaces/ranking";
+export * from "./interfaces/system-data";
+export * from "./interfaces/team-administrator";
+export * from "./interfaces/team-category";
+export * from "./interfaces/team-entry";
+export * from "./interfaces/team";
+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/category.ts

@@ -8,5 +8,6 @@ export interface Category {
   gender: string;
   class: number;
   age?: string;
+  allowedFrom: number | null;
   priority: number;
 }

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/guest-player-request.ts

@@ -0,0 +1,11 @@
+import { Player } from "./player";
+import { TeamEntry } from "./team-entry";
+
+export interface GuestPlayerRequest {
+  id: number;
+  // aki kéri a playert
+  applicant: TeamEntry;
+  // a kért játékos
+  requestedPlayer: Player;
+  status: number;
+}

src/interfaces/official.ts

@@ -1,10 +1,23 @@
-export interface Official {
+import { GenericUser } from "./generic-user";
+
+export interface Official extends GenericUser {
   id?: number;
-    name: string;
-    email: string;
-    phone?: string;
+  /** @deprecated since 3.0.0. Use lastName and firstName instead  */
+  name?: string;
   /** @deprecated Use referee and umpire booleans instead */
   type?: number;
   referee: boolean;
   umpire: boolean;
+  umpireLevel?: string;
+  refereeLevel?: string;
+  grade?: string;
+  birthDate?: string;
+  didUmpireExamAt?: string;
+  didRefereeExamAt?: string;
+  city?: string;
+  shirtSize?: string;
+  otherInfo?: string;
+  tshirtCount?: number;
+  hasCards?: boolean;
+  hasCoin?: boolean;
 }

src/interfaces/player.ts

@@ -1,14 +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;
-    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[];
 }

src/interfaces/role.ts

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

src/interfaces/single-tournament.ts

@@ -0,0 +1,8 @@
+import { Category } from "./category";
+import { Tournament } from "./tournament";
+
+export interface SingleTournament extends Tournament {
+  categories: Array<Category>;
+  allowedWithoutPartner: boolean;
+  allowedSimilarEntries: boolean;
+}

src/interfaces/tag.ts

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

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;
+  /** @deprecated since 3.0.0. Use keycloakUserId instead  */
   keycloakId?: string;
-    lastName: string;
-    firstName: string;
-    email: string;
   active?: boolean;
   club: Club;
 }

src/interfaces/team-category.ts

@@ -1,10 +1,11 @@
-import { Category } from "./category";
-
 export interface TeamCategory {
   id?: number;
   name: string;
-    class: number;
   gender: string;
-    age?: string;
-    categories?: Category[];
+  class: number;
+  age: string | null;
+  minMalePlayerCount: number | null;
+  minFemalePlayerCount: number | null;
+  maxNumberOfGuestPlayers: number | null;
+  priority: number;
 }

src/interfaces/team-championship.ts

@@ -0,0 +1,6 @@
+import { TeamCategory } from "./team-category";
+import { Tournament } from "./tournament";
+
+export interface TeamChampionship extends Tournament {
+  teamCategories: Array<TeamCategory>;
+}

src/interfaces/team-entry.ts

@@ -1,15 +1,15 @@
 import { Club } from "./club";
 import { Team } from "./team";
 import { TeamCategory } from "./team-category";
-import { Tournament } from "./tournament";
+import { TeamChampionship } from "./team-championship";
 
 export interface TeamEntry {
   id?: number;
   sentBy: Club;
-    status: number;
+  teamChampionship: TeamChampionship;
   category: TeamCategory;
-    tournament: Tournament;
-    createdAt: string;
-    updatedAt?: string;
   team: Team;
+  missingMalePlayerCount?: number;
+  missingFemalePlayerCount?: number;
+  canAddGuestPlayers: boolean;
 }

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 {
@@ -10,8 +11,6 @@ export interface Tournament {
     dateTo?: string;
     entryDeadline?: string;
     entryOpenFrom?: string;
-    categories: Array<Category>;
-    teamCategories?: Array<TeamCategory>;
     /**
      * @deprecated use organizerName instead
      */
@@ -20,12 +19,11 @@ export interface Tournament {
     active: boolean;
     city?: string;
     onlyWithLicence: boolean;
-    teamChampionship: boolean;
-    allowedWithoutPartner: boolean;
-    allowedSimilarEntries: boolean;
     entriesChecked?: boolean;
     referee: Official | null;
     deputyReferee: Official | null;
     drawUrl: string | null;
     notificationsSentAt?: Date | null;
+    '@type'?: string;
+    tags?: Tag[];
 }