Misc bunch of changes (#2815)

API/Controllers/AdminController.cs

@@ -1,5 +1,6 @@
 using System.Threading.Tasks;
 using API.Data.ManualMigrations;
+using API.DTOs.Progress;
 using API.Entities;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Identity;
@@ -29,4 +30,15 @@ public class AdminController : BaseApiController
         var users = await _userManager.GetUsersInRoleAsync("Admin");
         return users.Count > 0;
     }
+
+    /// <summary>
+    /// Set the progress information for a particular user
+    /// </summary>
+    /// <returns></returns>
+    [Authorize("RequireAdminRole")]
+    [HttpPost("update-chapter-progress")]
+    public async Task<ActionResult<bool>> UpdateChapterProgress(UpdateUserProgressDto dto)
+    {
+        return Ok(await Task.FromResult(false));
+    }
 }

API/Controllers/CollectionController.cs

@@ -3,10 +3,12 @@ using System.Collections.Generic;
 using System.Threading.Tasks;
 using API.Data;
 using API.Data.Repositories;
+using API.DTOs.Collection;
 using API.DTOs.CollectionTags;
 using API.Entities.Metadata;
 using API.Extensions;
 using API.Services;
+using API.Services.Plus;
 using Kavita.Common;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
@@ -23,14 +25,16 @@ public class CollectionController : BaseApiController
     private readonly IUnitOfWork _unitOfWork;
     private readonly ICollectionTagService _collectionService;
     private readonly ILocalizationService _localizationService;
+    private readonly IExternalMetadataService _externalMetadataService;
 
     /// <inheritdoc />
     public CollectionController(IUnitOfWork unitOfWork, ICollectionTagService collectionService,
-        ILocalizationService localizationService)
+        ILocalizationService localizationService, IExternalMetadataService externalMetadataService)
     {
         _unitOfWork = unitOfWork;
         _collectionService = collectionService;
         _localizationService = localizationService;
+        _externalMetadataService = externalMetadataService;
     }
 
     /// <summary>
@@ -168,4 +172,15 @@ public class CollectionController : BaseApiController
 
         return BadRequest(await _localizationService.Translate(User.GetUserId(), "generic-error"));
     }
+
+    /// <summary>
+    /// For the authenticated user, if they have an active Kavita+ subscription and a MAL username on record,
+    /// fetch their Mal interest stacks (including restacks)
+    /// </summary>
+    /// <returns></returns>
+    [HttpGet("mal-stacks")]
+    public async Task<ActionResult<IList<MalStackDto>>> GetMalStacksForUser()
+    {
+        return Ok(await _externalMetadataService.GetStacksForUser(User.GetUserId()));
+    }
 }

API/Controllers/OPDSController.cs

@@ -13,6 +13,7 @@ using API.DTOs.CollectionTags;
 using API.DTOs.Filtering;
 using API.DTOs.Filtering.v2;
 using API.DTOs.OPDS;
+using API.DTOs.Progress;
 using API.DTOs.Search;
 using API.Entities;
 using API.Entities.Enums;

API/Controllers/PanelsController.cs

@@ -1,6 +1,7 @@
 using System.Threading.Tasks;
 using API.Data;
 using API.DTOs;
+using API.DTOs.Progress;
 using API.Services;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;

API/Controllers/ReaderController.cs

@@ -7,8 +7,8 @@ using API.Constants;
 using API.Data;
 using API.Data.Repositories;
 using API.DTOs;
-using API.DTOs.Filtering;
 using API.DTOs.Filtering.v2;
+using API.DTOs.Progress;
 using API.DTOs.Reader;
 using API.Entities;
 using API.Entities.Enums;
@@ -880,4 +880,21 @@ public class ReaderController : BaseApiController
         await _unitOfWork.CommitAsync();
         return Ok();
     }
+
+    /// <summary>
+    /// Get all progress events for a given chapter
+    /// </summary>
+    /// <param name="chapterId"></param>
+    /// <returns></returns>
+    [HttpGet("all-chapter-progress")]
+    public async Task<ActionResult<IEnumerable<FullProgressDto>>> GetProgressForChapter(int chapterId)
+    {
+        if (User.IsInRole(PolicyConstants.AdminRole))
+        {
+            return Ok(await _unitOfWork.AppUserProgressRepository.GetUserProgressForChapter(chapterId));
+        }
+
+        return Ok(await _unitOfWork.AppUserProgressRepository.GetUserProgressForChapter(chapterId, User.GetUserId()));
+
+    }
 }

