Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 24 additions & 4 deletions backend/src/admin/admin.controller.ts
Original file line number Diff line number Diff line change
@@ -1,20 +1,22 @@
import {
Body,
Controller,
Get,
Delete,
Patch,
Get,
Param,
Patch,
Post,
Query,
Request,
UseGuards,
} from '@nestjs/common';
import { ApiBearerAuth, ApiOperation, ApiResponse } from '@nestjs/swagger';
import { JwtAuthGuard } from '../common/guards/jwt-auth.guard';
import { RolesGuard } from '../common/guards/roles.guard';
import { Roles } from '../common/decorators/roles.decorator';
import { Role } from '../common/enums/role.enum';
import { JwtAuthGuard } from '../common/guards/jwt-auth.guard';
import { RolesGuard } from '../common/guards/roles.guard';
import { ListFlagsQueryDto } from '../flags/dto/list-flags-query.dto';
import { ResolveFlagDto } from '../flags/dto/resolve-flag.dto';
import { AdminService } from './admin.service';
import { ActivityLogQueryDto } from './dto/activity-log-query.dto';
import { BanUserDto } from './dto/ban-user.dto';
Expand Down Expand Up @@ -100,6 +102,24 @@ export class AdminController {
return this.adminService.getUserActivity(id, query);
}

@Get('flags')
async listFlags(@Query() query: ListFlagsQueryDto) {
return this.adminService.listFlags(query);
}

@Patch('flags/:id/resolve')
async resolveFlag(
@Param('id') id: string,
@Body() dto: ResolveFlagDto,
@Request() req: any,
) {
return this.adminService.resolveFlag(
id,
dto,
(req as { user: { id: string } }).user.id,
);
}

@Post('markets/:id/resolve')
async resolveMarket(
@Param('id') id: string,
Expand Down
14 changes: 8 additions & 6 deletions backend/src/admin/admin.module.ts
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
import { Module } from '@nestjs/common';
import { TypeOrmModule } from '@nestjs/typeorm';
import { User } from '../users/entities/user.entity';
import { Market } from '../markets/entities/market.entity';
import { Comment } from '../markets/entities/comment.entity';
import { Prediction } from '../predictions/entities/prediction.entity';
import { Competition } from '../competitions/entities/competition.entity';
import { CompetitionParticipant } from '../competitions/entities/competition-participant.entity';
import { ActivityLog } from '../analytics/entities/activity-log.entity';
import { CompetitionParticipant } from '../competitions/entities/competition-participant.entity';
import { Competition } from '../competitions/entities/competition.entity';
import { FlagsModule } from '../flags/flags.module';
import { Comment } from '../markets/entities/comment.entity';
import { Market } from '../markets/entities/market.entity';
import { NotificationsModule } from '../notifications/notifications.module';
import { Prediction } from '../predictions/entities/prediction.entity';
import { User } from '../users/entities/user.entity';
import { AdminController } from './admin.controller';
import { AdminService } from './admin.service';

Expand All @@ -22,6 +23,7 @@ import { AdminService } from './admin.service';
CompetitionParticipant,
ActivityLog,
]),
FlagsModule,
NotificationsModule,
],
controllers: [AdminController],
Expand Down
38 changes: 37 additions & 1 deletion backend/src/admin/admin.service.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,10 @@ import { getRepositoryToken } from '@nestjs/typeorm';
import { AnalyticsService } from '../analytics/analytics.service';
import { ActivityLog } from '../analytics/entities/activity-log.entity';
import { Role } from '../common/enums/role.enum';
import { CompetitionParticipant } from '../competitions/entities/competition-participant.entity';
import { Competition } from '../competitions/entities/competition.entity';
import { FlagsService } from '../flags/flags.service';
import { Comment } from '../markets/entities/comment.entity';
import { CompetitionParticipant } from '../competitions/entities/competition-participant.entity';
import { Market } from '../markets/entities/market.entity';
import { NotificationsService } from '../notifications/notifications.service';
import { Prediction } from '../predictions/entities/prediction.entity';
Expand Down Expand Up @@ -86,6 +87,13 @@ describe('AdminService.adminResolveMarket', () => {
{ provide: AnalyticsService, useValue: analyticsService },
{ provide: NotificationsService, useValue: notificationsService },
{ provide: SorobanService, useValue: sorobanService },
{
provide: FlagsService,
useValue: {
listFlags: jest.fn(),
resolveFlag: jest.fn(),
},
},
],
}).compile();

