Merge branch 'develop' into push-notifications

package.json

@@ -50,6 +50,7 @@
     "class-validator": "^0.14.1",
     "crypto-js": "^4.2.0",
     "expo-server-sdk": "^3.10.0",
+    "express": "^4.19.2",
     "install": "^0.13.0",
     "ioredis": "^5.4.1",
     "jest-mock-extended": "^3.0.5",

src/auth/auth.e2e.spec.ts

@@ -164,6 +164,7 @@ describe('Auth Controller Tests', () => {
   });
 
   afterEach(async () => {
+    await prisma.userSettings.deleteMany();
     await prisma.user.deleteMany();
     await prisma.verificationCode.deleteMany();
   });

src/auth/service/auth.service.ts

@@ -214,6 +214,9 @@ export class AuthService {
           name: name,
           profilePictureUrl: profilePictureUrl,
           authType,
+          settings: {
+            create: {},
+          },
         },
         select: {
           id: true,

src/connections/connections.controller.ts

@@ -83,6 +83,16 @@ export class ConnectionsController {
     );
   }
 
+  /**
+   * Get logged in user reviewed users
+   */
+
+  @Get('/reviewed')
+  async getReviewedConnections(
+    @CurrentUser() user: User,
+  ): Promise<ConnectionDto[]> {
+    return this.connectionsService.getReviewedConnections(user.id);
+  }
   /**
    * Get a connection.
    */

src/connections/connections.service.ts

@@ -178,6 +178,9 @@ export class ConnectionsService {
           authType: AuthType.EXTERNAL,
           headline: profileData.headline,
           profilePictureUrl: profileData.profilePictureUrl,
+          settings: {
+            create: {},
+          },
         },
         include: this.includeWithUserConnection(),
       }),
@@ -191,4 +194,19 @@ export class ConnectionsService {
     ]);
     return this.convertConnectionToDto(newUser);
   }
+
+  async getReviewedConnections(userId: string): Promise<ConnectionDto[]> {
+    const connections = await this.prisma.user.findMany({
+      where: {
+        reviewsReceived: {
+          some: {
+            postedById: userId,
+          },
+        },
+      },
+      include: this.includeWithUserConnection(),
+    });
+
+    return connections.map((c) => this.convertConnectionToDto(c));
+  }
 }

src/prisma/migrations/20240527092301_add_user_settings/migration.sql

@@ -0,0 +1,15 @@
+-- CreateTable
+CREATE TABLE "UserSettings" (
+    "id" TEXT NOT NULL,
+    "reviewsVisible" BOOLEAN NOT NULL DEFAULT true,
+    "anonymous" BOOLEAN NOT NULL DEFAULT true,
+    "userId" TEXT NOT NULL,
+
+    CONSTRAINT "UserSettings_pkey" PRIMARY KEY ("id")
+);
+
+-- CreateIndex
+CREATE UNIQUE INDEX "UserSettings_userId_key" ON "UserSettings"("userId");
+
+-- AddForeignKey
+ALTER TABLE "UserSettings" ADD CONSTRAINT "UserSettings_userId_fkey" FOREIGN KEY ("userId") REFERENCES "User"("id") ON DELETE RESTRICT ON UPDATE CASCADE;

src/prisma/migrations/20240528092109_add_location/migration.sql

@@ -0,0 +1,2 @@
+-- AlterTable
+ALTER TABLE "User" ADD COLUMN     "location" TEXT;

src/prisma/schema.prisma