API/Controllers/ScrobblingController.cs

@@ -52,6 +52,23 @@ public class ScrobblingController : BaseApiController
         return Ok(user.AniListAccessToken);
     }
 
+    /// <summary>
+    /// Get the current user's MAL token & username
+    /// </summary>
+    /// <returns></returns>
+    [HttpGet("mal-token")]
+    public async Task<ActionResult<MalUserInfoDto>> GetMalToken()
+    {
+        var user = await _unitOfWork.UserRepository.GetUserByUsernameAsync(User.GetUsername());
+        if (user == null) return Unauthorized();
+
+        return Ok(new MalUserInfoDto()
+        {
+            Username = user.MalUserName,
+            AccessToken = user.MalAccessToken
+        });
+    }
+
     /// <summary>
     /// Update the current user's AniList token
     /// </summary>
@@ -76,6 +93,26 @@ public class ScrobblingController : BaseApiController
         return Ok();
     }
 
+    /// <summary>
+    /// Update the current user's MAL token (Client ID) and Username
+    /// </summary>
+    /// <param name="dto"></param>
+    /// <returns></returns>
+    [HttpPost("update-mal-token")]
+    public async Task<ActionResult> UpdateMalToken(MalUserInfoDto dto)
+    {
+        var user = await _unitOfWork.UserRepository.GetUserByUsernameAsync(User.GetUsername());
+        if (user == null) return Unauthorized();
+
+        user.MalAccessToken = dto.AccessToken;
+        user.MalUserName = dto.Username;
+
+        _unitOfWork.UserRepository.Update(user);
+        await _unitOfWork.CommitAsync();
+
+        return Ok();
+    }
+
     /// <summary>
     /// Checks if the current Scrobbling token for the given Provider has expired for the current user
     /// </summary>

API/Controllers/SettingsController.cs

@@ -457,6 +457,7 @@ public class SettingsController : BaseApiController
         }
     }
 
+
     /// <summary>
     /// All values allowed for Task Scheduling APIs. A custom cron job is not included. Disabled is not applicable for Cleanup.
     /// </summary>

API/Controllers/StatsController.cs

@@ -8,6 +8,7 @@ using API.Entities;
 using API.Entities.Enums;
 using API.Extensions;
 using API.Services;
+using API.Services.Plus;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Identity;
 using Microsoft.AspNetCore.Mvc;
@@ -22,14 +23,16 @@ public class StatsController : BaseApiController
     private readonly IUnitOfWork _unitOfWork;
     private readonly UserManager<AppUser> _userManager;
     private readonly ILocalizationService _localizationService;
+    private readonly ILicenseService _licenseService;
 
     public StatsController(IStatisticService statService, IUnitOfWork unitOfWork,
-        UserManager<AppUser> userManager, ILocalizationService localizationService)
+        UserManager<AppUser> userManager, ILocalizationService localizationService, ILicenseService licenseService)
     {
         _statService = statService;
         _unitOfWork = unitOfWork;
         _userManager = userManager;
         _localizationService = localizationService;
+        _licenseService = licenseService;
     }
 
     [HttpGet("user/{userId}/read")]
@@ -181,6 +184,18 @@ public class StatsController : BaseApiController
         return Ok(_statService.GetWordsReadCountByYear(userId));
     }
 
-
+    /// <summary>
+    /// Returns for Kavita+ the number of Series that have been processed, errored, and not processed
+    /// </summary>
+    /// <returns></returns>
+    [Authorize("RequireAdminRole")]
+    [HttpGet("kavitaplus-metadata-breakdown")]
+    [ResponseCache(CacheProfileName = "Statistics")]
+    public async Task<ActionResult<IEnumerable<StatCount<int>>>> GetKavitaPlusMetadataBreakdown()
+    {
+        if (!await _licenseService.HasActiveLicense())
+            return BadRequest("This data is not available for non-Kavita+ servers");
+        return Ok(await _statService.GetKavitaPlusMetadataBreakdown());
+    }
 
 }