Merge all to master

README.md

@@ -0,0 +1,33 @@
+# TicketBookingApp
+Seat reservation system for a multiplex.
+
+### Technologies used
+* Java
+* Spring Boot
+* H2 Database
+
+### Assumptions
+* There cannot be a single place left over in a row between two already reserved places. The seat that is on the edge can always be reserved.
+* Seats can be booked at latest 15 minutes before the screening begins. 
+* Reservation expiration time is set to 10 minutes before the screening begins.
+
+### Build  
+Application is written in Java JDK version 11. The application uses Gradle wrapper to build and then run app using *java -jar*.
+
+To build and run app type command:
+*bash build_and_run_script.sh PORT_NUMBER*
+where *PORT_NUMBER* is number of port of localhost on which app runs. When *PORT_NUMBER* is not defined, application starts on port 8080.
+
+If is problem to run script, check if file *gradlew* has a execution permision.
+
+### Run use case
+There are two scripts which run use case.
+
+First is *run_use_cases.sh* which uses **jq** for pretty JSON formatting.
+
+Second is *run_use_cases_without_jq.sh* which print JSON in normal way (as String).
+
+To run use case type command:  
+*bash SCRIPT_NAME PORT_NUMBER*  
+where *PORT_NUMBER* is number of port of localhost on which app runs. When *PORT_NUMBER* is not defined, application make calls on port 8080.
+

build.gradle

