feat(request-limits): ✨ Added the new request limit options into the …

…user importer
anojht · Oct 20, 2021 · 01d4f4d · 01d4f4d
1 parent 03bc23a
commit 01d4f4d
Show file tree

Hide file tree

Showing 6 changed files with 59 additions and 9 deletions.
diff --git a/src/Ombi.Schedule/Jobs/Emby/EmbyUserImporter.cs b/src/Ombi.Schedule/Jobs/Emby/EmbyUserImporter.cs
@@ -117,7 +117,11 @@ await _notification.Clients.Clients(NotificationHub.AdminConnectionIds)
                             ProviderUserId = embyUser.Id,
                             Alias = isConnectUser ? embyUser.Name : string.Empty,
                             MovieRequestLimit = userManagementSettings.MovieRequestLimit,
+                            MovieRequestLimitType = userManagementSettings.MovieRequestLimitType,
                             EpisodeRequestLimit = userManagementSettings.EpisodeRequestLimit,
+                            EpisodeRequestLimitType = userManagementSettings.EpisodeRequestLimitType,
+                            MusicRequestLimit = userManagementSettings.MusicRequestLimit,
+                            MusicRequestLimitType = userManagementSettings.MusicRequestLimitType,
                             StreamingCountry = userManagementSettings.DefaultStreamingCountry
                         };
                         var result = await _userManager.CreateAsync(newUser);

diff --git a/src/Ombi.Schedule/Jobs/Plex/PlexUserImporter.cs b/src/Ombi.Schedule/Jobs/Plex/PlexUserImporter.cs
@@ -104,7 +104,11 @@ await _notification.Clients.Clients(NotificationHub.AdminConnectionIds)
                             Email = plexUser?.Email ?? string.Empty,
                             Alias = string.Empty,
                             MovieRequestLimit = userManagementSettings.MovieRequestLimit,
+                            MovieRequestLimitType = userManagementSettings.MovieRequestLimitType,
                             EpisodeRequestLimit = userManagementSettings.EpisodeRequestLimit,
+                            EpisodeRequestLimitType = userManagementSettings.EpisodeRequestLimitType,
+                            MusicRequestLimit = userManagementSettings.MusicRequestLimit,
+                            MusicRequestLimitType = userManagementSettings.MusicRequestLimitType,
                             StreamingCountry = userManagementSettings.DefaultStreamingCountry
                         };
                         _log.LogInformation("Creating Plex user {0}", newUser.UserName);

