Cutlery/Kavita
1
0
Fork 0
mirror of https://github.com/Kareadita/Kavita.git synced 2025-06-02 21:24:18 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fixed a bug with user reviews (#2677)

Browse Source
This commit is contained in:
Joe Milazzo 2024-02-01 14:30:44 -06:00 committed by GitHub
parent 828d62dfe9
commit a9ab84803e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 22 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
API/Controllers/MetadataController.cs
View File

@ -207,7 +207,7 @@ public class MetadataController(IUnitOfWork unitOfWork, ILocalizationService loc
if (user == null) return Unauthorized(); if (user == null) return Unauthorized();
var userReviews = (await unitOfWork.UserRepository.GetUserRatingDtosForSeriesAsync(seriesId, user.Id)) var userReviews = (await unitOfWork.UserRepository.GetUserRatingDtosForSeriesAsync(seriesId, user.Id))
.Where(r => !string.IsNullOrEmpty(r.Body)) .Where(r => !string.IsNullOrEmpty(r.BodyJustText))
.OrderByDescending(review => review.Username.Equals(user.UserName) ? 1 : 0) .OrderByDescending(review => review.Username.Equals(user.UserName) ? 1 : 0)
.ToList(); .ToList();
@ -221,7 +221,13 @@ public class MetadataController(IUnitOfWork unitOfWork, ILocalizationService loc
} }
var ret = await metadataService.GetSeriesDetail(user.Id, seriesId); var ret = await metadataService.GetSeriesDetail(user.Id, seriesId);
if (ret == null) return Ok(null); if (ret == null) return Ok(new SeriesDetailPlusDto()
{
Reviews = userReviews,
Recommendations = null,
Ratings = null
});
await _cacheProvider.SetAsync(cacheKey, ret, TimeSpan.FromHours(48)); await _cacheProvider.SetAsync(cacheKey, ret, TimeSpan.FromHours(48));
// For some reason if we don't use a different instance, the cache keeps changes made below // For some reason if we don't use a different instance, the cache keeps changes made below

4
API/DTOs/SeriesDetail/SeriesDetailPlusDto.cs
View File

@ -9,7 +9,7 @@ namespace API.DTOs.SeriesDetail;
/// <remarks>This is what the UI sees, not what the API sends back</remarks> /// <remarks>This is what the UI sees, not what the API sends back</remarks>
public class SeriesDetailPlusDto public class SeriesDetailPlusDto
{ {
public RecommendationDto Recommendations { get; set; } public RecommendationDto? Recommendations { get; set; }
public IEnumerable<UserReviewDto> Reviews { get; set; } public IEnumerable<UserReviewDto> Reviews { get; set; }
public IEnumerable<RatingDto> Ratings { get; set; } public IEnumerable<RatingDto>? Ratings { get; set; }
} }

4
UI/Web/src/app/_models/series-detail/series-detail-plus.ts
View File

@ -3,7 +3,7 @@ import {UserReview} from "../../_single-module/review-card/user-review";
import {Rating} from "../rating"; import {Rating} from "../rating";
export interface SeriesDetailPlus { export interface SeriesDetailPlus {
recommendations: Recommendation; recommendations?: Recommendation;
reviews: Array<UserReview>; reviews: Array<UserReview>;
ratings: Array<Rating>; ratings?: Array<Rating>;
} }

12
UI/Web/src/app/series-detail/_components/series-detail/series-detail.component.ts
View File

@ -587,7 +587,7 @@ export class SeriesDetailComponent implements OnInit, AfterContentChecked {
}); });
this.setContinuePoint(); this.setContinuePoint();
if (KavitaPlusSupportedLibraryTypes.includes(this.libraryType) && loadExternal) { if (loadExternal) {
this.loadPlusMetadata(this.seriesId); this.loadPlusMetadata(this.seriesId);
} }
@ -701,10 +701,16 @@ export class SeriesDetailComponent implements OnInit, AfterContentChecked {
// Reviews // Reviews
this.reviews = [...data.reviews]; this.reviews = [...data.reviews];
this.ratings = [...data.ratings]; if (data.ratings) {
this.ratings = [...data.ratings];
}
// Recommendations // Recommendations
this.combinedRecs = [...data.recommendations.ownedSeries, ...data.recommendations.externalSeries]; if (data.recommendations) {
this.combinedRecs = [...data.recommendations.ownedSeries, ...data.recommendations.externalSeries];
}
this.hasRecommendations = this.combinedRecs.length > 0; this.hasRecommendations = this.combinedRecs.length > 0;
this.cdRef.markForCheck(); this.cdRef.markForCheck();

2
openapi.json
View File

@ -7,7 +7,7 @@
"name": "GPL-3.0", "name": "GPL-3.0",
"url": "https://github.com/Kareadita/Kavita/blob/develop/LICENSE" "url": "https://github.com/Kareadita/Kavita/blob/develop/LICENSE"
}, },
"version": "0.7.13.12" "version": "0.7.13.13"
}, },
"servers": [ "servers": [
{ {