Program

pom.xml

@@ -64,12 +64,13 @@
 			<artifactId>kotlin-logging-jvm</artifactId>
 			<version>3.0.5</version>
 		</dependency>
-        <dependency>
-            <groupId>com.itextpdf</groupId>
-            <artifactId>itextpdf</artifactId>
-            <version>5.5.8</version>
-        </dependency>
-        <dependency>
+		<dependency>
+			<groupId>com.itextpdf</groupId>
+			<artifactId>itext-core</artifactId>
+			<version>8.0.4</version>
+			<type>pom</type>
+		</dependency>
+		<dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-webflux</artifactId>
             <version>6.0.7</version>
@@ -88,7 +89,19 @@
 			<classifier>jakarta</classifier>
 			<version>${querydsl.version}</version>
 		</dependency>
-    </dependencies>
+		<dependency>
+			<groupId>com.ninja-squad</groupId>
+			<artifactId>springmockk</artifactId>
+			<version>4.0.2</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.mock-server</groupId>
+			<artifactId>mockserver-maven-plugin</artifactId>
+			<version>5.15.0</version>
+		</dependency>
+
+	</dependencies>
 
 	<build>
 		<sourceDirectory>${project.basedir}/src/main/kotlin</sourceDirectory>
@@ -98,6 +111,11 @@
 				<groupId>org.springframework.boot</groupId>
 				<artifactId>spring-boot-maven-plugin</artifactId>
 			</plugin>
+			<plugin>
+				<groupId>org.mock-server</groupId>
+				<artifactId>mockserver-maven-plugin</artifactId>
+				<version>5.15.0</version>
+			</plugin>
 			<plugin>
 				<groupId>org.jetbrains.kotlin</groupId>
 				<artifactId>kotlin-maven-plugin</artifactId>

src/main/kotlin/org/breizhcamp/konter/application/dto/HallDTO.kt

@@ -3,4 +3,5 @@ package org.breizhcamp.konter.application.dto
 data class HallDTO(
     val id: Int,
     val name: String?,
+    val trackId: Int?
 )

src/main/kotlin/org/breizhcamp/konter/application/dto/ManualSessionDTO.kt

@@ -0,0 +1,12 @@
+package org.breizhcamp.konter.application.dto
+
+import org.breizhcamp.konter.domain.entities.enums.SessionFormatEnum
+import org.breizhcamp.konter.domain.entities.enums.SessionThemeEnum
+
+data class ManualSessionDTO(
+    val id: Int,
+    val title: String,
+    val description: String,
+    val format: SessionFormatEnum,
+    val theme: SessionThemeEnum
+)

src/main/kotlin/org/breizhcamp/konter/application/dto/SessionDTO.kt

@@ -19,9 +19,7 @@ data class SessionDTO(
     val status: SessionStatusEnum,
     val submitted: LocalDateTime,
     val ownerNotes: String,
-    val hall: HallDTO?,
-    val beginning: LocalDateTime?,
-    val end: LocalDateTime?,
     val videoURL: String?,
     val rating: BigDecimal?,
+    val slot: SlotDTO?,
 )

src/main/kotlin/org/breizhcamp/konter/application/dto/SlotDTO.kt

@@ -0,0 +1,18 @@
+package org.breizhcamp.konter.application.dto
+
+import java.time.Duration
+import java.time.LocalTime
+import java.util.*
+
+data class SlotDTO(
+    val id: UUID,
+    val day: Int,
+    val session: SessionDTO?,
+    val halls: List<HallDTO>,
+    val start: LocalTime,
+    val duration: Duration,
+    val barcode: String?,
+    val span: Int,
+    val title: String?,
+    val assignable: Boolean
+)

src/main/kotlin/org/breizhcamp/konter/application/dto/TalkDTO.kt

