Requests now work for albums !wip

src/Ombi.Api.Lidarr/LidarrApi.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using System.Net.Http;
 using System.Threading.Tasks;
 using Microsoft.Extensions.Logging;
@@ -72,13 +73,14 @@ namespace Ombi.Api.Lidarr
         }
 
 
-        public Task<AlbumLookup> GetAlbumByForeignId(string foreignArtistId, string apiKey, string baseUrl)
+        public async Task<AlbumLookup> GetAlbumByForeignId(string foreignArtistId, string apiKey, string baseUrl)
         {
             var request = new Request($"{ApiVersion}/album/lookup", baseUrl, HttpMethod.Get);
 
             request.AddQueryString("term", $"lidarr:{foreignArtistId}");
             AddHeaders(request, apiKey);
-            return Api.Request<AlbumLookup>(request);
+            var albums = await Api.Request<List<AlbumLookup>>(request);
+            return albums.FirstOrDefault();
         }
 
         public Task<AlbumByArtistResponse> GetAlbumsByArtist(int artistId, string apiKey, string baseUrl)

src/Ombi.Core/Engine/MovieRequestEngine.cs

@@ -336,6 +336,7 @@ namespace Ombi.Core.Engine
                 };
             }
 
+            request.MarkedAsApproved = DateTime.Now;
             request.Approved = true;
             request.Denied = false;
             await MovieRepository.Update(request);

src/Ombi.Core/Engine/MusicRequestEngine.cs

@@ -39,7 +39,7 @@ namespace Ombi.Core.Engine
             _lidarrApi = lidarr;
             _lidarrSettings = lidarrSettings;
         }
-        
+
         private INotificationHelper NotificationHelper { get; }
         //private IMovieSender Sender { get; }
         private ILogger Logger { get; }
@@ -327,12 +327,11 @@ namespace Ombi.Core.Engine
                 };
             }
 
-            if (!request.Approved)
-            {
-                request.Approved = true;
-                request.Denied = false;
-                await MusicRepository.Update(request);
-            }
+            request.MarkedAsApproved = DateTime.Now;
+            request.Approved = true;
+            request.Denied = false;
+            await MusicRepository.Update(request);
+
 
             var canNotify = await RunSpecificRule(request, SpecificRules.CanSendNotification);
             if (canNotify.Success)

src/Ombi.Core/Models/Requests/RequestService.cs

@@ -5,13 +5,15 @@ namespace Ombi.Core.Models.Requests
 {
     public class RequestService : IRequestServiceMain
     {
-        public RequestService(ITvRequestRepository tv, IMovieRequestRepository movie)
+        public RequestService(ITvRequestRepository tv, IMovieRequestRepository movie, IMusicRequestRepository music)
         {
             TvRequestService = tv;
             MovieRequestService = movie;
+            MusicRequestRepository = music;
         }
 
         public ITvRequestRepository TvRequestService { get; }
+        public IMusicRequestRepository MusicRequestRepository { get; }
         public IMovieRequestRepository MovieRequestService { get; }
     }
 }

src/Ombi.Store/Migrations/20180824152254_MusicRequests.cs

@@ -0,0 +1,67 @@
+using System;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+namespace Ombi.Store.Migrations
+{
+    public partial class MusicRequests : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<int>(
+                name: "MusicRequestLimit",
+                table: "AspNetUsers",
+                nullable: true);
+
+            migrationBuilder.CreateTable(
+                name: "AlbumRequests",
+                columns: table => new
+                {
+                    Id = table.Column<int>(nullable: false)
+                        .Annotation("Sqlite:Autoincrement", true),
+                    Title = table.Column<string>(nullable: true),
+                    Approved = table.Column<bool>(nullable: false),
+                    MarkedAsApproved = table.Column<DateTime>(nullable: false),
+                    RequestedDate = table.Column<DateTime>(nullable: false),
+                    Available = table.Column<bool>(nullable: false),
+                    MarkedAsAvailable = table.Column<DateTime>(nullable: true),
+                    RequestedUserId = table.Column<string>(nullable: true),
+                    Denied = table.Column<bool>(nullable: true),
+                    MarkedAsDenied = table.Column<DateTime>(nullable: false),
+                    DeniedReason = table.Column<string>(nullable: true),
+                    RequestType = table.Column<int>(nullable: false),
+                    ForeignAlbumId = table.Column<string>(nullable: true),
+                    ForeignArtistId = table.Column<string>(nullable: true),
+                    Disk = table.Column<string>(nullable: true),
+                    Cover = table.Column<string>(nullable: true),
+                    Rating = table.Column<decimal>(nullable: false),
+                    ReleaseDate = table.Column<DateTime>(nullable: false),
+                    ArtistName = table.Column<string>(nullable: true)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_AlbumRequests", x => x.Id);
+                    table.ForeignKey(
+                        name: "FK_AlbumRequests_AspNetUsers_RequestedUserId",
+                        column: x => x.RequestedUserId,
+                        principalTable: "AspNetUsers",
+                        principalColumn: "Id",
+                        onDelete: ReferentialAction.Restrict);
+                });
+
+            migrationBuilder.CreateIndex(
+                name: "IX_AlbumRequests_RequestedUserId",
+                table: "AlbumRequests",
+                column: "RequestedUserId");
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropTable(
+                name: "AlbumRequests");
+
+            migrationBuilder.DropColumn(
+                name: "MusicRequestLimit",
+                table: "AspNetUsers");
+        }
+    }
+}

