Skip to content
Open
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
42 changes: 31 additions & 11 deletions backend/src/admin/admin.controller.ts
Original file line number Diff line number Diff line change
@@ -1,27 +1,29 @@
import {
Body,
Controller,
Get,
Post,
Patch,
Param,
Body,
Patch,
Post,
Query,
UseGuards,
Request,
UseGuards,
} from '@nestjs/common';
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 { ListUsersQueryDto } from './dto/list-users-query.dto';
import { BanUserDto } from './dto/ban-user.dto';
import { ActivityLogQueryDto } from './dto/activity-log-query.dto';
import { StatsResponseDto } from './dto/stats-response.dto';
import { ResolveMarketDto } from './dto/resolve-market.dto';
import { UpdateUserRoleDto } from './dto/update-user-role.dto';
import { BanUserDto } from './dto/ban-user.dto';
import { ListUsersQueryDto } from './dto/list-users-query.dto';
import { ModerateCommentDto } from './dto/moderate-comment.dto';
import { ReportQueryDto } from './dto/report-query.dto';
import { ResolveMarketDto } from './dto/resolve-market.dto';
import { StatsResponseDto } from './dto/stats-response.dto';
import { UpdateUserRoleDto } from './dto/update-user-role.dto';

@Controller('admin')
@UseGuards(JwtAuthGuard, RolesGuard)
Expand Down Expand Up @@ -81,6 +83,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
12 changes: 7 additions & 5 deletions backend/src/admin/admin.module.ts
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
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 { ActivityLog } from '../analytics/entities/activity-log.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 @@ -20,6 +21,7 @@ import { AdminService } from './admin.service';
Competition,
ActivityLog,
]),
FlagsModule,
NotificationsModule,
],
controllers: [AdminController],
Expand Down
48 changes: 32 additions & 16 deletions backend/src/admin/admin.service.ts
Original file line number Diff line number Diff line change
@@ -1,33 +1,36 @@
import {
Injectable,
NotFoundException,
ConflictException,
BadRequestException,
BadGatewayException,
BadRequestException,
ConflictException,
Injectable,
Logger,
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 { ActivityLog } from '../analytics/entities/activity-log.entity';
import { Between, Repository } from 'typeorm';
import { AnalyticsService } from '../analytics/analytics.service';
import { NotificationsService } from '../notifications/notifications.service';
import { ActivityLog } from '../analytics/entities/activity-log.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 { ListUsersQueryDto } from './dto/list-users-query.dto';
import { User } from '../users/entities/user.entity';
import { ActivityLogQueryDto } from './dto/activity-log-query.dto';
import { StatsResponseDto } from './dto/stats-response.dto';
import { ResolveMarketDto } from './dto/resolve-market.dto';
import { UpdateUserRoleDto } from './dto/update-user-role.dto';
import { ListUsersQueryDto } from './dto/list-users-query.dto';
import {
ReportFormat,
ReportQueryDto,
ReportTimeframe,
} from './dto/report-query.dto';
import { ResolveMarketDto } from './dto/resolve-market.dto';
import { StatsResponseDto } from './dto/stats-response.dto';
import { UpdateUserRoleDto } from './dto/update-user-role.dto';

@Injectable()
export class AdminService {
Expand All @@ -49,6 +52,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 @@ -244,6 +248,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
15 changes: 15 additions & 0 deletions backend/src/flags/dto/create-flag.dto.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
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;
}
108 changes: 108 additions & 0 deletions backend/src/flags/entities/flag.entity.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,108 @@
import { IsEnum, IsOptional, IsString, IsUUID } from 'class-validator';
import {
Column,
CreateDateColumn,
Entity,
Index,
ManyToOne,
PrimaryGeneratedColumn,
} from 'typeorm';
import { Market } from '../../markets/entities/market.entity';
import { User } from '../../users/entities/user.entity';

export enum FlagStatus {
PENDING = 'pending',
RESOLVED = 'resolved',
DISMISSED = 'dismissed',
}

export enum FlagReason {
INAPPROPRIATE_CONTENT = 'inappropriate_content',
SPAM = 'spam',
MISINFORMATION = 'misinformation',
HARASSMENT = 'harassment',
HATE_SPEECH = 'hate_speech',
VIOLENCE = 'violence',
COPYRIGHT = 'copyright',
OTHER = 'other',
}

export enum FlagResolutionAction {
DISMISS = 'dismiss',
REMOVE_MARKET = 'remove_market',
BAN_USER = 'ban_user',
}

@Entity('flags')
@Index(['market'])
@Index(['user'])
@Index(['status'])
@Index(['reason'])
export class Flag {
@PrimaryGeneratedColumn('uuid')
@IsUUID()
id: string;

@ManyToOne(() => Market, { onDelete: 'CASCADE' })
market: Market;

@Column()
@IsUUID()
market_id: string;

@ManyToOne(() => User, { onDelete: 'CASCADE' })
user: User;

@Column()
@IsUUID()
user_id: string;

@Column({
type: 'enum',
enum: FlagReason,
})
@IsEnum(FlagReason)
reason: FlagReason;

@Column({
type: 'enum',
enum: FlagStatus,
default: FlagStatus.PENDING,
})
@IsEnum(FlagStatus)
status: FlagStatus;

@Column('text', { nullable: true })
@IsOptional()
@IsString()
description: string | null;

@Column({
type: 'enum',
enum: FlagResolutionAction,
nullable: true,
})
@IsOptional()
@IsEnum(FlagResolutionAction)
resolution_action: FlagResolutionAction | null;

@Column('text', { nullable: true })
@IsOptional()
@IsString()
admin_notes: string | null;

@Column({ nullable: true })
@IsOptional()
@IsUUID()
resolved_by: string | null;

@ManyToOne(() => User, { nullable: true })
resolved_by_user: User | null;

@Column({ type: 'timestamptz', nullable: true })
@IsOptional()
resolved_at: Date | null;

@CreateDateColumn()
created_at: Date;
}
Loading
Loading