diff --git a/src/Ombi.Settings/Settings/Models/UserManagementSettings.cs b/src/Ombi.Settings/Settings/Models/UserManagementSettings.cs
@@ -1,4 +1,5 @@
-using System.Collections.Generic;
+using Ombi.Store.Entities;
+using System.Collections.Generic;
 
 namespace Ombi.Settings.Settings.Models
 {
@@ -9,7 +10,11 @@ public class UserManagementSettings : Settings
         public bool ImportEmbyUsers { get; set; }
         public bool ImportJellyfinUsers { get; set; }
         public int MovieRequestLimit { get; set; }
+        public RequestLimitType MovieRequestLimitType { get; set; } = RequestLimitType.Week;
         public int EpisodeRequestLimit { get; set; }
+        public RequestLimitType EpisodeRequestLimitType { get; set; } = RequestLimitType.Week;
+        public int MusicRequestLimit { get; set; }
+        public RequestLimitType MusicRequestLimitType { get; set; } = RequestLimitType.Week;
         public string DefaultStreamingCountry { get; set; } = "US";
         public List<string> DefaultRoles { get; set; } = new List<string>();
         public List<string> BannedPlexUserIds { get; set; } = new List<string>();

diff --git a/src/Ombi/ClientApp/src/app/interfaces/ISettings.ts b/src/Ombi/ClientApp/src/app/interfaces/ISettings.ts
@@ -1,4 +1,5 @@
 import { ISettings } from "./ICommon";
+import { RequestLimitType } from ".";
 
 export interface IExternalSettings extends ISettings {
   ssl: boolean;
@@ -247,10 +248,14 @@ export interface IUserManagementSettings extends ISettings {
   defaultRoles: string[];
   movieRequestLimit: number;
   episodeRequestLimit: number;
+  musicRequestLimit: number;
   bannedPlexUserIds: string[];
   bannedEmbyUserIds: string[];
   bannedJellyfinUserIds: string[];
   defaultStreamingCountry: string;
+  movieRequestLimitType: RequestLimitType;
+  episodeRequestLimitType: RequestLimitType;
+  musicRequestLimitType: RequestLimitType;
 }
 
 export interface IAbout {

diff --git a/src/Ombi/ClientApp/src/app/settings/usermanagement/usermanagement.component.html b/src/Ombi/ClientApp/src/app/settings/usermanagement/usermanagement.component.html
@@ -39,18 +39,18 @@
             <div class="form-group">
                 <mat-slide-toggle id="importJellyfinUsers" [(ngModel)]="settings.importJellyfinUsers">Import Jellyfin Users</mat-slide-toggle>
             </div>
-            
+
             <div *ngIf="jellyfinUsers">
                 <p>Jellyfin Users excluded from Import</p>
-                
+
                 <p-autoComplete [(ngModel)]="bannedJellyfinUsers" [suggestions]="filteredJellyfinUsers" [multiple]="true" field="username" (completeMethod)="filterJellyfinList($event)"></p-autoComplete>
             </div>
 
         </div>
     </div>
     <div class="col-md-6">
-        <h4>Default Roles</h4>
-
+        <h3>Default Roles</h3>
+        <hr>
         <div *ngFor="let c of claims">
             <div class="form-group">
                 <div>
@@ -60,20 +60,49 @@ <h4>Default Roles</h4>
             </div>
         </div>
 
-        <h4>Default Request Limits</h4>
+        <h3>Default Request Limits</h3>
+
+        <hr>
+
         <div class="form-group">
             <label for="movieRequestLimit" class="control-label">Movie Request Limit</label>
             <div>
                 <input type="text" [(ngModel)]="settings.movieRequestLimit" class="form-control form-small form-control-custom" id="movieRequestLimit" name="movieRequestLimit" value="{{settings?.movieRequestLimit}}">
             </div>
         </div>
 
+        <mat-label>Movie Request Limit Type</mat-label>
+        <mat-select  id="movieRequestLimitType" [(value)]="settings.movieRequestLimitType">
+        <mat-option *ngFor="let value of requestLimitTypes" [value]="value">
+            {{RequestLimitType[value]}}
+        </mat-option>
+        </mat-select>
+
         <div class="form-group">
             <label for="episodeRequestLimit" class="control-label">Episode Request Limit</label>
             <div>
                 <input type="text" [(ngModel)]="settings.episodeRequestLimit" class="form-control form-small form-control-custom" id="episodeRequestLimit" name="episodeRequestLimit" value="{{settings?.episodeRequestLimit}}">
             </div>
+
+        </div>
+        <mat-label>Episode Request Limit Type</mat-label>
+        <mat-select  id="episodeRequestLimitType" [(value)]="settings.episodeRequestLimitType">
+        <mat-option *ngFor="let value of requestLimitTypes" [value]="value">
+            {{RequestLimitType[value]}}
+        </mat-option>
+        </mat-select>
+        <div class="form-group">
+            <label for="episodeRequestLimit" class="control-label">Music Request Limit</label>
+            <div>
+                <input type="text" [(ngModel)]="settings.musicRequestLimit" class="form-control form-small form-control-custom" id="musicRequestLimit" name="musicRequestLimit" value="{{settings?.musicRequestLimit}}">
+            </div>
         </div>
+        <mat-label>Music Request Limit Type</mat-label>
+        <mat-select  id="musicRequestLimitType" [(value)]="settings.musicRequestLimitType">
+        <mat-option *ngFor="let value of requestLimitTypes" [value]="value">
+            {{RequestLimitType[value]}}
+        </mat-option>
+        </mat-select>
 
         <mat-form-field>
             <mat-label [translate]="'UserPreferences.StreamingCountry'"></mat-label>

diff --git a/src/Ombi/ClientApp/src/app/settings/usermanagement/usermanagement.component.ts b/src/Ombi/ClientApp/src/app/settings/usermanagement/usermanagement.component.ts
@@ -1,8 +1,8 @@
 import { Component, OnInit } from "@angular/core";
+import { EmbyService, IdentityService, JellyfinService, JobService, NotificationService, PlexService, SettingsService } from "../../services";
+import { ICheckbox, IUserManagementSettings, RequestLimitType } from "../../interfaces";
 
-import { ICheckbox, IUserManagementSettings } from "../../interfaces";
 import { IUsersModel } from "../../interfaces";
-import { EmbyService, JellyfinService, IdentityService, JobService, NotificationService, PlexService, SettingsService } from "../../services";
 
 @Component({
     templateUrl: "./usermanagement.component.html",
@@ -31,6 +31,9 @@ export class UserManagementComponent implements OnInit {
     public enableImportButton = false;
     public countries: string[];
 
+    public requestLimitTypes: RequestLimitType[] = [RequestLimitType.Day, RequestLimitType.Week, RequestLimitType.Month];
+    public RequestLimitType = RequestLimitType;
+
     constructor(private readonly settingsService: SettingsService,
                 private readonly notificationService: NotificationService,
                 private readonly identityService: IdentityService,
@@ -120,7 +123,7 @@ export class UserManagementComponent implements OnInit {
             if (x === true) {
                 this.notificationService.success("Successfully saved the User Management Settings");
             } else {
-                this.notificationService.success( "There was an error when saving the Ombi settings");
+                this.notificationService.success( "There was an error when saving the settings");
             }
         });
     }