fix logic response resource

Author: Fxdonad

src/app/core/models/post.models.ts

@@ -158,13 +158,6 @@ export type PostResponse = {
 };
 
 //post-create
-export interface PostDataCreateRequest {
-  file: File;
-  description: string;
-  tags: string[];
-  isLectureVideo: boolean;
-  isTextbook: boolean;
-}
 
 export type SavedPostResponse = {
   id: string;

src/app/core/models/resource.model.ts

@@ -43,13 +43,25 @@ export interface ResourceData {
   tags: Tag[];
   isLectureVideo: boolean;
   isTextbook: boolean;
-  viewCount: number;
-  rating: number;
-  orgId: string; // Guid
-  duration: string; // TimeSpan
-  hlsUrl: string;
+  viewCount: number | null;
+  rating: number | null;
+  orgId: string | null; // Guid
+  duration: string | null; // TimeSpan
+  hlsUrl: string | null;
   createdAt: string;
+  createdBy: string;
+  organizationId: string | null;
+  organizationRole: string;
+  userProfile: UserBasicInfo;
+}
+
+export interface ResourceCreateRequest {
+  file: File;
+  category: FileCategory;
+  description: string;
+  tags: string[];
 }
+
 //--------------Input episode local---------------------
 export interface IEpisodeLocal {
   episodeId: string;

src/app/core/models/user.models.ts

@@ -1,7 +1,6 @@
 //ví dụ
 export const DEFAULT_BG = 'https://wallpaper.dog/large/10932813.jpg';
-export const DEFAULT_AVATAR =
-  'https://static.vecteezy.com/system/resources/previews/023/329/545/large_2x/user-profile-shadow-symbol-icon-isolated-illustration-vector.jpg';
+export const DEFAULT_AVATAR = 'auth-assets/avatar_placeholder.png';
 
 export type User = {
   userId: string; // id của user

src/app/core/services/api-service/resource.service.ts

@@ -6,9 +6,13 @@ import {
   XuanIPaginationResponse,
   XuanPresignedUrlResponse,
 } from '../../models/api-response';
-import { MediaResource, ResourceData, Tag } from '../../models/resource.model';
+import {
+  MediaResource,
+  ResourceCreateRequest,
+  ResourceData,
+  Tag,
+} from '../../models/resource.model';
 import { API_CONFIG } from '../config-service/api.enpoints';
-import { PostDataCreateRequest } from '../../models/post.models';
 
 @Injectable({
   providedIn: 'root',
@@ -39,12 +43,12 @@ export class ResourceService {
   }
 
   getVideoResources() {
-    return this.api.get<ApiResponse<ResourceData[]>>(
+    return this.api.get<ApiResponse<MediaResource[]>>(
       API_CONFIG.ENDPOINTS.GET.GET_FILE_VIDEOS
     );
   }
   getDocumentResources() {
-    return this.api.get<ApiResponse<ResourceData[]>>(
+    return this.api.get<ApiResponse<MediaResource[]>>(
       API_CONFIG.ENDPOINTS.GET.GET_FILE_DOCUMENTS
     );
   }
@@ -54,15 +58,14 @@ export class ResourceService {
     );
   }
 
-  addResource(postData: PostDataCreateRequest) {
-    const { file, description, tags, isLectureVideo, isTextbook } = postData;
+  addResource(postData: ResourceCreateRequest) {
+    const { file, category, description, tags } = postData;
 
     // data: phần dữ liệu thông thường (không phải file)
     const data: Record<string, any> = {
+      category,
       description,
       tags: JSON.stringify(tags), // stringify array để backend parse
-      isLectureVideo: String(isLectureVideo),
-      isTextbook: String(isTextbook),
     };
 
     // files: phần file

src/app/features/resource-learning/pages/resource-create/resource-create.ts

@@ -25,6 +25,7 @@ import { InputComponent } from '../../../../shared/components/fxdonad-shared/inp
 import { decodeJWT } from '../../../../shared/utils/stringProcess';
 import { FormsModule } from '@angular/forms';
 import { Location } from '@angular/common';
+import { FileCategory } from '../../../../core/models/resource.model';
 
 @Component({
   selector: 'app-resource-create',
@@ -104,15 +105,14 @@ export class ResourceCreatePageComponent {
       sendNotification(
         this.store,
         'Tạo tài nguyên',
-        'Vui lòng chọn file!',
+        'Yêu cầu chọn file!',
         'error'
       );
       return;
     }
 
     const file = this.selectedFile;
-    let isTextbook = false;
-    let isLectureVideo = false;
+    let category: FileCategory = 3;
 
     if (file) {
       const fileType = file.type;
@@ -123,19 +123,21 @@ export class ResourceCreatePageComponent {
         fileType.includes('presentation') ||
         fileType.includes('text')
       ) {
-        isTextbook = true;
+        category = 2;
       }
       if (fileType.startsWith('video/')) {
-        isLectureVideo = true;
+        category = 1;
+      }
+      if (fileType.startsWith('image/')) {
+        category = 0;
       }
     }
 
     const postData = {
       file,
+      category,
       description: this.htmlToMd.convert(this.editorContent),
       tags: this.tags,
-      isTextbook,
-      isLectureVideo,
     };
     this.store.dispatch(
       setLoading({

src/app/features/resource-learning/pages/resource-detail/resource-detail.html

@@ -17,7 +17,7 @@
               alt="Avatar"
             />
           </div>
-          <div class="name">{{authorName}}</div>
+          <div class="name">{{authorName ? authorName : 'Ẩn danh'}}</div>
         </div>
         <!-- <div class="action">
           <div class="report">
@@ -30,8 +30,8 @@
       </div>
       <div class="tag-description">
         <div class="resource-tags">
-          @for (tag of resource.tags; track tag) {
-          <span class="resource-tag"> #{{ tag.name }} </span>
+          @for (tag of tags; track tag) {
+          <span class="resource-tag"> #{{ tag }} </span>
           }
         </div>
       </div>

src/app/features/resource-learning/pages/resource-detail/resource-detail.ts

@@ -50,6 +50,7 @@ export class ResourceDetail implements OnInit {
   isDocument: boolean = false;
   isImage: boolean = false;
   safeUrl!: SafeResourceUrl;
+  tags: string[] = [];
 
   // trạng thái phân trang
   isLoading = false;
@@ -113,6 +114,7 @@ export class ResourceDetail implements OnInit {
           this.resource.fileType
         );
         this.isImage = this.resource.fileType.startsWith('image/');
+        this.tags = JSON.parse(res.result.tags[0].name);
         if (this.resource.url) {
           this.setSafeUrl(this.resource.url);
         }

src/app/features/resource-learning/pages/resource-list/resource-list.ts

@@ -1,15 +1,12 @@
-import { NgClass } from '@angular/common';
 import { Component } from '@angular/core';
 import { Router } from '@angular/router';
-import { DropdownButtonComponent } from '../../../../shared/components/fxdonad-shared/dropdown/dropdown.component';
 import { InputComponent } from '../../../../shared/components/fxdonad-shared/input/input';
 import { SkeletonLoadingComponent } from '../../../../shared/components/fxdonad-shared/skeleton-loading/skeleton-loading.component';
 import { TrendingItem } from '../../../../shared/components/fxdonad-shared/trending/trending.component';
 import { ButtonComponent } from '../../../../shared/components/my-shared/button/button.component';
 import { MediaResource } from '../../../../core/models/resource.model';
 import { ResourceCardComponent } from '../../../../shared/components/my-shared/resource-card/resource-card';
 import { ResourceService } from '../../../../core/services/api-service/resource.service';
-import { mapToResourceCardList } from '../../../../shared/utils/mapData';
 import { Store } from '@ngrx/store';
 import {
   clearLoading,
@@ -18,6 +15,8 @@ import {
 import { sendNotification } from '../../../../shared/utils/notification';
 import { ResourceEditPopupComponent } from '../../modal/popup-update/resource-edit-popup.component';
 import { ScrollEndDirective } from '../../../../shared/directives/scroll-end.directive';
+import { forkJoin } from 'rxjs';
+import { map } from 'rxjs/operators';
 
 @Component({
   selector: 'app-resource-list',
@@ -78,25 +77,69 @@ export class ResourceListComponent {
   }
 
   ngOnInit(): void {
+    this.pageIndex = 1;
     this.fetchDataResource();
   }
 
+  // ================== Fetch ==================
+  // fetchDataResource(append: boolean = false) {
+  //   this.isLoadingMore = append;
+  //   this.isLoading = !append;
+
+  //   this.resourceService
+  //     .getAllResourceLearning(this.itemsPerPage, this.pageIndex)
+  //     .subscribe({
+  //       next: (res) => {
+  //         const newData = res.result.data;
+  //         const { currentPage, totalPages } = res.result;
+
+  //         this.resources = append ? [...this.resources, ...newData] : newData;
+  //         this.filteredResources = [...this.resources]; // gán mặc định cho search
+
+  //         this.hasMore = currentPage < totalPages;
+
+  //         this.isLoading = false;
+  //         this.isLoadingMore = false;
+  //       },
+  //       error: (err) => {
+  //         console.error(err);
+  //         this.isLoading = false;
+  //         this.isLoadingMore = false;
+  //       },
+  //     });
+  // }
+
   // ================== Fetch ==================
   fetchDataResource(append: boolean = false) {
     this.isLoadingMore = append;
     this.isLoading = !append;
 
-    this.resourceService
-      .getAllResourceLearning(this.itemsPerPage, this.pageIndex)
+    forkJoin([
+      this.resourceService.getVideoResources(),
+      this.resourceService.getDocumentResources(),
+    ])
+      .pipe(
+        map(([videosRes, docsRes]) => {
+          const videos = videosRes.result ?? [];
+          const docs = docsRes.result ?? [];
+          return [...videos, ...docs]; // gộp
+        })
+      )
       .subscribe({
-        next: (res) => {
-          const newData = res.result.data;
-          const { currentPage, totalPages } = res.result;
+        next: (allResources) => {
+          // Nếu append thì cộng dồn, ngược lại reset
+          this.resources = append
+            ? [...this.resources, ...allResources]
+            : allResources;
 
-          this.resources = append ? [...this.resources, ...newData] : newData;
-          this.filteredResources = [...this.resources]; // gán mặc định cho search
+          // tự phân trang tại FE
+          const start = (this.pageIndex - 1) * this.itemsPerPage;
+          const end = this.pageIndex * this.itemsPerPage;
 
-          this.hasMore = currentPage < totalPages;
+          this.filteredResources = this.resources.slice(0, end); // hiển thị từ đầu tới trang hiện tại
+
+          // check còn data nữa không
+          this.hasMore = end < this.resources.length;
 
           this.isLoading = false;
           this.isLoadingMore = false;
@@ -109,12 +152,23 @@ export class ResourceListComponent {
       });
   }
 
+  // ================== Load Next Page ==================
+  // loadNextPage() {
+  //   if (this.isLoadingMore || !this.hasMore) return;
+
+  //   this.pageIndex++;
+  //   this.fetchDataResource(true);
+  // }
+
   // ================== Load Next Page ==================
   loadNextPage() {
     if (this.isLoadingMore || !this.hasMore) return;
 
     this.pageIndex++;
-    this.fetchDataResource(true);
+    const end = this.pageIndex * this.itemsPerPage;
+
+    this.filteredResources = this.resources.slice(0, end);
+    this.hasMore = end < this.resources.length;
   }
 
   // ================== Delete ==================

src/app/shared/utils/mapData.ts

@@ -16,6 +16,7 @@ import {
   Post,
 } from '../../core/models/post.models';
 import {
+  MediaResource,
   ResourceData,
   resourceCardInfo,
 } from '../../core/models/resource.model';
@@ -101,14 +102,14 @@ export function mapPostdatatoPostCardInfo(post: PostResponse): PostCardInfo {
     allowComment: post.allowComment,
   };
 }
-export function maptoReourseCard(resourse: ResourceData): resourceCardInfo {
+export function maptoReourseCard(resourse: MediaResource): resourceCardInfo {
   return {
     id: resourse.id,
     avatarAuthor:
       'https://i.pinimg.com/736x/8b/8e/ff/8b8eff070443cf6103c8279a28673809.jpg',
     authorId: resourse.id,
     authorName: 'author',
-    duration: resourse.duration,
+    duration: resourse.duration?.toString() || '',
     progress: 5,
     title: resourse.fileName,
     thumnailurl: resourse.thumbnailUrl,
@@ -120,15 +121,15 @@ export function maptoReourseCard(resourse: ResourceData): resourceCardInfo {
   };
 }
 export function mapToResourceCardList(
-  resources: ResourceData[]
+  resources: MediaResource[]
 ): resourceCardInfo[] {
   return resources.map((resource) => ({
     id: resource.id,
     avatarAuthor:
       'https://i.pinimg.com/1200x/b3/c2/77/b3c2779d6b6195793b72bf73e284b3e8.jpg',
     authorId: resource.id,
     authorName: 'Ẩn danh',
-    duration: resource.duration,
+    duration: resource.duration?.toString() || '',
     thumnailurl: resource.thumbnailUrl,
     progress: 5,
     title: resource.fileName,