Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 5 additions & 21 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,6 @@
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-data-jpa</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-actuator</artifactId>
Expand Down Expand Up @@ -67,11 +63,11 @@
<artifactId>spring-boot-starter-validation</artifactId>
</dependency>

<dependency>
<groupId>org.mapstruct</groupId>
<artifactId>mapstruct</artifactId>
<version>${org.mapstruct.version}</version>
</dependency>
<dependency>
<groupId>org.mapstruct</groupId>
<artifactId>mapstruct</artifactId>
<version>${org.mapstruct.version}</version>
</dependency>

<dependency>
<groupId>org.projectlombok</groupId>
Expand Down Expand Up @@ -163,18 +159,6 @@
<version>${lombok-mapstruct-binding.version}</version>
</path>
</annotationProcessorPaths>
<showWarnings>true</showWarnings>
<compilerArgs>
<arg>
-Amapstruct.suppressGeneratorTimestamp=true
</arg>
<arg>
-Amapstruct.suppressGeneratorVersionInfoComment=true
</arg>
<arg>
-Amapstruct.verbose=true
</arg>
</compilerArgs>
</configuration>
</plugin>
<plugin>
Expand Down
66 changes: 0 additions & 66 deletions src/main/java/ru/practicum/shareit/PersistenceConfig.java

This file was deleted.

16 changes: 16 additions & 0 deletions src/main/java/ru/practicum/shareit/booking/Booking.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
package ru.practicum.shareit.booking;

import java.time.LocalDate;

/**
* TODO Sprint add-bookings.
*/
public class Booking {

private Long bookingId;
private LocalDate start;
private LocalDate end;
private Long itemId;
private Long bookerId;
BookingStatus status;
}
47 changes: 5 additions & 42 deletions src/main/java/ru/practicum/shareit/booking/BookingController.java
Original file line number Diff line number Diff line change
@@ -1,49 +1,12 @@
package ru.practicum.shareit.booking;

import jakarta.validation.Valid;
import lombok.RequiredArgsConstructor;
import org.springframework.web.bind.annotation.*;
import ru.practicum.shareit.booking.dto.BookingRequestDto;
import ru.practicum.shareit.booking.dto.BookingResponseDto;
import ru.practicum.shareit.booking.intrfaces.BookingServiceInterface;

import java.util.Collection;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;

/**
* TODO Sprint add-bookings.
*/
@RestController
@RequestMapping(path = "/bookings")
@RequiredArgsConstructor
public class BookingController {
private final BookingServiceInterface bookingService;
public static final String USER_ID = "X-Sharer-User-Id";

@PostMapping
public BookingResponseDto addBooking(@RequestBody @Valid BookingRequestDto booking,
@RequestHeader(USER_ID) Long bookerId) {
return bookingService.addBooking(booking, bookerId);
}

@PatchMapping("/{bookingId}")
public BookingResponseDto bookingApprove(@PathVariable Long bookingId,
@RequestHeader (USER_ID) Long ownerId,
@RequestParam Boolean approved) {
return bookingService.bookingApprove(bookingId, ownerId, approved);
}

@GetMapping("/{bookingId}")
public BookingResponseDto getBooking(@PathVariable Long bookingId,
@RequestHeader(USER_ID) Long userId) {
return bookingService.getBookingByBookingId(bookingId, userId);
}

@GetMapping
public Collection<BookingResponseDto> getBookingsByUser(@RequestHeader (USER_ID) Long userId,
@RequestParam(name = "state", defaultValue = "all") String state) {
return bookingService.getBookingsByUser(userId, state);
}

@GetMapping("/owner")
public Collection<BookingResponseDto> getBookingsByOwner(@RequestHeader (USER_ID) Long userId,
@RequestParam(name = "state", defaultValue = "all") String state) {
return bookingService.getBookingsByOwner(userId, state);
}
}
198 changes: 0 additions & 198 deletions src/main/java/ru/practicum/shareit/booking/BookingServiceImpl.java

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package ru.practicum.shareit.booking.model;
package ru.practicum.shareit.booking;

public enum BookingStatus {
WAITING,
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
package ru.practicum.shareit.booking.dto;

/**
* TODO Sprint add-bookings.
*/
public class BookingDto {
}
Loading
Loading