Enhancement/134 enhance room domain model

src/main/java/org/unilab/uniplan/building/Building.java

@@ -0,0 +1,42 @@
+package org.unilab.uniplan.building;
+
+import jakarta.persistence.CascadeType;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.OneToOne;
+import jakarta.persistence.Table;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import org.unilab.uniplan.common.model.BaseEntity;
+import org.unilab.uniplan.room.Room;
+import org.unilab.uniplan.university.University;
+import java.util.ArrayList;
+import java.util.List;
+
+@Entity
+@Table(name = "building")
+@Getter
+@Setter
+@NoArgsConstructor
+@AllArgsConstructor
+public class Building extends BaseEntity {
+
+    @Column(name = "name", nullable = false, length = 50)
+    private String name;
+
+    @Column(name = "address", nullable = false, length = 100)
+    private String address;
+
+    @ManyToOne(fetch = FetchType.LAZY)
+    @JoinColumn(name = "university_id", referencedColumnName = "id")
+    private University university;
+
+    @OneToMany(mappedBy = "building")
+    private List<Room> rooms = new ArrayList<>();
+}

src/main/java/org/unilab/uniplan/category/Category.java

@@ -19,6 +19,10 @@ public class Category extends BaseEntity {
 
     @Column(name = "room_type", nullable = false, length = 50)
     private String roomType;
+
     @Column(name = "capacity", nullable = false)
     private short capacity;
+
+    @Column(name = "description", nullable = true, length = 100)
+    private String description;
 }

src/main/java/org/unilab/uniplan/category/dto/CategoryDto.java

@@ -14,7 +14,10 @@ public record CategoryDto(
     String roomType,
 
     @Positive
-    short capacity
+    short capacity,
+
+    @Size(min = 1, max = 100, message = "Description must be between 1 and 100 characters")
+    String description
 ) {
 
 }

src/main/java/org/unilab/uniplan/category/dto/CategoryRequestDto.java

@@ -1,5 +1,6 @@
 package org.unilab.uniplan.category.dto;
 
+import jakarta.persistence.Column;
 import jakarta.validation.constraints.NotNull;
 import jakarta.validation.constraints.Positive;
 import jakarta.validation.constraints.Size;
@@ -11,7 +12,10 @@ public record CategoryRequestDto(
     String roomType,
 
     @Positive
-    short capacity
+    short capacity,
+
+    @Size(min = 1, max = 100, message = "Description must be between 1 and 100 characters")
+     String description
 ) {
 
 }

src/main/java/org/unilab/uniplan/category/dto/CategoryResponseDto.java

@@ -14,7 +14,10 @@ public record CategoryResponseDto(
     String roomType,
 
     @Positive
-    short capacity
+    short capacity,
+
+    @Size(min = 1, max = 100, message = "Description must be between 1 and 100 characters")
+    String description
 ) {
 
 }

src/main/java/org/unilab/uniplan/room/CustomRoomRepository.java

@@ -0,0 +1,14 @@
+package org.unilab.uniplan.room;
+
+import org.springframework.data.repository.query.Param;
+import org.unilab.uniplan.room.dto.RoomResponseDto;
+import java.util.List;
+import java.util.Optional;
+import java.util.UUID;
+
+public interface CustomRoomRepository {
+
+    List<RoomResponseDto> findAllRoomResponses();
+
+    Optional<RoomResponseDto> findRoomResponseById(UUID id);
+}

src/main/java/org/unilab/uniplan/room/CustomRoomRepositoryImpl.java

