Skip to content

Commit 7d21e12

Browse files
playjimplayjim
authored
Merge pull request #53 from Java-Java-Bootcamp/feature/#8
Feature/#8
2 parents 0bbd6c1 + 51c91b1 commit 7d21e12

49 files changed

Lines changed: 416 additions & 430 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎backend/pom.xml‎

Lines changed: 7 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
2+
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
33
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
44
<modelVersion>4.0.0</modelVersion>
55
<parent>
@@ -25,26 +25,19 @@
2525
<groupId>org.springframework.boot</groupId>
2626
<artifactId>spring-boot-starter-web</artifactId>
2727
</dependency>
28+
2829
<!-- https://mvnrepository.com/artifact/org.postgresql/postgresql -->
2930
<dependency>
3031
<groupId>org.postgresql</groupId>
3132
<artifactId>postgresql</artifactId>
3233
<scope>runtime</scope>
3334
</dependency>
3435

35-
36-
<!-- https://mvnrepository.com/artifact/org.postgresql/postgresql -->
37-
<dependency>
38-
<groupId>org.postgresql</groupId>
39-
<artifactId>postgresql</artifactId>
40-
<scope>runtime</scope>
41-
</dependency>
42-
43-
<dependency>
44-
<groupId>org.springframework.boot</groupId>
45-
<artifactId>spring-boot-starter-test</artifactId>
46-
<scope>test</scope>
47-
</dependency>
36+
<dependency>
37+
<groupId>org.springframework.boot</groupId>
38+
<artifactId>spring-boot-starter-test</artifactId>
39+
<scope>test</scope>
40+
</dependency>
4841

4942
<!-- https://mvnrepository.com/artifact/org.mockito/mockito-all -->
5043
<dependency>

‎backend/src/main/java/com/booking/backend/BackendApplication.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
@SpringBootApplication
77
public class BackendApplication {
88

9-
public static void main(String[] args) {
10-
SpringApplication.run(BackendApplication.class, args);
11-
}
9+
public static void main(String[] args) {
10+
SpringApplication.run(BackendApplication.class, args);
11+
}
1212

1313
}

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

Lines changed: 19 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,11 @@
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;
8+
import org.springframework.data.domain.Page;
9+
import org.springframework.data.domain.Pageable;
710
import org.springframework.web.bind.annotation.*;
811

912
import java.util.List;
@@ -14,26 +17,29 @@ public class OrganizationController {
1417

1518
private final OrganizationService organizationService;
1619

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) {
21-
return organizationService.getSortedOrganization(pageNo, pageSize, sortBy);
20+
@GetMapping("/organization")
21+
Page<OrganizationDto> getAllOrganizations(Pageable pageable) {
22+
return organizationService.getAllOrganizations(pageable);
23+
}
24+
25+
@GetMapping("/organization/type/{type}")
26+
Page<OrganizationDto> getAllOrganizationsByType(@PathVariable TypeOrganization type,
27+
Pageable pageable) {
28+
return organizationService.getOrganizationsByType(pageable, type);
2229
}
2330

24-
@GetMapping("/organization/name={name}")
25-
public List<OrganizationDto> getAll(@PathVariable String name) {
26-
return organizationService.findAllByName(name);
31+
@GetMapping("/organization/type")
32+
List<TypeOrganization> getAllTypesOrganizations() {
33+
return organizationService.getAllTypesOrganizations();
2734
}
2835

29-
@GetMapping("/organization/id={id}")
36+
@GetMapping("/organization/{id}")
3037
public OrganizationDto getById(@PathVariable Long id) {
3138
return organizationService.getById(id);
3239
}
3340

34-
@GetMapping("/organization")
35-
public List<OrganizationDto> getAllOrganization() {
36-
return organizationService.getAll();
41+
@PostMapping("/organization")
42+
public void addNewBooking(@RequestBody OrganizationDto organizationDto) {
43+
organizationService.updateOrganization(organizationDto);
3744
}
38-
3945
}

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

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

3+
import com.booking.backend.dto.PersonDto;
34
import com.booking.backend.service.PersonService;
45
import lombok.RequiredArgsConstructor;
56
import org.springframework.web.bind.annotation.*;
6-
import com.booking.backend.dto.PersonDto;
77

88
@RequiredArgsConstructor
99
@RestController
1010
public class PersonController {
1111
private final PersonService personService;
1212

13-
@GetMapping("/person/id={id}")
14-
public PersonDto getPersonById(@PathVariable Long id) {
13+
@GetMapping("/person/{id}")
14+
public PersonDto getById(@PathVariable Long id) {
1515
return personService.getPersonById(id);
1616
}
1717

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

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

3-
import lombok.*;
3+
import lombok.AllArgsConstructor;
4+
import lombok.Getter;
5+
import lombok.NoArgsConstructor;
6+
import lombok.Setter;
47

58
import javax.persistence.*;
69

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

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

33

4-
import lombok.*;
4+
import lombok.AllArgsConstructor;
5+
import lombok.Getter;
6+
import lombok.NoArgsConstructor;
7+
import lombok.Setter;
58

69
import javax.persistence.*;
710

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

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

33

4-
import lombok.*;
4+
import lombok.AllArgsConstructor;
5+
import lombok.Getter;
6+
import lombok.NoArgsConstructor;
7+
import lombok.Setter;
58

69
import javax.persistence.Entity;
710
import javax.persistence.Id;

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

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

3-
import lombok.*;
3+
import lombok.AllArgsConstructor;
4+
import lombok.Getter;
5+
import lombok.NoArgsConstructor;
6+
import lombok.Setter;
47

58
import javax.persistence.*;
69

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

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

3-
import lombok.*;
3+
import lombok.AllArgsConstructor;
4+
import lombok.Getter;
5+
import lombok.NoArgsConstructor;
6+
import lombok.Setter;
47

58
import javax.persistence.Entity;
69
import javax.persistence.Id;

‎backend/src/main/java/com/booking/backend/mapper/BookingMapper.java‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@
33
import com.booking.backend.dto.BookingDto;
44
import com.booking.backend.entity.Booking;
55
import org.mapstruct.Mapper;
6-
import org.mapstruct.factory.Mappers;
7-
import org.springframework.stereotype.Component;
86

97
@Mapper(componentModel = "spring")
108
public interface BookingMapper {

0 commit comments

Comments
 (0)