test data and controller tests added

Author: Enes Açıkoğlu

src/main/kotlin/com/cengenes/kotlin/api/KotlinSpringBootApiApplication.kt

@@ -4,9 +4,11 @@ import org.springframework.boot.autoconfigure.SpringBootApplication
 import org.springframework.boot.runApplication
 
 @SpringBootApplication
-class KotlinSpringBootApiApplication {
+class KotlinSpringBootApiApplication
 
+object KotlinMain {
+    @JvmStatic
     fun main(args: Array<String>) {
         runApplication<KotlinSpringBootApiApplication>(*args)
     }
-}
+}

src/main/kotlin/com/cengenes/kotlin/api/controller/HotelController.kt

@@ -4,19 +4,20 @@ import com.cengenes.kotlin.api.entity.Hotel
 import com.cengenes.kotlin.api.model.request.CheckInRequest
 import com.cengenes.kotlin.api.service.HotelServiceManager
 import org.springframework.web.bind.annotation.*
+import javax.validation.Valid
 
 @RestController
 @RequestMapping("/hotels")
 class HotelController(var hotelServiceManager: HotelServiceManager) {
 
     @GetMapping
-    fun getAllHotels(): MutableIterable<Hotel> = this.hotelServiceManager.findAll()
+    fun getAllHotels(): MutableList<Hotel> = this.hotelServiceManager.findAll()
 
     @GetMapping("/{name}")
     fun findByHotelName(@PathVariable(value = "name") name: String): Hotel = this.hotelServiceManager.findByName(name)
 
     @PostMapping("checkIn")
-    fun checkIn(@RequestBody checkInRequest: CheckInRequest): Boolean {
+    fun checkIn(@Valid @RequestBody checkInRequest: CheckInRequest): Boolean {
         return hotelServiceManager.checkIn(checkInRequest)
     }
 }

src/main/kotlin/com/cengenes/kotlin/api/model/request/CheckInRequest.kt

@@ -1,8 +1,9 @@
 package com.cengenes.kotlin.api.model.request
 
 import java.io.Serializable
+import javax.validation.constraints.NotNull
 
-data class CheckInRequest(var hotelName: String, var numberOfGuest: Long) : Serializable {
+data class CheckInRequest(@NotNull var hotelName: String, @NotNull var numberOfGuest: Long) : Serializable {
 
     override fun toString(): String {
         return "CheckInRequest(hotelName='$hotelName', numberOfGuest=$numberOfGuest)"

src/main/resources/db/changelog/version/1.0.0.xml

@@ -24,4 +24,10 @@
             </column>
         </createTable>
     </changeSet>
+    <changeSet id="17-06-2018 10:50" author="enes.acikoglu">
+        <sql>
+            INSERT INTO hotel (id, hotel_name,classification,total_room_count, free_room_count) VALUES(nextval('seq_hotel'), 'Hotel California',101, 200,200);
+            INSERT INTO hotel (id, hotel_name,classification,total_room_count, free_room_count) VALUES(nextval('seq_hotel'), 'Ns Hilton',102, 400,400);
+        </sql>
+    </changeSet>
 </databaseChangeLog>

src/test/kotlin/com/cengenes/kotlin/api/KotlinSpringBootApiApplicationIT.kt

@@ -7,5 +7,5 @@ import org.springframework.test.context.junit4.SpringRunner
 @RunWith(SpringRunner::class)
 class KotlinSpringBootApiApplicationIT {
     @Test
-    fun it_should_test_application_running_properly()=KotlinSpringBootApiApplication().main(arrayOf("test"))
+    fun it_should_test_application_running_properly()=KotlinMain.main(arrayOf("test"))
 }

src/test/kotlin/com/cengenes/kotlin/api/controller/HotelControllerIT.kt

@@ -0,0 +1,90 @@
+package com.cengenes.kotlin.api.controller
+
+import com.cengenes.kotlin.api.entity.Hotel
+import com.cengenes.kotlin.api.model.request.CheckInRequest
+import org.assertj.core.api.Assertions.assertThat
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.springframework.beans.factory.annotation.Autowired
+import org.springframework.boot.test.context.SpringBootTest
+import org.springframework.boot.test.web.client.TestRestTemplate
+import org.springframework.boot.test.web.client.getForEntity
+import org.springframework.core.ParameterizedTypeReference
+import org.springframework.http.HttpEntity
+import org.springframework.http.HttpMethod
+import org.springframework.http.HttpStatus
+import org.springframework.http.ResponseEntity
+import org.springframework.test.context.junit4.SpringRunner
+
+@RunWith(SpringRunner::class)
+@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
+class HotelControllerIT {
+
+    @Autowired
+    private lateinit var restTemplate: TestRestTemplate
+
+
+    @Test
+    fun it_should_get_hotel_by_name() {
+        //Given
+        var hotelName = "Hotel California"
+
+        //When
+        val hotelResponse: ResponseEntity<Hotel> = restTemplate.getForEntity(url = "/hotels/" + hotelName, uriVariables = Hotel::class)
+
+        //Then
+        assertThat(hotelResponse).isNotNull
+        assertThat(hotelResponse.statusCode).isEqualTo(HttpStatus.OK)
+        assertThat(hotelResponse.body?.name).isEqualTo("Hotel California")
+        assertThat(hotelResponse.body?.classification).isEqualTo(101L)
+        assertThat(hotelResponse.body?.totalRoomCount).isEqualTo(200L)
+        assertThat(hotelResponse.body?.freeRoomCount).isEqualTo(200L)
+    }
+
+    @Test
+    fun it_should_get_all_hotels() {
+        //Given
+
+        //When
+        val hotelResponse: ResponseEntity<MutableList<Hotel>> = restTemplate.exchange("/hotels", HttpMethod.GET, HttpEntity.EMPTY, object : ParameterizedTypeReference<MutableList<Hotel>>() {})
+
+        //Then
+        assertThat(hotelResponse).isNotNull
+        assertThat(hotelResponse.statusCode).isEqualTo(HttpStatus.OK)
+        assertThat(hotelResponse.body?.get(0)?.name).isEqualTo("Hotel California")
+        assertThat(hotelResponse.body?.get(0)?.classification).isEqualTo(101L)
+        assertThat(hotelResponse.body?.get(0)?.totalRoomCount).isEqualTo(200L)
+        assertThat(hotelResponse.body?.get(0)?.freeRoomCount).isEqualTo(200L)
+        assertThat(hotelResponse.body?.get(1)?.name).isEqualTo("Ns Hilton")
+        assertThat(hotelResponse.body?.get(1)?.classification).isEqualTo(102L)
+        assertThat(hotelResponse.body?.get(1)?.totalRoomCount).isEqualTo(400L)
+        assertThat(hotelResponse.body?.get(1)?.freeRoomCount).isEqualTo(400L)
+    }
+
+    @Test
+    fun it_should_checkin_succesfully_when_free_room_count_is_available() {
+        //Given
+        val checkInRequest = CheckInRequest("Hotel California", 199L)
+
+        //When
+        val response = restTemplate.postForEntity("/hotels/checkIn", checkInRequest, Boolean::class.java)
+
+        //Then
+        assertThat(response).isNotNull
+        assertThat(response.body).isTrue()
+
+    }
+
+    @Test
+    fun it_should_checkin_failed_when_free_room_count_is_not_available() {
+        //Given
+        val checkInRequest = CheckInRequest("Hotel California", 201L)
+
+        //When
+        val response = restTemplate.postForEntity("/hotels/checkIn", checkInRequest, Boolean::class.java)
+
+        //Then
+        assertThat(response).isNotNull
+        assertThat(response.body).isFalse()
+    }
+}

src/test/kotlin/com/cengenes/kotlin/api/repository/HotelRepositoryTest.kt

@@ -22,17 +22,17 @@ class HotelRepositoryTest {
     @Test
     fun it_should_find_hotel_by_name() {
         //Given
-        val hotel = Hotel("Hotel California",99L,250L)
+        val hotel = Hotel("Sultanahmet Inn Hotel",99L,250L)
         testEntityManager.persistAndFlush(hotel)
 
         //When
-        val optionalHotel = hotelRepository.findByName("Hotel California")
+        val optionalHotel = hotelRepository.findByName("Sultanahmet Inn Hotel")
 
         //Then
         assertThat(optionalHotel).isPresent
         val expectedHotel = optionalHotel.get()
         assertThat(expectedHotel.id).isNotNull()
-        assertThat(expectedHotel.name).isEqualTo("Hotel California")
+        assertThat(expectedHotel.name).isEqualTo("Sultanahmet Inn Hotel")
         assertThat(expectedHotel.classification).isEqualTo(99L)
         assertThat(expectedHotel.totalRoomCount).isEqualTo(250L)
         assertThat(expectedHotel.freeRoomCount).isEqualTo(250L)