@@ -0,0 +1,81 @@
+package org.unilab.uniplan.room;
+
+import jakarta.persistence.EntityManager;
+import jakarta.persistence.PersistenceContext;
+import org.hibernate.query.common.JoinType;
+import org.hibernate.query.criteria.HibernateCriteriaBuilder;
+import org.hibernate.query.criteria.JpaCriteriaQuery;
+import org.hibernate.query.criteria.JpaEntityJoin;
+import org.hibernate.query.criteria.JpaRoot;
+import org.springframework.data.repository.query.Param;
+import org.unilab.uniplan.category.Category;
+import org.unilab.uniplan.room.dto.RoomResponseDto;
+import org.unilab.uniplan.roomcategory.RoomCategory;
+import java.util.List;
+import java.util.Optional;
+import java.util.UUID;
+
+public class CustomRoomRepositoryImpl implements CustomRoomRepository {
+
+    @PersistenceContext
+    private EntityManager entityManager;
+
+    @Override
+    public List<RoomResponseDto> findAllRoomResponses() {
+        HibernateCriteriaBuilder cb = (HibernateCriteriaBuilder) entityManager.getCriteriaBuilder();
+
+        JpaCriteriaQuery<RoomResponseDto> query = cb.createQuery(RoomResponseDto.class);
+
+        JpaRoot<Room> room = query.from(Room.class);
+
+        JpaEntityJoin<Room, RoomCategory> roomCategory =
+            room.join(RoomCategory.class, JoinType.LEFT);
+        roomCategory.on(cb.equal(roomCategory.get("room"), room));
+
+        JpaEntityJoin<RoomCategory, Category> category =
+            roomCategory.join(Category.class, JoinType.LEFT);
+        category.on(cb.equal(category, roomCategory.get("category")));
+
+        query.select(cb.construct(
+            RoomResponseDto.class,
+            room.get("id"),
+            room.get("faculty").get("id"),
+            room.get("roomNumber"),
+            room.get("availableSeats"),
+            category.get("id"),
+            room.get("building").get("id")
+        ));
+
+        return entityManager.createQuery(query).getResultList();
+    }
+
+    @Override
+    public Optional<RoomResponseDto> findRoomResponseById(UUID id) {
+        HibernateCriteriaBuilder cb = (HibernateCriteriaBuilder) entityManager.getCriteriaBuilder();
+
+        JpaCriteriaQuery<RoomResponseDto> query = cb.createQuery(RoomResponseDto.class);
+
+        JpaRoot<Room> room = query.from(Room.class);
+        JpaEntityJoin<Room, RoomCategory> roomCategory =
+            room.join(RoomCategory.class, JoinType.LEFT);
+        roomCategory.on(cb.equal(roomCategory.get("room"), room));
+
+        JpaEntityJoin<RoomCategory, Category> category =
+            roomCategory.join(Category.class, JoinType.LEFT);
+        category.on(cb.equal(category, roomCategory.get("category")));
+
+        query.select(cb.construct(
+            RoomResponseDto.class,
+            room.get("id"),
+            room.get("faculty").get("id"),
+            room.get("roomNumber"),
+            room.get("availableSeats"),
+            category.get("id"),
+            room.get("building").get("id")
+        )).where(cb.equal(room.get("id"), id));
+
+        return entityManager.createQuery(query)
+                            .getResultStream()
+                            .findFirst();
+    }
+}

src/main/java/org/unilab/uniplan/room/Room.java

@@ -4,11 +4,13 @@
 import jakarta.persistence.Entity;
 import jakarta.persistence.JoinColumn;
 import jakarta.persistence.ManyToOne;
+import jakarta.persistence.OneToOne;
 import jakarta.persistence.Table;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
+import org.unilab.uniplan.building.Building;
 import org.unilab.uniplan.common.model.BaseEntity;
 import org.unilab.uniplan.faculty.Faculty;
 
@@ -21,9 +23,16 @@
 public class Room extends BaseEntity {
 
     @ManyToOne
-    @JoinColumn(name = "faculty_id", referencedColumnName = "id", nullable = false)
+    @JoinColumn(name = "faculty_id", referencedColumnName = "id", nullable = true)
     private Faculty faculty;
+
     @Column(name = "room_number", nullable = false, length = 50)
     private String roomNumber;
 
+    @Column(name = "available_seats", nullable = false)
+    private int availableSeats;
+
+    @ManyToOne
+    @JoinColumn(name = "building_id")
+    private Building building;
 }

src/main/java/org/unilab/uniplan/room/RoomController.java

@@ -1,7 +1,5 @@
 package org.unilab.uniplan.room;
 
-import static org.springframework.http.ResponseEntity.ok;
-
 import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.validation.Valid;
 import jakarta.validation.constraints.NotNull;
@@ -18,7 +16,6 @@
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
-import org.unilab.uniplan.room.dto.RoomDto;
 import org.unilab.uniplan.room.dto.RoomRequestDto;
 import org.unilab.uniplan.room.dto.RoomResponseDto;
 
