fix(web): split home matches by schedule
This commit is contained in:
1 parent
6697cd8ea1
commit
f586542dc3
6 files changed
+524
-37
No files matched your search
@@ -23,6 +23,8 @@ import { TournamentCodeService } from '../tournament-code/tournament-code.servic
|
||||
const MATCH_SHORT_CODE_ALPHABET = 'ABCDEFGHJKLMNPQRSTUVWXYZ23456789';
|
||||
const MATCH_SHORT_CODE_LENGTH = 4;
|
||||
const MATCH_SHORT_CODE_GENERATION_ATTEMPTS = 20;
|
||||
const DEFAULT_MATCH_LIST_LIMIT = 50;
|
||||
const MAX_MATCH_LIST_LIMIT = 200;
|
||||
|
||||
interface CreateMatchParams {
|
||||
communityId: mongoose.Types.ObjectId;
|
||||
@@ -40,6 +42,23 @@ interface ListMatchesQuery {
|
||||
communityId: mongoose.Types.ObjectId;
|
||||
status?: MatchStatus;
|
||||
limit?: number;
|
||||
scheduledFrom?: Date;
|
||||
scheduledTo?: Date;
|
||||
sort?: 'asc' | 'desc';
|
||||
}
|
||||
|
||||
interface ListMatchesPageQuery extends ListMatchesQuery {
|
||||
page?: number;
|
||||
offset?: number;
|
||||
}
|
||||
|
||||
interface MatchListFilter {
|
||||
communityId: mongoose.Types.ObjectId;
|
||||
status?: MatchStatus;
|
||||
scheduledAt?: {
|
||||
$gte?: Date;
|
||||
$lt?: Date;
|
||||
};
|
||||
}
|
||||
|
||||
interface JoinMatchParams {
|
||||
@@ -101,19 +120,42 @@ export class MatchService {
|
||||
|
||||
public async list(query: ListMatchesQuery): Promise<MatchDocument[]> {
|
||||
const MatchModel = await this.connectionService.getModel('match');
|
||||
const filter: {
|
||||
communityId: mongoose.Types.ObjectId;
|
||||
status?: MatchStatus;
|
||||
} = {
|
||||
communityId: query.communityId,
|
||||
};
|
||||
if (query.status) filter.status = query.status;
|
||||
const filter = this.buildListFilter(query);
|
||||
return MatchModel.find(filter)
|
||||
.sort({ scheduledAt: -1 })
|
||||
.limit(Math.min(query.limit ?? 50, 200))
|
||||
.sort(this.buildListSort(query.sort))
|
||||
.limit(this.normalizeListLimit(query.limit))
|
||||
.exec();
|
||||
}
|
||||
|
||||
public async listPage(query: ListMatchesPageQuery): Promise<{
|
||||
matches: MatchDocument[];
|
||||
total: number;
|
||||
page: number;
|
||||
limit: number;
|
||||
}> {
|
||||
const MatchModel = await this.connectionService.getModel('match');
|
||||
const filter = this.buildListFilter(query);
|
||||
const page = this.normalizeListPage(query.page);
|
||||
const limit = this.normalizeListLimit(query.limit);
|
||||
const offset = this.normalizeListOffset(query.offset);
|
||||
const skip = offset + (page - 1) * limit;
|
||||
const [matches, rawTotal] = await Promise.all([
|
||||
MatchModel.find(filter)
|
||||
.sort(this.buildListSort(query.sort))
|
||||
.skip(skip)
|
||||
.limit(limit)
|
||||
.exec(),
|
||||
MatchModel.countDocuments(filter).exec(),
|
||||
]);
|
||||
|
||||
return {
|
||||
matches,
|
||||
total: Math.max(rawTotal - offset, 0),
|
||||
page,
|
||||
limit,
|
||||
};
|
||||
}
|
||||
|
||||
public async ensureShortCode(match: MatchDocument): Promise<MatchDocument> {
|
||||
if (match.shortCode) return match;
|
||||
|
||||
@@ -394,6 +436,44 @@ export class MatchService {
|
||||
};
|
||||
}
|
||||
|
||||
private buildListFilter(query: ListMatchesQuery): MatchListFilter {
|
||||
const filter: MatchListFilter = {
|
||||
communityId: query.communityId,
|
||||
};
|
||||
if (query.status) filter.status = query.status;
|
||||
if (query.scheduledFrom || query.scheduledTo) {
|
||||
filter.scheduledAt = {};
|
||||
if (query.scheduledFrom) filter.scheduledAt.$gte = query.scheduledFrom;
|
||||
if (query.scheduledTo) filter.scheduledAt.$lt = query.scheduledTo;
|
||||
}
|
||||
return filter;
|
||||
}
|
||||
|
||||
private buildListSort(sort?: 'asc' | 'desc'): { scheduledAt: 1 | -1 } {
|
||||
return { scheduledAt: sort === 'asc' ? 1 : -1 };
|
||||
}
|
||||
|
||||
private normalizeListLimit(limit?: number): number {
|
||||
if (!Number.isFinite(limit) || !limit || limit < 1) {
|
||||
return DEFAULT_MATCH_LIST_LIMIT;
|
||||
}
|
||||
return Math.min(Math.floor(limit), MAX_MATCH_LIST_LIMIT);
|
||||
}
|
||||
|
||||
private normalizeListPage(page?: number): number {
|
||||
if (!Number.isFinite(page) || !page || page < 1) {
|
||||
return 1;
|
||||
}
|
||||
return Math.floor(page);
|
||||
}
|
||||
|
||||
private normalizeListOffset(offset?: number): number {
|
||||
if (!Number.isFinite(offset) || !offset || offset < 1) {
|
||||
return 0;
|
||||
}
|
||||
return Math.floor(offset);
|
||||
}
|
||||
|
||||
private async generateUniqueShortCode(
|
||||
MatchModel: mongoose.Model<Match>,
|
||||
communityId: mongoose.Types.ObjectId,
|
||||
|
||||
Reference in new issue
Block a user