Restructured the discover code. also fixed a bug where Endgame is earning too much revenue where we could no longer store it in a int32!

src/Ombi.Api.Emby/Models/Media/Movie/MovieInformation.cs

@@ -53,7 +53,7 @@ namespace Ombi.Api.Emby.Models.Movie
         public string MediaType { get; set; }
         public string HomePageUrl { get; set; }
         public int Budget { get; set; }
-        public int Revenue { get; set; }
+        public float Revenue { get; set; }
         public object[] LockedFields { get; set; }
         public bool LockData { get; set; }
     }

src/Ombi.Core/Models/Search/V2/MovieFullInfoViewModel.cs

@@ -17,7 +17,7 @@ namespace Ombi.Core.Models.Search.V2
         public string Overview { get; set; }
         public List<ProductionCompaniesViewModel> ProductionCompanies { get; set; }
         public double Popularity { get; set; }
-        public int Revenue { get; set; }
+        public float Revenue { get; set; }
         public long Runtime { get; set; }
         public string PosterPath { get; set; }
         public DateTime? ReleaseDate { get; set; }

src/Ombi.TheMovieDbApi/Models/FullMovieInfo.cs

@@ -39,7 +39,7 @@ namespace Ombi.Api.TheMovieDb.Models
         [JsonProperty("release_date")]
         public string ReleaseDate { get; set; }
         [JsonProperty("revenue")]
-        public int Revenue { get; set; }
+        public float Revenue { get; set; }
         [JsonProperty("runtime")]
         public long Runtime { get; set; }
         [JsonProperty("spoken_languages")]

src/Ombi/ClientApp/src/app/discover/components/actor/discover-actor.component.ts

@@ -1,9 +1,9 @@
 import { Component, AfterViewInit } from "@angular/core";
 import { ActivatedRoute } from "@angular/router";
