Skip to content

Commit 5e3d75f

Browse files
playjimplayjim
committed
пофиксил ошибку jackson
1 parent f54ea8e commit 5e3d75f

4 files changed

Lines changed: 23 additions & 34 deletions

File tree

‎bot/src/main/java/com/booking/bot/adapter/BotAdapter.java‎

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4,38 +4,32 @@
44
import com.booking.bot.client.PersonClient;
55
import com.booking.bot.dto.OrganizationDto;
66
import com.booking.bot.dto.PersonDto;
7-
//import lombok.RequiredArgsConstructor;
7+
import lombok.RequiredArgsConstructor;
88
import org.springframework.data.domain.Page;
99
import org.springframework.data.domain.Pageable;
1010
import org.springframework.stereotype.Component;
1111

1212
import java.util.List;
1313

1414
@Component
15-
//@RequiredArgsConstructor
15+
@RequiredArgsConstructor
1616
public class BotAdapter {
1717

1818
private final PersonClient personClient;
1919
private final OrganizationClient organizationClient;
2020

21-
public BotAdapter(PersonClient personClient, OrganizationClient organizationClient) {
22-
this.personClient = personClient;
23-
this.organizationClient = organizationClient;
24-
}
25-
2621
public void addPerson(PersonDto personDto) {
2722
personClient.addNewBooking(personDto);
2823
}
2924
public List<String> getAllTypesOrganizations() {
3025
return organizationClient.getAllTypesOrganizations();
3126
}
32-
//@TODO: Пофиксить ошибку
3327
public List<OrganizationDto> getAllOrganizations(){
3428
return organizationClient.getAllOrganizations(Pageable.unpaged()).getContent();
3529
}
36-
// public List<OrganizationDto> getAllOrganizationsByType(String type) {
37-
// return organizationClient.getAllOrganizationsByType(type,Pageable.unpaged()).getContent();
38-
// }
30+
public Page<OrganizationDto> getAllOrganizationsByType(String type) {
31+
return organizationClient.getAllOrganizationsByType(type,Pageable.unpaged());
32+
}
3933
public OrganizationDto getOrganizationById(String id) {
4034
return organizationClient.getById(Long.parseLong(id));
4135
}

‎bot/src/main/java/com/booking/bot/client/OrganizationClient.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@ public interface OrganizationClient {
1515
@GetMapping("/organization")
1616
Page<OrganizationDto> getAllOrganizations(Pageable pageable);
1717

18-
// @GetMapping("/organization/type/{type}")
19-
// Page<OrganizationDto> getAllOrganizationsByType(@PathVariable TypeOrganization type,
20-
// Pageable pageable);
18+
@GetMapping("/organization/type/{type}?size=5")
19+
Page<OrganizationDto> getAllOrganizationsByType(@PathVariable String type,
20+
Pageable pageable);
2121
@GetMapping("/organization/type")
2222
List<String> getAllTypesOrganizations();
2323

‎bot/src/main/java/com/booking/bot/service/MenuServiceImpl.java‎

Lines changed: 13 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,8 @@
44
import com.booking.bot.dto.OrganizationDto;
55
import com.booking.bot.state.Context;
66
import com.booking.bot.state.Stage;
7-
import com.fasterxml.jackson.core.JsonProcessingException;
8-
import com.fasterxml.jackson.databind.ObjectMapper;
97
import lombok.RequiredArgsConstructor;
8+
import org.springframework.data.domain.Page;
109
import org.springframework.stereotype.Service;
1110
import org.telegram.telegrambots.meta.api.objects.replykeyboard.InlineKeyboardMarkup;
1211
import org.telegram.telegrambots.meta.api.objects.replykeyboard.buttons.InlineKeyboardButton;
@@ -48,25 +47,20 @@ public InlineKeyboardMarkup getOrganizationTypeKeyboard(Context context) {
4847
}
4948

5049
public InlineKeyboardMarkup getChoiceOrganizationKeyboard(Context context) {
50+
//TODO: сделать кнопки страниц
5151
List<List<InlineKeyboardButton>> rowList = new ArrayList<>();
5252
System.out.println(context.getCallbackData());
53-
System.out.println(botAdapter.getAllOrganizations());
54-
// List<OrganizationDto> organizationsByType = botAdapter.getAllOrganizationsByType(context.getCallbackData());
55-
// System.out.println(organizationsByType.toString());
56-
// long countOrganizations = organizationsByType.stream()
57-
// .filter(o -> o.typeOrganization().equals(type))
58-
// .count();
59-
// List<InlineKeyboardButton> pagesButtonRow = new ArrayList<>();
60-
// long pages = countOrganizations >= 10 && countOrganizations % 10 == 0 ? countOrganizations / 10 : countOrganizations / 10 + 1;
61-
// for (int i = 1; i <= pages; i++) {
62-
// pagesButtonRow.add(InlineKeyboardButton.builder().text(String.valueOf(i)).callbackData(String.valueOf(i)).build());
63-
// }
64-
// organizationsByType.forEach(organizationDto -> rowList.add(
65-
// List.of(InlineKeyboardButton.builder()
66-
// .text(organizationDto.name())
67-
// .callbackData(organizationDto.id().toString())
68-
// .build())));
69-
// rowList.add(pagesButtonRow);
53+
Page<OrganizationDto> organizationsByTypePage = botAdapter.getAllOrganizationsByType(context.getCallbackData());
54+
List<InlineKeyboardButton> pagesButtonRow = new ArrayList<>();
55+
for (int i = 1; i <= organizationsByTypePage.getTotalPages(); i++) {
56+
pagesButtonRow.add(InlineKeyboardButton.builder().text(String.valueOf(i)).callbackData(String.valueOf(i)).build());
57+
}
58+
organizationsByTypePage.getContent().forEach(organizationDto -> rowList.add(
59+
List.of(InlineKeyboardButton.builder()
60+
.text(organizationDto.name())
61+
.callbackData(organizationDto.id().toString())
62+
.build())));
63+
rowList.add(pagesButtonRow);
7064
rowList.add(List.of(InlineKeyboardButton.builder()
7165
.text("<< Назад")
7266
.callbackData("TYPE")

‎bot/src/main/resources/application.properties‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
bot.username=${BOT_USERNAME}
22
bot.token=${BOT_TOKEN}
3-
server.port=${BOT_PORT}
3+
server.port=${BOT_PORT}
4+
feign.autoconfiguration.jackson.enabled=true

0 commit comments

Comments
 (0)