Expand Down Expand Up @@ -257,6 +265,13 @@ describe('AdminService.featureMarket', () => {
{ provide: AnalyticsService, useValue: analyticsService },
{ provide: NotificationsService, useValue: { create: jest.fn() } },
{ provide: SorobanService, useValue: { resolveMarket: jest.fn() } },
{
provide: FlagsService,
useValue: {
listFlags: jest.fn(),
resolveFlag: jest.fn(),
},
},
],
}).compile();

Expand Down Expand Up @@ -349,6 +364,13 @@ describe('AdminService.unfeatureMarket', () => {
{ provide: AnalyticsService, useValue: analyticsService },
{ provide: NotificationsService, useValue: { create: jest.fn() } },
{ provide: SorobanService, useValue: { resolveMarket: jest.fn() } },
{
provide: FlagsService,
useValue: {
listFlags: jest.fn(),
resolveFlag: jest.fn(),
},
},
],
}).compile();

Expand Down Expand Up @@ -439,6 +461,13 @@ describe('AdminService.updateUserRole', () => {
refundCompetitionParticipant: jest.fn(),
},
},
{
provide: FlagsService,
useValue: {
listFlags: jest.fn(),
resolveFlag: jest.fn(),
},
},
],
}).compile();

Expand Down Expand Up @@ -530,6 +559,13 @@ describe('AdminService.adminCancelCompetition', () => {
{ provide: AnalyticsService, useValue: analyticsService },
{ provide: NotificationsService, useValue: notificationsService },
{ provide: SorobanService, useValue: sorobanService },
{
provide: FlagsService,
useValue: {
listFlags: jest.fn(),
resolveFlag: jest.fn(),
},
},
],
}).compile();

