fix some flows org

Author: Fxdonad

src/app/app.routes.ts

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

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

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

src/app/core/models/socket-data.model.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/router-manager/horizontal-menu.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/vetical-menu-dynamic/org-vertical-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/services/api-service/notification-list.service.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/config-service/api.enpoints.ts

@@ -207,6 +207,7 @@ export const API_CONFIG = {
         readStatus: ReadStatusNotice
       ) =>
         `/notification/my?page=${page}&size=${size}&readStatus=${readStatus}`,
+      GET_COUNT_MY_UNREAD: '/notification/my/unread-count',
     },
     POST: {
       LOGIN: '/identity/auth/login',

src/app/core/services/socket-service/port-socket.ts renamed to src/app/core/services/config-socket/port-socket.ts

@@ -1,2 +1,3 @@
 export const CODE_COMPILER_SOCKET = 'http://localhost:4098';
 export const CONVERSATION_CHAT_SOCKET = 'http://localhost:4099';
+export const NOTIFICATION_SOCKET_PORT = 'http://localhost:4101';

src/app/core/services/socket-service/socketConnection.service.ts renamed to src/app/core/services/config-socket/socketConnection.service.ts

@@ -0,0 +1,29 @@
+// notification.service.ts
+import { Injectable } from '@angular/core';
+import { Observable } from 'rxjs';
+import { SocketConnectionService } from '../config-socket/socketConnection.service';
+import { NOTIFICATION_SOCKET_PORT } from '../config-socket/port-socket';
+
+export interface NotificationEvent {
+  channel: string;
+  recipient: string;
+  templateCode: string;
+  param: Record<string, any>;
+  subject: string;
+  body: string;
+}
+
+@Injectable({ providedIn: 'root' })
+export class NotificationService {
+  private readonly url = `${NOTIFICATION_SOCKET_PORT}?token=${localStorage.getItem(
+    'token'
+  )}`;
+
+  constructor(private socketService: SocketConnectionService) {
+    this.socketService.connect(this.url);
+  }
+
+  listenNotifications(): Observable<NotificationEvent> {
+    return this.socketService.on<NotificationEvent>(this.url, 'notification');
+  }
+}