Skip to content

Resolve #260 - Remove redundant book_id column #261

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
PiCiU1221 merged 1 commit into from
Oct 26, 2025
Merged

Resolve #260 - Remove redundant book_id column #261

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion backend/sql/database_schema.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -268,7 +268,6 @@ CREATE TABLE rental_return_items
id SERIAL PRIMARY KEY,
rental_return_id INT NOT NULL REFERENCES rental_returns(id) ON DELETE CASCADE,
rental_id INT NOT NULL REFERENCES rentals(id) ON DELETE CASCADE,
book_id INT NOT NULL REFERENCES books(id),
returned_quantity INT NOT NULL CHECK (returned_quantity > 0)
);

Expand Down
4 changes: 2 additions & 2 deletions backend/sql/sample_data.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -332,9 +332,9 @@ INSERT INTO rental_returns (return_order_id, returned_at, status)
VALUES
(1,NULL, 'IN_PROGRESS');

INSERT INTO rental_return_items (rental_return_id, rental_id, book_id, returned_quantity)
INSERT INTO rental_return_items (rental_return_id, rental_id, returned_quantity)
VALUES
(1, 1, 2, 2);
(1, 1, 2);

-- Driver accept the return order
UPDATE orders
Expand Down
7 changes: 5 additions & 2 deletions backend/src/main/java/edu/zut/bookrider/mapper/rentalReturn/RentalReturnMapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
import edu.zut.bookrider.dto.RentalReturnItemDTO;
import edu.zut.bookrider.mapper.Mapper;
import edu.zut.bookrider.mapper.book.BookReadMapper;
import edu.zut.bookrider.model.Rental;
import edu.zut.bookrider.model.RentalReturn;
import edu.zut.bookrider.model.RentalReturnItem;
import lombok.RequiredArgsConstructor;
Expand Down Expand Up @@ -34,10 +35,12 @@ public RentalReturnDTO map(RentalReturn rentalReturn) {
}

