build(deps): bump dependencies (#2796)

server/entity/Media.ts

@@ -3,7 +3,6 @@ import {
   Column,
   CreateDateColumn,
   Entity,
-  getRepository,
   In,
   Index,
   OneToMany,
@@ -15,6 +14,7 @@ import SonarrAPI from '../api/servarr/sonarr';
 import { MediaStatus, MediaType } from '../constants/media';
 import type { DownloadingItem } from '../lib/downloadtracker';
 import downloadTracker from '../lib/downloadtracker';
+import { getRepository } from '../datasource';
 import { getSettings } from '../lib/settings';
 import logger from '../logger';
 import Issue from './Issue';
@@ -37,7 +37,7 @@ class Media {
       }
 
       const media = await mediaRepository.find({
-        tmdbId: In(finalIds),
+        where: { tmdbId: In(finalIds) },
       });
 
       return media;
@@ -56,10 +56,10 @@ class Media {
     try {
       const media = await mediaRepository.findOne({
         where: { tmdbId: id, mediaType },
-        relations: ['requests', 'issues'],
+        relations: { requests: true, issues: true },
       });
 
-      return media;
+      return media ?? undefined;
     } catch (e) {
       logger.error(e.message);
       return undefined;

server/entity/MediaRequest.ts

@@ -6,7 +6,6 @@ import {
   Column,
   CreateDateColumn,
   Entity,
-  getRepository,
   ManyToOne,
   OneToMany,
   PrimaryGeneratedColumn,
@@ -20,6 +19,7 @@ import SonarrAPI from '../api/servarr/sonarr';
 import TheMovieDb from '../api/themoviedb';
 import { ANIME_KEYWORD_ID } from '../api/themoviedb/constants';
 import { MediaRequestStatus, MediaStatus, MediaType } from '../constants/media';
+import { getRepository } from '../datasource';
 import notificationManager, { Notification } from '../lib/notifications';
 import { getSettings } from '../lib/settings';
 import logger from '../logger';
@@ -206,7 +206,7 @@ export class MediaRequest {
     const mediaRepository = getRepository(Media);
     const media = await mediaRepository.findOne({
       where: { id: this.media.id },
-      relations: ['requests'],
+      relations: { requests: true },
     });
     if (!media) {
       logger.error('Media data not found', {
@@ -271,7 +271,7 @@ export class MediaRequest {
     const mediaRepository = getRepository(Media);
     const fullMedia = await mediaRepository.findOneOrFail({
       where: { id: this.media.id },
-      relations: ['requests'],
+      relations: { requests: true },
     });
 
     if (
@@ -542,7 +542,7 @@ export class MediaRequest {
 
         const media = await mediaRepository.findOne({
           where: { id: this.media.id },
-          relations: ['requests'],
+          relations: { requests: true },
         });
 
         if (!media) {
@@ -669,7 +669,7 @@ export class MediaRequest {
             // We grab media again here to make sure we have the latest version of it
             const media = await mediaRepository.findOne({
               where: { id: this.media.id },
-              relations: ['requests'],
+              relations: { requests: true },
             });
 
             if (!media) {

server/entity/User.ts

@@ -7,8 +7,6 @@ import {
   Column,
   CreateDateColumn,
   Entity,
-  getRepository,
-  MoreThan,
   Not,
   OneToMany,
   OneToOne,
@@ -18,12 +16,14 @@ import {
 } from 'typeorm';
 import { MediaRequestStatus, MediaType } from '../constants/media';
 import { UserType } from '../constants/user';
+import { getRepository } from '../datasource';
 import type { QuotaResponse } from '../interfaces/api/userInterfaces';
 import PreparedEmail from '../lib/email';
 import type { PermissionCheckOptions } from '../lib/permissions';
 import { hasPermission, Permission } from '../lib/permissions';
 import { getSettings } from '../lib/settings';
 import logger from '../logger';
+import { AfterDate } from '../utils/dateHelpers';
 import Issue from './Issue';
 import { MediaRequest } from './MediaRequest';
 import SeasonRequest from './SeasonRequest';
@@ -252,13 +252,14 @@ export class User {
     if (movieQuotaDays) {
       movieDate.setDate(movieDate.getDate() - movieQuotaDays);
     }
-    const movieQuotaStartDate = movieDate.toJSON();
 
     const movieQuotaUsed = movieQuotaLimit
       ? await requestRepository.count({
           where: {
-            requestedBy: this,
-            createdAt: MoreThan(movieQuotaStartDate),
+            requestedBy: {
+              id: this.id,
+            },
+            createdAt: AfterDate(movieDate),
             type: MediaType.MOVIE,
             status: Not(MediaRequestStatus.DECLINED),
           },