Skip to content

Commit ed83404

Browse files
a-poliakova-poliakov
authored
Merge pull request #46 from Java-Java-Bootcamp/#33-create-buttons-for-sorting-organizations
#33 create buttons for sorting organizations
2 parents 3ebfcbd + 882ac50 commit ed83404

38 files changed

Lines changed: 470 additions & 305 deletions

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

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,24 +2,21 @@
22

33
import com.booking.backend.dto.BookingDto;
44
import com.booking.backend.service.BookingService;
5+
import lombok.RequiredArgsConstructor;
56
import org.springframework.web.bind.annotation.*;
67

78
import java.util.List;
89

10+
@RequiredArgsConstructor
911
@RestController
1012
public class BookingController {
1113

1214
private final BookingService bookingService;
1315

14-
public BookingController(BookingService bookingService) {
15-
this.bookingService = bookingService;
16-
}
17-
18-
@GetMapping("/booking")
19-
@RequestMapping(value = "/booking", params = {"pageNo","pageSize","sortBy"})
20-
public List<BookingDto> getAll(@RequestParam Integer pageNo,
21-
@RequestParam Integer pageSize,
22-
@RequestParam String sortBy) {
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) {
2320
return bookingService.getAllBookings(pageNo, pageSize, sortBy);
2421
}
2522

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

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -3,35 +3,35 @@
33

44
import com.booking.backend.dto.OrganizationDto;
55
import com.booking.backend.service.OrganizationService;
6+
import lombok.RequiredArgsConstructor;
67
import org.springframework.web.bind.annotation.*;
78

89
import java.util.List;
910

11+
@RequiredArgsConstructor
1012
@RestController
1113
public class OrganizationController {
1214

1315
private final OrganizationService organizationService;
1416

15-
public OrganizationController(OrganizationService organizationService) {
16-
this.organizationService = organizationService;
17-
}
18-
19-
@GetMapping("/organization")
20-
@RequestMapping(value = "/organization", params = {"pageNo","pageSize","sortBy"})
21-
public List<OrganizationDto> getAll(@RequestParam Integer pageNo,
22-
@RequestParam Integer pageSize,
23-
@RequestParam String sortBy) {
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) {
2421
return organizationService.getSortedOrganization(pageNo, pageSize, sortBy);
2522
}
2623

27-
@GetMapping("/organization")
28-
@RequestMapping(value = "/organization", params = "name")
29-
public List<OrganizationDto> getAll(@RequestParam String name) {
24+
@GetMapping("/organization/name={name}")
25+
public List<OrganizationDto> getAll(@PathVariable String name) {
3026
return organizationService.findAllByName(name);
3127
}
3228

29+
@GetMapping("/organization/id={id}")
30+
public OrganizationDto getById(@PathVariable Long id) {
31+
return organizationService.getById(id);
32+
}
33+
3334
@GetMapping("/organization")
34-
@RequestMapping(value = "/organization")
3535
public List<OrganizationDto> getAllOrganization() {
3636
return organizationService.getAll();
3737
}

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

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,17 @@
11
package com.booking.backend.controller;
2-
import com.booking.backend.dto.OrganizationDto;
2+
33
import com.booking.backend.service.PersonService;
4+
import lombok.RequiredArgsConstructor;
45
import org.springframework.web.bind.annotation.*;
56
import com.booking.backend.dto.PersonDto;
7+
8+
@RequiredArgsConstructor
69
@RestController
710
public class PersonController {
8-
private PersonService personService;
9-
10-
public PersonController(PersonService personService){
11-
this.personService = personService;
12-
}
11+
private final PersonService personService;
1312

14-
@GetMapping("/person")
15-
@RequestMapping(value = "/person", params = "id")
16-
public PersonDto getPersonById(@RequestParam Long id) {
13+
@GetMapping("/person/id={id}")
14+
public PersonDto getPersonById(@PathVariable Long id) {
1715
return personService.getPersonById(id);
1816
}
1917

‎backend/src/main/java/com/booking/backend/dto/OrganizationDto.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@ public record OrganizationDto(Long id,
44
String name,
55
String schedule,
66
Double averageCheck,
7-
Double rating) {
8-
7+
Double rating,
8+
String typeOrganization) {
99
}

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

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,19 @@
11
package com.booking.backend.entity;
22

3-
import lombok.AllArgsConstructor;
4-
import lombok.Builder;
5-
import lombok.Data;
6-
import lombok.NoArgsConstructor;
3+
import lombok.*;
74

85
import javax.persistence.*;
96

10-
@Data
11-
@NoArgsConstructor
12-
@AllArgsConstructor
7+
@Getter
8+
@Setter
139
@Entity
14-
@Builder
10+
@AllArgsConstructor
11+
@NoArgsConstructor
1512
public class Booking {
16-
1713
@Id
1814
@GeneratedValue(strategy = GenerationType.IDENTITY)
1915
private Long id;
2016

2117
@ManyToOne
2218
private Person person;
23-
24-
2519
}

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

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,15 @@
11
package com.booking.backend.entity;
22

33

4-
import lombok.AllArgsConstructor;
5-
import lombok.Builder;
6-
import lombok.Data;
7-
import lombok.NoArgsConstructor;
4+
import lombok.*;
85

96
import javax.persistence.*;
10-
import java.util.ArrayList;
11-
import java.util.List;
127

13-
@Data
14-
@NoArgsConstructor
15-
@AllArgsConstructor
8+
@Getter
9+
@Setter
1610
@Entity
17-
@Builder
11+
@AllArgsConstructor
12+
@NoArgsConstructor
1813
public class Organization {
1914

2015
@Id
@@ -28,5 +23,6 @@ public class Organization {
2823
private Double averageCheck;
2924

3025
private Double rating;
31-
26+
@Enumerated(EnumType.STRING)
27+
private TypeOrganization typeOrganization;
3228
}

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

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,16 @@
11
package com.booking.backend.entity;
22

33

4-
import lombok.AllArgsConstructor;
5-
import lombok.Builder;
6-
import lombok.Data;
7-
import lombok.NoArgsConstructor;
4+
import lombok.*;
85

96
import javax.persistence.Entity;
10-
import javax.persistence.GeneratedValue;
11-
import javax.persistence.GenerationType;
127
import javax.persistence.Id;
138

14-
@Data
15-
@NoArgsConstructor
16-
@AllArgsConstructor
9+
@Getter
10+
@Setter
1711
@Entity
18-
@Builder
12+
@AllArgsConstructor
13+
@NoArgsConstructor
1914
public class Person {
2015

2116
@Id

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

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,16 @@
11
package com.booking.backend.entity;
22

3-
import lombok.AllArgsConstructor;
4-
import lombok.Builder;
5-
import lombok.Data;
6-
import lombok.NoArgsConstructor;
3+
import lombok.*;
74

85
import javax.persistence.*;
96

7+
@Getter
8+
@Setter
109
@Entity
11-
@Data
12-
@NoArgsConstructor
1310
@AllArgsConstructor
14-
@Builder
11+
@NoArgsConstructor
1512
public class Reservation {
1613

17-
1814
@Id
1915
@GeneratedValue(strategy = GenerationType.IDENTITY)
2016
private Long id;

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

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,16 @@
11
package com.booking.backend.entity;
22

3-
import lombok.AllArgsConstructor;
4-
import lombok.Builder;
5-
import lombok.Data;
6-
import lombok.NoArgsConstructor;
3+
import lombok.*;
74

85
import javax.persistence.Entity;
96
import javax.persistence.Id;
107
import javax.persistence.ManyToOne;
118

9+
@Getter
10+
@Setter
1211
@Entity
13-
@Data
1412
@AllArgsConstructor
1513
@NoArgsConstructor
16-
@Builder
1714
public class SomeObject {
1815

1916
@Id

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

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
package com.booking.backend.entity;
2+
3+
public enum TypeOrganization {
4+
PUB,
5+
BAR,
6+
RESTAURANT,
7+
HOSTEL
8+
}

0 commit comments

Comments
 (0)