Skip to content

Commit f79b2f6

Browse files
PiCiU1221PiCiU1221
authored
Merge pull request #261 from PiCiU1221/refactor/260-redundant-book-id-column
Remove redundant book_id column
2 parents 60a009e + 561d7c8 commit f79b2f6

10 files changed

Lines changed: 12 additions & 31 deletions

File tree

‎backend/sql/database_schema.sql‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -268,7 +268,6 @@ CREATE TABLE rental_return_items
268268
id SERIAL PRIMARY KEY,
269269
rental_return_id INT NOT NULL REFERENCES rental_returns(id) ON DELETE CASCADE,
270270
rental_id INT NOT NULL REFERENCES rentals(id) ON DELETE CASCADE,
271-
book_id INT NOT NULL REFERENCES books(id),
272271
returned_quantity INT NOT NULL CHECK (returned_quantity > 0)
273272
);
274273

‎backend/sql/sample_data.sql‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -332,9 +332,9 @@ INSERT INTO rental_returns (return_order_id, returned_at, status)
332332
VALUES
333333
(1,NULL, 'IN_PROGRESS');
334334

335-
INSERT INTO rental_return_items (rental_return_id, rental_id, book_id, returned_quantity)
335+
INSERT INTO rental_return_items (rental_return_id, rental_id, returned_quantity)
336336
VALUES
337-
(1, 1, 2, 2);
337+
(1, 1, 2);
338338

339339
-- Driver accept the return order
340340
UPDATE orders

‎backend/src/main/java/edu/zut/bookrider/mapper/rentalReturn/RentalReturnMapper.java‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
import edu.zut.bookrider.dto.RentalReturnItemDTO;
55
import edu.zut.bookrider.mapper.Mapper;
66
import edu.zut.bookrider.mapper.book.BookReadMapper;
7+
import edu.zut.bookrider.model.Rental;
78
import edu.zut.bookrider.model.RentalReturn;
89
import edu.zut.bookrider.model.RentalReturnItem;
910
import lombok.RequiredArgsConstructor;
@@ -34,10 +35,12 @@ public RentalReturnDTO map(RentalReturn rentalReturn) {
3435
}
3536

3637
private RentalReturnItemDTO mapItem(RentalReturnItem item) {
38+
Rental rental = item.getRental();
39+
3740
return new RentalReturnItemDTO(
3841
item.getId(),
39-
item.getRental().getId(),
40-
item.getBook() != null ? bookReadMapper.map(item.getBook()) : null,
42+
rental.getId(),
43+
bookReadMapper.map(rental.getBook()),
4144
item.getReturnedQuantity()
4245
);
4346
}

‎backend/src/main/java/edu/zut/bookrider/model/RentalReturnItem.java‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,6 @@ public class RentalReturnItem extends BaseEntity<Integer> {
2222
@JoinColumn(name = "rental_id", nullable = false)
2323
private Rental rental;
2424

25-
@ManyToOne(fetch = FetchType.LAZY)
26-
@JoinColumn(name = "book_id")
27-
private Book book;
28-
2925
@Column(nullable = false)
3026
private int returnedQuantity;
3127
}

