feat: re-enable user page and add route for getting user data by username

Author: Bentroen

server/src/user/user.controller.ts

@@ -1,4 +1,12 @@
-import { Body, Controller, Get, Inject, Patch, Query } from '@nestjs/common';
+import {
+  Body,
+  Controller,
+  Get,
+  Inject,
+  Param,
+  Patch,
+  Query,
+} from '@nestjs/common';
 import { ApiBearerAuth, ApiOperation, ApiTags } from '@nestjs/swagger';
 import { PageQueryDTO } from '@shared/validation/common/dto/PageQuery.dto';
 import { GetUser } from '@shared/validation/user/dto/GetUser.dto';
@@ -19,8 +27,13 @@ export class UserController {
     private readonly userService: UserService,
   ) {}
 
+  @Get('/:username')
+  async getUser(@Param('username') username: string) {
+    return await this.userService.getUserByEmailOrId({ username: username });
+  }
+
   @Get('by-query')
-  async getUser(@Query() query: GetUser) {
+  async getUserByQuery(@Query() query: GetUser) {
     return await this.userService.getUserByEmailOrId(query);
   }
 

server/src/user/user.service.ts

@@ -6,6 +6,7 @@ import { CreateUser } from '@shared/validation/user/dto/CreateUser.dto';
 import { GetUser } from '@shared/validation/user/dto/GetUser.dto';
 import { UpdateUsernameDto } from '@shared/validation/user/dto/UpdateUsername.dto';
 import { UpdateUserProfileDto } from '@shared/validation/user/dto/UpdateUserProfile.dto';
+import { UserViewDto } from '@shared/validation/user/dto/UserView.dto';
 import { validate } from 'class-validator';
 import { Model } from 'mongoose';
 
@@ -39,6 +40,12 @@ export class UserService {
     return user;
   }
 
+  public async findByUsername(username: string): Promise<UserDocument | null> {
+    const user = await this.userModel.findOne({ username }).exec();
+
+    return user;
+  }
+
   public async getUserPaginated(query: PageQueryDTO) {
     const { page = 1, limit = 10, sort = 'createdAt', order = 'asc' } = query;
 
@@ -134,24 +141,24 @@ export class UserService {
 
   public async getUserByEmailOrId(query: GetUser) {
     const { email, id, username } = query;
+    let user;
 
     if (email) {
-      return await this.findByEmail(email);
+      user = await this.findByEmail(email);
     }
 
     if (id) {
-      return await this.findByID(id);
+      user = await this.findByID(id);
     }
 
     if (username) {
-      throw new HttpException(
-        'Username is not supported yet',
-        HttpStatus.BAD_REQUEST,
-      );
+      user = await this.findByUsername(username);
     }
 
+    if (user) return new UserViewDto(user);
+
     throw new HttpException(
-      'You must provide an email or an id',
+      'You must provide an email, ID or username',
       HttpStatus.BAD_REQUEST,
     );
   }

web/src/app/(content)/user/[id]/page.tsx

@@ -0,0 +1,23 @@
+import { ErrorBox } from '@web/src/modules/shared/components/client/ErrorBox';
+import UserProfile from '@web/src/modules/user/components/UserProfile';
+import { getUserProfileData } from '@web/src/modules/user/features/user.util';
+
+const UserPage = async ({ params }: { params: { id: string } }) => {
+  const { id } = params;
+
+  let userData;
+
+  try {
+    userData = await getUserProfileData(id);
+  } catch {
+    userData = null;
+  }
+
+  return !userData ? (
+    <ErrorBox message='Failed to get user data' />
+  ) : (
+    <UserProfile userData={userData} />
+  );
+};
+
+export default UserPage;

web/src/app/(content)/user/[id]/page_disable.tsx

@@ -5,7 +5,7 @@ export const getUserProfileData = async (
   id: string,
 ): Promise<UserProfileData | never> => {
   try {
-    const res = await axiosInstance.get(`/user/?id=${id}`);
+    const res = await axiosInstance.get(`/user/${id}`);
     if (res.status === 200) return res.data as UserProfileData;
     else throw new Error('Failed to get user data');
   } catch {