@@ -6,7 +6,7 @@ plugins {
 apply plugin: 'io.spring.dependency-management'
 
 group = 'com.mkopec'
-version = '0.0.1-SNAPSHOT'
+version = '0.0.1'
 sourceCompatibility = '11'
 
 configurations {
@@ -19,11 +19,20 @@ repositories {
     mavenCentral()
 }
 
+bootJar {
+    launchScript()
+}
+
 dependencies {
     implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
     implementation 'org.springframework.boot:spring-boot-starter-web'
     compileOnly 'org.projectlombok:lombok'
     runtimeOnly 'com.h2database:h2'
     annotationProcessor 'org.projectlombok:lombok'
     testImplementation 'org.springframework.boot:spring-boot-starter-test'
+
+    compile group: 'org.mapstruct', name: 'mapstruct-jdk8', version: '1.2.0.Final'
+    compileOnly 'org.mapstruct:mapstruct-processor:1.2.0.Final'
+    annotationProcessor 'org.mapstruct:mapstruct-processor:1.2.0.Final'
+
 }

build_and_run_script.sh

@@ -0,0 +1,7 @@
+#!/usr/bin/env sh
+
+passed_port=$1
+default_port=8080
+port=${passed_port:-$default_port}
+
+./gradlew build && java -jar build/libs/ticket-booking-app-0.0.1.jar --server.port=$((port))

run_use_cases.sh

@@ -0,0 +1,77 @@
+#!/usr/bin/env bash
+generate_post_data()
+{
+cat <<EOF
+{
+   "screeningID": "$screening_id",
+   "firstName": "$first_name",
+   "lastName": "$last_name",
+   "tickets": [
+      {
+         "seatID": "$seat_1",
+         "ticketTypeID": "$type_2"
+      },
+      {
+         "seatID": "$seat_2",
+         "ticketTypeID": "$type_3"
+      },
+      {
+         "seatID": "$seat_3",
+         "ticketTypeID": "$type_1"
+      },
+      {
+         "seatID": "$seat_4",
+         "ticketTypeID": "$type_1"
+      }
+   ]
+}
+EOF
+}
+
+
+passed_port=$1
+default_port=8080
+port=${passed_port:-$default_port}
+
+host="localhost:$port"
+
+selected_date=`date --date="next day" +%Y-%m-%d`
+time_start="14:00:00"
+time_end="22:00:00"
+
+list_movies_endpoint="$host/screening?date=$selected_date&timeStart=$time_start&timeEnd=$time_end"
+
+echo "Selected date: $selected_date"
+echo "Time interval start: $time_start"
+echo "Time interval end: $time_end"
+echo "The endpoint: $list_movies_endpoint"
+
+curl -v ${list_movies_endpoint} | jq .
+
+screening_id=2
+echo "Selected screening: $screening_id"
+
+curl -v "$host/screening/$screening_id" | jq .
+
+
+first_name="Ola"
+last_name="Kalinowska-Jaworska"
+type_1=1
+type_2=2
+type_3=3
+
+seat_1=1
+seat_2=2
+seat_3=11
+seat_4=12
+
+
+
+reservation_endpoint="$host/reservation"
+echo "Post reservation request body"
+echo $(generate_post_data) | jq .
+
+curl -v \
+    -H 'Content-Type: application/json' \
+    -d "$(generate_post_data)" \
+    ${reservation_endpoint} | jq .

run_use_cases_without_jq.sh

@@ -0,0 +1,78 @@
+#!/usr/bin/env bash
+generate_post_data()
+{
+cat <<EOF
+{
+   "screeningID": "$screening_id",
+   "firstName": "$first_name",
+   "lastName": "$last_name",
+   "tickets": [
+      {
+         "seatID": "$seat_1",
+         "ticketTypeID": "$type_2"
+      },
+      {
+         "seatID": "$seat_2",
+         "ticketTypeID": "$type_3"
+      },
+      {
+         "seatID": "$seat_3",
+         "ticketTypeID": "$type_1"
+      },
+      {
+         "seatID": "$seat_4",
+         "ticketTypeID": "$type_1"
+      }
+   ]
+}
+EOF
+}
+
+
+passed_port=$1
+default_port=8080
+port=${passed_port:-$default_port}
+
+host="localhost:$port"
+
+selected_date=`date --date="next day" +%Y-%m-%d`
+time_start="14:00:00"
+time_end="22:00:00"
+
+list_movies_endpoint="$host/screening?date=$selected_date&timeStart=$time_start&timeEnd=$time_end"
+
+echo "Selected date: $selected_date"
+echo "Time interval start: $time_start"
+echo "Time interval end: $time_end"
+echo "The endpoint: $list_movies_endpoint"
+
+curl -v ${list_movies_endpoint} 
+
+screening_id=2
+echo "Selected screening: $screening_id"
+
+curl -v "$host/screening/$screening_id" 
+
+
+first_name="Ola"
+last_name="Kalinowska-Jaworska"
+type_1=1
+type_2=2
+type_3=3
+
+seat_1=1
+seat_2=2
+seat_3=11
+seat_4=12
+
+
+
+reservation_endpoint="$host/reservation"
+echo "Post reservation request body"
+echo $(generate_post_data) 
+
+curl -v \
+    -H 'Content-Type: application/json' \
+    -d "$(generate_post_data)" \
+    ${reservation_endpoint} 
+

src/main/java/com/mkopec/ticketbookingapp/controller/ReservationController.java

@@ -0,0 +1,27 @@
+package com.mkopec.ticketbookingapp.controller;
+
+import com.mkopec.ticketbookingapp.domain.Reservation;
+import com.mkopec.ticketbookingapp.dtos.ReservationPostDTO;
+import com.mkopec.ticketbookingapp.dtos.ShortReservationDTO;
+import com.mkopec.ticketbookingapp.mapper.ReservationMapper;
+import com.mkopec.ticketbookingapp.service.ReservationService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("/reservation")
+public class ReservationController {
+    private final ReservationService service;
+    private final ReservationMapper mapper;
+
+    @PostMapping
+    public ShortReservationDTO postReservation(@RequestBody ReservationPostDTO postDTO) {
+        Reservation reservation = mapper.toReservation(postDTO);
+        return mapper.toShortReservationDTO(service.saveReservation(reservation));
+    }
+
+}

src/main/java/com/mkopec/ticketbookingapp/controller/ScreeningController.java

@@ -0,0 +1,40 @@
+package com.mkopec.ticketbookingapp.controller;
+
+import com.mkopec.ticketbookingapp.dtos.ScreeningDTO;
+import com.mkopec.ticketbookingapp.dtos.ShortScreeningDTO;
+import com.mkopec.ticketbookingapp.mapper.RoomSeatMapper;
+import com.mkopec.ticketbookingapp.mapper.ScreeningMapper;
+import com.mkopec.ticketbookingapp.service.ScreeningService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.format.annotation.DateTimeFormat;
+import org.springframework.web.bind.annotation.*;
+
+import java.time.LocalDate;
+import java.time.LocalTime;
+import java.util.List;
+
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("/screening")
+public class ScreeningController {
+    private final ScreeningService service;
+    private final ScreeningMapper mapper;
+
+    private final RoomSeatMapper roomSeatMapper;
+
+    @GetMapping
+    public List<ShortScreeningDTO> getScreeningsInDayAndTimeInterval(
+            @RequestParam("date") @DateTimeFormat(pattern = "yyyy-MM-dd") LocalDate date,
+            @RequestParam("timeStart") @DateTimeFormat(pattern = "HH:mm:ss") LocalTime timeStart,
+            @RequestParam("timeEnd") @DateTimeFormat(pattern = "HH:mm:ss") LocalTime timeEnd) {
+
+        return mapper.toShortScreeningDTOs(service.findAllInDayAndTimeInterval(date, timeStart, timeEnd));
+    }
+
+    @GetMapping("/{screeningID}")
+    public ScreeningDTO getScreeningDetails(@PathVariable Long screeningID) {
+        ScreeningDTO screeningDTO = mapper.toScreeningDTO(service.findByID(screeningID));
+        screeningDTO.setAvailableSeats(roomSeatMapper.toRoomSeatDTOs(service.findAvailableSeats(screeningID)));
+        return screeningDTO;
+    }
+}

src/main/java/com/mkopec/ticketbookingapp/domain/Movie.java

@@ -0,0 +1,26 @@
+package com.mkopec.ticketbookingapp.domain;
+
+import lombok.Data;
+
+import javax.persistence.Basic;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+
+import static javax.persistence.GenerationType.IDENTITY;
+
+@Entity
+@Data
+public class Movie {
+
+    @Id
+    @GeneratedValue(strategy = IDENTITY)
+    private Long id;
+
+    private String title;
+
+    private String director;
+
+    @Basic
+    private java.time.LocalTime length;
+}

src/main/java/com/mkopec/ticketbookingapp/domain/Reservation.java

@@ -0,0 +1,39 @@
+package com.mkopec.ticketbookingapp.domain;
+
+import lombok.Data;
+
+import javax.persistence.*;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+import java.util.List;
+
+import static javax.persistence.CascadeType.PERSIST;
+import static javax.persistence.FetchType.LAZY;
+import static javax.persistence.GenerationType.IDENTITY;
+
+@Entity
+@Data
+public class Reservation {
+
+    @Id
+    @GeneratedValue(strategy = IDENTITY)
+    private Long id;
+
+    @ManyToOne(fetch = LAZY)
+    @JoinColumn(name = "screening_id")
+    private Screening screening;
+
+    @Column(name = "first_name")
+    private String firstName;
+
+    @Column(name = "last_name")
+    private String lastName;
+
+    @Basic
+    private LocalDateTime expirationTime;
+
+    private BigDecimal payment;
+
+    @OneToMany(mappedBy = "reservation", fetch = LAZY, cascade = PERSIST)
+    private List<Ticket> tickets;
+}

src/main/java/com/mkopec/ticketbookingapp/domain/Room.java

@@ -0,0 +1,20 @@
+package com.mkopec.ticketbookingapp.domain;
+
+import lombok.Data;
+
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+
+import static javax.persistence.GenerationType.IDENTITY;
+
+@Entity
+@Data
+public class Room {
+
+    @Id
+    @GeneratedValue(strategy = IDENTITY)
+    private Long id;
+
+    private Integer number;
+}