@@ -28,39 +25,34 @@
 @Tag(name = "Rooms", description = "Manage classrooms and lecture halls, including room numbers and assigned faculties")
 public class RoomController {
 
-    private final RoomService roomService;
-    private final RoomMapper roomMapper;
+    private final RoomWebFacade roomWebFacade;
 
     @PostMapping
-    public ResponseEntity<RoomResponseDto> createRoom(@Valid @NotNull @RequestBody final RoomRequestDto roomRequestDto) {
-        final RoomDto roomDto = roomService.createRoom(roomMapper.toInternalDto(roomRequestDto));
-
-        return new ResponseEntity<>(roomMapper.toResponseDto(roomDto), HttpStatus.CREATED);
+    public ResponseEntity<Void> createRoom(@Valid @NotNull @RequestBody final RoomRequestDto roomRequestDto) {
+        roomWebFacade.createRoom(roomRequestDto);
+        return ResponseEntity.status(HttpStatus.CREATED).build();
     }
 
     @GetMapping
-    public List<RoomResponseDto> getAllRooms() {
-        return roomMapper.toResponseDtoList(roomService.getAllRooms());
+    public ResponseEntity<List<RoomResponseDto>> getAllRooms() {
+        return ResponseEntity.ok(roomWebFacade.getAllRooms());
     }
 
     @GetMapping("/{id}")
     public ResponseEntity<RoomResponseDto> getRoomById(@PathVariable final UUID id) {
-        final RoomDto roomDto = roomService.getRoomById(id);
-
-        return ok(roomMapper.toResponseDto(roomDto));
+        return ResponseEntity.ok(roomWebFacade.getRoomById(id));
     }
 
     @PutMapping("/{id}")
     public ResponseEntity<RoomResponseDto> updateRoom(@PathVariable final UUID id,
                                                       @Valid @NotNull @RequestBody final RoomRequestDto roomRequestDto) {
-        final RoomDto internalDto = roomMapper.toInternalDto(roomRequestDto);
-
-        return ok(roomMapper.toResponseDto(roomService.updateRoom(id, internalDto)));
+        roomWebFacade.updateRoom(id, roomRequestDto);
+        return ResponseEntity.noContent().build();
     }
 
     @DeleteMapping("/{id}")
     public ResponseEntity<Void> deleteRoom(@PathVariable final UUID id) {
-        roomService.deleteRoom(id);
+        roomWebFacade.deleteRoom(id);
 
         return ResponseEntity.noContent().build();
     }

src/main/java/org/unilab/uniplan/room/RoomMapper.java

@@ -4,29 +4,21 @@
 import org.mapstruct.Mapper;
 import org.mapstruct.Mapping;
 import org.mapstruct.MappingTarget;
-import org.unilab.uniplan.room.dto.RoomDto;
 import org.unilab.uniplan.room.dto.RoomRequestDto;
 import org.unilab.uniplan.room.dto.RoomResponseDto;
 
 @Mapper
 public interface RoomMapper {
 
-    @Mapping(source = "faculty.id", target = "facultyId")
-    RoomDto toDto(final Room room);
+    @Mapping(target = "faculty", ignore = true)
+    Room toEntity(final RoomRequestDto roomRequestDto);
 
-    @Mapping(source = "facultyId", target = "faculty.id")
-    Room toEntity(final RoomDto roomDto);
+    @Mapping(target = "facultyId", source = "faculty.id")
+    RoomResponseDto toResponseDto(Room room);
 
-    @Mapping(target = "id", ignore = true)
-    RoomDto toInternalDto(final RoomRequestDto roomRequestDto);
-
-    RoomResponseDto toResponseDto(final RoomDto roomDto);
-
-    List<RoomDto> toDtoList(final List<Room> rooms);
-
-    List<RoomResponseDto> toResponseDtoList(final List<RoomDto> rooms);
+    List<RoomResponseDto> toResponseDtoList(final List<Room> rooms);
 
-    @Mapping(source = "roomDto.facultyId", target = "faculty.id")
+    @Mapping(target = "faculty", ignore = true)
     @Mapping(target = "id", ignore = true)
-    void updateEntityFromDto(final RoomDto roomDto, @MappingTarget final Room room);
+    void updateEntityFromDto(final RoomRequestDto roomRequestDto, @MappingTarget final Room room);
 }

src/main/java/org/unilab/uniplan/room/RoomRepository.java

@@ -5,6 +5,5 @@
 import org.springframework.stereotype.Repository;
 
 @Repository
-public interface RoomRepository extends JpaRepository<Room, UUID> {
-
+public interface RoomRepository extends JpaRepository<Room, UUID>, CustomRoomRepository {
 }