@@ -0,0 +1,25 @@
+package org.breizhcamp.konter.application.dto
+
+import com.fasterxml.jackson.annotation.JsonFormat
+import com.fasterxml.jackson.databind.PropertyNamingStrategies
+import com.fasterxml.jackson.databind.annotation.JsonNaming
+import java.time.LocalDateTime
+
+@JsonNaming(PropertyNamingStrategies.SnakeCaseStrategy::class)
+data class TalkDTO(
+    @JsonFormat(shape = JsonFormat.Shape.STRING)
+    val id: Int,
+    val name: String,
+    val eventStart: LocalDateTime,
+    val eventEnd: LocalDateTime,
+    val eventType: String,
+    val format: String,
+    val venue: String,
+    @JsonFormat(shape = JsonFormat.Shape.STRING)
+    val venueId: Int,
+    val speakers: String,
+    val videoUrl: String?,
+    val filesUrl: String?,
+    val slidesUrl: String?,
+    val description: String?
+)

src/main/kotlin/org/breizhcamp/konter/application/requests/HallCreationReq.kt

@@ -1,5 +1,6 @@
 package org.breizhcamp.konter.application.requests
 
 data class HallCreationReq(
-    val name: String
+    val name: String,
+    val trackId: Int?,
 )

src/main/kotlin/org/breizhcamp/konter/application/requests/HallPatchReq.kt

@@ -0,0 +1,6 @@
+package org.breizhcamp.konter.application.requests
+
+data class HallPatchReq(
+    val name: String,
+    val trackId: Int?
+)

src/main/kotlin/org/breizhcamp/konter/application/requests/SessionCreationReq.kt

@@ -0,0 +1,11 @@
+package org.breizhcamp.konter.application.requests
+
+import org.breizhcamp.konter.domain.entities.enums.SessionFormatEnum
+import org.breizhcamp.konter.domain.entities.enums.SessionThemeEnum
+
+data class SessionCreationReq(
+    val title: String,
+    val description: String,
+    val format: SessionFormatEnum,
+    val theme: SessionThemeEnum,
+)

src/main/kotlin/org/breizhcamp/konter/application/requests/SessionPatchReq.kt

@@ -0,0 +1,20 @@
+package org.breizhcamp.konter.application.requests
+
+import org.breizhcamp.konter.domain.entities.enums.SessionFormatEnum
+import org.breizhcamp.konter.domain.entities.enums.SessionThemeEnum
+
+data class SessionPatchReq(
+    val title: String?,
+    val description: String?,
+    val format: SessionFormatEnum?,
+    val theme: SessionThemeEnum?,
+) {
+    companion object {
+        fun empty(): SessionPatchReq = SessionPatchReq(
+            title = null,
+            description = null,
+            format = null,
+            theme = null
+        )
+    }
+}

src/main/kotlin/org/breizhcamp/konter/application/requests/SlotCreationReq.kt

@@ -0,0 +1,16 @@
+package org.breizhcamp.konter.application.requests
+
+import org.hibernate.annotations.JdbcTypeCode
+import org.hibernate.type.SqlTypes
+import java.time.Duration
+import java.time.LocalTime
+
+data class SlotCreationReq(
+    val start: LocalTime,
+    val day: Int,
+    @JdbcTypeCode(SqlTypes.INTERVAL_SECOND)
+    val duration: Duration,
+    val title: String?,
+    val hallIds: List<Int>,
+    val assignable: Boolean
+)

src/main/kotlin/org/breizhcamp/konter/application/requests/SlotPatchReq.kt

@@ -0,0 +1,6 @@
+package org.breizhcamp.konter.application.requests
+
+data class SlotPatchReq(
+    val title: String?,
+    val assignable: Boolean
+)

src/main/kotlin/org/breizhcamp/konter/application/rest/HallController.kt

@@ -3,43 +3,92 @@ package org.breizhcamp.konter.application.rest
 import mu.KotlinLogging
 import org.breizhcamp.konter.application.dto.HallDTO
 import org.breizhcamp.konter.application.requests.HallCreationReq
+import org.breizhcamp.konter.application.requests.HallPatchReq
 import org.breizhcamp.konter.domain.entities.Hall