src/Ombi.Store/Migrations/OmbiContextModelSnapshot.cs

@@ -311,6 +311,8 @@ namespace Ombi.Store.Migrations
 
                     b.Property<int?>("MovieRequestLimit");
 
+                    b.Property<int?>("MusicRequestLimit");
+
                     b.Property<string>("NormalizedEmail")
                         .HasMaxLength(256);
 
@@ -460,6 +462,54 @@ namespace Ombi.Store.Migrations
                     b.ToTable("RecentlyAddedLog");
                 });
 
+            modelBuilder.Entity("Ombi.Store.Entities.Requests.AlbumRequest", b =>
+                {
+                    b.Property<int>("Id")
+                        .ValueGeneratedOnAdd();
+
+                    b.Property<bool>("Approved");
+
+                    b.Property<string>("ArtistName");
+
+                    b.Property<bool>("Available");
+
+                    b.Property<string>("Cover");
+
+                    b.Property<bool?>("Denied");
+
+                    b.Property<string>("DeniedReason");
+
+                    b.Property<string>("Disk");
+
+                    b.Property<string>("ForeignAlbumId");
+
+                    b.Property<string>("ForeignArtistId");
+
+                    b.Property<DateTime>("MarkedAsApproved");
+
+                    b.Property<DateTime?>("MarkedAsAvailable");
+
+                    b.Property<DateTime>("MarkedAsDenied");
+
+                    b.Property<decimal>("Rating");
+
+                    b.Property<DateTime>("ReleaseDate");
+
+                    b.Property<int>("RequestType");
+
+                    b.Property<DateTime>("RequestedDate");
+
+                    b.Property<string>("RequestedUserId");
+
+                    b.Property<string>("Title");
+
+                    b.HasKey("Id");
+
+                    b.HasIndex("RequestedUserId");
+
+                    b.ToTable("AlbumRequests");
+                });
+
             modelBuilder.Entity("Ombi.Store.Entities.Requests.ChildRequests", b =>
                 {
                     b.Property<int>("Id")
@@ -894,6 +944,13 @@ namespace Ombi.Store.Migrations
                         .HasForeignKey("PlexServerContentId");
                 });
 
