fix

slovpunk · slovpunk · commit be0bff61e2d7 · 2022-04-27T13:58:42.000+03:00
diff --git a/backend/pom.xml b/backend/pom.xml
@@ -84,8 +84,8 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
                 <configuration>
-                    <source>16</source>
-                    <target>16</target>
+                    <source>17</source>
+                    <target>17</target>
                 </configuration>
             </plugin>
 
@@ -94,8 +94,8 @@
                 <artifactId>maven-compiler-plugin</artifactId>
                 <version>3.5.1</version>
                 <configuration>
-                    <source>1.8</source>
-                    <target>1.8</target>
+                    <source>17</source>
+                    <target>17</target>
                     <annotationProcessorPaths>
                         <path>
                             <groupId>org.mapstruct</groupId>
diff --git a/backend/src/main/java/com/booking/backend/controller/ReservationController.java b/backend/src/main/java/com/booking/backend/controller/ReservationController.java
@@ -8,10 +8,13 @@
 import org.springframework.web.bind.annotation.RestController;
 
 @RestController
-@RequiredArgsConstructor
 public class ReservationController {
 
-    private final ReservationService reservationService;
+    private ReservationService reservationService;
+
+    public ReservationController(ReservationService reservationService) {
+        this.reservationService = reservationService;
+    }
 
     @PostMapping("/reservation")
     public void updateReservation(@RequestBody ReservationDto reservationDto) {
diff --git a/backend/src/main/java/com/booking/backend/mapper/BookingMapper.java b/backend/src/main/java/com/booking/backend/mapper/BookingMapper.java
@@ -2,10 +2,14 @@
 
 import com.booking.backend.dto.BookingDto;
 import com.booking.backend.entity.Booking;
+import org.mapstruct.Mapper;
+import org.springframework.stereotype.Component;
 
+@Mapper
+@Component
 public interface BookingMapper {
 
-    BookingDto convertFromBookingToBookingDto(Booking booking);
+    BookingDto convert (Booking booking);
 
-    Booking convertFromBookingDtoToBooking(BookingDto bookingDto);
+    Booking convert(BookingDto bookingDto);
 }
diff --git a/backend/src/main/java/com/booking/backend/mapper/BookingMapperImpl.java b/backend/src/main/java/com/booking/backend/mapper/BookingMapperImpl.java
@@ -1,25 +0,0 @@
-package com.booking.backend.mapper;
-
-import com.booking.backend.dto.BookingDto;
-import com.booking.backend.entity.Booking;
-import org.springframework.stereotype.Component;
-
-@Component
-public class BookingMapperImpl implements BookingMapper {
-
-    private PersonMapper personMapper;
-
-    public BookingMapperImpl(PersonMapper personMapper) {
-        this.personMapper = personMapper;
-    }
-
-    @Override
-    public BookingDto convertFromBookingToBookingDto(Booking booking) {
-        return new BookingDto(booking.getId(), personMapper.convert(booking.getPerson()));
-    }
-
-    @Override
-    public Booking convertFromBookingDtoToBooking(BookingDto bookingDto) {
-        return new Booking(bookingDto.id(), personMapper.convert(bookingDto.person()));
-    }
-}
diff --git a/backend/src/main/java/com/booking/backend/mapper/OrganizationMapper.java b/backend/src/main/java/com/booking/backend/mapper/OrganizationMapper.java
@@ -1,18 +1,15 @@
 package com.booking.backend.mapper;
 
-import com.booking.backend.dto.BookingDto;
 import com.booking.backend.dto.OrganizationDto;
-import com.booking.backend.dto.PersonDto;
-import com.booking.backend.entity.Booking;
 import com.booking.backend.entity.Organization;
-import com.booking.backend.entity.Person;
-
-import java.util.Optional;
+import org.mapstruct.Mapper;
+import org.springframework.stereotype.Component;
 
+@Mapper
+@Component
 public interface OrganizationMapper {
 
-    OrganizationDto convertFromOrganizationToOrganizationDto(Organization organization);
-
-    Organization convertFromOrganizationDtoToOrganization(OrganizationDto organizationDto);
+    OrganizationDto convert(Organization organization);
+    Organization convert(OrganizationDto organizationDto);
 
 }
diff --git a/backend/src/main/java/com/booking/backend/mapper/OrganizationMapperImpl.java b/backend/src/main/java/com/booking/backend/mapper/OrganizationMapperImpl.java
@@ -1,24 +0,0 @@
-package com.booking.backend.mapper;
-
-import com.booking.backend.dto.OrganizationDto;
-import com.booking.backend.entity.Organization;
-import com.booking.backend.entity.TypeOrganization;
-import org.springframework.stereotype.Component;
-
-@Component
-public class OrganizationMapperImpl implements OrganizationMapper {
-
-    @Override
-    public OrganizationDto convertFromOrganizationToOrganizationDto(Organization organization) {
-        return new OrganizationDto(organization.getId(), organization.getName(),
-                organization.getSchedule(), organization.getAverageCheck(),
-                organization.getRating(),organization.getTypeOrganization().toString());
-    }
-
-    @Override
-    public Organization convertFromOrganizationDtoToOrganization(OrganizationDto organizationDto) {
-        return new Organization(organizationDto.id(), organizationDto.name(),
-                organizationDto.schedule(), organizationDto.averageCheck(),
-                organizationDto.rating(), TypeOrganization.valueOf(organizationDto.typeOrganization()));
-    }
-}
diff --git a/backend/src/main/java/com/booking/backend/mapper/PersonMapper.java b/backend/src/main/java/com/booking/backend/mapper/PersonMapper.java
@@ -2,15 +2,19 @@
 
 import com.booking.backend.dto.PersonDto;
 import com.booking.backend.entity.Person;
+import org.mapstruct.Mapper;
+import org.springframework.stereotype.Component;
 
 import java.util.Optional;
 
+@Mapper
+@Component
 public interface PersonMapper {
 
     Person convert(PersonDto personDto);
 
     PersonDto convert(Person person);
 
-    PersonDto convertFromPersonToPersonDtoInController(Optional<Person> person);
+    PersonDto convert(Optional<Person> person);
 
     }
diff --git a/backend/src/main/java/com/booking/backend/mapper/PersonMapperImpl.java b/backend/src/main/java/com/booking/backend/mapper/PersonMapperImpl.java
@@ -1,25 +0,0 @@
-package com.booking.backend.mapper;
-
-import com.booking.backend.dto.PersonDto;
-import com.booking.backend.entity.Person;
-import org.springframework.stereotype.Component;
-
-import java.util.Optional;
-
-@Component
-public class PersonMapperImpl implements PersonMapper {
-
-    @Override
-    public Person convert(PersonDto personDto) {
-        return new Person(personDto.id(), personDto.name());
-    }
-
-    @Override
-    public PersonDto convertFromPersonToPersonDtoInController(Optional<Person> person) {
-        return person.map(value -> new PersonDto(value.getId(), value.getName())).orElse(null);
-    }
-    @Override
-    public PersonDto convert(Person person) {
-        return new PersonDto(person.getId(), person.getName());
-    }
-}
diff --git a/backend/src/main/java/com/booking/backend/mapper/ReservationMapper.java b/backend/src/main/java/com/booking/backend/mapper/ReservationMapper.java
@@ -4,10 +4,14 @@
 import com.booking.backend.dto.ReservationDto;
 import com.booking.backend.entity.Person;
 import com.booking.backend.entity.Reservation;
+import org.mapstruct.Mapper;
+import org.springframework.stereotype.Component;
 
+@Mapper
+@Component
 public interface ReservationMapper {
 
-    Reservation convertFromReservationDtoToReservation(ReservationDto reservationDto);
+    Reservation convert (ReservationDto reservationDto);
 
-    ReservationDto convertFromReservationToReservationDto(Reservation reservation);
+    ReservationDto convert (Reservation reservation);
 }
diff --git a/backend/src/main/java/com/booking/backend/mapper/ReservationMapperImpl.java b/backend/src/main/java/com/booking/backend/mapper/ReservationMapperImpl.java
diff --git a/backend/src/main/java/com/booking/backend/mapper/SomeObjectMapper.java b/backend/src/main/java/com/booking/backend/mapper/SomeObjectMapper.java
@@ -4,10 +4,12 @@
 import com.booking.backend.dto.SomeObjectDto;
 import com.booking.backend.entity.Person;
 import com.booking.backend.entity.SomeObject;
+import org.mapstruct.Mapper;
 
+@Mapper
 public interface SomeObjectMapper {
 
-    SomeObject convertFromSomeObjectDtoToSomeObject(SomeObjectDto someObjectDto);
+    SomeObject convert(SomeObjectDto someObjectDto);
 
-    SomeObjectDto convertFromSomeObjectToSomeObjectDto(SomeObject someObject);
+    SomeObjectDto convert(SomeObject someObject);
 }
diff --git a/backend/src/main/java/com/booking/backend/mapper/SomeObjectMapperImpl.java b/backend/src/main/java/com/booking/backend/mapper/SomeObjectMapperImpl.java
@@ -1,26 +0,0 @@
-package com.booking.backend.mapper;
-
-import com.booking.backend.dto.SomeObjectDto;
-import com.booking.backend.entity.SomeObject;
-import lombok.Getter;
-import lombok.RequiredArgsConstructor;
-import org.springframework.stereotype.Component;
-@Getter
-@RequiredArgsConstructor
-@Component
-public class SomeObjectMapperImpl implements SomeObjectMapper {
-
-    private final OrganizationMapper organizationMapper;
-
-    @Override
-    public SomeObject convertFromSomeObjectDtoToSomeObject(SomeObjectDto someObjectDto) {
-        return new SomeObject(someObjectDto.id(), someObjectDto.description(),
-                organizationMapper.convertFromOrganizationDtoToOrganization(someObjectDto.organizationDto()));
-    }
-
-    @Override
-    public SomeObjectDto convertFromSomeObjectToSomeObjectDto(SomeObject someObject) {
-        return new SomeObjectDto(someObject.getId(), someObject.getDescription(),
-                organizationMapper.convertFromOrganizationToOrganizationDto(someObject.getOrganization()));
-    }
-}
diff --git a/backend/src/main/java/com/booking/backend/service/BookingServiceImpl.java b/backend/src/main/java/com/booking/backend/service/BookingServiceImpl.java
@@ -3,7 +3,8 @@
 import com.booking.backend.dto.BookingDto;
 import com.booking.backend.mapper.BookingMapper;
 import com.booking.backend.repository.BookingRepository;
-import lombok.RequiredArgsConstructor;
+import lombok.AllArgsConstructor;
+import lombok.NoArgsConstructor;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
@@ -17,6 +18,6 @@ public class BookingServiceImpl implements BookingService {
 
     @Override
     public void addNewBooking(BookingDto bookingDto) {
-        bookingRepository.save(bookingMapper.convertFromBookingDtoToBooking(bookingDto));
+        bookingRepository.save(bookingMapper.convert(bookingDto));
     }
 }
diff --git a/backend/src/main/java/com/booking/backend/service/OrganizationServiceImpl.java b/backend/src/main/java/com/booking/backend/service/OrganizationServiceImpl.java
@@ -22,6 +22,8 @@ public class OrganizationServiceImpl implements OrganizationService {
     private final OrganizationRepository organizationRepository;
     private final OrganizationMapper organizationMapper;
 
+
+
     @Override
     public List<OrganizationDto> getSortedOrganization(Integer pageNo, Integer pageSize, String sortBy) {
 
@@ -42,7 +44,7 @@ private List<OrganizationDto> changeOrganizationToOrganizationDtoWithPaging(Inte
         Page<Organization> pagedResult = organizationRepository.findAll(paging);
         if (pagedResult.hasContent()) {
             return pagedResult.getContent().stream()
-                    .map(organizationMapper::convertFromOrganizationToOrganizationDto)
+                    .map(organizationMapper::convert)
                     .collect(Collectors.toList());
         } else {
             return new ArrayList<>();
@@ -52,20 +54,20 @@ private List<OrganizationDto> changeOrganizationToOrganizationDtoWithPaging(Inte
     @Override
     public List<OrganizationDto> findAllByName(String name) {
         return organizationRepository.getAllByName(name).stream()
-                .map(organizationMapper::convertFromOrganizationToOrganizationDto)
+                .map(organizationMapper::convert)
                 .collect(Collectors.toList());
     }
 
     @Override
     public List<OrganizationDto> getAll() {
         return organizationRepository.findAll().stream()
-                .map(organizationMapper::convertFromOrganizationToOrganizationDto)
+                .map(organizationMapper::convert)
                 .collect(Collectors.toList());
     }
 
     @Override
     public void updateOrganization(OrganizationDto organizationDto) {
-        organizationRepository.save(organizationMapper.convertFromOrganizationDtoToOrganization(organizationDto));
+        organizationRepository.save(organizationMapper.convert(organizationDto));
     }
 
     @Override
diff --git a/backend/src/main/java/com/booking/backend/service/PersonServiceImpl.java b/backend/src/main/java/com/booking/backend/service/PersonServiceImpl.java
@@ -14,7 +14,7 @@ public class PersonServiceImpl implements PersonService {
 
     @Override
     public PersonDto getPersonById(Long id) {
-        return mapper.convertFromPersonToPersonDtoInController(personRepository.findById(id));
+        return mapper.convert(personRepository.findById(id));
     }
 
 
diff --git a/backend/src/main/java/com/booking/backend/service/ReservationService.java b/backend/src/main/java/com/booking/backend/service/ReservationService.java
@@ -3,6 +3,5 @@
 import com.booking.backend.dto.ReservationDto;
 
 public interface ReservationService {
-
     void updateWithNewBooking(ReservationDto reservationDto);
 }
diff --git a/backend/src/main/java/com/booking/backend/service/ReservationServiceImpl.java b/backend/src/main/java/com/booking/backend/service/ReservationServiceImpl.java
@@ -3,23 +3,30 @@
 import com.booking.backend.dto.ReservationDto;
 import com.booking.backend.mapper.ReservationMapper;
 import com.booking.backend.repository.ReservationRepository;
+import lombok.NoArgsConstructor;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 
 @Service
-@RequiredArgsConstructor
 public class ReservationServiceImpl implements ReservationService {
 
-    private final ReservationRepository reservationRepository;
-    private final ReservationMapper reservationMapper;
-    private final BookingService bookingService;
+    private ReservationRepository reservationRepository;
+    private ReservationMapper reservationMapper;
+    private BookingService bookingService;
+
+    public ReservationServiceImpl(ReservationRepository reservationRepository,
+                                  ReservationMapper reservationMapper, BookingService bookingService) {
+        this.reservationRepository = reservationRepository;
+        this.reservationMapper = reservationMapper;
+        this.bookingService = bookingService;
+    }
 
     @Override
     @Transactional
     public void updateWithNewBooking(ReservationDto reservationDto) {
         bookingService.addNewBooking(reservationDto.bookingDto());
-        reservationRepository.save(reservationMapper.convertFromReservationDtoToReservation(reservationDto));
+        reservationRepository.save(reservationMapper.convert(reservationDto));
     }
 }