@@ -28,6 +28,7 @@ model User {
   id                String           @id @default(cuid())
   email             String?          @unique
   name              String?
+  location          String?
   profilePictureUrl String?
   socialAccounts    SocialAccount[]
   authType          AuthType
@@ -41,6 +42,7 @@ model User {
   favoriteReviews   FavoriteReview[] @relation("userFavoriteReviews")
   notifications     Notification[]   @relation("notifications")
   pushToken         PushToken[]      @relation("pushTokens")
+  settings          UserSettings?
 }
 
 model Connection {
@@ -128,3 +130,11 @@ model PushToken {
   userId String
   token  String @id
 }
+
+model UserSettings {
+  id             String  @id @default(cuid())
+  reviewsVisible Boolean @default(true)
+  anonymous      Boolean @default(true)
+  userId         String  @unique
+  user           User    @relation(fields: [userId], references: [id])
+}

src/reviews/reviews.e2e.spec.ts

@@ -42,6 +42,7 @@ describe('Reviws Controller Tests', () => {
   });
 
   beforeEach(async () => {
+    await prisma.userSettings.deleteMany();
     await prisma.user.deleteMany();
 
     await prisma.user.create({

src/schemas/user.properties.ts

@@ -10,6 +10,7 @@ export const userProperties = {
   isEmailVerified: { type: 'boolean' },
   headline: { type: 'string' },
   joinedAt: { type: 'string', format: 'date-time' },
+  location: { type: 'string' },
 };
 
 export const userExtraProps = {

src/user/controller/user.controller.ts

@@ -2,6 +2,7 @@ import {
   BadRequestException,
   Body,
   Controller,
+  Delete,
   Get,
   Put,
   Req,
@@ -26,6 +27,8 @@ import { Public } from '../../decorators/public.decorator';
 import { Request, Response } from 'express';
 import { LinkedInOAuthStrategyFactory } from '../../oauth/factory/linkedin/linkedin-strategy.factory';
 import { AuthGuard } from '@nestjs/passport';
+import { UpdateUserSettingsDto } from '../dto/update-user-settings.dto';
+import { UserSettingsDto } from '../dto/user-settings.dto';
 
 @Controller('user')
 @ApiBearerAuth()
@@ -120,4 +123,32 @@ export class UserController {
 
     res.status(302).redirect('/api/user/link-social/linkedin/callback');
   }
+
+  /**
+   * Get logged in user's settings
+   */
+  @Get('settings')
+  async getUserSettings(@CurrentUser() user: User): Promise<UserSettingsDto> {
+    return this.userService.getSettings(user.id);
+  }
+
+  /**
+   * Update logged in user's settings
+   */
+  @Put('settings')
+  async updateUserSettings(
+    @CurrentUser() user: User,
+    @Body() data: UpdateUserSettingsDto,
+  ): Promise<UserSettingsDto> {
+    return this.userService.updateSettings(user.id, data);
+  }
+
+  /**
+   * Delete the entire user account
+   */
+  @Delete()
+  async deleteUserAccount(@CurrentUser() user: User) {
+    await this.userService.deleteUser(user.id);
+    return { ok: true };
+  }
 }

src/user/dto/update-user-settings.dto.ts

@@ -0,0 +1,11 @@
+import { IsBoolean, IsOptional } from 'class-validator';
+
+export class UpdateUserSettingsDto {
+  @IsBoolean()
+  @IsOptional()
+  anonymous?: boolean;
+
+  @IsBoolean()
+  @IsOptional()
+  reviewsVisible?: boolean;
+}

src/user/dto/update-user.dto.ts

@@ -21,4 +21,14 @@ export class UpdateUserDto {
     example: 'Software Engineer',
   })
   headline?: string;
+
+  @IsOptional()
+  @IsString()
+  @ApiProperty({
+    name: 'location',
+    description: 'User location',
+    required: false,
+    example: 'Bucharest, Romania',
+  })
+  location?: string;
 }

src/user/dto/user-settings.dto.ts

@@ -0,0 +1,9 @@
+import { IsBoolean } from 'class-validator';
+
+export class UserSettingsDto {
+  @IsBoolean()
+  anonymous: boolean;
+
+  @IsBoolean()
+  reviewsVisible: boolean;
+}

src/user/service/user.service.ts

@@ -12,8 +12,10 @@ import { S3Client, PutObjectCommand } from '@aws-sdk/client-s3';
 import { S3_CLIENT } from '../../provider/s3.provider';
 import { REDIS_CLIENT } from '../../provider/redis.provider';
 import { Redis } from 'ioredis';
+import { v4 } from 'uuid';
 
 import { getMimeType } from '../../utils/image';
+import { UpdateUserSettingsDto } from '../dto/update-user-settings.dto';
 
 @Injectable()
 export class UserService {
@@ -35,6 +37,7 @@ export class UserService {
       data: {
         name: dto.name,
         headline: dto.headline,
+        location: dto.location,
       },
     });
   }
@@ -50,9 +53,11 @@ export class UserService {
       'base64',
     );
 
+    const key = `profile-pictures/${user.id}-${v4()}`;
     const putObjectRequest = new PutObjectCommand({
       Bucket: process.env.AWS_S3_BUCKET_NAME,
-      Key: `profile-pictures/${user.id}`,
+      Key: key,
+
       Body: buf,
       ContentType: type,
     });
@@ -64,7 +69,7 @@ export class UserService {
       return await this.prisma.user.update({
         where: { id: user.id },
         data: {
-          profilePictureUrl: `https://${process.env.AWS_S3_BUCKET_NAME}.s3.${process.env.AWS_REGION}.amazonaws.com/profile-pictures/${user.id}`,
+          profilePictureUrl: `https://${process.env.AWS_S3_BUCKET_NAME}.s3.${process.env.AWS_REGION}.amazonaws.com/${key}`,
         },
       });
     } catch (err) {
@@ -133,4 +138,30 @@ export class UserService {
       });
     }
   }
+
+  updateSettings(id: string, data: UpdateUserSettingsDto) {
+    return this.prisma.userSettings.update({
+      where: {
+        userId: id,
+      },
+      data,
+    });
+  }
+
+  getSettings(id: string) {
+    return this.prisma.userSettings.findUniqueOrThrow({
+      where: {
+        userId: id,
+      },
+    });
+  }
+
+  async deleteUser(id: string) {
+    await this.prisma.userSettings.delete({ where: { userId: id } });
+    return this.prisma.user.delete({
+      where: {
+        id,
+      },
+    });
+  }
 }

src/user/user.e2e.spec.ts

@@ -120,6 +120,7 @@ describe('User Controller Tests', () => {
 
   afterAll(async () => {
     try {
+      await prisma.userSettings.deleteMany();
       await prisma.user.deleteMany();
       await prisma.review.deleteMany();
       await app.close();