Nueva estructura

angular/RestClient/src/app/app.component.ts

 import { Component } from '@angular/core';
 import { RouterOutlet } from '@angular/router';
-import { NavigationComponent } from './core/navigation/navigation.component';
+import { NavigationComponent } from '@shared';
 
 @Component({
   selector: 'app-root',

angular/RestClient/src/app/app.config.ts

@@ -9,7 +9,7 @@ import {
 import { provideAnimationsAsync } from '@angular/platform-browser/animations/async';
 import { ReactiveFormsModule } from '@angular/forms'; // Added import for ReactiveFormsModule
 import { provideNativeDateAdapter } from '@angular/material/core';
-import { authRequest } from './security/auth.interceptor';
+import { authRequest } from '@core/interceptors';
 
 export const appConfig: ApplicationConfig = {
   providers: [

angular/RestClient/src/app/app.routes.ts

-import { Route, Routes } from '@angular/router';
-import { HotelListComponent } from './core/features/hotel/hotel-list/hotel-list.component';
-import { BookingComponent } from './core/features/bookings/booking/booking.component';
-import { HotelRegisterComponent } from './core/features/hotel/hotel-register/hotel-register.component';
-import { MainPageComponent } from './core/features/user/main-page/main-page.component';
-import { BookingListComponent } from './core/features/bookings/booking-list/booking-list.component';
-import { UserBookingListComponent } from './core/features/user/user-booking-list/user-booking-list.component';
-import { UserFormComponent } from './core/features/user/user-form/user-form.component';
+import { HotelListComponent } from './features/hotels/hotel-list/hotel-list.component';
+import { BookingComponent } from './features/bookings/booking/booking.component';
+import { HotelRegisterComponent } from './features/hotels/hotel-register/hotel-register.component';
+import { MainPageComponent } from './features/users/main-page/main-page.component';
+import { UserBookingListComponent } from './features/bookings/user-booking-list/user-booking-list.component';
+import { UserFormComponent } from './features/users/user-form/user-form.component';
 import { UnauthorizedComponent } from './page/unauthorized/unauthorized.component';
-import { rolGuard } from './security/rol.guard';
-import { UserRol, UserRolesArray } from './types';
-
-interface RouteData {
-  expectedRole: UserRol | UserRol[];
-}
-
-type AppRoute = Omit<Route, 'data'> & {
-  data?: RouteData;
-};
+import { AppRoute, UserRolesArray } from './core/models';
+import { rolGuard, rolGuardChild } from '@core/guards';
 
 export const routes: AppRoute[] = [
   // Auth
   {
-    path: 'login',
-    component: UserFormComponent,
-  },
-  {
-    path: 'register',
-    component: UserFormComponent,
+    path: '',
+    loadChildren: () => import('./features/auth').then((m) => m.AUTH_ROUTES),
   },
-
   // Hoteles
   {
-    path: 'hotels', // Ruta para la lista de hoteles
-    component: HotelListComponent,
-  },
-  {
-    path: 'hotels/register', // Registrar nuevo hotel
-    component: HotelRegisterComponent,
-    canActivate: [rolGuard],
-    data: { expectedRole: 'HOTEL_ADMIN' },
-  },
-  {
-    path: 'hotels/:id', // Hotel concreto
-    component: HotelRegisterComponent,
+    path: 'hotels',
+    loadChildren: () =>
+      import('./features/hotels').then((m) => m.HOTELS_ROUTES),
   },
-
   // Usuario
   {
-    path: 'me', // Main
-    canActivate: [rolGuard],
-    data: { expectedRole: UserRolesArray },
-    component: UserFormComponent,
-  },
-  {
-    path: 'me/edit', // Main
-    component: UserFormComponent,
-    canActivate: [rolGuard],
-    data: { expectedRole: UserRolesArray },
-  },
-  {
-    path: 'me/change-passwd', // Main
-    component: UserFormComponent,
-    canActivate: [rolGuard],
-    data: { expectedRole: UserRolesArray },
-  },
-  // Usuario HOTEL admin
-  {
-    path: 'me/hotels',
-    component: HotelListComponent,
-    canActivate: [rolGuard],
-    data: { expectedRole: 'HOTEL_ADMIN' },
-  },
-  {
-    path: 'me/hotels/:id',
-    component: HotelRegisterComponent,
-    canActivate: [rolGuard],
-    data: { expectedRole: 'HOTEL_ADMIN' },
-  },
-  // {
-  //   path: 'me/hotels/:id/bookings',
-  //   component: BookingListComponent,
-  // },
-  // {
-  //   path: 'me/hotels/:id/rooms/:id/bookings',
-  //   component: BookingListComponent,
-  // },
-
-  // Usuario Cliente
-  {
-    path: 'me/bookings',
-    component: UserBookingListComponent,
-    canActivate: [rolGuard],
-    data: { expectedRole: 'CLIENT' },
-  },
-  {
-    path: 'me/bookings/:id',
-    component: BookingComponent,
+    path: 'me',
     canActivate: [rolGuard],
-    data: { expectedRole: 'CLIENT' },
+    canActivateChild: [rolGuardChild],
+    loadChildren: () => import('./features/users').then((m) => m.USERS_ROUTES),
   },
-  {
-    path: 'me/bookings/new',
-    component: BookingComponent,
-    canActivate: [rolGuard],
-    data: { expectedRole: 'CLIENT' },
-  },
-
   // Administrador
   {
-    path: 'admin', // Main
-    component: UserFormComponent,
-    canActivate: [rolGuard],
-    data: { expectedRole: 'ADMIN' },
-  },
-  {
-    path: 'admin/users', // Main
-    component: MainPageComponent,
-    canActivate: [rolGuard],
-    data: { expectedRole: 'ADMIN' },
-  },
-  {
-    path: 'admin/users/:id', // Main
-    component: UserFormComponent,
-    canActivate: [rolGuard],
-    data: { expectedRole: 'ADMIN' },
-  },
-  {
-    path: 'admin/users/:id/edit', // Main
-    component: UserFormComponent,
+    path: 'admin',
     canActivate: [rolGuard],
+    canActivateChild: [rolGuardChild],
     data: { expectedRole: 'ADMIN' },
+    loadChildren: () => import('./features/admin').then((m) => m.ADMIN_ROUTES),
   },
-  {
-    path: 'admin/users/:id/change-passwd', // Main
-    component: UserFormComponent,
-    canActivate: [rolGuard],
-    data: { expectedRole: 'ADMIN' },
-  },
-  {
-    path: 'admin/users/:id/bookings',
-    component: UserBookingListComponent,
-    canActivate: [rolGuard],
-    data: { expectedRole: 'ADMIN' },
-  },
-  // {
-  //   path: 'admin/users/:id/bookings/:bookingId',
-  //   component: BookingComponent,
-  // },
-  {
-    path: 'admin/users/:id/hotels',
-    component: HotelListComponent,
-    canActivate: [rolGuard],
-    data: { expectedRole: 'ADMIN' },
-  },
-  {
-    path: 'admin/users/:userId/hotels/:id',
-    component: HotelRegisterComponent,
-    canActivate: [rolGuard],
-    data: { expectedRole: 'ADMIN' },
-  },
-  // {
-  //   path: 'admin/users/:userId/hotels/:id/bookings',
-  //   component: BookingListComponent,
-  //   canActivate: [rolGuard],
-  //   data: { expectedRole: 'ADMIN' },
-  // },
-  // {
-  //   path: 'admin/users/:userId/hotels/:hotelId/rooms/:id/bookings',
-  //   component: BookingListComponent,
-  //   canActivate: [rolGuard],
-  //   data: { expectedRole: 'ADMIN' },
-  // },
-
+  // Página no autorizada
   {
     path: 'unauthorized',
     component: UnauthorizedComponent,

angular/RestClient/src/app/core/guards/index.ts

+export * from './rol.guard';

angular/RestClient/src/app/security/rol.guard.ts → angular/RestClient/src/app/core/guards/rol.guard.ts

 import { inject } from '@angular/core';
-import { CanActivateFn, Router } from '@angular/router';
-import { SessionService } from '../shared/session.service';
-import { UserRol, Session } from '../types';
+import {
+  ActivatedRouteSnapshot,
+  CanActivateChildFn,
+  CanActivateFn,
+  Router,
+} from '@angular/router';
+import { Session, UserRol } from '@core/models';
+import { SessionService } from '@core/services';
+
 import { map } from 'rxjs';
 
-export const rolGuard: CanActivateFn = (route, state) => {
+/**
+ * Obtiene el rol de la ruta padre si el hijo no define uno.
+ * Navega hacia los ancestros buscando un rol especificado en `data`.
+ */
+function getInheritedRole(route: ActivatedRouteSnapshot): string | undefined {
+  let parent = route.parent; // Comenzar desde el padre inmediato
+  while (parent) {
+    if (parent.data && parent.data['rol']) {
+      return parent.data['rol']; // Retorna el primer rol encontrado
+    }
+    parent = parent.parent; // Continuar hacia arriba en el árbol
+  }
+  return undefined; // No se encontró un rol definido en los ancestros
+}
+
+function verifyRol(expectedRole: UserRol) {
   const sessionService = inject(SessionService);
   const router = inject(Router);
-  // Obtén el rol esperado desde los datos de la ruta
-  const expectedRole = route.data?.['expectedRole'];
-
   // Verifica si el usuario tiene sesión activa
   const session = sessionService.isValid();
 
@@ -18,7 +36,6 @@ export const rolGuard: CanActivateFn = (route, state) => {
     router.navigate(['/login']);
     return false;
   }
-
   return sessionService.getSession().pipe(
     map((session: Session | null) => {
       if (!session) return false;
@@ -40,4 +57,22 @@ export const rolGuard: CanActivateFn = (route, state) => {
       return false;
     })
   );
+}
+
+export const rolGuard: CanActivateFn = (route, state) => {
+  // Obtén el rol esperado desde los datos de la ruta
+  const expectedRole = route.data?.['expectedRole'];
+  return verifyRol(expectedRole);
+};
+
+export const rolGuardChild: CanActivateChildFn = (childRoute, state) => {
+  // Obtener el rol de la ruta hija si está especificado y en caso
+  // de no especificarse se busca en el/los padres
+  let requiredRol = childRoute.data['rol'] ?? getInheritedRole(childRoute);
+
+  // Si no hay rol especificado se supone libre de verificación
+  if (!requiredRol) return true;
+
+  // Verificar si el usuario tiene el rol requerido
+  return verifyRol(requiredRol);
 };

angular/RestClient/src/app/core/interceptors/auth.interceptor.spec.ts

+import { TestBed } from '@angular/core/testing';
+import { HttpInterceptorFn } from '@angular/common/http';
+
+import { authInterceptor } from './auth.interceptor';
+
+describe('authInterceptor', () => {
+  const interceptor: HttpInterceptorFn = (req, next) => 
+    TestBed.runInInjectionContext(() => authInterceptor(req, next));
+
+  beforeEach(() => {
+    TestBed.configureTestingModule({});
+  });
+
+  it('should be created', () => {
+    expect(interceptor).toBeTruthy();
+  });
+});

angular/RestClient/src/app/security/auth.interceptor.ts → angular/RestClient/src/app/core/interceptors/auth.interceptor.ts

 import { HttpInterceptorFn } from '@angular/common/http';
 import { inject } from '@angular/core';
-import { LocalStorageService } from '../shared/local-storage.service';
-import { SessionService } from '../shared/session.service';
+import { SessionService } from '@core/services/session/session.service';
 
 const excluded = ['/login', '/register'];
 

angular/RestClient/src/app/core/interceptors/index.ts

+export * from './auth.interceptor';

angular/RestClient/src/app/types/Booking.d.ts → angular/RestClient/src/app/core/models/Booking.interface.ts

-import { Room } from './Room';
-import { User } from './User';
+import { Room } from './Room.interface';
+import { User } from './User.interface';
 
 export interface Booking {
   id: number;

angular/RestClient/src/app/types/Hotel.d.ts → angular/RestClient/src/app/core/models/Hotel.interface.ts

-import { Address } from './Address';
-import { Room } from './Room';
+import { Address } from './Address.interface';
+import { Room } from './Room.interface';
 
 export interface Hotel {
   id: number;

angular/RestClient/src/app/types/Room.d.ts → angular/RestClient/src/app/core/models/Room.interface.ts

 export type RoomType = 'SINGLE' | 'DOUBLE' | 'SUITE';
+
+export const roomTypeArray: RoomType[] = ['SINGLE', 'DOUBLE', 'SUITE'];
+
 export interface Room {
   id: number;
   roomNumber: String;

angular/RestClient/src/app/core/models/Route.interface.ts

+import { Route } from '@angular/router';
+import { UserRol } from './User.interface';
+
+interface RouteData {
+  expectedRole: UserRol | UserRol[];
+}
+
+export type AppRoute = Omit<Route, 'data'> & {
+  data?: RouteData;
+};

angular/RestClient/src/app/types/Session.d.ts → angular/RestClient/src/app/core/models/Session.interface.ts

+import { UserRol } from './User.interface';
+
 export interface Session {
   id: number;
   name: string;
@@ -5,7 +7,7 @@ export interface Session {
   rol: UserRol;
 }
 
-interface PersistenToken {
+export interface PersistenToken {
   token: string;
   session?: Session;
 }

angular/RestClient/src/app/types/User.d.ts → angular/RestClient/src/app/core/models/User.interface.ts

@@ -15,6 +15,7 @@ export interface HotelAdmin extends User {
 }
 
 export type UserRol = 'ADMIN' | 'CLIENT' | 'HOTEL_ADMIN';
+export const UserRolesArray: UserRol[] = ['CLIENT', 'HOTEL_ADMIN', 'ADMIN'];
 
 export type UserStateFilter = 'All' | UserState;
 

angular/RestClient/src/app/core/models/index.ts

+export * from './User.interface';
+export * from './Address.interface';
+export * from './Hotel.interface';
+export * from './Room.interface';
+export * from './Room.interface';
+export * from './Booking.interface';
+export * from './User.interface';
+export * from './Session.interface';
+export * from './Route.interface';

angular/RestClient/src/app/shared/auth-client.service.spec.ts → angular/RestClient/src/app/core/services/api/auth/auth-client.service.spec.ts

 import { TestBed } from '@angular/core/testing';
 
 import { AuthClientService } from './auth-client.service';
+import { Session } from '@core/models';
 
 describe('AuthClientService', () => {
   let service: AuthClientService;
+  let s: Session;
 
   beforeEach(() => {
     TestBed.configureTestingModule({});

angular/RestClient/src/app/shared/auth-client.service.ts → angular/RestClient/src/app/core/services/api/auth/auth-client.service.ts

 import { Injectable } from '@angular/core';
-import { environment } from '../../environments/environment';
+import { environment } from '../../../../../environments/environment';
 import { HttpClient } from '@angular/common/http';
 
 @Injectable({