Changed api communication

nmakhmutov · nmakhmutov · commit dfd7eb6c9a42 · 2025-03-27T09:36:04.000+04:00
diff --git a/src/Education.Client/Education.Client.csproj b/src/Education.Client/Education.Client.csproj
@@ -11,11 +11,11 @@
     <PackageReference Include="Blazor-ApexCharts" Version="5.1.0"/>
     <PackageReference Include="Blazored.FluentValidation" Version="2.2.0"/>
     <PackageReference Include="Blazored.LocalStorage" Version="4.5.0"/>
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="9.0.2" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Authentication" Version="9.0.2" />
-    <PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="9.0.2" />
-    <PackageReference Include="Microsoft.Extensions.Http.Resilience" Version="9.2.0" />
-    <PackageReference Include="Microsoft.Extensions.Localization" Version="9.0.2" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="9.0.3" />
+    <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Authentication" Version="9.0.3" />
+    <PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="9.0.3" />
+    <PackageReference Include="Microsoft.Extensions.Http.Resilience" Version="9.3.0" />
+    <PackageReference Include="Microsoft.Extensions.Localization" Version="9.0.3" />
     <PackageReference Include="MudBlazor" Version="8.3.0" />
   </ItemGroup>
 </Project>
diff --git a/src/Education.Client/Features/History/Clients/Course/Model/CourseModel.cs b/src/Education.Client/Features/History/Clients/Course/Model/CourseModel.cs
@@ -11,5 +11,5 @@ public sealed record CourseModel(
     UserArticleOverviewModel[] Articles
 )
 {
-    public sealed record CourseDetailsModel(uint Learners, TimeSpan TimeToRead, ContentRatingModel Rating);
+    public sealed record CourseDetailsModel(uint Learners, TimeSpan TimeToRead, double Popularity);
 }
diff --git a/src/Education.Client/Features/History/Clients/CourseOverviewModel.cs b/src/Education.Client/Features/History/Clients/CourseOverviewModel.cs
@@ -8,5 +8,5 @@ public sealed record CourseOverviewModel(
     string Overview,
     ImageBundleModel Image,
     uint ArticleCount,
-    ContentRatingModel Rating
+    double Popularity
 );
diff --git a/src/Education.Client/Features/History/Clients/Learner/HistoryLearnerService.cs b/src/Education.Client/Features/History/Clients/Learner/HistoryLearnerService.cs
@@ -61,8 +61,8 @@ public Task<ApiResult<PagingTokenModel<UserArticleOverviewModel>>> GetArticleBoo
     public Task<ApiResult<ArticleStatisticsModel>> GetArticleAsync(string articleId) =>
         _api.GetAsync<ArticleStatisticsModel>($"{Root}/articles/{articleId}");
 
-    public Task<ApiResult<bool>> ToggleArticleBookmarkAsync(string articleId) =>
-        _api.PostAsync<bool>($"{Root}/articles/{articleId}/bookmarks");
+    public Task<ApiResult<Unit>> ToggleArticleBookmarkAsync(string articleId) =>
+        _api.PostAsync<Unit>($"{Root}/articles/{articleId}/bookmarks");
 
     public Task<ApiResult<Unit>> LikeArticleAsync(string articleId) =>
         _api.PostAsync<Unit>($"{Root}/articles/{articleId}/likes");
@@ -88,8 +88,8 @@ public Task<ApiResult<CourseStatisticsModel>> GetCourseAsync(string courseId) =>
     public Task<ApiResult<UserCourseActivityModel>> StartCourseAsync(string courseId) =>
         _api.PostAsync<UserCourseActivityModel>($"{Root}/courses/{courseId}");
 
-    public Task<ApiResult<bool>> ToggleCourseBookmarkAsync(string courseId) =>
-        _api.PostAsync<bool>($"{Root}/courses/{courseId}/bookmarks");
+    public Task<ApiResult<Unit>> ToggleCourseBookmarkAsync(string courseId) =>
+        _api.PostAsync<Unit>($"{Root}/courses/{courseId}/bookmarks");
 
     public Task<ApiResult<Unit>> LikeCourseAsync(string courseId) =>
         _api.PostAsync<Unit>($"{Root}/courses/{courseId}/likes");
diff --git a/src/Education.Client/Features/History/Clients/Learner/IHistortyLearnerService.cs b/src/Education.Client/Features/History/Clients/Learner/IHistortyLearnerService.cs
@@ -40,7 +40,7 @@ public interface IHistoryLearnerClient
 
     Task<ApiResult<ArticleStatisticsModel>> GetArticleAsync(string articleId);
 
-    Task<ApiResult<bool>> ToggleArticleBookmarkAsync(string articleId);
+    Task<ApiResult<Unit>> ToggleArticleBookmarkAsync(string articleId);
 
     Task<ApiResult<Unit>> LikeArticleAsync(string articleId);
 
