fix: Fixes that came out of update

Author: TriPSs

apps/scraper/src/shared/models.module.ts

@@ -1,7 +1,7 @@
 import { Global, Module } from '@nestjs/common'
-
-import { MOVIES_MONGOOSE_FEATURE } from '@pct-org/types/movie'
-import { SHOWS_MONGOOSE_FEATURE } from '@pct-org/types/show'
+import { MongooseModule } from '@nestjs/mongoose'
+import { movieSchema } from '@pct-org/types/movie'
+import { showSchema } from '@pct-org/types/show'
 import { SEASONS_MONGOOSE_FEATURE } from '@pct-org/types/season'
 import { EPISODES_MONGOOSE_FEATURE } from '@pct-org/types/episode'
 import { DOWNLOADS_MONGOOSE_FEATURE } from '@pct-org/types/download'
@@ -10,20 +10,28 @@ import { BLACKLIST_MONGOOSE_FEATURE } from '@pct-org/types/blacklist'
 @Global()
 @Module({
   imports: [
-    MOVIES_MONGOOSE_FEATURE,
-    SHOWS_MONGOOSE_FEATURE,
+
+    // TODO:: Refactor the models to decorators
+    // https://docs.nestjs.com/techniques/mongodb#model-injection
+    MongooseModule.forFeature([
+        {
+          name: 'Movies',
+          schema: movieSchema
+        },
+        {
+          name: 'Shows',
+          schema: showSchema
+        }
+      ]
+    ),
+
     SEASONS_MONGOOSE_FEATURE,
     EPISODES_MONGOOSE_FEATURE,
     DOWNLOADS_MONGOOSE_FEATURE,
     BLACKLIST_MONGOOSE_FEATURE
   ],
   exports: [
-    MOVIES_MONGOOSE_FEATURE,
-    SHOWS_MONGOOSE_FEATURE,
-    SEASONS_MONGOOSE_FEATURE,
-    EPISODES_MONGOOSE_FEATURE,
-    DOWNLOADS_MONGOOSE_FEATURE,
-    BLACKLIST_MONGOOSE_FEATURE
+    MongooseModule
   ]
 })
 export class ModelsModule {

libs/scraper/helpers/episode/src/episode-helper.service.ts

@@ -1,17 +1,19 @@
 import { Injectable, Logger } from '@nestjs/common'
 import { InjectModel } from '@nestjs/mongoose'
 import { Show } from '@pct-org/types/show'
-import { EpisodeModel, Episode, EPISODE_TYPE } from '@pct-org/types/episode'
+import { Episode, EPISODE_TYPE, EpisodeDocument } from '@pct-org/types/episode'
 import { IMAGES_DEFAULT } from '@pct-org/types/image'
 import { TraktEpisode } from '@pct-org/services/trakt'
 import { formatTorrents } from '@pct-org/torrent/utils'
 import { ScrapedTorrent } from '@pct-org/scraper/providers/base'
 
+import type { Model } from 'mongoose'
+
 @Injectable()
 export class EpisodeHelperService {
 
   @InjectModel('Episodes')
-  private readonly episodeModel: EpisodeModel
+  private readonly episodeModel: Model<EpisodeDocument>
 
   protected readonly logger = new Logger('EpisodeHelper')
 

libs/scraper/helpers/movie/src/movie-helper.service.ts

@@ -2,7 +2,7 @@ import { Inject, Injectable, Logger } from '@nestjs/common'
 import { BaseHelper } from '@pct-org/scraper/helpers/base'
 import { ScrapedItem, ScrapedTorrent } from '@pct-org/scraper/providers/base'
 import { InjectModel } from '@nestjs/mongoose'
-import { MovieModel, Movie, MOVIE_TYPE } from '@pct-org/types/movie'
+import { Movie, MOVIE_TYPE, MovieDocument } from '@pct-org/types/movie'
 import { Show } from '@pct-org/types/show'
 import { TraktService } from '@pct-org/services/trakt'
 import { TmdbService } from '@pct-org/services/tmdb'
@@ -11,11 +11,13 @@ import { OmdbService } from '@pct-org/services/omdb'
 import { formatTorrents } from '@pct-org/torrent/utils'
 import { IMAGES_DEFAULT } from '@pct-org/types/image'
 
+import type { Model } from 'mongoose'
+
 @Injectable()
 export class MovieHelperService extends BaseHelper {
 
   @InjectModel('Movies')
-  private readonly movieModel: MovieModel
+  private readonly movieModel: Model<MovieDocument>
 
   @Inject()
   private readonly traktService: TraktService
@@ -118,7 +120,9 @@ export class MovieHelperService extends BaseHelper {
         : ['unknown'],
       trailer: traktMovie.trailer,
       trailerId: traktMovie.trailer
-        ? traktMovie.trailer.split('v=').reverse().shift()
+        ? traktMovie.trailer.split('v=')
+          .reverse()
+          .shift()
         : null,
       createdAt: Number(new Date()),
       updatedAt: Number(new Date()),

libs/scraper/helpers/season/src/season-helper.service.ts

@@ -2,18 +2,20 @@ import { Inject, Injectable, Logger } from '@nestjs/common'
 import { ScrapedShowTorrents } from '@pct-org/scraper/providers/base'
 import { InjectModel } from '@nestjs/mongoose'
 import { Show } from '@pct-org/types/show'
-import { SeasonModel, Season, SEASON_TYPE } from '@pct-org/types/season'
+import { Season, SEASON_TYPE, SeasonDocument } from '@pct-org/types/season'
 import { Episode } from '@pct-org/types/episode'
 import { EpisodeHelperService } from '@pct-org/scraper/helpers/episode'
 import { IMAGES_DEFAULT } from '@pct-org/types/image'
 import { TmdbService } from '@pct-org/services/tmdb'
 import pMap from 'p-map'
 
+import type { Model } from 'mongoose'
+
 @Injectable()
 export class SeasonHelperService {
 
   @InjectModel('Seasons')
-  private readonly seasonModel: SeasonModel
+  private readonly seasonModel: Model<SeasonDocument>
 
   @Inject()
   private readonly episodeHelperService: EpisodeHelperService

libs/scraper/helpers/show/src/show-helper.service.ts

@@ -1,11 +1,8 @@
 import { Inject, Injectable, Logger } from '@nestjs/common'
 import { BaseHelper } from '@pct-org/scraper/helpers/base'
-import {
-  ScrapedItem,
-  ScrapedShowTorrents
-} from '@pct-org/scraper/providers/base'
+import { ScrapedItem, ScrapedShowTorrents } from '@pct-org/scraper/providers/base'
 import { InjectModel } from '@nestjs/mongoose'
-import { ShowModel, Show, SHOW_TYPE } from '@pct-org/types/show'
+import { ShowDocument, Show, SHOW_TYPE } from '@pct-org/types/show'
 import { Movie } from '@pct-org/types/movie'
 import { TraktEpisode, TraktService, TraktShow } from '@pct-org/services/trakt'
 import { TmdbService } from '@pct-org/services/tmdb'
@@ -14,10 +11,13 @@ import { TvdbService } from '@pct-org/services/tvdb'
 import { SeasonHelperService } from '@pct-org/scraper/helpers/season'
 import { IMAGES_DEFAULT } from '@pct-org/types/image'
 
+import type { Model } from 'mongoose'
+
 @Injectable()
 export class ShowHelperService extends BaseHelper {
+
   @InjectModel('Shows')
-  private readonly showModel: ShowModel
+  private readonly showModel: Model<ShowDocument>
 
   @Inject()
   private readonly traktService: TraktService

packages/eztv-api/src/eztv-api.ts

@@ -1,7 +1,7 @@
 import * as cheerio from 'cheerio'
 import type { CheerioAPI } from 'cheerio'
 import debug from 'debug'
-import got from 'got'
+import axios from 'axios'
 import bytes from 'bytes'
 
 import { name } from '../package.json'
@@ -44,8 +44,8 @@ export class EztvApi {
 
     this.debug(`Making request to: '${uri}'`)
 
-    return got.get(uri).then(({ body }) => {
-      return cheerio.load(body)
+    return axios.get(uri).then(({ data }) => {
+      return cheerio.load(data)
     })
   }
 

packages/kat-api/src/index.ts

@@ -2,7 +2,7 @@
 const bytes = require('bytes')
 const cheerio = require('cheerio')
 const debug = require('debug')
-const got = require('got')
+const got = require('got') // TODO:: Change to axios
 const { stringify } = require('querystring')
 
 const { name } = require('./package')

packages/solidtorrents-api/src/index.ts

@@ -1,7 +1,7 @@
 // @ts-nocheck
 const bytes = require('bytes')
 const debug = require('debug')
-const got = require('got')
+const got = require('got') // TODO:: Change to axios
 const { stringify } = require('querystring')
 
 const { name } = require('../package')