+            modelBuilder.Entity("Ombi.Store.Entities.Requests.AlbumRequest", b =>
+                {
+                    b.HasOne("Ombi.Store.Entities.OmbiUser", "RequestedUser")
+                        .WithMany()
+                        .HasForeignKey("RequestedUserId");
+                });
+
             modelBuilder.Entity("Ombi.Store.Entities.Requests.ChildRequests", b =>
                 {
                     b.HasOne("Ombi.Store.Entities.Requests.TvRequests", "ParentRequest")

src/Ombi/ClientApp/app/interfaces/IRequestModel.ts

@@ -20,6 +20,22 @@ export interface IMovieRequests extends IFullBaseRequest {
   qualityOverrideTitle: string;
 }
 
+export interface IAlbumRequest extends IBaseRequest {
+  foreignAlbumId: string;
+  foreignArtistId: string;
+  Disk: string;
+  cover: string;
+  releaseDate: Date;
+  artistName: string;
+
+  subscribed: boolean;
+  showSubscribe: boolean;
+}
+
+export interface IAlbumRequestModel {
+  foreignAlbumId: string;
+}
+
 export interface IRequestsViewModel<T> {
   total: number;
   collection: T[];
@@ -29,6 +45,10 @@ export interface IMovieUpdateModel {
   id: number;
 }
 
+export interface IAlbumUpdateModel {
+  id: number;
+}
+
 export interface IFullBaseRequest extends IBaseRequest {
   imdbId: string;
   overview: string;

src/Ombi/ClientApp/app/interfaces/ISearchMusicResult.ts

@@ -45,6 +45,7 @@ export interface ISearchAlbumResult {
     available: boolean;
    
     // for the UI
+    showSubscribe: boolean;
     requestProcessing: boolean;
     processed: boolean;
     background: any;

src/Ombi/ClientApp/app/recentlyAdded/recentlyAdded.component.ts

@@ -1,8 +1,8 @@
 import { Component, OnInit } from "@angular/core";
 import { NguCarouselConfig } from "@ngu/carousel";
 
-import { ImageService, RecentlyAddedService } from "../services";
 import { IRecentlyAddedMovies, IRecentlyAddedTvShows } from "../interfaces";
+import { ImageService, RecentlyAddedService } from "../services";
 
 @Component({
     templateUrl: "recentlyAdded.component.html",

src/Ombi/ClientApp/app/search/music/albumsearch.component.ts

@@ -2,7 +2,7 @@ import { Component, EventEmitter, Input, Output } from "@angular/core";
 import { TranslateService } from "@ngx-translate/core";
 
 import { AuthService } from "../../auth/auth.service";
-import { IRequestEngineResult, ISearchMovieResult } from "../../interfaces";
+import { IRequestEngineResult } from "../../interfaces";
 import { ISearchAlbumResult } from "../../interfaces/ISearchMusicResult";
 import { NotificationService, RequestService } from "../../services";
 
@@ -30,16 +30,16 @@ export class AlbumSearchComponent {
         this.setSearch.emit(artistId);
     }
 
-    public request(searchResult: ISearchMovieResult) {
+    public request(searchResult: ISearchAlbumResult) {
         searchResult.requested = true;
         searchResult.requestProcessing = true;
         searchResult.showSubscribe = false;
-        if (this.authService.hasRole("admin") || this.authService.hasRole("AutoApproveMovie")) {
+        if (this.authService.hasRole("admin") || this.authService.hasRole("AutoApproveMusic")) {
             searchResult.approved = true;
         }
 
         try {
-            this.requestService.requestMovie({ theMovieDbId: searchResult.id })
+            this.requestService.requestAlbum({ foreignAlbumId: searchResult.foreignAlbumId })
                 .subscribe(x => {
                     this.engineResult = x;
 

src/Ombi/ClientApp/app/services/request.service.ts

@@ -5,7 +5,8 @@ import { HttpClient } from "@angular/common/http";
 import { Observable } from "rxjs";
 
 import { TreeNode } from "primeng/primeng";
-import { FilterType, IChildRequests, IFilter, IMovieRequestModel, IMovieRequests, IMovieUpdateModel, IRequestEngineResult, IRequestsViewModel,  ITvRequests, ITvUpdateModel, OrderType } from "../interfaces";
+import { FilterType, IAlbumRequest, IAlbumRequestModel, IAlbumUpdateModel, IChildRequests, IFilter, IMovieRequestModel, IMovieRequests,
+      IMovieUpdateModel, IRequestEngineResult, IRequestsViewModel, ITvRequests, ITvUpdateModel, OrderType } from "../interfaces";
 import { ITvRequestViewModel } from "../interfaces";
 import { ServiceHelpers } from "./service.helpers";
 
@@ -132,4 +133,42 @@ export class RequestService extends ServiceHelpers {
     public setRootFolder(requestId: number, rootFolderId: number): Observable<boolean> {
         return this.http.put<boolean>(`${this.url}tv/root/${requestId}/${rootFolderId}`, {headers: this.headers});
     }
+
+    // Music
+    public requestAlbum(Album: IAlbumRequestModel): Observable<IRequestEngineResult> {
+        return this.http.post<IRequestEngineResult>(`${this.url}music/`, JSON.stringify(Album),  {headers: this.headers});
+    }
+
+    public getTotalAlbums(): Observable<number> {
+        return this.http.get<number>(`${this.url}music/total`, {headers: this.headers});
+    }
+
+    public approveAlbum(Album: IAlbumUpdateModel): Observable<IRequestEngineResult> {
+        return this.http.post<IRequestEngineResult>(`${this.url}music/Approve`, JSON.stringify(Album),  {headers: this.headers});
+    }
+
+    public denyAlbum(Album: IAlbumUpdateModel): Observable<IRequestEngineResult> {
+        return this.http.put<IRequestEngineResult>(`${this.url}music/Deny`, JSON.stringify(Album),  {headers: this.headers});
+    }
+
+    public markAlbumAvailable(Album: IAlbumUpdateModel): Observable<IRequestEngineResult> {
+        return this.http.post<IRequestEngineResult>(`${this.url}music/available`, JSON.stringify(Album),  {headers: this.headers});
+    }
+
+    public markAlbumUnavailable(Album: IAlbumUpdateModel): Observable<IRequestEngineResult> {
+        return this.http.post<IRequestEngineResult>(`${this.url}music/unavailable`, JSON.stringify(Album),  {headers: this.headers});
+    }
+
+    public getAlbumRequests(count: number, position: number, order: OrderType, filter: IFilter): Observable<IRequestsViewModel<IMovieRequests>> {
+        return this.http.get<IRequestsViewModel<IMovieRequests>>(`${this.url}music/${count}/${position}/${order}/${filter.statusFilter}/${filter.availabilityFilter}`, {headers: this.headers});
+    }
+
+    public searchAlbumRequests(search: string): Observable<IAlbumRequest[]> {
+        return this.http.get<IAlbumRequest[]>(`${this.url}music/search/${search}`, {headers: this.headers});
+    }
+
+    public removeAlbumRequest(request: IAlbumRequest) {
+        this.http.delete(`${this.url}music/${request.id}`, {headers: this.headers}).subscribe();
+    }
+
 }

src/Ombi/ClientApp/app/wizard/plex/plexoauth.component.ts

@@ -1,8 +1,8 @@
 import { Component, OnInit } from "@angular/core";
 import { ActivatedRoute, Router } from "@angular/router";
 
-import { IdentityService, PlexOAuthService } from "../../services";
 import { AuthService } from "../../auth/auth.service";
+import { IdentityService, PlexOAuthService } from "../../services";
 
 @Component({
     templateUrl: "./plexoauth.component.html",