From 77d7cc0e531c90085c67c220b424b1413eb24457 Mon Sep 17 00:00:00 2001 From: Olivier Nzia Date: Sun, 22 Dec 2024 18:39:14 -0600 Subject: [PATCH] migrate all MongoRepository instances to Repository --- .../src/applications/applications.service.ts | 4 ++-- apps/backend/src/reviews/reviews.service.ts | 15 ++------------- apps/backend/src/users/users.service.spec.ts | 4 ++-- apps/backend/src/users/users.service.ts | 6 +++--- 4 files changed, 9 insertions(+), 20 deletions(-) diff --git a/apps/backend/src/applications/applications.service.ts b/apps/backend/src/applications/applications.service.ts index 42b9f862..da3a397d 100644 --- a/apps/backend/src/applications/applications.service.ts +++ b/apps/backend/src/applications/applications.service.ts @@ -4,7 +4,7 @@ import { Injectable, } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; -import { MongoRepository } from 'typeorm'; +import { Repository } from 'typeorm'; import { UsersService } from '../users/users.service'; import { Application } from './application.entity'; import { @@ -24,7 +24,7 @@ import { stagesMap } from './applications.constants'; export class ApplicationsService { constructor( @InjectRepository(Application) - private readonly applicationsRepository: MongoRepository, + private readonly applicationsRepository: Repository, private readonly usersService: UsersService, ) {} diff --git a/apps/backend/src/reviews/reviews.service.ts b/apps/backend/src/reviews/reviews.service.ts index 84dd311f..28401420 100644 --- a/apps/backend/src/reviews/reviews.service.ts +++ b/apps/backend/src/reviews/reviews.service.ts @@ -1,6 +1,6 @@ import { Injectable } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; -import { MongoRepository } from 'typeorm'; +import { Repository } from 'typeorm'; import { Review } from './review.entity'; import { ApplicationsService } from '../applications/applications.service'; import { User } from '../users/user.entity'; @@ -10,7 +10,7 @@ import { SubmitReviewRequestDTO } from './dto/submit-review.request.dto'; export class ReviewsService { constructor( @InjectRepository(Review) - private reviewsRepository: MongoRepository, + private reviewsRepository: Repository, private applicationsService: ApplicationsService, ) {} @@ -37,15 +37,4 @@ export class ReviewsService { return this.reviewsRepository.save(review); } - - /** - * Get all reviews of an application with the given ID - */ - async getReviews(applicationId: number): Promise { - const application = await this.applicationsService.findCurrent( - applicationId, - ); - - return this.reviewsRepository.find({ application }); - } } diff --git a/apps/backend/src/users/users.service.spec.ts b/apps/backend/src/users/users.service.spec.ts index 2d65e011..9137a9fe 100644 --- a/apps/backend/src/users/users.service.spec.ts +++ b/apps/backend/src/users/users.service.spec.ts @@ -1,14 +1,14 @@ import { NotFoundException } from '@nestjs/common'; import { getRepositoryToken } from '@nestjs/typeorm'; import { Test, TestingModule } from '@nestjs/testing'; -import { MongoRepository } from 'typeorm'; +import { Repository } from 'typeorm'; import { UsersService } from './users.service'; import { User } from './user.entity'; import { userFactory } from '../testing/factories/user.factory'; import { UserStatus } from './types'; -const mockUsersRepository: Partial> = { +const mockUsersRepository: Partial> = { findOne: jest.fn(), }; diff --git a/apps/backend/src/users/users.service.ts b/apps/backend/src/users/users.service.ts index 80a95828..6dc1ec13 100644 --- a/apps/backend/src/users/users.service.ts +++ b/apps/backend/src/users/users.service.ts @@ -5,7 +5,7 @@ import { BadRequestException, } from '@nestjs/common'; import { InjectRepository } from '@nestjs/typeorm'; -import { MongoRepository } from 'typeorm'; +import { Not, Repository } from 'typeorm'; import { User } from './user.entity'; import { UpdateUserRequestDTO } from './dto/update-user.request.dto'; import { UserStatus } from './types'; @@ -14,7 +14,7 @@ import { UserStatus } from './types'; export class UsersService { constructor( @InjectRepository(User) - private usersRepository: MongoRepository, + private usersRepository: Repository, ) {} async create( @@ -42,7 +42,7 @@ export class UsersService { const users: User[] = await this.usersRepository.find({ where: { - status: { $not: { $eq: UserStatus.APPLICANT } }, + status: Not(UserStatus.APPLICANT), }, });