Toni grbic/backend profile leaderboard

apps/api/prisma/migrations/20250418164613_user_soft_delete_support/migration.sql

@@ -0,0 +1,21 @@
+/*
+  Warnings:
+
+  - A unique constraint covering the columns `[email,isDeleted]` on the table `User` will be added. If there are existing duplicate values, this will fail.
+  - A unique constraint covering the columns `[phoneNumber,isDeleted]` on the table `User` will be added. If there are existing duplicate values, this will fail.
+
+*/
+-- DropIndex
+DROP INDEX "User_email_key";
+
+-- DropIndex
+DROP INDEX "User_phoneNumber_key";
+
+-- AlterTable
+ALTER TABLE "User" ALTER COLUMN "isDeleted" SET DEFAULT false;
+
+-- CreateIndex
+CREATE UNIQUE INDEX "User_email_isDeleted_key" ON "User"("email", "isDeleted");
+
+-- CreateIndex
+CREATE UNIQUE INDEX "User_phoneNumber_isDeleted_key" ON "User"("phoneNumber", "isDeleted");

apps/api/prisma/schema.prisma

@@ -218,16 +218,16 @@ model User {
   id                         Int                 @id @default(autoincrement())
   firstName                  String
   lastName                   String
-  email                      String              @unique
-  phoneNumber                String              @unique
+  email                      String              
+  phoneNumber                String              
   birthYear                  Int
   occupation                 String?
   educationDegree            String?
   password                   String?
   points                     Int?
   newsletterEnabled          Boolean?
   companiesNewsEnabled       Boolean?
-  isDeleted                  Boolean?
+  isDeleted                  Boolean?            @default(false)
   isConfirmed                Boolean?            @default(false)
   profilePhotoUrl            String?
   avatar                     Avatar[]
@@ -237,6 +237,9 @@ model User {
   userToAchievement          UserToAchievement[]
   userToEvent                UserToEvent[]
   userToInterest             UserToInterest[]
+
+  @@unique([email, isDeleted])
+  @@unique([phoneNumber, isDeleted])
 }
 
 model UserNotification {

apps/api/src/app.module.ts

@@ -13,11 +13,13 @@ import { EventModule } from './event/event.module';
 import { FrequentlyAskedQuestionModule } from './frequently-asked-question/frequently-asked-question.module';
 import { InterestModule } from './interest/interest.module';
 import { JobModule } from './job/job.module';
+import { LeaderboardModule } from './leaderboard/leaderboard.module';
 import { NotificationModule } from './notification/notification.module';
 import { PrismaService } from './prisma.service';
 import { ShopModule } from './shop/shop.module';
 import { SpeakerModule } from './speaker/speaker.module';
 import { SurveyQuestionModule } from './survey-question/survey-question.module';
+import { UserModule } from './user/user.module';
 
 @Module({
   imports: [
@@ -56,6 +58,8 @@ import { SurveyQuestionModule } from './survey-question/survey-question.module';
 
     BoothModule,
     ShopModule,
+    UserModule,
+    LeaderboardModule,
   ],
   controllers: [AppController],
   providers: [AppService, PrismaService],

apps/api/src/auth/auth.service.ts

@@ -1,5 +1,5 @@
 import { JwtResponseDto } from '@ddays-app/types';
-import { UserDto } from '@ddays-app/types/src/dto/user';
+import { UserDto, UserPublicDto } from '@ddays-app/types/src/dto/user';
 import { BadRequestException, Injectable } from '@nestjs/common';
 import { JwtService } from '@nestjs/jwt';
 import { compare, hash } from 'bcrypt';
@@ -49,16 +49,18 @@ export class AuthService {
     email: string,
     password: string,
   ): Promise<JwtResponseDto> {
-    const loginUser = await this.prisma.user.findUnique({
+    const loginUser = await this.prisma.user.findFirst({
       where: {
         email,
+        isDeleted: false,
       },
       select: {
         id: true,
         email: true,
         firstName: true,
         lastName: true,
         password: true,
+        isDeleted: true,
       },
     });
 
@@ -83,25 +85,27 @@ export class AuthService {
   }
 
   async userRegister(register: UserDto): Promise<JwtResponseDto> {
-    const existingPhoneNumber = await this.prisma.user.findUnique({
+    const existingActivePhoneUser = await this.prisma.user.findFirst({
       where: {
         phoneNumber: register.phoneNumber,
+        isDeleted: false,
       },
     });
 
-    if (existingPhoneNumber) {
+    if (existingActivePhoneUser) {
       throw new BadRequestException(
         'Korisnik sa ovim brojem telefona već postoji!',
       );
     }
 
-    const existingUser = await this.prisma.user.findUnique({
+    const existingActiveEmailUser = await this.prisma.user.findFirst({
       where: {
         email: register.email,
+        isDeleted: false,
       },
     });
 
-    if (existingUser) {
+    if (existingActiveEmailUser) {
       throw new BadRequestException('Korisnik sa ovim emailom već postoji!');
     }
 
@@ -125,9 +129,23 @@ export class AuthService {
     return { accessToken };
   }
 
-  async getUserById(id: number) {
+  async getUserById(id: number): Promise<UserPublicDto> {
     return this.prisma.user.findUnique({
       where: { id },
+      select: {
+        id: true,
+        email: true,
+        firstName: true,
+        lastName: true,
+        phoneNumber: true,
+        birthYear: true,
+        educationDegree: true,
+        occupation: true,
+        newsletterEnabled: true,
+        companiesNewsEnabled: true,
+        isConfirmed: true,
+        isDeleted: true,
+      },
     });
   }
 }

apps/api/src/leaderboard/leaderboard.controller.ts

@@ -0,0 +1,49 @@
+import {
+  LeaderboardEntryDto,
+  LeaderboardQueryDto,
+  LeaderboardResponseDto,
+  UserRankResponseDto,
+} from '@ddays-app/types/src/dto/leaderboard';
+import {
+  Controller,
+  Get,
+  Param,
+  ParseIntPipe,
+  Query,
+  Req,
+  UseGuards,
+} from '@nestjs/common';
+
+import { UserGuard } from '../auth/user.guard';
+import { LeaderboardService } from './leaderboard.service';
+
+@Controller('leaderboard')
+export class LeaderboardController {
+  constructor(private readonly leaderboardService: LeaderboardService) {}
+
+  @Get()
+  async getLeaderboard(
+    @Query() query: LeaderboardQueryDto,
+  ): Promise<LeaderboardResponseDto> {
+    return this.leaderboardService.getLeaderboard(query);
+  }
+
+  @Get('top')
+  async getTopUsers(): Promise<LeaderboardEntryDto[]> {
+    return this.leaderboardService.getTopUsers(3);
+  }
+
+  @Get('user/:id')
+  @UseGuards(UserGuard)
+  async getUserRank(
+    @Param('id', ParseIntPipe) userId: number,
+  ): Promise<UserRankResponseDto> {
+    return this.leaderboardService.getUserRank(userId);
+  }
+
+  @Get('me')
+  @UseGuards(UserGuard)
+  async getCurrentUserRank(@Req() { user }): Promise<UserRankResponseDto> {
+    return this.leaderboardService.getUserRank(user.id);
+  }
+}

apps/api/src/leaderboard/leaderboard.module.ts

@@ -0,0 +1,11 @@
+import { Module } from '@nestjs/common';
+import { PrismaService } from 'src/prisma.service';
+
+import { LeaderboardController } from './leaderboard.controller';
+import { LeaderboardService } from './leaderboard.service';
+
+@Module({
+  controllers: [LeaderboardController],
+  providers: [LeaderboardService, PrismaService],
+})
+export class LeaderboardModule {}