-import org.breizhcamp.konter.domain.use_cases.HallCreate
-import org.breizhcamp.konter.domain.use_cases.HallList
+import org.breizhcamp.konter.domain.entities.exceptions.EventNotFoundException
+import org.breizhcamp.konter.domain.use_cases.HallAssociateEvent
+import org.breizhcamp.konter.domain.use_cases.HallCRUD
+import org.breizhcamp.konter.domain.use_cases.HallSetOrder
+import org.springframework.http.HttpStatus
+import org.springframework.http.ResponseEntity
 import org.springframework.web.bind.annotation.*
 
 private val logger = KotlinLogging.logger {  }
 
 @RestController
 @RequestMapping("/api/halls")
 class HallController (
-    private val hallCreate: HallCreate,
-    private val hallList: HallList,
+    private val hallCRUD: HallCRUD,
+    private val hallAssociateEvent: HallAssociateEvent,
+    private val hallSetOrder: HallSetOrder
 ) {
 
     @GetMapping
     fun listAll(): List<HallDTO> {
         logger.info { "Listing all Halls" }
 
-        return hallList.listAll().map { it.toDto() }
+        return hallCRUD.listAll().map { it.toDto() }
+    }
+
+    @GetMapping("/{eventId}")
+    fun listByEvent(@PathVariable eventId: Int): List<HallDTO> {
+        logger.info { "Listing Halls available for Event:$eventId" }
+
+        return hallCRUD.listByEvent(eventId).map { it.toDto() }
     }
 
     @PostMapping
     fun createHall(@RequestBody req: HallCreationReq): HallDTO {
-        logger.info { "Creating a Hall with name ${req.name}" }
+        logger.info { "Creating a Hall with name ${req.name} and trackId ${req.trackId}" }
 
-        return hallCreate.createHall(req).toDto()
+        return hallCRUD.create(req).toDto()
     }
 
-    @GetMapping("/{eventId}")
-    fun listByEvent(@PathVariable eventId: Int): List<HallDTO> {
-        logger.info { "Listing Halls available for Event<$eventId>" }
+    @PatchMapping("/{id}")
+    fun patchHall(@PathVariable id: Int, @RequestBody req: HallPatchReq): HallDTO {
+        logger.info { "Updating Hall:$id" }
 
-        return hallList.listByEvent(eventId).map { it.toDto() }
+        return hallCRUD.update(id, req).toDto()
     }
+
+    @DeleteMapping("/{id}")
+    fun deleteHall(@PathVariable id: Int) {
+        logger.info { "Deleting Hall:$id" }
+
+        return hallCRUD.delete(id)
+    }
+
+    @PostMapping("/{id}/event/{eventId}/{order}")
+    fun associateToEvent(@PathVariable id: Int, @PathVariable eventId: Int, @PathVariable order: Int): ResponseEntity<*> {
+        logger.info { "Associating Hall:$id to Event:$eventId" }
+
+        return try {
+            ResponseEntity.ok(hallAssociateEvent.associate(id, eventId, order).toDto())
+        } catch (e: EventNotFoundException) {
+            logger.error { e }
+
+            ResponseEntity.status(HttpStatus.NOT_FOUND).body(e.message)
+        }
+    }
+
+    @DeleteMapping("/{id}/event/{eventId}")
+    fun dissociateFromEvent(@PathVariable id: Int, @PathVariable eventId: Int): HallDTO {
+        logger.info { "Dissociating Hall:$id from Event:$eventId" }
+
+        return hallAssociateEvent.dissociate(id, eventId).toDto()
+    }
+
+    @PatchMapping("/{id}/event/{eventId}/{order}")
+    fun updateOrderForEvent(@PathVariable id: Int, @PathVariable eventId: Int, @PathVariable order: Int): HallDTO {
+        logger.info { "Updating order of Hall:$id for Event:$eventId to $order" }
+
+        return hallSetOrder.setOrder(id, eventId, order).toDto()
+    }
+
 }
 
 fun Hall.toDto() = HallDTO(
     id = id,
     name = name,
+    trackId = trackId
 )