feat: rewire routing for publisher and index

Author: JFronny

src/main/java/edu/kit/hci/soli/controller/LayoutParamsAdvice.java

@@ -5,9 +5,7 @@
 import edu.kit.hci.soli.domain.User;
 import edu.kit.hci.soli.dto.LayoutParams;
 import edu.kit.hci.soli.dto.LoginStateModel;
-import edu.kit.hci.soli.service.BookingsService;
-import edu.kit.hci.soli.service.TimeService;
-import edu.kit.hci.soli.service.UserService;
+import edu.kit.hci.soli.service.*;
 import jakarta.servlet.http.HttpServletRequest;
 import lombok.extern.slf4j.Slf4j;
 import org.jetbrains.annotations.Nullable;
@@ -25,6 +23,7 @@ public class LayoutParamsAdvice {
     private final UserService userService;
     private final BookingsService bookingsService;
     private final TimeService timeService;
+    private final RoomService roomService;
 
     /**
      * Constructs a LoginControllerAdvice with the specified UserService.
@@ -33,10 +32,11 @@ public class LayoutParamsAdvice {
      * @param bookingsService the service for managing bookings
      * @param timeService     the service for managing time
      */
-    public LayoutParamsAdvice(UserService userService, BookingsService bookingsService, TimeService timeService) {
+    public LayoutParamsAdvice(UserService userService, BookingsService bookingsService, TimeService timeService, RoomService roomService) {
         this.userService = userService;
         this.bookingsService = bookingsService;
         this.timeService = timeService;
+        this.roomService = roomService;
     }
 
     /**
@@ -86,7 +86,7 @@ public LayoutParams getLayoutParams(@ModelAttribute("login") LoginStateModel log
                 room -> {
                     request.getSession().setAttribute("room", room);
                     return getUpdate(room, login.user());
-                });
+                }, roomService.count() > 1);
     }
 
     private LayoutParams.ParamsUpdate getUpdate(@Nullable Room room, User user) {

src/main/java/edu/kit/hci/soli/controller/MainController.java

@@ -3,6 +3,7 @@
 import edu.kit.hci.soli.config.SoliConfiguration;
 import edu.kit.hci.soli.domain.Room;
 import edu.kit.hci.soli.dto.KnownError;
+import edu.kit.hci.soli.dto.LayoutParams;
 import edu.kit.hci.soli.service.RoomService;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
@@ -12,9 +13,7 @@
 import org.springframework.boot.web.servlet.error.DefaultErrorAttributes;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
 import java.util.Map;
@@ -100,6 +99,26 @@ public String securityTxt(HttpServletResponse response) {
                 """.formatted(soliConfiguration.getHostname());
     }
 
+    /**
+     * Handles GET requests to the root endpoint.
+     * If there is only one room, redirect to that room.
+     *
+     * @param model the model to which attributes are added
+     * @param layout the layout parameters
+     * @return the name of the view to be rendered
+     */
+    @GetMapping("/")
+    public String index(Model model, @ModelAttribute("layout") LayoutParams layout) {
+        List<Room> rooms = roomService.getAll();
+        if (rooms.size() == 1) {
+            return "redirect:/" + rooms.getFirst().getId();
+        }
+        layout.setRoom(null);
+        model.addAttribute("rooms", rooms);
+        model.addAttribute("roomsFirst", true);
+        return "index";
+    }
+
     /**
      * Returns the view for the publisher information (impressum).
      *
@@ -110,6 +129,7 @@ public String securityTxt(HttpServletResponse response) {
     public String getPublisher(Model model) {
         List<Room> rooms = roomService.getAll();
         model.addAttribute("rooms", rooms);
-        return "publisher";
+        model.addAttribute("roomsFirst", false);
+        return "index";
     }
 }

src/main/java/edu/kit/hci/soli/controller/RoomsController.java

@@ -32,26 +32,6 @@ public RoomsController(RoomService roomService) {
         this.roomService = roomService;
     }
 
-    /**
-     * Handles GET requests to the root endpoint.
-     * If there is only one room, redirects to that room.
-     *
-     * @param model the model to which attributes are added
-     * @param layout the layout parameters
-     * @return the name of the view to be rendered
-     */
-    @GetMapping("/")
-    public String roomList(Model model,
-                           @ModelAttribute("layout") LayoutParams layout) {
-        List<Room> rooms = roomService.getAll();
-        if (rooms.size() == 1) {
-            return "redirect:/" + rooms.get(0).getId();
-        }
-        layout.setRoom(null);
-        model.addAttribute("rooms", rooms);
-        return "rooms";
-    }
-
     /**
      * Shows the room list in edit mode.
      *
@@ -64,7 +44,7 @@ public String adminRoomList(Model model, @ModelAttribute("layout") LayoutParams
         List<Room> rooms = roomService.getAll();
         model.addAttribute("rooms", rooms);
         model.addAttribute("edit", true);
-        return "rooms";
+        return "admin/rooms/list";
     }
 
     /**
@@ -80,7 +60,7 @@ public String newRoom(Model model, @ModelAttribute("layout") LayoutParams layout
         model.addAttribute("name", "");
         model.addAttribute("description", "");
         model.addAttribute("location", "");
-        return "admin/edit_room_page";
+        return "admin/rooms/edit";
     }
 
     /**
@@ -104,7 +84,7 @@ public String editRoom(Model model, HttpServletResponse response,
         model.addAttribute("name", room.get().getName());
         model.addAttribute("description", room.get().getDescription());
         model.addAttribute("location", room.get().getLocation());
-        return "admin/edit_room_page";
+        return "admin/rooms/edit";
     }
 
     /**
@@ -188,5 +168,4 @@ public String editOrCreateRoom(Model model, HttpServletResponse response, @Model
         roomService.save(room);
         return "redirect:/admin/rooms";
     }
-
 }

src/main/java/edu/kit/hci/soli/dto/LayoutParams.java

@@ -9,14 +9,16 @@
 public class LayoutParams {
     private final LoginStateModel login;
     private final RoomChangeListener onRoomChange;
+    private final boolean hasMultipleRooms;
     private @Nullable Room room;
     private @Nullable Booking currentHighestBooking;
     private @Nullable Booking currentBookingOfUser;
 
-    public LayoutParams(@NotNull LoginStateModel login, @Nullable Room room, @NotNull RoomChangeListener onRoomChange) {
+    public LayoutParams(@NotNull LoginStateModel login, @Nullable Room room, @NotNull RoomChangeListener onRoomChange, boolean hasMultipleRooms) {
         this.login = Objects.requireNonNull(login);
         this.room = room;
         this.onRoomChange = Objects.requireNonNull(onRoomChange);
+        this.hasMultipleRooms = hasMultipleRooms;
         ParamsUpdate paramsUpdate = onRoomChange.onRoomChange(room);
         this.currentHighestBooking = paramsUpdate.currentHighestBooking();
         this.currentBookingOfUser = paramsUpdate.currentBookingOfUser();
@@ -45,6 +47,10 @@ public void setRoom(@Nullable Room room) {
         return currentBookingOfUser;
     }
 
+    public boolean isMultipleRooms() {
+        return hasMultipleRooms;
+    }
+
     /**
      * Functional interface for listening to room changes on a {@link LayoutParams}
      * and modifying relevant fields as needed.

src/main/java/edu/kit/hci/soli/service/RoomService.java

@@ -33,6 +33,13 @@ public interface RoomService {
      */
     List<Room> getAll();
 
+    /**
+     * Retrieves the number of rooms.
+     *
+     * @return the number of rooms
+     */
+    long count();
+
     /**
      * Creates a new room.
      *

src/main/java/edu/kit/hci/soli/service/impl/RoomServiceImpl.java

@@ -36,6 +36,11 @@ public List<Room> getAll() {
         return roomRepository.findAll();
     }
 
+    @Override
+    public long count() {
+        return roomRepository.count();
+    }
+
     @Override
     public Room save(Room room) {
         return roomRepository.save(room);

src/main/jte/admin/edit_room_page.jte src/main/jte/admin/rooms/edit.jtesrc/main/jte/admin/edit_room_page.jte renamed to src/main/jte/admin/rooms/edit.jte

@@ -12,5 +12,7 @@
 @param boolean edit = false
 
 @template.layout(page = context.page("rooms"), layout = layout, context = context, content = @`
-    @template.util.room_list(context = context, layout = layout, csrf = csrf, rooms = rooms, edit = edit)
+    <div class="mx-auto">
+        @template.util.room_list(context = context, layout = layout, csrf = csrf, rooms = rooms, edit = edit)
+    </div>
 `)

src/main/jte/rooms.jte src/main/jte/admin/rooms/list.jtesrc/main/jte/rooms.jte renamed to src/main/jte/admin/rooms/list.jte

@@ -9,10 +9,19 @@
 @param CsrfToken csrf
 
 @param List<Room> rooms
+@param boolean roomsFirst
 
 @template.layout(page = context.page("layout.publisher"), context = context, layout = layout, content = @`
-    <div class="container">
+    <div class="mx-auto" style="max-width: 100ch;">
+        @if (roomsFirst)
+            <h1 class="text-4xl font-bold">${context.localize("rooms")}</h1>
+            <br>
+            @template.util.room_list(context = context, layout = layout, csrf = csrf, rooms = rooms)
+            <br><br>
+        @endif
+
         <h1 class="text-4xl font-bold">${context.localize("layout.publisher")}</h1>
+        <br>
         <p>${context.localize("publisher.description")}</p>
 
         <br>
@@ -23,9 +32,11 @@
         </p>
         <a class="link link-primary" href="https://hci.iar.kit.edu/deutsch/index.php">HCI (Human-Computer Interaction and Accessibility)</a>
 
-        <br><br>
-
-        <h1 class="text-4xl font-bold">${context.localize("rooms")}</h1>
-        @template.util.room_list(context = context, layout = layout, csrf = csrf, rooms = rooms)
+        @if (!roomsFirst)
+            <br><br>
+            <h1 class="text-4xl font-bold">${context.localize("rooms")}</h1>
+            <br>
+            @template.util.room_list(context = context, layout = layout, csrf = csrf, rooms = rooms)
+        @endif
     </div>
 `)

src/main/jte/publisher.jte src/main/jte/index.jtesrc/main/jte/publisher.jte renamed to src/main/jte/index.jte

@@ -146,7 +146,11 @@
 
                         @if(layout.getRoom() != null)
                             <div class="divider"></div>
-                            <li><a href="/"><i class="fa-solid fa-folder-tree"></i> ${context.localize("layout.current_room", layout.getRoom().getName())}</a></li>
+                            @if (layout.isMultipleRooms())
+                                <li><a href="/"><i class="fa-solid fa-folder-tree"></i> ${context.localize("layout.current_room", layout.getRoom().getName())}</a></li>
+                            @else
+                                <li class="pointer-events-none"><label><i class="fa-solid fa-circle-info"></i> ${context.localize("layout.current_room", layout.getRoom().getName())}</label></li>
+                            @endif
                         @endif
 
                         @if(layout.getLogin().kind() == LoginStateModel.Kind.ADMIN)