@@ -56,7 +56,7 @@ public interface IHistoryLearnerClient
 
     Task<ApiResult<UserCourseActivityModel>> StartCourseAsync(string courseId);
 
-    Task<ApiResult<bool>> ToggleCourseBookmarkAsync(string courseId);
+    Task<ApiResult<Unit>> ToggleCourseBookmarkAsync(string courseId);
 
     Task<ApiResult<Unit>> LikeCourseAsync(string courseId);
 
diff --git a/src/Education.Client/Features/History/Clients/User/Model/TransactionModel.cs b/src/Education.Client/Features/History/Clients/User/Model/TransactionModel.cs
@@ -1,15 +1,15 @@
-namespace Education.Client.Features.History.Clients.User.Model;
+using System.Text.Json.Serialization;
 
-public sealed record TransactionModel(
-    DateTime Date,
-    string Title,
-    TransactionKind Kind,
-    GameMoneyModel[] Monies
-);
+namespace Education.Client.Features.History.Clients.User.Model;
 
-public enum TransactionKind
+[JsonPolymorphic(TypeDiscriminatorPropertyName = "_t"),
+ JsonDerivedType(typeof(Income), "income"),
+ JsonDerivedType(typeof(Expense), "expense")]
+public abstract record TransactionModel(string Title, DateTime CreatedAt, IEnumerable<GameMoneyModel> Monies)
 {
-    Unknown = 0,
-    Income = 1,
-    Expense = 2
+    public sealed record Income(DateTime CreatedAt, string Title, IEnumerable<GameMoneyModel> Monies)
+        : TransactionModel(Title, CreatedAt, Monies);
+
+    public sealed record Expense(DateTime CreatedAt, string Title, IEnumerable<GameMoneyModel> Monies)
+        : TransactionModel(Title, CreatedAt, Monies);
 }
diff --git a/src/Education.Client/Features/History/Components/Cards/ArticleCard.razor b/src/Education.Client/Features/History/Components/Cards/ArticleCard.razor
@@ -70,7 +70,7 @@
     public UserArticleActivityModel? Activity { get; set; }
 
     [Parameter, EditorRequired]
-    public required Func<string, Task<ApiResult<bool>>> OnBookmarkClick { get; set; }
+    public required Func<string, Task<ApiResult<Unit>>> OnBookmarkClick { get; set; }
 
     [Parameter]
     public string? Class { get; set; }
diff --git a/src/Education.Client/Features/History/Components/Cards/CourseCard.razor b/src/Education.Client/Features/History/Components/Cards/CourseCard.razor
@@ -26,9 +26,9 @@
         </div>
 
         <footer class="d-flex align-center gap-3">
-            <EduRating Compact
-                       Stars="@Course.Rating.Stars"
-                       Votes="@Course.Rating.Votes"/>
+            <MudTooltip Text="@L["ContentPopularity_Title"]" Arrow Inline>
+                <EduPopularity Popularity="@Course.Popularity"/>
+            </MudTooltip>
 
             <MudTooltip Text="@L["Articles_Title"]">
                 <div class="d-flex align-center mud-text-secondary">
@@ -75,7 +75,7 @@
     public UserCourseActivityModel? Activity { get; set; }
 
     [Parameter, EditorRequired]
-    public required Func<string, Task<ApiResult<bool>>> OnBookmarkClick { get; set; }
+    public required Func<string, Task<ApiResult<Unit>>> OnBookmarkClick { get; set; }
 
     [Parameter]
     public string? Class { get; set; }
diff --git a/src/Education.Client/Features/History/Pages/Article/Components/ArticleInformation.razor b/src/Education.Client/Features/History/Pages/Article/Components/ArticleInformation.razor
@@ -44,7 +44,7 @@
     public required bool? IsBookmarked { get; set; }
 
     [Parameter, EditorRequired]
-    public required Func<string, Task<ApiResult<bool>>> OnBookmarkClick { get; set; }
+    public required Func<string, Task<ApiResult<Unit>>> OnBookmarkClick { get; set; }
 
     [Parameter]
     public string? Class { get; set; }
diff --git a/src/Education.Client/Features/History/Pages/Article/Components/RelatedArticles.razor b/src/Education.Client/Features/History/Pages/Article/Components/RelatedArticles.razor
@@ -30,7 +30,7 @@
     public required string Title { get; set; }
 
     [Parameter, EditorRequired]
-    public required Func<string, Task<ApiResult<bool>>> OnBookmarkClick { get; set; }
+    public required Func<string, Task<ApiResult<Unit>>> OnBookmarkClick { get; set; }
 
     [Parameter]
     public string? Class { get; set; }
