Merge pull request #192 from CapstoneProjectCMC/feature/sap-service-and-payment

Feature/sap service and payment

Author: Fxdonad

public/csv/identity_users_import_template.xlsx

@@ -144,8 +144,6 @@ export const routes: Routes = [
           import('./features/organization/organization.module').then(
             (m) => m.OrganizationModule
           ),
-        data: { roles: ['ADMIN'] },
-        canActivate: [RoleGuard],
       },
     ],
   },

src/app/app.routes.ts

@@ -4,6 +4,8 @@ export const IGNORE_ERROR_NOTIFICATION_URLS = [
   '/submission/exercise/quiz/', // Bỏ qua tất cả endpoint chứa pattern này
   '/profile/user/',
   '/submission/exercise/coding/',
+  '/notification/',
+  '/ai/chat/',
   // Ví dụ pattern regex: /\/submission\/exercise\/quiz\/\d+(\?.*)?$/
   // Thêm các endpoint khác nếu cần
 ];

src/app/core/interceptors/config/ignoreApiHandleError.ts

@@ -32,6 +32,7 @@ export interface CommentResponse {
   content: string;
   replies?: CommentResponse[] | []; // đệ quy
   user: User;
+  createdAt: string;
 }
 
 export interface AddCommentResponse {

src/app/core/models/comment.models.ts

@@ -71,7 +71,7 @@ export interface postData {
 }
 export type PostType = 'Global' | 'Private' | 'Org';
 export interface FileDocument {
-  file?: File;
+  file?: File[];
   category?: string; // BE mong muốn STRING
   description?: string;
   tags?: string[]; // mảng -> sẽ append tags[0], tags[1]...
@@ -102,7 +102,7 @@ export interface CreatePostRequest {
   hashtag?: string;
 
   fileDocument?: {
-    file?: File;
+    files?: File[];
     category?: string;
     description?: string;
     tags?: string[];

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

@@ -0,0 +1,8 @@
+export interface NotificationEvent {
+  channel: string;
+  recipient: string;
+  templateCode: string;
+  param: Record<string, any>;
+  subject: string;
+  body: string;
+}

src/app/core/models/socket-data.model.ts

@@ -53,10 +53,12 @@ export function getNavHorizontalItems(roles: string[]): SidebarItem[] {
     },
     {
       id: 'organization ',
-      path: '/organization/orgs-list',
+      path: roles.includes('ADMIN')
+        ? '/organization/orgs-list'
+        : '/organization/org-list-post',
       label: 'Tổ chức',
       icon: 'fa-solid fa-building-user',
-      isVisible: !roles.includes(auth_lv2[0]),
+      // isVisible: !roles.includes(auth_lv2[0]),
     },
   ];
 }

src/app/core/router-manager/horizontal-menu.ts

@@ -1,12 +1,27 @@
 import { SidebarItem } from '../../models/data-handle';
 
 export function sidebarOrgRouter(roles: string[]): SidebarItem[] {
+  const auth_lv2 = ['ADMIN'];
+
   return [
     {
       id: 'list-orgs',
       path: '/organization/orgs-list',
       label: 'Danh sách tổ chức',
       icon: 'fa-solid fa-tasks',
+      isVisible: !roles.includes(auth_lv2[0]),
+    },
+    {
+      id: 'list-posts-org',
+      path: '/organization/org-list-post',
+      label: 'Danh sách bài viết',
+      icon: 'fa-solid fa-newspaper',
+    },
+    {
+      id: 'list-exercise-org',
+      path: '/organization/org-list-exercise',
+      label: 'Danh sách bài tập',
+      icon: 'fa-solid fa-book',
     },
   ];
 }

src/app/core/router-manager/vetical-menu-dynamic/org-vertical-menu.ts

@@ -31,4 +31,10 @@ export class NotificationListService {
       Ids
     );
   }
+
+  countMyUnread() {
+    return this.api.get<ApiResponse<number>>(
+      API_CONFIG.ENDPOINTS.GET.GET_COUNT_MY_UNREAD
+    );
+  }
 }

src/app/core/services/api-service/notification-list.service.ts

@@ -54,7 +54,7 @@ export class OrganizationService {
     return this.api.patchWithFormData<ApiResponse<null>>(
       API_CONFIG.ENDPOINTS.PATCH.EDIT_ORG(orgId),
       otherData,
-      logo
+      { logo }
     );
   }