refactoring

Impeqq · Nov 20, 2021 · 36b4cbd · 36b4cbd
1 parent 0fb8f98
commit 36b4cbd
Show file tree

Hide file tree

Showing 16 changed files with 54 additions and 19,425 deletions.
diff --git a/backend/src/main.ts b/backend/src/main.ts
@@ -4,6 +4,7 @@ import { AppModule } from './app.module';
 
 async function bootstrap() {
   const app = await NestFactory.create(AppModule);
+  app.enableCors();
   app.use(
     graphqlUploadExpress({
       maxFileSize: 100000000,

diff --git a/backend/src/user/user.entity.ts b/backend/src/user/user.entity.ts
@@ -39,7 +39,7 @@ export class UserEntity extends BaseEntity {
   @Column('boolean', { default: false, nullable: true })
   online: boolean;
 
-  @OneToOne(() => FileEntity)
+  @OneToOne(() => FileEntity, { nullable: true })
   @JoinColumn()
   avatar?: FileEntity;
 

diff --git a/backend/src/user/user.gateway.ts b/backend/src/user/user.gateway.ts
@@ -10,7 +10,7 @@ import { Socket, Server } from 'socket.io';
 import { UserService } from './user.service';
 import { pubsub } from 'src/lib/pubsub';
 
-@WebSocketGateway(5001, { cors: true })
+@WebSocketGateway({ cors: true })
 export class UserGateway
   implements OnGatewayInit, OnGatewayConnection, OnGatewayDisconnect {
   @WebSocketServer() server: Server;

diff --git a/backend/src/user/user.service.ts b/backend/src/user/user.service.ts
@@ -5,7 +5,7 @@ import {
 } from '@nestjs/common';
 import { InjectRepository } from '@nestjs/typeorm';
 import { UserEntity } from './user.entity';
-import { Repository } from 'typeorm';
+import { ILike, Repository } from 'typeorm';
 import * as jwt from 'jsonwebtoken';
 import * as bcrypt from 'bcryptjs';
 import { SignInInput, SignUpInput } from './dto/auth.inputs';
@@ -37,13 +37,12 @@ export class UserService {
   async findByName(name: string, id: string) {
     if (!name) return [];
 
-    return await this.userRepo
-      .createQueryBuilder('user')
-      .innerJoinAndSelect('user.avatar', 'file')
-      .where('user.firstName ILike :name', { name })
-      .orWhere('user.lastName ILike :name', { name })
-      .andWhere('user.id != :id', { id })
-      .getMany();
+    return await this.userRepo.find({
+      where: [
+        { firstName: ILike(`%${name}%`) },
+        { lastName: ILike(`%${name}%`) },
+      ],
+    });
   }
 
   async findOne(id: string) {
@@ -81,8 +80,8 @@ export class UserService {
       .where('id = :id', { id: user_id })
       .execute();
 
-    if (avatar) {
-      await this.fileService.deleteDatabaseFile(oldUser.avatar.id);
+    if (avatar && oldUser.avatar?.id) {
+      await this.fileService.deleteDatabaseFile(oldUser.avatar?.id);
     }
 
     const user = await this.userRepo.findOne(user_id, {