‎backend/src/main/java/edu/zut/bookrider/service/RentalReturnItemService.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,6 @@ public List<RentalReturnItem> createRentalReturnItems(RentalReturn rentalReturn,
4949
RentalReturnItem returnItem = new RentalReturnItem();
5050
returnItem.setRentalReturn(rentalReturn);
5151
returnItem.setRental(rental);
52-
returnItem.setBook(rental.getBook());
5352
returnItem.setReturnedQuantity(toReturn);
5453

5554
returnItems.add(returnItem);

‎backend/src/test/java/edu/zut/bookrider/integration/controller/OrderControllerIT.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1216,7 +1216,6 @@ void whenDriverDeliversReturnOrder_thenReturnOkAndCreateRentalReturn() throws Ex
12161216
RentalReturnItem rentalReturnItem = new RentalReturnItem();
12171217
rentalReturnItem.setRentalReturn(rentalReturn);
12181218
rentalReturnItem.setRental(rental);
1219-
rentalReturnItem.setBook(rental.getBook());
12201219
rentalReturnItem.setReturnedQuantity(2);
12211220

12221221
List<RentalReturnItem> rentalReturnItems = new ArrayList<>();

‎backend/src/test/java/edu/zut/bookrider/integration/controller/RentalControllerIT.java‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,6 @@ public class RentalControllerIT {
6464
private User user;
6565
private User driver;
6666
private Library library1;
67-
private Library library2;
6867
private Address address;
6968

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

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

166164
@Test
@@ -232,14 +230,13 @@ void whenUserRequestsRentalsWithPartialReturns_thenReturnRentalsPageWithCorrectQ
232230
RentalReturnItem rentalReturnItem = new RentalReturnItem();
233231
rentalReturnItem.setRentalReturn(rentalReturn);
234232
rentalReturnItem.setRental(rental1);
235-
rentalReturnItem.setBook(rental1.getBook());
236233
rentalReturnItem.setReturnedQuantity(2);
237234

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

242-
rentalReturn = rentalReturnRepository.save(rentalReturn);
239+
rentalReturnRepository.save(rentalReturn);
243240

244241
mockMvc.perform(MockMvcRequestBuilders.get("/api/rentals")
245242
.contentType(MediaType.APPLICATION_JSON))

‎backend/src/test/java/edu/zut/bookrider/integration/controller/RentalReturnControllerIT.java‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -444,7 +444,6 @@ void whenLibrarianRequestsLatestDriversReturn_thenReturnOkAndLatestReturn() thro
444444
RentalReturnItem rentalReturnItem = new RentalReturnItem();
445445
rentalReturnItem.setRentalReturn(rentalReturn);
446446
rentalReturnItem.setRental(rental);
447-
rentalReturnItem.setBook(rental.getBook());
448447
rentalReturnItem.setReturnedQuantity(2);
449448

450449
List<RentalReturnItem> rentalReturnItems = new ArrayList<>();
@@ -497,7 +496,6 @@ void whenLibrarianRequestsDeliveryReturnCompletion_thenReturnNoContent() throws
497496
RentalReturnItem rentalReturnItem = new RentalReturnItem();
498497
rentalReturnItem.setRentalReturn(rentalReturn);
499498
rentalReturnItem.setRental(rental);
500-
rentalReturnItem.setBook(rental.getBook());
501499
rentalReturnItem.setReturnedQuantity(2);
502500

503501
List<RentalReturnItem> rentalReturnItems = new ArrayList<>();
@@ -546,7 +544,6 @@ void whenLibrarianRequestsInPersonReturnCompletion_thenReturnNoContent() throws
546544
RentalReturnItem rentalReturnItem = new RentalReturnItem();
547545
rentalReturnItem.setRentalReturn(rentalReturn);
548546
rentalReturnItem.setRental(rental);
549-
rentalReturnItem.setBook(rental.getBook());
550547
rentalReturnItem.setReturnedQuantity(2);
551548

552549
List<RentalReturnItem> rentalReturnItems = new ArrayList<>();
@@ -593,7 +590,6 @@ void whenLibrarianRequestsInPersonReturnCompletionForDeliveryReturn_thenReturnNo
593590
RentalReturnItem rentalReturnItem = new RentalReturnItem();
594591
rentalReturnItem.setRentalReturn(rentalReturn);
595592
rentalReturnItem.setRental(rental);
596-
rentalReturnItem.setBook(rental.getBook());
597593
rentalReturnItem.setReturnedQuantity(2);
598594

599595
List<RentalReturnItem> rentalReturnItems = new ArrayList<>();
@@ -636,7 +632,6 @@ void whenLibrarianRequestsInPersonReturnDTOById_thenReturnOkAndRentalReturnDTO()
636632
RentalReturnItem rentalReturnItem = new RentalReturnItem();
637633
rentalReturnItem.setRentalReturn(rentalReturn);
638634
rentalReturnItem.setRental(rental);
639-
rentalReturnItem.setBook(rental.getBook());
640635
rentalReturnItem.setReturnedQuantity(2);
641636

642637
List<RentalReturnItem> rentalReturnItems = new ArrayList<>();
@@ -858,7 +853,6 @@ void whenUserHandsOverReturnOrder_thenChangeOrderStatusToInTransit() throws Exce
858853
RentalReturnItem rentalReturnItem = new RentalReturnItem();
859854
rentalReturnItem.setRentalReturn(rentalReturn);
860855
rentalReturnItem.setRental(rental);
861-
rentalReturnItem.setBook(rental.getBook());
862856
rentalReturnItem.setReturnedQuantity(2);
863857

864858
List<RentalReturnItem> rentalReturnItems = new ArrayList<>();
@@ -906,7 +900,6 @@ void whenUserHandsOverReturnOrderToWrongDriver_thenReturnBadRequest() throws Exc
906900
RentalReturnItem rentalReturnItem = new RentalReturnItem();
907901
rentalReturnItem.setRentalReturn(rentalReturn);
908902
rentalReturnItem.setRental(rental);
909-
rentalReturnItem.setBook(rental.getBook());
910903
rentalReturnItem.setReturnedQuantity(2);
911904

912905
List<RentalReturnItem> rentalReturnItems = new ArrayList<>();
@@ -951,7 +944,6 @@ void whenUserRequestsRentalReturnOrders_thenReturnRentalReturnDTOPage() throws E
951944
RentalReturnItem rentalReturnItem = new RentalReturnItem();
952945
rentalReturnItem.setRentalReturn(rentalReturn);
953946
rentalReturnItem.setRental(rental);
954-
rentalReturnItem.setBook(rental.getBook());
955947
rentalReturnItem.setReturnedQuantity(2);
956948

957949
List<RentalReturnItem> rentalReturnItems = new ArrayList<>();
@@ -996,7 +988,6 @@ void whenUserRequestsReturnOrderForAlreadyReturnedReturn_thenReturnConflict() th
996988
RentalReturnItem rentalReturnItem = new RentalReturnItem();
997989
rentalReturnItem.setRentalReturn(rentalReturn);
998990
rentalReturnItem.setRental(rental);
999-
rentalReturnItem.setBook(rental.getBook());
1000991
rentalReturnItem.setReturnedQuantity(2);
1001992

1002993
List<RentalReturnItem> rentalReturnItems = new ArrayList<>();
@@ -1045,7 +1036,6 @@ void whenUserRequestsReturnOrderPartiallyReturnedReturn_thenReturnOk() throws Ex
10451036
RentalReturnItem rentalReturnItem = new RentalReturnItem();
10461037
rentalReturnItem.setRentalReturn(rentalReturn);
10471038
rentalReturnItem.setRental(rental);
1048-
rentalReturnItem.setBook(rental.getBook());
10491039
rentalReturnItem.setReturnedQuantity(1);
10501040

10511041
List<RentalReturnItem> rentalReturnItems = new ArrayList<>();
@@ -1094,7 +1084,6 @@ void whenLibrarianRequestsDeliveryReturnCompletionFromWrongLibrary_thenReturnCon
10941084
RentalReturnItem rentalReturnItem = new RentalReturnItem();
10951085
rentalReturnItem.setRentalReturn(rentalReturn);
10961086
rentalReturnItem.setRental(rental);
1097-
rentalReturnItem.setBook(rental.getBook());
10981087
rentalReturnItem.setReturnedQuantity(2);
10991088

11001089
List<RentalReturnItem> rentalReturnItems = new ArrayList<>();
@@ -1140,7 +1129,6 @@ void whenLibrarianRequestsInPersonReturnCompletionFromWrongLibrary_thenReturnCon
11401129
RentalReturnItem rentalReturnItem = new RentalReturnItem();
11411130
rentalReturnItem.setRentalReturn(rentalReturn);
11421131
rentalReturnItem.setRental(rental);
1143-
rentalReturnItem.setBook(rental.getBook());
11441132
rentalReturnItem.setReturnedQuantity(2);
11451133

11461134
List<RentalReturnItem> rentalReturnItems = new ArrayList<>();

‎backend/src/test/java/edu/zut/bookrider/integration/service/NavigationServiceIT.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ void whenPossibleRouteFromInput_thenNavigationStepsShouldBeCorrect() {
3939
double totalDuration = navigationResponseDTO.getTotalDuration();
4040

4141
assertEquals(0.2, totalDistance);
42-
assertEquals(46.4, totalDuration);
42+
assertEquals(46.3, totalDuration);
4343

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

@@ -57,7 +57,7 @@ void whenPossibleRouteFromInput_thenNavigationStepsShouldBeCorrect() {
5757

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

60-
assertEquals(59.4, thirdStep.getStepDistance());
60+
assertEquals(59.3, thirdStep.getStepDistance());
6161
assertEquals(10.7, thirdStep.getStepDuration());
6262
assertEquals("Turn left", thirdStep.getInstruction());
6363

‎backend/src/test/java/edu/zut/bookrider/unit/service/NavigationServiceTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ void whenPossibleRouteFromInput_thenNavigationStepsShouldBeCorrect() {
6464
double totalDuration = navigationResponseDTO.getTotalDuration();
6565

6666
assertEquals(0.2, totalDistance);
67-
assertEquals(46.4, totalDuration);
67+
assertEquals(46.3, totalDuration);
6868

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

@@ -82,7 +82,7 @@ void whenPossibleRouteFromInput_thenNavigationStepsShouldBeCorrect() {
8282

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

85-
assertEquals(59.4, thirdStep.getStepDistance());
85+
assertEquals(59.3, thirdStep.getStepDistance());
8686
assertEquals(10.7, thirdStep.getStepDuration());
8787
assertEquals("Turn left", thirdStep.getInstruction());
8888

0 commit comments

Comments
 (0)