iktdev/MediaProcessing
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Changed input

Browse Source
This commit is contained in:
bskjon 2024-05-04 22:53:58 +02:00
parent ca46332007
commit 4d7af0dedb
2 changed files with 26 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
apps/coordinator/src/main/kotlin/no/iktdev/mediaprocessing/coordinator/controller/RequestEventController.kt
View File

@ -3,7 +3,7 @@ package no.iktdev.mediaprocessing.coordinator.controller
import com.google.gson.Gson import com.google.gson.Gson
import no.iktdev.mediaprocessing.coordinator.Coordinator import no.iktdev.mediaprocessing.coordinator.Coordinator
import no.iktdev.mediaprocessing.shared.contract.ProcessType import no.iktdev.mediaprocessing.shared.contract.ProcessType
import no.iktdev.mediaprocessing.shared.contract.dto.ConvertRequest import no.iktdev.mediaprocessing.shared.contract.dto.EventRequest
import no.iktdev.mediaprocessing.shared.contract.dto.StartOperationEvents import no.iktdev.mediaprocessing.shared.contract.dto.StartOperationEvents
import org.springframework.beans.factory.annotation.Autowired import org.springframework.beans.factory.annotation.Autowired
import org.springframework.http.HttpStatus import org.springframework.http.HttpStatus
@ -21,49 +21,58 @@ class RequestEventController(@Autowired var coordinator: Coordinator) {
@PostMapping("/convert") @PostMapping("/convert")
@ResponseStatus(HttpStatus.OK) @ResponseStatus(HttpStatus.OK)
fun requestConvert(@RequestBody convert: ConvertRequest): ResponseEntity<String> { fun requestConvert(@RequestBody payload: String): ResponseEntity<String> {
var convert: EventRequest? = null
var referenceId: String?
try { try {
convert = Gson().fromJson(payload, EventRequest::class.java)
val file = File(convert.file) val file = File(convert.file)
if (!file.exists()) { if (!file.exists()) {
return ResponseEntity.status(HttpStatus.NO_CONTENT).body(convert.file) return ResponseEntity.status(HttpStatus.NO_CONTENT).body(convert.file)
} }
val referenceId = coordinator.startProcess(file, ProcessType.MANUAL, listOf(StartOperationEvents.CONVERT)) referenceId = coordinator.startProcess(file, ProcessType.FLOW, listOf(StartOperationEvents.CONVERT)).toString()
} catch (e: Exception) { } catch (e: Exception) {
return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(Gson().toJson(convert)) return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(Gson().toJson(convert))
} }
return ResponseEntity.ok(null) return ResponseEntity.ok(referenceId)
} }
@PostMapping("/extract") @PostMapping("/extract")
@ResponseStatus(HttpStatus.OK) @ResponseStatus(HttpStatus.OK)
fun requestExtract(@RequestBody selectedFile: String): ResponseEntity<String> { fun requestExtract(@RequestBody payload: String): ResponseEntity<String> {
var request: EventRequest? = null
var referenceId: String?
try { try {
val file = File(selectedFile) request = Gson().fromJson(payload, EventRequest::class.java)
val file = File(request.file)
if (!file.exists()) { if (!file.exists()) {
return ResponseEntity.status(HttpStatus.NO_CONTENT).body(selectedFile) return ResponseEntity.status(HttpStatus.NO_CONTENT).body(payload)
} }
coordinator.startProcess(file, ProcessType.MANUAL, listOf(StartOperationEvents.EXTRACT)) referenceId = coordinator.startProcess(file, ProcessType.MANUAL, listOf(StartOperationEvents.EXTRACT)).toString()
} catch (e: Exception) { } catch (e: Exception) {
return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(selectedFile) return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(payload)
} }
return ResponseEntity.ok(null) return ResponseEntity.ok(referenceId)
} }
@PostMapping("/all") @PostMapping("/all")
@ResponseStatus(HttpStatus.OK) @ResponseStatus(HttpStatus.OK)
fun requestAll(@RequestBody selectedFile: String): ResponseEntity<String> { fun requestAll(@RequestBody payload: String): ResponseEntity<String> {
var request: EventRequest? = null
var referenceId: String?
try { try {
val file = File(selectedFile) request = Gson().fromJson(payload, EventRequest::class.java)
val file = File(request.file)
if (!file.exists()) { if (!file.exists()) {
return ResponseEntity.status(HttpStatus.NO_CONTENT).body(selectedFile) return ResponseEntity.status(HttpStatus.NO_CONTENT).body(payload)
} }
coordinator.startProcess(file, type = ProcessType.MANUAL) referenceId = coordinator.startProcess(file, type = ProcessType.MANUAL).toString()
} catch (e: Exception) { } catch (e: Exception) {
return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(selectedFile) return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(payload)
} }
return ResponseEntity.ok(null) return ResponseEntity.ok(referenceId)
} }
} }

2
shared/contract/src/main/kotlin/no/iktdev/mediaprocessing/shared/contract/dto/ConvertRequest.kt → shared/contract/src/main/kotlin/no/iktdev/mediaprocessing/shared/contract/dto/EventRequest.kt
View File

@ -1,6 +1,6 @@
package no.iktdev.mediaprocessing.shared.contract.dto package no.iktdev.mediaprocessing.shared.contract.dto
data class ConvertRequest( data class EventRequest(
val file: String, // FullPath val file: String, // FullPath
override val source: String override val source: String
): Requester() ): Requester()