fix(profile): v2 (#110)

* fix(profile): fix profile posts ordering

* fix(profile): add reply context to liked and media posts

* fix(auth): fix confirm password response status codes

* feat(profile): add posts counters to user

* feat(profile): add user posts counts in profile response

* feat(profile): add email to profile response

* fix(profile): add reposts count to profile

Author: Alyaa242

src/auth/auth.controller.ts

@@ -660,8 +660,9 @@ export class AuthController {
     @ApiOperation(confirm_password_swagger.operation)
     @ApiBody({ type: ConfirmPasswordDto })
     @ApiOkResponse(confirm_password_swagger.responses.success)
-    @ApiUnauthorizedErrorResponse(ERROR_MESSAGES.WRONG_PASSWORD)
-    @ApiUnauthorizedErrorResponse(ERROR_MESSAGES.SOCIAL_LOGIN_REQUIRED)
+    @ApiUnauthorizedErrorResponse(ERROR_MESSAGES.INVALID_OR_EXPIRED_TOKEN)
+    @ApiForbiddenErrorResponse(ERROR_MESSAGES.WRONG_PASSWORD)
+    @ApiConflictErrorResponse(ERROR_MESSAGES.ACCOUNT_HAS_NO_PASSWORD)
     @ApiNotFoundErrorResponse(ERROR_MESSAGES.USER_NOT_FOUND)
     @ResponseMessage(SUCCESS_MESSAGES.PASSWORD_CONFIRMED)
     @Post('confirm-password')

src/auth/auth.service.ts

@@ -1086,9 +1086,9 @@ export class AuthService {
                 confirm_password_dto.password,
                 user.password
             );
-            if (!is_password_valid) throw new UnauthorizedException(ERROR_MESSAGES.WRONG_PASSWORD);
+            if (!is_password_valid) throw new ForbiddenException(ERROR_MESSAGES.WRONG_PASSWORD);
         } else {
-            throw new UnauthorizedException(ERROR_MESSAGES.SOCIAL_LOGIN_REQUIRED);
+            throw new ConflictException(ERROR_MESSAGES.ACCOUNT_HAS_NO_PASSWORD);
         }
 
         return { valid: true };

src/constants/swagger-messages.ts

@@ -17,6 +17,7 @@ export const ERROR_MESSAGES = {
     PHONE_NUMBER_NOT_FOUND: 'Phone number not found',
     USERNAME_NOT_FOUND: 'Username not found',
     USERNAME_ALREADY_TAKEN: 'Username is already taken',
+    ACCOUNT_HAS_NO_PASSWORD: 'Account does not have a password set',
 
     // OAuth completion
     INVALID_OAUTH_SESSION_TOKEN: 'Invalid OAuth session token',

src/user/dto/user-profile.dto.ts

@@ -5,6 +5,9 @@ export class UserProfileDto {
     @Expose()
     user_id: string;
 
+    @Expose()
+    email?: string;
+
     @Expose()
     name: string;
 
@@ -42,4 +45,16 @@ export class UserProfileDto {
         return Number(source) || 0;
     })
     following_count: number;
+
+    @Expose()
+    num_posts: number;
+
+    @Expose()
+    num_replies: number;
+
+    @Expose()
+    num_media: number;
+
+    @Expose()
+    num_likes?: number;
 }

src/user/user.repository.ts

@@ -63,10 +63,16 @@ export class UserRepository extends Repository<User> {
     }
 
     async getMyProfile(current_user_id: string): Promise<UserProfileDto | null> {
-        const profile = await this.buildProfileQuery(
-            current_user_id,
-            'id'
-        ).getRawOne<UserProfileDto>();
+        const query = this.buildProfileQuery(current_user_id, 'id');
+        query.addSelect('user.email AS email');
+        query.addSelect((sub_query) => {
+            return sub_query
+                .select('COUNT(*)', 'count')
+                .from('tweet_likes', 'tl')
+                .where('tl.user_id = user.id');
+        }, 'num_likes');
+
+        const profile = await query.getRawOne<UserProfileDto>();
         return profile ?? null;
     }
 
@@ -126,6 +132,32 @@ export class UserRepository extends Repository<User> {
             'user.following AS following_count',
         ]);
 
+        query.addSelect((sub_query) => {
+            return sub_query
+                .select('COUNT(*)', 'count')
+                .from('tweets', 't')
+                .where('t.user_id = user.id')
+                .andWhere("t.type = 'reply'")
+                .andWhere('t.deleted_at IS NULL');
+        }, 'num_replies');
+
+        query.addSelect(
+            `(
+            (SELECT COUNT(*) FROM tweets t WHERE t.user_id = user.id AND t.type != 'reply' AND t.deleted_at IS NULL) +
+            (SELECT COUNT(*) FROM tweet_reposts r WHERE r.user_id = user.id)
+            )`,
+            'num_posts'
+        );
+
+        query.addSelect((sub_query) => {
+            return sub_query
+                .select('COUNT(*)', 'count')
+                .from('tweets', 't')
+                .where('t.user_id = user.id')
+                .andWhere('(array_length(t.images, 1) > 0 OR array_length(t.videos, 1) > 0)')
+                .andWhere('t.deleted_at IS NULL');
+        }, 'num_media');
+
         if (identifier_type === 'id') {
             query.where('user.id = :identifier', { identifier });
         } else {