diff --git a/src/Education.Client/Features/History/Pages/Course/Components/CourseDetails.razor b/src/Education.Client/Features/History/Pages/Course/Components/CourseDetails.razor
@@ -21,10 +21,8 @@
     </div>
 
     <div class="d-flex justify-space-between align-center">
-        <MudText Typo="Typo.body1">@L["ContentRating_Title"]</MudText>
-        <EduRating Placement="Placement.Right"
-                   Stars="@Details.Rating.Stars"
-                   Votes="@Details.Rating.Votes"/>
+        <MudText Typo="Typo.body1">@L["ContentPopularity_Title"]</MudText>
+        <EduPopularity Popularity="@Details.Popularity"/>
     </div>
 </section>
 
diff --git a/src/Education.Client/Features/History/Pages/Course/Components/CourseHeader.razor b/src/Education.Client/Features/History/Pages/Course/Components/CourseHeader.razor
@@ -97,7 +97,7 @@
     public required Func<string, Task<ApiResult<Unit>>> OnDislikeClick { get; set; }
 
     [Parameter, EditorRequired]
-    public required Func<string, Task<ApiResult<bool>>> OnBookmarkClick { get; set; }
+    public required Func<string, Task<ApiResult<Unit>>> OnBookmarkClick { get; set; }
 
     [Parameter, EditorRequired]
     public EventCallback<string> OnStartClick { get; set; }
diff --git a/src/Education.Client/Features/History/Pages/Home/Components/TrendingArticleCard.razor b/src/Education.Client/Features/History/Pages/Home/Components/TrendingArticleCard.razor
@@ -69,7 +69,7 @@
     public bool HasQuiz { get; set; }
 
     [Parameter, EditorRequired]
-    public required Func<string, Task<ApiResult<bool>>> OnBookmarkClick { get; set; }
+    public required Func<string, Task<ApiResult<Unit>>> OnBookmarkClick { get; set; }
 
     [Parameter]
     public string? Class { get; set; }
diff --git a/src/Education.Client/Features/History/Pages/Home/Components/TrendingArticles.razor b/src/Education.Client/Features/History/Pages/Home/Components/TrendingArticles.razor
@@ -15,11 +15,12 @@
         <section class="grid @Class">
             @foreach (var overview in context)
             {
-                <TrendingArticleCard Class="article"
-                                     Article="@overview.Article"
-                                     Activity="@overview.Activity"
-                                     HasQuiz="@overview.HasQuiz"
-                                     OnBookmarkClick="@LearnerClient.ToggleArticleBookmarkAsync"/>
+                <TrendingArticleCard
+                    Class="article"
+                    Article="@overview.Article"
+                    Activity="@overview.Activity"
+                    HasQuiz="@overview.HasQuiz"
+                    OnBookmarkClick="@LearnerClient.ToggleArticleBookmarkAsync"/>
             }
         </section>
     </ChildContent>
diff --git a/src/Education.Client/Features/History/Pages/Home/Components/TrendingCourseCard.razor b/src/Education.Client/Features/History/Pages/Home/Components/TrendingCourseCard.razor
@@ -19,9 +19,9 @@
         </p>
 
         <footer class="d-flex align-center gap-3 w-100">
-            <EduRating Compact
-                       Stars="@Course.Rating.Stars"
-                       Votes="@Course.Rating.Votes"/>
+            <MudTooltip Text="@L["ContentPopularity_Title"]" Arrow Inline>
+                <EduPopularity Popularity="@Course.Popularity"/>
+            </MudTooltip>
 
             <MudTooltip Text="@L["Articles_Title"]">
                 <div class="d-flex align-center white-text">
@@ -69,7 +69,7 @@
     public bool HasExamination { get; set; }
 
     [Parameter, EditorRequired]
-    public required Func<string, Task<ApiResult<bool>>> OnBookmarkClick { get; set; }
+    public required Func<string, Task<ApiResult<Unit>>> OnBookmarkClick { get; set; }
 
     [Parameter]
     public string? Class { get; set; }
diff --git a/src/Education.Client/Features/History/Pages/Home/Components/TrendingCourses.razor b/src/Education.Client/Features/History/Pages/Home/Components/TrendingCourses.razor
@@ -14,11 +14,12 @@
         <section class="grid @Class">
             @foreach (var overview in context)
             {
-                <TrendingCourseCard Class="course"
-                                    Course="@overview.Course"
-                                    Activity="@overview.Activity"
-                                    HasExamination="@overview.HasExamination"
-                                    OnBookmarkClick="@LearnerClient.ToggleCourseBookmarkAsync"/>
+                <TrendingCourseCard
+                    Class="course"
+                    Course="@overview.Course"
+                    Activity="@overview.Activity"
+                    HasExamination="@overview.HasExamination"
+                    OnBookmarkClick="@LearnerClient.ToggleCourseBookmarkAsync"/>
             }
         </section>
     </ChildContent>