Expand Down
32 changes: 24 additions & 8 deletions backend/src/admin/admin.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,18 +7,21 @@ import {
NotFoundException,
} from '@nestjs/common';
import { InjectRepository } from '@nestjs/typeorm';
import { Repository, Between } from 'typeorm';
import { User } from '../users/entities/user.entity';
import { Market } from '../markets/entities/market.entity';
import { Comment } from '../markets/entities/comment.entity';
import { Prediction } from '../predictions/entities/prediction.entity';
import { Competition } from '../competitions/entities/competition.entity';
import { CompetitionParticipant } from '../competitions/entities/competition-participant.entity';
import { ActivityLog } from '../analytics/entities/activity-log.entity';
import { Between, Repository } from 'typeorm';
import { AnalyticsService } from '../analytics/analytics.service';
import { ActivityLog } from '../analytics/entities/activity-log.entity';
import { CompetitionParticipant } from '../competitions/entities/competition-participant.entity';
import { Competition } from '../competitions/entities/competition.entity';
import { ListFlagsQueryDto } from '../flags/dto/list-flags-query.dto';
import { ResolveFlagDto } from '../flags/dto/resolve-flag.dto';
import { FlagsService } from '../flags/flags.service';
import { Comment } from '../markets/entities/comment.entity';
import { Market } from '../markets/entities/market.entity';
import { NotificationType } from '../notifications/entities/notification.entity';
import { NotificationsService } from '../notifications/notifications.service';
import { Prediction } from '../predictions/entities/prediction.entity';
import { SorobanService } from '../soroban/soroban.service';
import { User } from '../users/entities/user.entity';
import { ActivityLogQueryDto } from './dto/activity-log-query.dto';
import { ListUsersQueryDto } from './dto/list-users-query.dto';
import {
Expand Down Expand Up @@ -52,6 +55,7 @@ export class AdminService {
private readonly analyticsService: AnalyticsService,
private readonly notificationsService: NotificationsService,
private readonly sorobanService: SorobanService,
private readonly flagsService: FlagsService,
) {}

async getStats(): Promise<StatsResponseDto> {
Expand Down Expand Up @@ -247,6 +251,18 @@ export class AdminService {
};
}

async listFlags(query: ListFlagsQueryDto) {
return this.flagsService.listFlags(query);
}

async resolveFlag(
flagId: string,
resolveFlagDto: ResolveFlagDto,
adminId: string,
) {
return this.flagsService.resolveFlag(flagId, resolveFlagDto, adminId);
}

async adminResolveMarket(
id: string,
dto: ResolveMarketDto,
Expand Down
9 changes: 5 additions & 4 deletions backend/src/app.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,25 +6,26 @@ import { TypeOrmModule } from '@nestjs/typeorm';

import { ThrottlerGuard, ThrottlerModule } from '@nestjs/throttler';
import { LoggerModule } from 'nestjs-pino';
import { AchievementsModule } from './achievements/achievements.module';
import { AdminModule } from './admin/admin.module';
import { AnalyticsModule } from './analytics/analytics.module';
import { AppController } from './app.controller';
import { AppService } from './app.service';
import { AuthModule } from './auth/auth.module';
import { CommonModule } from './common/common.module';
import { AdminModule } from './admin/admin.module';
import { AchievementsModule } from './achievements/achievements.module';
import { JwtAuthGuard } from './common/guards/jwt-auth.guard';
import { RolesGuard } from './common/guards/roles.guard';
import { CompetitionsModule } from './competitions/competitions.module';
import { validate } from './config/env.validation';
import { FlagsModule } from './flags/flags.module';
import { HealthModule } from './health/health.module';
import { LeaderboardModule } from './leaderboard/leaderboard.module';
import { MarketsModule } from './markets/markets.module';
import { NotificationsModule } from './notifications/notifications.module';
import { PredictionsModule } from './predictions/predictions.module';
import { SearchModule } from './search/search.module';
import { SeasonsModule } from './seasons/seasons.module';
import { SorobanModule } from './soroban/soroban.module';
import { SearchModule } from './search/search.module';
import { UsersModule } from './users/users.module';

@Module({
Expand Down Expand Up @@ -82,7 +83,7 @@ import { UsersModule } from './users/users.module';
AchievementsModule,
SearchModule,
CommonModule,
AnalyticsModule,
FlagsModule,
],

controllers: [AppController],
Expand Down
21 changes: 21 additions & 0 deletions backend/src/flags/dto/create-flag.dto.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
import {
IsUUID,
IsEnum,
IsString,
IsOptional,
MaxLength,
} from 'class-validator';
import { FlagReason } from '../entities/flag.entity';

export class CreateFlagDto {
@IsUUID()
market_id: string;

@IsEnum(FlagReason)
reason: FlagReason;

@IsOptional()
@IsString()
@MaxLength(500)
description?: string;
}
32 changes: 32 additions & 0 deletions backend/src/flags/dto/list-flags-query.dto.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
import { IsEnum, IsOptional, IsString, IsUUID } from 'class-validator';
import { FlagReason, FlagStatus } from '../entities/flag.entity';

export class ListFlagsQueryDto {
@IsOptional()
@IsEnum(FlagStatus)
status?: FlagStatus;

@IsOptional()
@IsEnum(FlagReason)
reason?: FlagReason;

@IsOptional()
@IsUUID()
user_id?: string;

@IsOptional()
@IsString()
page?: string;

@IsOptional()
@IsString()
limit?: string;

@IsOptional()
@IsString()
sortBy?: string;

@IsOptional()
@IsString()
sortOrder?: string;
}
12 changes: 12 additions & 0 deletions backend/src/flags/dto/resolve-flag.dto.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
import { IsEnum, IsString, IsOptional, MaxLength } from 'class-validator';
import { FlagResolutionAction } from '../entities/flag.entity';

export class ResolveFlagDto {
@IsEnum(FlagResolutionAction)
action: FlagResolutionAction;

@IsOptional()
@IsString()
@MaxLength(1000)
admin_notes?: string;
}
Loading
Loading