Skip to content

Commit b03d11e

Browse files
playjimplayjim
committed
resolve conflicts
2 parents ef2f25f + 0bbd6c1 commit b03d11e

19 files changed

Lines changed: 67 additions & 186 deletions

‎backend/pom.xml‎

Lines changed: 30 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,38 @@
3939
<scope>test</scope>
4040
</dependency>
4141

42+
<!-- https://mvnrepository.com/artifact/org.mockito/mockito-all -->
43+
<dependency>
44+
<groupId>org.mockito</groupId>
45+
<artifactId>mockito-all</artifactId>
46+
<version>1.10.19</version>
47+
<scope>test</scope>
48+
</dependency>
49+
50+
<!-- https://mvnrepository.com/artifact/com.h2database/h2 -->
51+
<dependency>
52+
<groupId>com.h2database</groupId>
53+
<artifactId>h2</artifactId>
54+
<version>2.1.212</version>
55+
<scope>test</scope>
56+
</dependency>
57+
4258
<dependency>
4359
<groupId>org.projectlombok</groupId>
4460
<artifactId>lombok</artifactId>
4561
</dependency>
62+
63+
<dependency>
64+
<groupId>org.mapstruct</groupId>
65+
<artifactId>mapstruct</artifactId>
66+
<version>1.4.2.Final</version>
67+
</dependency>
68+
69+
<dependency>
70+
<groupId>org.mapstruct</groupId>
71+
<artifactId>mapstruct-processor</artifactId>
72+
<version>1.4.2.Final</version>
73+
</dependency>
4674
</dependencies>
4775

4876
<build>
@@ -55,8 +83,8 @@
5583
<groupId>org.apache.maven.plugins</groupId>
5684
<artifactId>maven-compiler-plugin</artifactId>
5785
<configuration>
58-
<source>16</source>
59-
<target>16</target>
86+
<source>17</source>
87+
<target>17</target>
6088
</configuration>
6189
</plugin>
6290
</plugins>

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

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

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111

1212
import java.util.List;
1313

14-
@RequiredArgsConstructor
1514
@RestController
15+
@RequiredArgsConstructor
1616
public class OrganizationController {
1717

1818
private final OrganizationService organizationService;

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

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

2828
private Double rating;
29+
2930
@Enumerated(EnumType.STRING)
3031
private TypeOrganization typeOrganization;
3132
}

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,12 @@
22

33
import com.booking.backend.dto.BookingDto;
44
import com.booking.backend.entity.Booking;
5+
import org.mapstruct.Mapper;
56

7+
@Mapper(componentModel = "spring")
68
public interface BookingMapper {
79

8-
BookingDto convertFromBookingToBookingDto(Booking booking);
10+
BookingDto convert (Booking booking);
911

10-
Booking convertFromBookingDtoToBooking(BookingDto bookingDto);
12+
Booking convert(BookingDto bookingDto);
1113
}

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

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

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

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,10 @@
22

33
import com.booking.backend.dto.OrganizationDto;
44
import com.booking.backend.entity.Organization;
5+
import org.mapstruct.Mapper;
56

7+
@Mapper(componentModel = "spring")
68
public interface OrganizationMapper {
7-
8-
OrganizationDto convertFromOrganizationToOrganizationDto(Organization organization);
9-
10-
Organization convertFromOrganizationDtoToOrganization(OrganizationDto organizationDto);
11-
9+
OrganizationDto convert(Organization organization);
10+
Organization convert(OrganizationDto organizationDto);
1211
}

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

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

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

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,16 @@
22

33
import com.booking.backend.dto.PersonDto;
44
import com.booking.backend.entity.Person;
5-
5+
import org.mapstruct.Mapper;
66
import java.util.Optional;
77

8+
@Mapper(componentModel = "spring")
89
public interface PersonMapper {
910

10-
Person convertFromPersonDtoToPerson(PersonDto personDto);
11+
Person convert(PersonDto personDto);
1112

12-
PersonDto convertFromPersonToPersonDto(Person person);
13+
PersonDto convert(Person person);
1314

14-
PersonDto convertFromPersonToPersonDtoInController(Optional<Person> person);
15+
PersonDto convert(Optional<Person> person);
1516

1617
}

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

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

0 commit comments

Comments
 (0)