diff --git a/src/Education.Client/Features/History/Pages/My/Finance/Components/TransactionsCard.razor b/src/Education.Client/Features/History/Pages/My/Finance/Components/TransactionsCard.razor
@@ -10,7 +10,7 @@
         Dense>
         <RowTemplate>
             <MudTd>
-                @if (context.Kind == TransactionKind.Income)
+                @if (context is TransactionModel.Income)
                 {
                     <MudIcon Icon="@Icons.Material.Outlined.TrendingUp" Color="Color.Success"/>
                 }
@@ -24,7 +24,7 @@
                     @context.Title
                 </MudText>
                 <MudText Class="mud-text-secondary" Typo="Typo.body2">
-                    @Customer.Humanize(context.Date)
+                    @Customer.Humanize(context.CreatedAt)
                 </MudText>
             </MudTd>
             <MudTd>
diff --git a/src/Education.Client/Models/Content/ContentRatingModel.cs b/src/Education.Client/Models/Content/ContentRatingModel.cs
diff --git a/src/Education.Client/Models/Unit.cs b/src/Education.Client/Models/Unit.cs
@@ -1,19 +1,12 @@
 namespace Education.Client.Models;
 
-public readonly struct Unit : IEquatable<Unit>,
-    IComparable<Unit>,
-    IComparable
+public readonly struct Unit : IEquatable<Unit>, IComparable<Unit>
 {
     public static readonly Unit Value = new();
 
-    public static readonly Task<Unit> Task = System.Threading.Tasks.Task.FromResult(Value);
-
     public int CompareTo(Unit other) =>
         0;
 
-    int IComparable.CompareTo(object? obj) =>
-        0;
-
     public override int GetHashCode() =>
         0;
 
diff --git a/src/Education.Client/Resources/App.resx b/src/Education.Client/Resources/App.resx
@@ -267,9 +267,6 @@
   <data name="ContentRating_OutOf" xml:space="preserve">
     <value>{0} out of {1}</value>
   </data>
-  <data name="ContentRating_Title" xml:space="preserve">
-    <value>Rating</value>
-  </data>
   <data name="ContentPopularity_Title" xml:space="preserve">
     <value>Popularity</value>
   </data>
diff --git a/src/Education.Client/Shared/Components/Button/EduBookmarkButton.razor b/src/Education.Client/Shared/Components/Button/EduBookmarkButton.razor
@@ -23,7 +23,7 @@
     public required bool IsBookmarked { get; set; }
 
     [Parameter, EditorRequired]
-    public required Func<string, Task<ApiResult<bool>>> OnBookmarkClick { get; set; }
+    public required Func<string, Task<ApiResult<Unit>>> OnBookmarkClick { get; set; }
 
     [Parameter]
     public Color Color { get; set; } = Color.Default;
@@ -38,8 +38,8 @@
         {
             var response = await OnBookmarkClick.Invoke(Id);
 
-            IsBookmarked = response
-                .UnwrapOr(false);
+            if (response.IsSuccess)
+                IsBookmarked = !IsBookmarked;
         }
         finally
         {
diff --git a/src/Education.Client/Shared/Components/Button/EduBookmarkIconButton.razor b/src/Education.Client/Shared/Components/Button/EduBookmarkIconButton.razor
@@ -22,7 +22,7 @@
     public required bool IsBookmarked { get; set; }
 
     [Parameter, EditorRequired]
-    public required Func<string, Task<ApiResult<bool>>> OnBookmarkClick { get; set; }
+    public required Func<string, Task<ApiResult<Unit>>> OnBookmarkClick { get; set; }
 
     [Parameter]
     public Color Color { get; set; } = Color.Default;
@@ -37,8 +37,8 @@
     {
         var response = await OnBookmarkClick.Invoke(Id);
 
-        IsBookmarked = response
-            .UnwrapOr(false);
+        if (response.IsSuccess)
+            IsBookmarked = !IsBookmarked;
     }
 
 }
diff --git a/src/Education.Client/Shared/Components/EduRating.razor b/src/Education.Client/Shared/Components/EduRating.razor
diff --git a/src/Education.Client/Shared/Components/EduRating.razor.css b/src/Education.Client/Shared/Components/EduRating.razor.css
diff --git a/src/Education.Server/Education.Server.csproj b/src/Education.Server/Education.Server.csproj

Original file line number	Diff line number	Diff line change
`@@ -11,5 +11,5 @@ public sealed record CourseModel(`
`11`	`11`	`UserArticleOverviewModel[] Articles`
`12`	`12`	`)`
`13`	`13`	`{`
`14`		`- public sealed record CourseDetailsModel(uint Learners, TimeSpan TimeToRead, ContentRatingModel Rating);`
	`14`	`+ public sealed record CourseDetailsModel(uint Learners, TimeSpan TimeToRead, double Popularity);`
`15`	`15`	`}`