Skip to content

Commit 0cd957b

Browse files
annaalkhannaalkh
authored
Merge pull request #50 from Java-Java-Bootcamp/#36-create-tests
#36 create tests
2 parents ed83404 + ef02115 commit 0cd957b

22 files changed

Lines changed: 470 additions & 45 deletions

‎backend/pom.xml‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,22 @@
4646
<scope>test</scope>
4747
</dependency>
4848

49+
<!-- https://mvnrepository.com/artifact/org.mockito/mockito-all -->
50+
<dependency>
51+
<groupId>org.mockito</groupId>
52+
<artifactId>mockito-all</artifactId>
53+
<version>1.10.19</version>
54+
<scope>test</scope>
55+
</dependency>
56+
57+
<!-- https://mvnrepository.com/artifact/com.h2database/h2 -->
58+
<dependency>
59+
<groupId>com.h2database</groupId>
60+
<artifactId>h2</artifactId>
61+
<version>2.1.212</version>
62+
<scope>test</scope>
63+
</dependency>
64+
4965
<dependency>
5066
<groupId>org.projectlombok</groupId>
5167
<artifactId>lombok</artifactId>

‎backend/src/main/java/com/booking/backend/controller/BookingController.java‎

Lines changed: 0 additions & 28 deletions
This file was deleted.

‎backend/src/main/java/com/booking/backend/controller/OrganizationController.java‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,4 @@ public List<OrganizationDto> getAllOrganization() {
3636
return organizationService.getAll();
3737
}
3838

39-
@PostMapping("/organization")
40-
public void addNewBooking(@RequestBody OrganizationDto organizationDto) {
41-
organizationService.updateOrganization(organizationDto);
42-
}
4339
}

‎backend/src/main/java/com/booking/backend/entity/Organization.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ public class Organization {
2323
private Double averageCheck;
2424

2525
private Double rating;
26+
2627
@Enumerated(EnumType.STRING)
2728
private TypeOrganization typeOrganization;
2829
}

‎backend/src/main/java/com/booking/backend/mapper/BookingMapperImpl.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@ public BookingMapperImpl(PersonMapper personMapper) {
1515

1616
@Override
1717
public BookingDto convertFromBookingToBookingDto(Booking booking) {
18-
return new BookingDto(booking.getId(), personMapper.convertFromPersonToPersonDto(booking.getPerson()));
18+
return new BookingDto(booking.getId(), personMapper.convert(booking.getPerson()));
1919
}
2020

2121
@Override
2222
public Booking convertFromBookingDtoToBooking(BookingDto bookingDto) {
23-
return new Booking(bookingDto.id(), personMapper.convertFromPersonDtoToPerson(bookingDto.person()));
23+
return new Booking(bookingDto.id(), personMapper.convert(bookingDto.person()));
2424
}
2525
}

‎backend/src/main/java/com/booking/backend/mapper/PersonMapper.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77

88
public interface PersonMapper {
99

10-
Person convertFromPersonDtoToPerson(PersonDto personDto);
10+
Person convert(PersonDto personDto);
1111

12-
PersonDto convertFromPersonToPersonDto(Person person);
12+
PersonDto convert(Person person);
1313

1414
PersonDto convertFromPersonToPersonDtoInController(Optional<Person> person);
1515

‎backend/src/main/java/com/booking/backend/mapper/PersonMapperImpl.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
public class PersonMapperImpl implements PersonMapper {
1111

1212
@Override
13-
public Person convertFromPersonDtoToPerson(PersonDto personDto) {
13+
public Person convert(PersonDto personDto) {
1414
return new Person(personDto.id(), personDto.name());
1515
}
1616

@@ -19,7 +19,7 @@ public PersonDto convertFromPersonToPersonDtoInController(Optional<Person> perso
1919
return person.map(value -> new PersonDto(value.getId(), value.getName())).orElse(null);
2020
}
2121
@Override
22-
public PersonDto convertFromPersonToPersonDto(Person person) {
22+
public PersonDto convert(Person person) {
2323
return new PersonDto(person.getId(), person.getName());
2424
}
2525
}

‎backend/src/main/java/com/booking/backend/service/BookingService.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
import java.util.List;
66

77
public interface BookingService {
8-
List<BookingDto> getAllBookings(Integer pageNo, Integer pageSize, String sortBy);
98

109
void addNewBooking(BookingDto bookingDto);
1110
}

‎backend/src/main/java/com/booking/backend/service/BookingServiceImpl.java‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,6 @@ public class BookingServiceImpl implements BookingService {
1515
private final BookingRepository bookingRepository;
1616
private final BookingMapper bookingMapper;
1717

18-
@Override
19-
public List<BookingDto> getAllBookings(Integer pageNo, Integer pageSize, String sortBy) {
20-
return null;
21-
}
22-
2318
@Override
2419
public void addNewBooking(BookingDto bookingDto) {
2520
bookingRepository.save(bookingMapper.convertFromBookingDtoToBooking(bookingDto));

‎backend/src/main/java/com/booking/backend/service/PersonServiceImpl.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,6 @@ public PersonDto getPersonById(Long id) {
2020

2121
@Override
2222
public void updatePerson(PersonDto personDto) {
23-
personRepository.save(mapper.convertFromPersonDtoToPerson(personDto));
23+
personRepository.save(mapper.convert(personDto));
2424
}
2525
}

0 commit comments

Comments
 (0)