Merge remote-tracking branch 'origin/features/add-feign-client' into #33-create-buttons-for-sorting-organizations

playjim · playjim · commit 166fd543c035 · 2022-04-25T16:35:08.000+03:00
# Conflicts:
#	bot/src/main/java/com/booking/bot/adapter/BotAdapter.java
diff --git a/backend/src/main/java/com/booking/backend/controller/PersonController.java b/backend/src/main/java/com/booking/backend/controller/PersonController.java
@@ -20,5 +20,6 @@ public PersonDto getPersonById(@RequestParam Long id) {
     @PostMapping("/person")
     public void addNewBooking(@RequestBody PersonDto personDto) {
         personService.updatePerson(personDto);
+
     }
 }
diff --git a/backend/src/main/java/com/booking/backend/controller/ReservationController.java b/backend/src/main/java/com/booking/backend/controller/ReservationController.java
@@ -0,0 +1,20 @@
+package com.booking.backend.controller;
+
+import com.booking.backend.dto.ReservationDto;
+import com.booking.backend.service.ReservationService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequiredArgsConstructor
+public class ReservationController {
+
+    private final ReservationService reservationService;
+
+    @PostMapping("/reservation")
+    public void updateReservation(@RequestBody ReservationDto reservationDto) {
+        reservationService.updateWithNewBooking(reservationDto);
+    }
+}
diff --git a/backend/src/main/java/com/booking/backend/mapper/PersonMapper.java b/backend/src/main/java/com/booking/backend/mapper/PersonMapper.java
@@ -9,10 +9,8 @@ public interface PersonMapper {
 
     Person convertFromPersonDtoToPerson(PersonDto personDto);
 
-    PersonDto convertFromPersonToPersonDtoInController(Optional<Person> person);
-
     PersonDto convertFromPersonToPersonDto(Person person);
 
-    Person convertFromPersonDtoToPersonInController(Optional<PersonDto> personDto);
+    PersonDto convertFromPersonToPersonDtoInController(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
@@ -14,11 +14,6 @@ public Person convertFromPersonDtoToPerson(PersonDto personDto) {
         return new Person(personDto.id(), personDto.name());
     }
 
-    @Override
-    public Person convertFromPersonDtoToPersonInController(Optional<PersonDto> personDto) {
-        return personDto.map(value -> new Person(value.id(), value.name())).orElse(null);
-    }
-
     @Override
     public PersonDto convertFromPersonToPersonDtoInController(Optional<Person> person) {
         return person.map(value -> new PersonDto(value.getId(), value.getName())).orElse(null);
diff --git a/backend/src/main/java/com/booking/backend/mapper/ReservationMapper.java b/backend/src/main/java/com/booking/backend/mapper/ReservationMapper.java
@@ -0,0 +1,13 @@
+package com.booking.backend.mapper;
+
+import com.booking.backend.dto.PersonDto;
+import com.booking.backend.dto.ReservationDto;
+import com.booking.backend.entity.Person;
+import com.booking.backend.entity.Reservation;
+
+public interface ReservationMapper {
+
+    Reservation convertFromReservationDtoToReservation(ReservationDto reservationDto);
+
+    ReservationDto convertFromReservationToReservationDto(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
@@ -0,0 +1,30 @@
+package com.booking.backend.mapper;
+
+import com.booking.backend.dto.ReservationDto;
+import com.booking.backend.entity.Reservation;
+import org.springframework.stereotype.Component;
+
+@Component
+public class ReservationMapperImpl implements ReservationMapper {
+
+    private SomeObjectMapper someObjectMapper;
+    private BookingMapper bookingMapper;
+
+    public ReservationMapperImpl(SomeObjectMapper someObjectMapper, BookingMapper bookingMapper) {
+        this.someObjectMapper = someObjectMapper;
+        this.bookingMapper = bookingMapper;
+    }
+
+    @Override
+    public Reservation convertFromReservationDtoToReservation(ReservationDto reservationDto) {
+        return new Reservation(reservationDto.id(), reservationDto.beginning(), reservationDto.ending(),
+                reservationDto.date(),
+                someObjectMapper.convertFromSomeObjectDtoToSomeObject(reservationDto.someObjectDto()),
+                bookingMapper.convertFromBookingDtoToBooking(reservationDto.bookingDto()));
+    }
+
+    @Override
+    public ReservationDto convertFromReservationToReservationDto(Reservation reservation) {
+        return null;
+    }
+}
diff --git a/backend/src/main/java/com/booking/backend/mapper/SomeObjectMapper.java b/backend/src/main/java/com/booking/backend/mapper/SomeObjectMapper.java
@@ -0,0 +1,13 @@
+package com.booking.backend.mapper;
+
+import com.booking.backend.dto.PersonDto;
+import com.booking.backend.dto.SomeObjectDto;
+import com.booking.backend.entity.Person;
+import com.booking.backend.entity.SomeObject;
+
+public interface SomeObjectMapper {
+
+    SomeObject convertFromSomeObjectDtoToSomeObject(SomeObjectDto someObjectDto);
+
+    SomeObjectDto convertFromSomeObjectToSomeObjectDto(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
@@ -0,0 +1,27 @@
+package com.booking.backend.mapper;
+
+import com.booking.backend.dto.SomeObjectDto;
+import com.booking.backend.entity.SomeObject;
+import org.springframework.stereotype.Component;
+
+@Component
+public class SomeObjectMapperImpl implements SomeObjectMapper {
+
+    private OrganizationMapper organizationMapper;
+
+    public SomeObjectMapperImpl(OrganizationMapper organizationMapper) {
+        this.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/repository/ReservationRepository.java b/backend/src/main/java/com/booking/backend/repository/ReservationRepository.java
@@ -0,0 +1,7 @@
+package com.booking.backend.repository;
+
+import com.booking.backend.entity.Reservation;
+import org.springframework.data.jpa.repository.JpaRepository;
+
+public interface ReservationRepository extends JpaRepository<Reservation, Long> {
+}
diff --git a/backend/src/main/java/com/booking/backend/service/BookingService.java b/backend/src/main/java/com/booking/backend/service/BookingService.java
@@ -4,10 +4,10 @@
 import com.booking.backend.entity.Booking;
 
 import java.util.List;
+import java.util.Optional;
 
 public interface BookingService {
 
-//    List<Booking> findAllByBookedFalseAndOrganizationName(String nameOfOrganization);
 
     List<BookingDto> getAllBookings(Integer pageNo, Integer pageSize, String sortBy);
 
diff --git a/backend/src/main/java/com/booking/backend/service/BookingServiceImpl.java b/backend/src/main/java/com/booking/backend/service/BookingServiceImpl.java
@@ -17,6 +17,7 @@
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Optional;
 import java.util.stream.Collectors;
 
 @Service
@@ -67,6 +68,8 @@ public List<BookingDto> getAllBookings(Integer pageNo, Integer pageSize, String
         return null;
     }
 
+
+
     @Override
     public void addNewBooking(BookingDto bookingDto) {
         bookingRepository.save(bookingMapper.convertFromBookingDtoToBooking(bookingDto));
diff --git a/backend/src/main/java/com/booking/backend/service/ReservationService.java b/backend/src/main/java/com/booking/backend/service/ReservationService.java
@@ -0,0 +1,8 @@
+package com.booking.backend.service;
+
+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
@@ -0,0 +1,25 @@
+package com.booking.backend.service;
+
+import com.booking.backend.dto.ReservationDto;
+import com.booking.backend.mapper.ReservationMapper;
+import com.booking.backend.repository.ReservationRepository;
+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;
+
+    @Override
+    @Transactional
+    public void updateWithNewBooking(ReservationDto reservationDto) {
+        bookingService.addNewBooking(reservationDto.bookingDto());
+        reservationRepository.save(reservationMapper.convertFromReservationDtoToReservation(reservationDto));
+    }
+}
diff --git a/bot/pom.xml b/bot/pom.xml
@@ -41,7 +41,14 @@
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
         </dependency>
-    </dependencies>
+		<!-- https://mvnrepository.com/artifact/org.springframework.cloud/spring-cloud-starter-openfeign -->
+		<dependency>
+			<groupId>org.springframework.cloud</groupId>
+			<artifactId>spring-cloud-starter-openfeign</artifactId>
+			<version>3.1.1</version>
+		</dependency>
+
+	</dependencies>
 
 	<build>
 		<plugins>
diff --git a/bot/src/main/java/com/booking/bot/BotApplication.java b/bot/src/main/java/com/booking/bot/BotApplication.java
@@ -2,8 +2,10 @@
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.cloud.openfeign.EnableFeignClients;
 
 @SpringBootApplication
+@EnableFeignClients
 public class BotApplication {
 
     public static void main(String[] args) {
diff --git a/bot/src/main/java/com/booking/bot/adapter/BotAdapter.java b/bot/src/main/java/com/booking/bot/adapter/BotAdapter.java
@@ -1,7 +1,10 @@
 package com.booking.bot.adapter;
 
+import com.booking.bot.client.BookingClient;
+import com.booking.bot.client.PersonClient;
 import com.booking.bot.dto.OrganizationDto;
 import com.booking.bot.dto.PersonDto;
+import lombok.RequiredArgsConstructor;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.MediaType;
 import org.springframework.stereotype.Component;
@@ -14,28 +17,20 @@
 import java.util.stream.Collectors;
 
 @Component
-public class BotAdapter {
+@RequiredArgsConstructor
+public class BookingAdapter {
 
-    private final WebClient client;
-
-    public BotAdapter() {
-        this.client = WebClient.create("http://localhost:8080");
-    }
+    private final BookingClient bookingClient;
+    private final PersonClient personClient;
 
     public void addPerson(PersonDto personDto, String uri) {
-        client
-                .post()
-                .uri(uri)
-                .header(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON_VALUE)
-                .body(Mono.just(personDto), PersonDto.class)
-                .retrieve()
-                .bodyToMono(String.class)
-                .share()
-                .block();
+        personClient.addNewBooking(personDto);
+        // todo: обрабатывать ошибки
     }
 
 
     public List<OrganizationDto> getOrganization(String uri, String organizationName) {
+
         return Arrays.asList(Objects.requireNonNull(client.get().uri(uri, organizationName)
                 .retrieve().bodyToMono(OrganizationDto[].class).share().block()));
     }
@@ -49,21 +44,4 @@ public List<OrganizationDto> getOrganizations(String uri, String sortBy) {
         return Arrays.stream(Objects.requireNonNull(organizationDtoMono.share().block())).collect(Collectors.toList());
     }
 
-    public List<OrganizationDto> getOrganizations(String uri) {
-        Mono<OrganizationDto[]> organizationDtoMono
-                = client.get()
-                .uri(uri)
-                .retrieve()
-                .bodyToMono(OrganizationDto[].class);
-        return Arrays.stream(Objects.requireNonNull(organizationDtoMono.share().block())).collect(Collectors.toList());
-    }
-
-    public OrganizationDto getOrganizationById(String uri, String id) {
-        Mono<OrganizationDto> organizationDtoMono
-                = client.get()
-                .uri(uri, id)
-                .retrieve()
-                .bodyToMono(OrganizationDto.class);
-        return organizationDtoMono.share().block();
-    }
 }
diff --git a/bot/src/main/java/com/booking/bot/client/BookingClient.java b/bot/src/main/java/com/booking/bot/client/BookingClient.java
@@ -0,0 +1,21 @@
+package com.booking.bot.client;
+
+import com.booking.bot.dto.BookingDto;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+@FeignClient(url="localhost:8080")
+public interface BookingClient {
+    @GetMapping("/booking")
+    @RequestMapping(value = "/booking", params = {"pageNo","pageSize","sortBy"})
+    List<BookingDto> getAll(@RequestParam Integer pageNo,
+                                   @RequestParam Integer pageSize,
+                                   @RequestParam String sortBy);
+
+    @PostMapping("/bookings")
+    void addNewBooking(@RequestBody BookingDto bookingDto);
+
+}
+
diff --git a/bot/src/main/java/com/booking/bot/client/PersonClient.java b/bot/src/main/java/com/booking/bot/client/PersonClient.java
@@ -0,0 +1,17 @@
+package com.booking.bot.client;
+
+import com.booking.bot.dto.PersonDto;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.*;
+
+@FeignClient(url="localhost:8080")
+public interface PersonClient {
+
+    @GetMapping("/person")
+    @RequestMapping(value = "/person", params = "id")
+    PersonDto getPersonById(@RequestParam Long id);
+
+    @PostMapping("/person")
+     void addNewBooking(@RequestBody PersonDto personDto);
+}
+
diff --git a/bot/src/main/java/com/booking/bot/dto/ReservationDto.java b/bot/src/main/java/com/booking/bot/dto/ReservationDto.java
@@ -1,4 +1,10 @@
 package com.booking.bot.dto;
 
-public record ReservationDto(Long id, Integer beginning, Integer ending, Integer numbersOfTables) {
+public record ReservationDto(Long id,
+                             Integer beginning,
+                             Integer ending,
+                             String date,
+                             SomeObjectDto someObjectDto,
+                             BookingDto bookingDto
+                             ) {
 }
diff --git a/bot/src/main/java/com/booking/bot/dto/SomeObjectDto.java b/bot/src/main/java/com/booking/bot/dto/SomeObjectDto.java
@@ -0,0 +1,6 @@
+package com.booking.bot.dto;
+
+public record SomeObjectDto(Long id,
+                            String description,
+                            OrganizationDto organizationDto) {
+}
diff --git a/imgs/booking-create-booking.png b/imgs/booking-create-booking.png
diff --git a/imgs/booking-services.png b/imgs/booking-services.png
diff --git a/imgs/booking-use-case.png b/imgs/booking-use-case.png

Original file line number	Diff line number	Diff line change
`@@ -20,5 +20,6 @@ public PersonDto getPersonById(@RequestParam Long id) {`
`20`	`20`	`@PostMapping("/person")`
`21`	`21`	`public void addNewBooking(@RequestBody PersonDto personDto) {`
`22`	`22`	`personService.updatePerson(personDto);`
	`23`	`+`
`23`	`24`	`}`
`24`	`25`	`}`
Original file line number	Diff line number	Diff line change
`@@ -9,10 +9,8 @@ public interface PersonMapper {`
`9`	`9`
`10`	`10`	`Person convertFromPersonDtoToPerson(PersonDto personDto);`
`11`	`11`
`12`		`- PersonDto convertFromPersonToPersonDtoInController(Optional<Person> person);`
`13`		`-`
`14`	`12`	`PersonDto convertFromPersonToPersonDto(Person person);`
`15`	`13`
`16`		`- Person convertFromPersonDtoToPersonInController(Optional<PersonDto> personDto);`
	`14`	`+ PersonDto convertFromPersonToPersonDtoInController(Optional<Person> person);`
`17`	`15`
`18`	`16`	`}`