Skip to content

Commit a51bdb0

Browse files
playjimplayjim
committed
Fix controllers. Add new controllers and add buttons.
1 parent ed83404 commit a51bdb0

18 files changed

Lines changed: 143 additions & 149 deletions

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

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,6 @@ public class BookingController {
1313

1414
private final BookingService bookingService;
1515

16-
@GetMapping("/booking/pageNo={pageNo},pageSize={pageSize},sortBy={sortBy}")
17-
public List<BookingDto> getAll(@PathVariable Integer pageNo,
18-
@PathVariable Integer pageSize,
19-
@PathVariable String sortBy) {
20-
return bookingService.getAllBookings(pageNo, pageSize, sortBy);
21-
}
22-
2316
@PostMapping("/bookings")
2417
public void addNewBooking(@RequestBody BookingDto bookingDto) {
2518
bookingService.addNewBooking(bookingDto);

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

Lines changed: 22 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33

44
import com.booking.backend.dto.OrganizationDto;
5+
import com.booking.backend.entity.TypeOrganization;
56
import com.booking.backend.service.OrganizationService;
67
import lombok.RequiredArgsConstructor;
78
import org.springframework.web.bind.annotation.*;
@@ -14,23 +15,36 @@ public class OrganizationController {
1415

1516
private final OrganizationService organizationService;
1617

17-
@GetMapping("/organization/pageNo={pageNo},pageSize={pageSize},sortBy={sortBy}")
18-
public List<OrganizationDto> getAll(@PathVariable Integer pageNo,
19-
@PathVariable Integer pageSize,
20-
@PathVariable String sortBy) {
18+
@RequestMapping(value = "/organization", params = {"pageNo", "pageSize", "sortBy"}, method = RequestMethod.GET)
19+
List<OrganizationDto> getSort(@RequestParam Integer pageNo,
20+
@RequestParam Integer pageSize,
21+
@RequestParam String sortBy) {
2122
return organizationService.getSortedOrganization(pageNo, pageSize, sortBy);
2223
}
2324

24-
@GetMapping("/organization/name={name}")
25-
public List<OrganizationDto> getAll(@PathVariable String name) {
25+
@RequestMapping(value = "/organization", params = {"pageNo", "pageSize", "sortBy", "type"}, method = RequestMethod.GET)
26+
List<OrganizationDto> getSortByType(@RequestParam Integer pageNo,
27+
@RequestParam Integer pageSize,
28+
@RequestParam String sortBy,
29+
@RequestParam TypeOrganization type) {
30+
return organizationService.getSortedOrganizationByType(pageNo, pageSize, sortBy, type);
31+
}
32+
33+
@RequestMapping(value = "/organization", params = {"name"}, method = RequestMethod.GET)
34+
public List<OrganizationDto> getAll(@RequestParam String name) {
2635
return organizationService.findAllByName(name);
2736
}
2837

29-
@GetMapping("/organization/id={id}")
30-
public OrganizationDto getById(@PathVariable Long id) {
38+
@RequestMapping(value = "/organization", params = {"id"}, method = RequestMethod.GET)
39+
public OrganizationDto getById(@RequestParam Long id) {
3140
return organizationService.getById(id);
3241
}
3342

43+
@RequestMapping(value = "/organization", params = {"type"}, method = RequestMethod.GET)
44+
public List<OrganizationDto> getByType(@RequestParam TypeOrganization type) {
45+
return organizationService.getByType(type);
46+
}
47+
3448
@GetMapping("/organization")
3549
public List<OrganizationDto> getAllOrganization() {
3650
return organizationService.getAll();

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@
1010
public class PersonController {
1111
private final PersonService personService;
1212

13-
@GetMapping("/person/id={id}")
14-
public PersonDto getPersonById(@PathVariable Long id) {
13+
@RequestMapping(value = "/person", params = {"id"}, method = RequestMethod.GET)
14+
public PersonDto getPersonById(@RequestParam Long id) {
1515
return personService.getPersonById(id);
1616
}
1717

‎backend/src/main/java/com/booking/backend/repository/OrganizationRepository.java‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,14 @@
11
package com.booking.backend.repository;
22

33
import com.booking.backend.entity.Organization;
4+
import com.booking.backend.entity.TypeOrganization;
5+
import org.springframework.data.domain.Page;
6+
import org.springframework.data.domain.Pageable;
47
import org.springframework.data.jpa.repository.JpaRepository;
58
import java.util.List;
69

710
public interface OrganizationRepository extends JpaRepository<Organization, Long> {
8-
List<Organization> getAllByName(String name);
11+
List<Organization> findAllByName(String name);
12+
List<Organization> findAllByTypeOrganization(TypeOrganization type);
13+
Page<Organization> findAllByTypeOrganization(Pageable page, TypeOrganization typeOrganization);
914
}

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

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

77
public interface BookingService {
8-
List<BookingDto> getAllBookings(Integer pageNo, Integer pageSize, String sortBy);
9-
108
void addNewBooking(BookingDto bookingDto);
119
}

‎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/OrganizationService.java‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
11
package com.booking.backend.service;
22

33
import com.booking.backend.dto.OrganizationDto;
4+
import com.booking.backend.entity.TypeOrganization;
45

56
import java.util.List;
67

78
public interface OrganizationService {
9+
List<OrganizationDto> getSortedOrganizationByType(Integer pageNo, Integer pageSize, String sortBy, TypeOrganization typeOrganization);
810

911
List<OrganizationDto> getSortedOrganization(Integer pageNo, Integer pageSize, String sortBy);
1012

@@ -15,4 +17,6 @@ public interface OrganizationService {
1517
OrganizationDto getById(Long id);
1618

1719
void updateOrganization(OrganizationDto organizationDto);
20+
21+
List<OrganizationDto> getByType(TypeOrganization type);
1822
}

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

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import com.booking.backend.dto.OrganizationDto;
44
import com.booking.backend.entity.Organization;
5+
import com.booking.backend.entity.TypeOrganization;
56
import com.booking.backend.mapper.OrganizationMapper;
67
import com.booking.backend.repository.OrganizationRepository;
78
import lombok.RequiredArgsConstructor;
@@ -49,9 +50,21 @@ private List<OrganizationDto> changeOrganizationToOrganizationDtoWithPaging(Inte
4950
}
5051
}
5152

53+
public List<OrganizationDto> getSortedOrganizationByType(Integer pageNo, Integer pageSize, String sortBy, TypeOrganization type) {
54+
Pageable paging = PageRequest.of(pageNo, pageSize, Sort.by(sortBy));
55+
Page<Organization> pagedResult = organizationRepository.findAllByTypeOrganization(paging, type);
56+
if (pagedResult.hasContent()) {
57+
return pagedResult.getContent().stream()
58+
.map(organizationMapper::convertFromOrganizationToOrganizationDto)
59+
.collect(Collectors.toList());
60+
} else {
61+
return new ArrayList<>();
62+
}
63+
}
64+
5265
@Override
5366
public List<OrganizationDto> findAllByName(String name) {
54-
return organizationRepository.getAllByName(name).stream()
67+
return organizationRepository.findAllByName(name).stream()
5568
.map(organizationMapper::convertFromOrganizationToOrganizationDto)
5669
.collect(Collectors.toList());
5770
}
@@ -68,6 +81,12 @@ public void updateOrganization(OrganizationDto organizationDto) {
6881
organizationRepository.save(organizationMapper.convertFromOrganizationDtoToOrganization(organizationDto));
6982
}
7083

84+
@Override
85+
public List<OrganizationDto> getByType(TypeOrganization type) {
86+
return organizationRepository.findAllByTypeOrganization(type).stream().map(organizationMapper::convertFromOrganizationToOrganizationDto)
87+
.collect(Collectors.toList());
88+
}
89+
7190
@Override
7291
public OrganizationDto getById(Long id) {
7392
return organizationMapper.convertFromOrganizationToOrganizationDto(organizationRepository.getById(id));

‎backend/src/main/resources/data.sql‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,15 @@ VALUES (1, 3000.5, 'Россичъ', 9.9, '10:00-22:00', 'RESTAURANT'),
1313
(12, 1564.21, 'Sun', 7.4, '12:00-23:00', 'RESTAURANT'),
1414
(13, 3320.10, 'Star', 9.7, '12:00-23:00', 'RESTAURANT'),
1515
(14, 2000.52, 'Beer', 9.3, '12:00-23:00', 'BAR'),
16-
(15, 1564.22, 'Vodka', 10.1, '12:00-23:00', 'BAR');
16+
(15, 1564.22, 'Vodka', 10.1, '12:00-23:00', 'BAR'),
17+
(16, 3320.10, 'Star1', 9.7, '12:00-23:00', 'RESTAURANT'),
18+
(17, 3322.10, 'Star2', 9.7, '12:00-23:00', 'RESTAURANT'),
19+
(18, 3323.10, 'Star3', 9.7, '12:00-23:00', 'RESTAURANT'),
20+
(19, 3324.10, 'Star4', 9.7, '12:00-23:00', 'RESTAURANT'),
21+
(20, 3325.10, 'Star5', 9.7, '12:00-23:00', 'RESTAURANT'),
22+
(21, 3326.10, 'Star6', 9.7, '12:00-23:00', 'RESTAURANT'),
23+
(22, 3327.10, 'Star7', 9.7, '12:00-23:00', 'RESTAURANT'),
24+
(23, 3328.10, 'Star8', 9.7, '12:00-23:00', 'RESTAURANT');
1725

1826
INSERT INTO "some_object" (id, description, organization_id)
1927
VALUES (1, 'Столик у окна на 8 мест', 1),

‎bot/src/main/java/com/booking/bot/TelegramBot.java‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
11
package com.booking.bot;
22

3-
import com.booking.bot.service.BookingService;
43
import com.booking.bot.service.ChatService;
54
import com.fasterxml.jackson.core.JsonProcessingException;
65
import lombok.RequiredArgsConstructor;
7-
import org.springframework.beans.factory.annotation.Autowired;
86
import org.springframework.beans.factory.annotation.Value;
97
import org.springframework.stereotype.Component;
108
import org.telegram.telegrambots.bots.TelegramLongPollingBot;

0 commit comments

Comments
 (0)