ballrush-core 0.5.4 → 0.6.1

package/dist/domain/event.d.ts

@@ -10,7 +10,7 @@ export declare class Event {
     private matches;
     private readonly createdBy;
     private isRatingApplied;
-    private seasonName;
+    private seasonId;
     private reportMessageId?;
     private status;
     private constructor();
@@ -20,7 +20,7 @@ export declare class Event {
         templateId: number;
         date: Date;
         createdBy: number;
-        seasonName: string;
+        seasonId: string;
         participants?: ParticipantEvent[];
         teams?: Team[];
         matches?: Match[];
@@ -35,14 +35,13 @@ export declare class Event {
     getMessageId(): number;
     getReportMessageId(): number | undefined;
     getDate(): Date;
-    getSeasonName(): string;
+    getSeasonId(): string;
     getParticipants(): ParticipantEvent[];
     getTeams(): Team[];
     getMatches(): Match[];
     getCreatedBy(): number;
     getStatus(): EventStatus;
     getIsRatingApplied(): boolean;
-    renameSeason(newName: string): void;
     reschedule(newDate: Date): void;
     attachMessage(messageId: number): void;
     attachReportMessage(reportMessageId: number): void;

package/dist/domain/event.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Event = void 0;
 class Event {
-    constructor(eventId, groupId, messageId, templateId, date, participants, teams, matches, createdBy, isRatingApplied, seasonName, reportMessageId, status = "active") {
+    constructor(eventId, groupId, messageId, templateId, date, participants, teams, matches, createdBy, isRatingApplied, seasonId, reportMessageId, status = "active") {
         this.eventId = eventId;
         this.groupId = groupId;
         this.messageId = messageId;
@@ -13,15 +13,15 @@ class Event {
         this.matches = matches;
         this.createdBy = createdBy;
         this.isRatingApplied = isRatingApplied;
-        this.seasonName = seasonName;
+        this.seasonId = seasonId;
         this.reportMessageId = reportMessageId;
         this.status = status;
     }
     static create(params) {
-        if (!params.seasonName) {
-            throw new Error("Event must have a season name");
+        if (!params.seasonId) {
+            throw new Error("Event must have a season ID");
         }
-        return new Event(params.eventId, params.groupId, params.messageId ?? 0, params.templateId, params.date, params.participants ?? [], params.teams ?? [], params.matches ?? [], params.createdBy, params.isRatingApplied ?? false, params.seasonName, params.reportMessageId, params.status ?? "active");
+        return new Event(params.eventId, params.groupId, params.messageId ?? 0, params.templateId, params.date, params.participants ?? [], params.teams ?? [], params.matches ?? [], params.createdBy, params.isRatingApplied ?? false, params.seasonId, params.reportMessageId, params.status ?? "active");
     }
     getEventId() { return this.eventId; }
     getGroupId() { return this.groupId; }
@@ -29,18 +29,13 @@ class Event {
     getMessageId() { return this.messageId; }
     getReportMessageId() { return this.reportMessageId; }
     getDate() { return this.date; }
-    getSeasonName() { return this.seasonName; }
+    getSeasonId() { return this.seasonId; }
     getParticipants() { return this.participants; }
     getTeams() { return this.teams; }
     getMatches() { return this.matches; }
     getCreatedBy() { return this.createdBy; }
     getStatus() { return this.status; }
     getIsRatingApplied() { return this.isRatingApplied; }
-    renameSeason(newName) {
-        if (!newName)
-            throw new Error("Season name cannot be empty");
-        this.seasonName = newName;
-    }
     reschedule(newDate) {
         this.date = newDate;
     }

package/dist/domain/season.d.ts

@@ -1,4 +1,5 @@
 export type SeasonStatus = 'upcoming' | 'in_progress' | 'ended';
+export type SeasonType = 'system' | 'group';
 export declare class Season {
     private seasonId;
     private name;
@@ -7,12 +8,13 @@ export declare class Season {
     private endDate;
     private status;
     private isPublic;
+    private seasonType;
     private description?;
     private groupId?;
     private createdBy?;
     private createdAt?;
     private updatedAt?;
-    constructor(seasonId: string, name: string, year: number, startDate: Date, endDate: Date, status: SeasonStatus, isPublic: boolean, description?: string | undefined, groupId?: number | undefined, createdBy?: number | undefined, createdAt?: Date | undefined, updatedAt?: Date | undefined);
+    constructor(seasonId: string, name: string, year: number, startDate: Date, endDate: Date, status: SeasonStatus, isPublic: boolean, seasonType: SeasonType, description?: string | undefined, groupId?: number | undefined, createdBy?: number | undefined, createdAt?: Date | undefined, updatedAt?: Date | undefined);
     static create(p: {
         seasonId: string;
         name: string;
@@ -20,7 +22,8 @@ export declare class Season {
         startDate: Date;
         endDate: Date;
         status?: SeasonStatus;
-        isPublic?: boolean;
+        isPublic: boolean;
+        seasonType: SeasonType;
         description?: string;
         groupId?: number;
         createdBy?: number;
@@ -50,6 +53,7 @@ export declare class Season {
     getEndDate(): Date;
     getStatus(): SeasonStatus;
     getIsPublic(): boolean;
+    getSeasonType(): SeasonType;
     getDescription(): string | undefined;
     getGroupId(): number | undefined;
     getCreatedBy(): number | undefined;
@@ -61,6 +65,7 @@ export declare class Season {
     setEndDate(endDate: Date): void;
     setStatus(status: SeasonStatus): void;
     setIsPublic(isPublic: boolean): void;
+    setSeasonType(seasonType: SeasonType): void;
     setDescription(description?: string): void;
     setGroupId(groupId?: number): void;
     setCreatedBy(createdBy?: number): void;
@@ -72,6 +77,7 @@ export declare class Season {
         endDate: Date;
         status: SeasonStatus;
         isPublic: boolean;
+        seasonType: SeasonType;
         description: string | undefined;
         groupId: number | undefined;
         createdBy: number | undefined;

package/dist/domain/season.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Season = void 0;
 class Season {
-    constructor(seasonId, name, year, startDate, endDate, status, isPublic, description, groupId, createdBy, createdAt, updatedAt) {
+    constructor(seasonId, name, year, startDate, endDate, status, isPublic, seasonType, description, groupId, createdBy, createdAt, updatedAt) {
         this.seasonId = seasonId;
         this.name = name;
         this.year = year;
@@ -10,6 +10,7 @@ class Season {
         this.endDate = endDate;
         this.status = status;
         this.isPublic = isPublic;
+        this.seasonType = seasonType;
         this.description = description;
         this.groupId = groupId;
         this.createdBy = createdBy;
@@ -29,10 +30,13 @@ class Season {
             throw new Error("endDate is required");
         if (p.startDate >= p.endDate)
             throw new Error("startDate must be before endDate");
+        if (p.isPublic === undefined)
+            throw new Error("isPublic is required");
+        if (!p.seasonType)
+            throw new Error("seasonType is required");
         // Если статус не указан, вычисляем автоматически
         const status = p.status ?? Season.calculateStatusFromDates(p.startDate, p.endDate);
-        return new Season(p.seasonId, p.name, p.year, p.startDate, p.endDate, status, p.isPublic ?? true, // По умолчанию публичный (системный)
-        p.description, p.groupId, p.createdBy, p.createdAt ?? new Date(), p.updatedAt ?? new Date());
+        return new Season(p.seasonId, p.name, p.year, p.startDate, p.endDate, status, p.isPublic, p.seasonType, p.description, p.groupId, p.createdBy, p.createdAt ?? new Date(), p.updatedAt ?? new Date());
     }
     /**
      * Вычисляет статус сезона на основе дат
@@ -71,6 +75,7 @@ class Season {
     getEndDate() { return this.endDate; }
     getStatus() { return this.status; }
     getIsPublic() { return this.isPublic; }
+    getSeasonType() { return this.seasonType; }
     getDescription() { return this.description; }
     getGroupId() { return this.groupId; }
     getCreatedBy() { return this.createdBy; }
@@ -109,6 +114,10 @@ class Season {
         this.isPublic = isPublic;
         this.updatedAt = new Date();
     }
+    setSeasonType(seasonType) {
+        this.seasonType = seasonType;
+        this.updatedAt = new Date();
+    }
     setDescription(description) {
         this.description = description;
         this.updatedAt = new Date();
@@ -130,6 +139,7 @@ class Season {
             endDate: this.endDate,
             status: this.status,
             isPublic: this.isPublic,
+            seasonType: this.seasonType,
             description: this.description,
             groupId: this.groupId,
             createdBy: this.createdBy,

package/dist/mongo/schemas/event.schema.d.ts

@@ -10,7 +10,7 @@ export interface EventDoc {
     participants: ParticipantEvent[];
     teams: Team[];
     matches: Match[];
-    seasonName: string;
+    seasonId: string;
     status: EventStatus;
     isRatingApplied: boolean;
     reportMessageId?: number;

package/dist/mongo/schemas/event.schema.js

@@ -39,7 +39,7 @@ function createEventSchema() {
         messageId: { type: Number, required: true },
         templateId: { type: Number, required: true },
         date: { type: Date, required: true },
-        seasonName: { type: String, required: true },
+        seasonId: { type: String, required: true },
         createdBy: { type: Number, required: true },
         participants: { type: [ParticipantSchema], default: [] },
         teams: { type: [TeamSchema], default: [] },

package/dist/mongo/schemas/season.schema.d.ts

@@ -1,5 +1,5 @@
 import { Schema } from "mongoose";
-import { SeasonStatus } from "../../domain/season";
+import { SeasonStatus, SeasonType } from "../../domain/season";
 export interface SeasonDoc {
     seasonId: string;
     name: string;
@@ -8,6 +8,7 @@ export interface SeasonDoc {
     endDate: Date;
     status: SeasonStatus;
     isPublic: boolean;
+    seasonType: SeasonType;
     description?: string;
     groupId?: number;
     createdBy?: number;

package/dist/mongo/schemas/season.schema.js

@@ -43,6 +43,13 @@ function createSeasonSchema() {
             default: true,
             index: true
         },
+        seasonType: {
+            type: String,
+            enum: ['system', 'group'],
+            required: true,
+            default: 'system',
+            index: true
+        },
         description: {
             type: String,
             required: false
@@ -68,6 +75,7 @@ function createSeasonSchema() {
         timestamps: true, // Автоматически обновляет createdAt и updatedAt
     });
     // Compound indexes для оптимизации запросов
+    schema.index({ seasonType: 1, status: 1 }); // Для поиска системных/групповых сезонов
     schema.index({ isPublic: 1, status: 1 }); // Для поиска публичных активных сезонов
     schema.index({ groupId: 1, status: 1 }); // Для поиска сезонов группы
     schema.index({ year: 1, status: 1 }); // Для поиска по году и статусу

package/dist/ports/events.repository.d.ts

@@ -11,7 +11,7 @@ export type EventWrite = {
     teams: Team[];
     matches: Match[];
     status: EventStatus;
-    seasonName: string;
+    seasonId: string;
     isRatingApplied?: boolean;
     reportMessageId?: number;
 };

package/dist/repositories/mongo/event.mapper.js

@@ -15,7 +15,7 @@ function toDomain(doc) {
         matches: doc.matches,
         createdBy: doc.createdBy,
         isRatingApplied: doc.isRatingApplied,
-        seasonName: doc.seasonName,
+        seasonId: doc.seasonId,
         reportMessageId: doc.reportMessageId,
         status: doc.status,
     });
@@ -32,7 +32,7 @@ function toDoc(event) {
         teams: event.getTeams(),
         matches: event.getMatches(),
         status: event.getStatus(),
-        seasonName: event.getSeasonName(),
+        seasonId: event.getSeasonId(),
         isRatingApplied: event.getIsRatingApplied(),
         reportMessageId: event.getReportMessageId(),
     };

package/dist/repositories/mongo/season.mapper.js

@@ -12,6 +12,7 @@ function toDomain(doc) {
         endDate: new Date(doc.endDate),
         status: doc.status,
         isPublic: doc.isPublic,
+        seasonType: doc.seasonType,
         description: doc.description,
         groupId: doc.groupId,
         createdBy: doc.createdBy,
@@ -28,6 +29,7 @@ function toDoc(entity) {
         endDate: entity.getEndDate(),
         status: entity.getStatus(),
         isPublic: entity.getIsPublic(),
+        seasonType: entity.getSeasonType(),
         description: entity.getDescription(),
         groupId: entity.getGroupId(),
         createdBy: entity.getCreatedBy(),

package/dist/repositories/mongo/season.repository.js

@@ -23,7 +23,7 @@ class MongoSeasonsRepository {
     }
     async getPublicSeasons() {
         try {
-            const docs = await this.Model.find({ isPublic: true }).sort({ year: -1, startDate: -1 }).lean();
+            const docs = await this.Model.find({ seasonType: 'system' }).sort({ year: -1, startDate: -1 }).lean();
             return docs.map(d => (0, season_mapper_1.toDomain)(d));
         }
         catch (error) {
@@ -35,10 +35,8 @@ class MongoSeasonsRepository {
             if (!groupId || groupId === 0) {
                 throw new errors_1.ValidationError('Season', 'groupId', groupId, 'must be a non-zero number');
             }
-            // Возвращаем публичные сезоны + сезоны конкретной группы
             const docs = await this.Model.find({
                 $or: [
-                    { isPublic: true },
                     { groupId: groupId }
                 ]
             }).sort({ year: -1, startDate: -1 }).lean();
@@ -178,7 +176,7 @@ class MongoSeasonsRepository {
                     throw new errors_1.ValidationError('Season', 'groupId', groupId, 'must be a non-zero number');
                 }
                 filter.$or = [
-                    { isPublic: true },
+                    { seasonType: 'system' },
                     { groupId: groupId }
                 ];
             }
@@ -199,7 +197,7 @@ class MongoSeasonsRepository {
                     throw new errors_1.ValidationError('Season', 'groupId', groupId, 'must be a non-zero number');
                 }
                 filter.$or = [
-                    { isPublic: true },
+                    { seasonType: 'system' },
                     { groupId: groupId }
                 ];
             }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "ballrush-core",
-    "version": "0.5.4",
+    "version": "0.6.1",
     "private": false,
     "license": "MIT",
     "main": "./dist/index.js",