Add Surah/Ayah browse with Gharaati Tafsir Noor crawl.
build-and-deploy / deploy (push) Failing after 11m0s
build-and-deploy / deploy (push) Failing after 11m0s
Replace episode bookmarks with surah/ayah bookmarks and ayah favorites; import ayah text, notes, messages, and official per-ayah audio from gharaati.ir.
This commit is contained in:
@@ -1,7 +1,6 @@
|
||||
using System.Security.Claims;
|
||||
using Microsoft.EntityFrameworkCore;
|
||||
using TafsirQuran.Api.Auth;
|
||||
using TafsirQuran.Api.Mapping;
|
||||
using TafsirQuran.Domain.Entities;
|
||||
using TafsirQuran.Infrastructure.Persistence;
|
||||
using TafsirQuran.Shared.Dtos;
|
||||
@@ -12,47 +11,53 @@ public static class FavoriteEndpoints
|
||||
{
|
||||
public static RouteGroupBuilder MapFavoriteEndpoints(this WebApplication app)
|
||||
{
|
||||
var group = app.MapGroup("/api/favorites");
|
||||
var group = app.MapGroup("/api/favorites/ayahs");
|
||||
|
||||
group.MapGet("/", async (string deviceId, ClaimsPrincipal user, AppDbContext db, CancellationToken ct) =>
|
||||
{
|
||||
var userId = JwtTokenService.GetUserId(user);
|
||||
var items = await db.Favorites.AsNoTracking()
|
||||
.Include(f => f.Episode).ThenInclude(e => e.Surah)
|
||||
var items = await db.AyahFavorites.AsNoTracking()
|
||||
.Include(f => f.Surah)
|
||||
.Include(f => f.Tafsir)
|
||||
.Where(f => f.DeviceId == deviceId || (userId.HasValue && f.UserId == userId))
|
||||
.OrderByDescending(f => f.CreatedAt)
|
||||
.ToListAsync(ct);
|
||||
|
||||
return Results.Ok(items.Select(f => new FavoriteDto(
|
||||
f.Id, f.EpisodeId, f.CreatedAt, EpisodeMapper.ToListItem(f.Episode))).ToList());
|
||||
return Results.Ok(items.Select(f => new AyahFavoriteDto(
|
||||
f.Id, f.TafsirId, f.Tafsir.Slug, f.SurahId, f.Surah.NameFa, f.AyahNumber, f.CreatedAt)).ToList());
|
||||
});
|
||||
|
||||
group.MapPost("/", async (ToggleEpisodeRequest request, ClaimsPrincipal user, AppDbContext db, CancellationToken ct) =>
|
||||
group.MapPost("/", async (ToggleAyahRequest request, ClaimsPrincipal user, AppDbContext db, CancellationToken ct) =>
|
||||
{
|
||||
var userId = JwtTokenService.GetUserId(user);
|
||||
var exists = await db.Favorites.AnyAsync(f =>
|
||||
f.EpisodeId == request.EpisodeId &&
|
||||
var exists = await db.AyahFavorites.AnyAsync(f =>
|
||||
f.TafsirId == request.TafsirId &&
|
||||
f.SurahId == request.SurahNumber &&
|
||||
f.AyahNumber == request.AyahNumber &&
|
||||
(f.DeviceId == request.DeviceId || (userId.HasValue && f.UserId == userId)), ct);
|
||||
if (exists) return Results.NoContent();
|
||||
|
||||
db.Favorites.Add(new Favorite
|
||||
db.AyahFavorites.Add(new AyahFavorite
|
||||
{
|
||||
DeviceId = request.DeviceId,
|
||||
UserId = userId,
|
||||
EpisodeId = request.EpisodeId
|
||||
TafsirId = request.TafsirId,
|
||||
SurahId = request.SurahNumber,
|
||||
AyahNumber = request.AyahNumber
|
||||
});
|
||||
await db.SaveChangesAsync(ct);
|
||||
return Results.Created($"/api/favorites/{request.EpisodeId}", null);
|
||||
return Results.Created($"/api/favorites/ayahs/{request.SurahNumber}/{request.AyahNumber}", null);
|
||||
});
|
||||
|
||||
group.MapDelete("/{episodeId:guid}", async (Guid episodeId, string deviceId, ClaimsPrincipal user, AppDbContext db, CancellationToken ct) =>
|
||||
group.MapDelete("/{surahNumber:int}/{ayahNumber:int}", async (
|
||||
int surahNumber, int ayahNumber, Guid tafsirId, string deviceId, ClaimsPrincipal user, AppDbContext db, CancellationToken ct) =>
|
||||
{
|
||||
var userId = JwtTokenService.GetUserId(user);
|
||||
var items = await db.Favorites
|
||||
.Where(f => f.EpisodeId == episodeId &&
|
||||
var items = await db.AyahFavorites
|
||||
.Where(f => f.TafsirId == tafsirId && f.SurahId == surahNumber && f.AyahNumber == ayahNumber &&
|
||||
(f.DeviceId == deviceId || (userId.HasValue && f.UserId == userId)))
|
||||
.ToListAsync(ct);
|
||||
db.Favorites.RemoveRange(items);
|
||||
db.AyahFavorites.RemoveRange(items);
|
||||
await db.SaveChangesAsync(ct);
|
||||
return Results.NoContent();
|
||||
});
|
||||
|
||||
Reference in New Issue
Block a user