-import { SearchV2Service } from "../../services";
+import { SearchV2Service } from "../../../services";
-import { IActorCredits } from "../../interfaces/ISearchTvResultV2";
+import { IActorCredits } from "../../../interfaces/ISearchTvResultV2";
-import { IDiscoverCardResult } from "../interfaces";
+import { IDiscoverCardResult } from "../../interfaces";
-import { RequestType } from "../../interfaces";
+import { RequestType } from "../../../interfaces";
 
 @Component({
     templateUrl: "./discover-actor.component.html",

src/Ombi/ClientApp/src/app/discover/components/card/discover-card-details.component.ts

@@ -1,12 +1,12 @@
 import { Component, Inject, OnInit, ViewEncapsulation } from "@angular/core";
 import { MatDialogRef, MAT_DIALOG_DATA, MatDialog } from "@angular/material";
-import { IDiscoverCardResult } from "../interfaces";
+import { IDiscoverCardResult } from "../../interfaces";
-import { SearchV2Service, RequestService, MessageService } from "../../services";
+import { SearchV2Service, RequestService, MessageService } from "../../../services";
-import { RequestType } from "../../interfaces";
+import { RequestType } from "../../../interfaces";
-import { ISearchMovieResultV2 } from "../../interfaces/ISearchMovieResultV2";
+import { ISearchMovieResultV2 } from "../../../interfaces/ISearchMovieResultV2";
-import { ISearchTvResultV2 } from "../../interfaces/ISearchTvResultV2";
+import { ISearchTvResultV2 } from "../../../interfaces/ISearchTvResultV2";
-import { RouterLink, Router } from "@angular/router";
+import { Router } from "@angular/router";
-import { EpisodeRequestComponent } from "../../shared/episode-request/episode-request.component";
+import { EpisodeRequestComponent } from "../../../shared/episode-request/episode-request.component";
 
 @Component({
     selector: "discover-card-details",

src/Ombi/ClientApp/src/app/discover/components/card/discover-card.component.ts

@@ -1,7 +1,7 @@
 import { Component, OnInit, Input } from "@angular/core";
-import { IDiscoverCardResult } from "../interfaces";
+import { IDiscoverCardResult } from "../../interfaces";
-import { RequestType, ISearchTvResult, ISearchMovieResult } from "../../interfaces";
+import { RequestType, ISearchTvResult, ISearchMovieResult } from "../../../interfaces";
-import { SearchService } from "../../services";
+import { SearchService } from "../../../services";
 import { MatDialog } from "@angular/material";
 import { DiscoverCardDetailsComponent } from "./discover-card-details.component";
 

src/Ombi/ClientApp/src/app/discover/components/collections/discover-collections.component.ts

@@ -1,9 +1,9 @@
 import { Component, OnInit } from "@angular/core";
 import { ActivatedRoute } from "@angular/router";
-import { SearchV2Service, RequestService, NotificationService, MessageService } from "../../services";
+import { SearchV2Service, RequestService, MessageService } from "../../../services";
-import { IMovieCollectionsViewModel } from "../../interfaces/ISearchTvResultV2";
+import { IMovieCollectionsViewModel } from "../../../interfaces/ISearchTvResultV2";
-import { IDiscoverCardResult } from "../interfaces";
+import { IDiscoverCardResult } from "../../interfaces";
-import { RequestType } from "../../interfaces";
+import { RequestType } from "../../../interfaces";
 
 @Component({
     templateUrl: "./discover-collections.component.html",

src/Ombi/ClientApp/src/app/discover/components/discover/discover.component.ts

@@ -1,7 +1,7 @@
 import { Component, OnInit } from "@angular/core";
-import { SearchV2Service } from "../services";
+import { SearchV2Service } from "../../../services";
-import { ISearchMovieResult, ISearchTvResult, RequestType } from "../interfaces";
+import { ISearchMovieResult, ISearchTvResult, RequestType } from "../../../interfaces";
-import { IDiscoverCardResult } from "./interfaces";
+import { IDiscoverCardResult } from "../../interfaces";
 import { trigger, transition, style, animate } from "@angular/animations";
 
 @Component({

src/Ombi/ClientApp/src/app/discover/components/index.ts

@@ -0,0 +1,35 @@
+import { DiscoverComponent } from "./discover/discover.component";
+import { DiscoverCardDetailsComponent } from "./card/discover-card-details.component";
+import { DiscoverCollectionsComponent } from "./collections/discover-collections.component";
+import { DiscoverActorComponent } from "./actor/discover-actor.component";
+import { DiscoverCardComponent } from "./card/discover-card.component";
+import { Routes } from "@angular/router";
+import { AuthGuard } from "../../auth/auth.guard";
+import { SearchService, RequestService } from "../../services";
+import { MatDialog } from "@angular/material";
+
+
+export const components: any[] = [
+    DiscoverComponent,
+    DiscoverCardComponent,
+    DiscoverCardDetailsComponent,
+    DiscoverCollectionsComponent,
+    DiscoverActorComponent,
+];
+
+
+export const entryComponents: any[] = [
+    DiscoverCardDetailsComponent
+];
+
+export const providers: any[] = [
+    SearchService,
+    MatDialog,
+    RequestService,
+];
+
+export const routes: Routes = [
+    { path: "", component: DiscoverComponent, canActivate: [AuthGuard] },
+    { path: "collection/:collectionId", component: DiscoverCollectionsComponent, canActivate: [AuthGuard] },
+    { path: "actor/:actorId", component: DiscoverActorComponent, canActivate: [AuthGuard] }
+];

src/Ombi/ClientApp/src/app/discover/discover.module.ts

@@ -1,49 +1,32 @@
 import { NgModule } from "@angular/core";
-import { RouterModule, Routes } from "@angular/router";
+import { RouterModule } from "@angular/router";
 import { InfiniteScrollModule } from 'ngx-infinite-scroll';
 
-import { SearchService, RequestService } from "../services";
-
 import { SharedModule } from "../shared/shared.module";
-import { DiscoverComponent } from "./discover.component";
-import { DiscoverCardComponent } from "./card/discover-card.component";
-import { AuthGuard } from "../auth/auth.guard";
 import { PipeModule } from "../pipes/pipe.module";
-import { DiscoverCardDetailsComponent } from "./card/discover-card-details.component";
-import { MatDialog } from "@angular/material";
-import { DiscoverCollectionsComponent } from "./collections/discover-collections.component";
-import { DiscoverActorComponent } from "./actor/discover-actor.component";
 
-const routes: Routes = [
+import * as fromComponents from './components';
-    { path: "", component: DiscoverComponent, canActivate: [AuthGuard] },
+
-    { path: "collection/:collectionId", component: DiscoverCollectionsComponent, canActivate: [AuthGuard] },
+
-    { path: "actor/:actorId", component: DiscoverActorComponent, canActivate: [AuthGuard] }
-];
 @NgModule({
     imports: [
-        RouterModule.forChild(routes),
+        RouterModule.forChild(fromComponents.routes),
         SharedModule,
         PipeModule,
         InfiniteScrollModule,
     ],
     declarations: [
-        DiscoverComponent,
+        ...fromComponents.components
-        DiscoverCardComponent,
-        DiscoverCardDetailsComponent,
-        DiscoverCollectionsComponent,
-        DiscoverActorComponent,
     ],
     entryComponents: [
-        DiscoverCardDetailsComponent
+        ...fromComponents.entryComponents
     ],
     exports: [
         RouterModule,
     ],
     providers: [
-        SearchService,
+        ...fromComponents.providers
-        MatDialog,
+    ],
-        RequestService,
-        ],
 
 })
 export class DiscoverModule { }