private RentalReturnItemDTO mapItem(RentalReturnItem item) {
Rental rental = item.getRental();

return new RentalReturnItemDTO(
item.getId(),
item.getRental().getId(),
item.getBook() != null ? bookReadMapper.map(item.getBook()) : null,
rental.getId(),
bookReadMapper.map(rental.getBook()),
item.getReturnedQuantity()
);
}
Expand Down
4 changes: 0 additions & 4 deletions backend/src/main/java/edu/zut/bookrider/model/RentalReturnItem.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,6 @@ public class RentalReturnItem extends BaseEntity<Integer> {
@JoinColumn(name = "rental_id", nullable = false)
private Rental rental;

@ManyToOne(fetch = FetchType.LAZY)
@JoinColumn(name = "book_id")
private Book book;

@Column(nullable = false)
private int returnedQuantity;
}
1 change: 0 additions & 1 deletion backend/src/main/java/edu/zut/bookrider/service/RentalReturnItemService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,6 @@ public List<RentalReturnItem> createRentalReturnItems(RentalReturn rentalReturn,
RentalReturnItem returnItem = new RentalReturnItem();
returnItem.setRentalReturn(rentalReturn);
returnItem.setRental(rental);
returnItem.setBook(rental.getBook());
returnItem.setReturnedQuantity(toReturn);

returnItems.add(returnItem);
Expand Down
1 change: 0 additions & 1 deletion backend/src/test/java/edu/zut/bookrider/integration/controller/OrderControllerIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1216,7 +1216,6 @@ void whenDriverDeliversReturnOrder_thenReturnOkAndCreateRentalReturn() throws Ex
RentalReturnItem rentalReturnItem = new RentalReturnItem();
rentalReturnItem.setRentalReturn(rentalReturn);
rentalReturnItem.setRental(rental);
rentalReturnItem.setBook(rental.getBook());
rentalReturnItem.setReturnedQuantity(2);

List<RentalReturnItem> rentalReturnItems = new ArrayList<>();
Expand Down
5 changes: 1 addition & 4 deletions backend/src/test/java/edu/zut/bookrider/integration/controller/RentalControllerIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,6 @@ public class RentalControllerIT {
private User user;
private User driver;
private Library library1;
private Library library2;
private Address address;

private Address createAddress(String postalCode, String city, String street, double lat, double lon) {
Expand Down Expand Up @@ -160,7 +159,6 @@ void setUp() {
driver = createUser("testdriver@rcit.com", "driver", 0);

library1 = createLibrary("Library1", "70-426", "Szczecin", "Generała Ludomiła Rayskiego 3", 53.434882, 14.552266);
library2 = createLibrary("Library2", "70-426", "Szczecin", "Księdza Piotra Wawrzyniaka 13", 53.437720, 14.531702);
}

@Test
Expand Down Expand Up @@ -232,14 +230,13 @@ void whenUserRequestsRentalsWithPartialReturns_thenReturnRentalsPageWithCorrectQ
RentalReturnItem rentalReturnItem = new RentalReturnItem();
rentalReturnItem.setRentalReturn(rentalReturn);
rentalReturnItem.setRental(rental1);
rentalReturnItem.setBook(rental1.getBook());
rentalReturnItem.setReturnedQuantity(2);

List<RentalReturnItem> rentalReturnItems = new ArrayList<>();
rentalReturnItems.add(rentalReturnItem);
rentalReturn.setRentalReturnItems(rentalReturnItems);

rentalReturn = rentalReturnRepository.save(rentalReturn);
rentalReturnRepository.save(rentalReturn);

mockMvc.perform(MockMvcRequestBuilders.get("/api/rentals")
.contentType(MediaType.APPLICATION_JSON))
Expand Down
12 changes: 0 additions & 12 deletions backend/src/test/java/edu/zut/bookrider/integration/controller/RentalReturnControllerIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -444,7 +444,6 @@ void whenLibrarianRequestsLatestDriversReturn_thenReturnOkAndLatestReturn() thro
RentalReturnItem rentalReturnItem = new RentalReturnItem();
rentalReturnItem.setRentalReturn(rentalReturn);
rentalReturnItem.setRental(rental);
rentalReturnItem.setBook(rental.getBook());
rentalReturnItem.setReturnedQuantity(2);

List<RentalReturnItem> rentalReturnItems = new ArrayList<>();
Expand Down Expand Up @@ -497,7 +496,6 @@ void whenLibrarianRequestsDeliveryReturnCompletion_thenReturnNoContent() throws
RentalReturnItem rentalReturnItem = new RentalReturnItem();
rentalReturnItem.setRentalReturn(rentalReturn);
rentalReturnItem.setRental(rental);
rentalReturnItem.setBook(rental.getBook());
rentalReturnItem.setReturnedQuantity(2);

List<RentalReturnItem> rentalReturnItems = new ArrayList<>();
Expand Down Expand Up @@ -546,7 +544,6 @@ void whenLibrarianRequestsInPersonReturnCompletion_thenReturnNoContent() throws
RentalReturnItem rentalReturnItem = new RentalReturnItem();
rentalReturnItem.setRentalReturn(rentalReturn);
rentalReturnItem.setRental(rental);
rentalReturnItem.setBook(rental.getBook());
rentalReturnItem.setReturnedQuantity(2);

List<RentalReturnItem> rentalReturnItems = new ArrayList<>();
Expand Down Expand Up @@ -593,7 +590,6 @@ void whenLibrarianRequestsInPersonReturnCompletionForDeliveryReturn_thenReturnNo
RentalReturnItem rentalReturnItem = new RentalReturnItem();
rentalReturnItem.setRentalReturn(rentalReturn);
rentalReturnItem.setRental(rental);
rentalReturnItem.setBook(rental.getBook());
rentalReturnItem.setReturnedQuantity(2);

List<RentalReturnItem> rentalReturnItems = new ArrayList<>();
Expand Down Expand Up @@ -636,7 +632,6 @@ void whenLibrarianRequestsInPersonReturnDTOById_thenReturnOkAndRentalReturnDTO()
RentalReturnItem rentalReturnItem = new RentalReturnItem();
rentalReturnItem.setRentalReturn(rentalReturn);
rentalReturnItem.setRental(rental);
rentalReturnItem.setBook(rental.getBook());
rentalReturnItem.setReturnedQuantity(2);

List<RentalReturnItem> rentalReturnItems = new ArrayList<>();
Expand Down Expand Up @@ -858,7 +853,6 @@ void whenUserHandsOverReturnOrder_thenChangeOrderStatusToInTransit() throws Exce
RentalReturnItem rentalReturnItem = new RentalReturnItem();
rentalReturnItem.setRentalReturn(rentalReturn);
rentalReturnItem.setRental(rental);
rentalReturnItem.setBook(rental.getBook());
rentalReturnItem.setReturnedQuantity(2);

List<RentalReturnItem> rentalReturnItems = new ArrayList<>();
Expand Down Expand Up @@ -906,7 +900,6 @@ void whenUserHandsOverReturnOrderToWrongDriver_thenReturnBadRequest() throws Exc
RentalReturnItem rentalReturnItem = new RentalReturnItem();
rentalReturnItem.setRentalReturn(rentalReturn);
rentalReturnItem.setRental(rental);
rentalReturnItem.setBook(rental.getBook());
rentalReturnItem.setReturnedQuantity(2);

List<RentalReturnItem> rentalReturnItems = new ArrayList<>();
Expand Down Expand Up @@ -951,7 +944,6 @@ void whenUserRequestsRentalReturnOrders_thenReturnRentalReturnDTOPage() throws E
RentalReturnItem rentalReturnItem = new RentalReturnItem();
rentalReturnItem.setRentalReturn(rentalReturn);
rentalReturnItem.setRental(rental);
rentalReturnItem.setBook(rental.getBook());
rentalReturnItem.setReturnedQuantity(2);

List<RentalReturnItem> rentalReturnItems = new ArrayList<>();
Expand Down Expand Up @@ -996,7 +988,6 @@ void whenUserRequestsReturnOrderForAlreadyReturnedReturn_thenReturnConflict() th
RentalReturnItem rentalReturnItem = new RentalReturnItem();
rentalReturnItem.setRentalReturn(rentalReturn);
rentalReturnItem.setRental(rental);
rentalReturnItem.setBook(rental.getBook());
rentalReturnItem.setReturnedQuantity(2);

List<RentalReturnItem> rentalReturnItems = new ArrayList<>();
Expand Down Expand Up @@ -1045,7 +1036,6 @@ void whenUserRequestsReturnOrderPartiallyReturnedReturn_thenReturnOk() throws Ex
RentalReturnItem rentalReturnItem = new RentalReturnItem();
rentalReturnItem.setRentalReturn(rentalReturn);
rentalReturnItem.setRental(rental);
rentalReturnItem.setBook(rental.getBook());
rentalReturnItem.setReturnedQuantity(1);

List<RentalReturnItem> rentalReturnItems = new ArrayList<>();
Expand Down Expand Up @@ -1094,7 +1084,6 @@ void whenLibrarianRequestsDeliveryReturnCompletionFromWrongLibrary_thenReturnCon
RentalReturnItem rentalReturnItem = new RentalReturnItem();
rentalReturnItem.setRentalReturn(rentalReturn);
rentalReturnItem.setRental(rental);
rentalReturnItem.setBook(rental.getBook());
rentalReturnItem.setReturnedQuantity(2);

List<RentalReturnItem> rentalReturnItems = new ArrayList<>();
Expand Down Expand Up @@ -1140,7 +1129,6 @@ void whenLibrarianRequestsInPersonReturnCompletionFromWrongLibrary_thenReturnCon
RentalReturnItem rentalReturnItem = new RentalReturnItem();
rentalReturnItem.setRentalReturn(rentalReturn);
rentalReturnItem.setRental(rental);
rentalReturnItem.setBook(rental.getBook());
rentalReturnItem.setReturnedQuantity(2);

List<RentalReturnItem> rentalReturnItems = new ArrayList<>();
Expand Down
4 changes: 2 additions & 2 deletions backend/src/test/java/edu/zut/bookrider/integration/service/NavigationServiceIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ void whenPossibleRouteFromInput_thenNavigationStepsShouldBeCorrect() {
double totalDuration = navigationResponseDTO.getTotalDuration();

assertEquals(0.2, totalDistance);
assertEquals(46.4, totalDuration);
assertEquals(46.3, totalDuration);

List<NavigationResponseDTO.RouteStep> steps = navigationResponseDTO.getSteps();

Expand All @@ -57,7 +57,7 @@ void whenPossibleRouteFromInput_thenNavigationStepsShouldBeCorrect() {

NavigationResponseDTO.RouteStep thirdStep = steps.get(2);

assertEquals(59.4, thirdStep.getStepDistance());
assertEquals(59.3, thirdStep.getStepDistance());
assertEquals(10.7, thirdStep.getStepDuration());
assertEquals("Turn left", thirdStep.getInstruction());

Expand Down
4 changes: 2 additions & 2 deletions backend/src/test/java/edu/zut/bookrider/unit/service/NavigationServiceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ void whenPossibleRouteFromInput_thenNavigationStepsShouldBeCorrect() {
double totalDuration = navigationResponseDTO.getTotalDuration();

assertEquals(0.2, totalDistance);
assertEquals(46.4, totalDuration);
assertEquals(46.3, totalDuration);

List<NavigationResponseDTO.RouteStep> steps = navigationResponseDTO.getSteps();

Expand All @@ -82,7 +82,7 @@ void whenPossibleRouteFromInput_thenNavigationStepsShouldBeCorrect() {

NavigationResponseDTO.RouteStep thirdStep = steps.get(2);

assertEquals(59.4, thirdStep.getStepDistance());
assertEquals(59.3, thirdStep.getStepDistance());
assertEquals(10.7, thirdStep.getStepDuration());
assertEquals("Turn left", thirdStep.getInstruction());

Expand Down