Index: build.gradle =================================================================== diff -u -r3152d1837aa6c1bcc2a9418285093646e922f14f -r76ca411ee08798be231525205bf920166f62b7db --- build.gradle (.../build.gradle) (revision 3152d1837aa6c1bcc2a9418285093646e922f14f) +++ build.gradle (.../build.gradle) (revision 76ca411ee08798be231525205bf920166f62b7db) @@ -60,11 +60,11 @@ implementation 'org.spockframework:spock-spring:2.0-M2-groovy-2.5' - implementation 'com.lemans.boot.common:lemans-testing:0.0.1q' - implementation 'com.lemans.boot.common:lemans-security:0.0.1q' - implementation 'com.lemans.boot.common:lemans-rest:0.0.1q' - implementation 'com.lemans.boot.common:lemans-core:0.0.1q' - implementation 'com.lemans.boot.common:lemans-gradle:0.0.1q' + implementation 'com.lemans.boot.common:lemans-testing:0.0.1r' + implementation 'com.lemans.boot.common:lemans-security:0.0.1r' + implementation 'com.lemans.boot.common:lemans-rest:0.0.1r' + implementation 'com.lemans.boot.common:lemans-core:0.0.1r' + implementation 'com.lemans.boot.common:lemans-gradle:0.0.1r' implementation group: 'commons-dbcp', name: 'commons-dbcp', version: '1.4' Index: src/main/groovy/com/lemans/media/controllers/TemporaryMediaController.groovy =================================================================== diff -u -rc272d2266095f3bf825a15952d762fb5c03b0b19 -r76ca411ee08798be231525205bf920166f62b7db --- src/main/groovy/com/lemans/media/controllers/TemporaryMediaController.groovy (.../TemporaryMediaController.groovy) (revision c272d2266095f3bf825a15952d762fb5c03b0b19) +++ src/main/groovy/com/lemans/media/controllers/TemporaryMediaController.groovy (.../TemporaryMediaController.groovy) (revision 76ca411ee08798be231525205bf920166f62b7db) @@ -18,14 +18,15 @@ @PostMapping(value = "/media") def addTempMedia(@RequestParam('tempFiles') MultipartFile[] multipartFiles) { + Map criteria = mediaCriteria() List multiPartFiles = multipartFiles ?: [] List errors = [] if (!multiPartFiles) { errors << 'No files found to upload!' } - if (request.getParameter('mediaTypeId') == 'null') { errors << 'Media Type is a required field' } - if (request.getParameter('mediaCategoryId') == 'null') { errors << 'Media Category is a required field' } + if (!criteria.mediaTypeId) { errors << 'Media Type is a required field' } + if (!criteria.mediaCategoryId) { errors << 'Media Category is a required field' } if (errors) { renderErrors(errors) } else { - Map data = mediaManagerService.addTemporaryMedia(multiPartFiles, mediaCriteria()) + Map data = mediaManagerService.addTemporaryMedia(multiPartFiles, criteria) if (data.errors) { renderErrors(data.errors) } else { render([results: data.results]) } } @@ -42,7 +43,7 @@ } private Map mediaCriteria() { - [mediaCategoryId: request.getParameter('mediaCategoryId').toInteger(), - mediaTypeId: request.getParameter('mediaTypeId').toInteger()] + filters(['description']) + [mediaCategoryId: param('mediaCategoryId')?.toInteger(), + mediaTypeId: param('mediaTypeId')?.toInteger()] + filters(['description']) } } Index: src/main/groovy/com/lemans/media/services/MediaManagerService.groovy =================================================================== diff -u -rb2af2054fd20e6c645ceb9d20543ff308f034c89 -r76ca411ee08798be231525205bf920166f62b7db --- src/main/groovy/com/lemans/media/services/MediaManagerService.groovy (.../MediaManagerService.groovy) (revision b2af2054fd20e6c645ceb9d20543ff308f034c89) +++ src/main/groovy/com/lemans/media/services/MediaManagerService.groovy (.../MediaManagerService.groovy) (revision 76ca411ee08798be231525205bf920166f62b7db) @@ -1,22 +1,20 @@ package com.lemans.media.services import com.lemans.services.LemansManager -import org.slf4j.Logger -import org.slf4j.LoggerFactory -import org.springframework.beans.factory.annotation.Autowired -import org.springframework.stereotype.Service -import org.springframework.web.multipart.MultipartFile -import org.springframework.web.multipart.support.StandardMultipartHttpServletRequest +import groovy.util.logging.Log4j import org.apache.commons.io.FilenameUtils import org.apache.tika.detect.Detector import org.apache.tika.metadata.Metadata import org.apache.tika.parser.AutoDetectParser +import org.springframework.beans.factory.annotation.Autowired +import org.springframework.stereotype.Service +import org.springframework.web.multipart.MultipartFile +import org.springframework.web.multipart.support.StandardMultipartHttpServletRequest @Service +@Log4j class MediaManagerService extends LemansManager { - Logger log = LoggerFactory.getLogger('MediaManagerService') - @Autowired(required = true) String temporaryDocumentPath Index: src/test/groovy/com/lemans/media/temp/TemporaryMediaFunctionalSpec.groovy =================================================================== diff -u -rb7644e82bd0bafac713bbd32cdf553a06bee096b -r76ca411ee08798be231525205bf920166f62b7db --- src/test/groovy/com/lemans/media/temp/TemporaryMediaFunctionalSpec.groovy (.../TemporaryMediaFunctionalSpec.groovy) (revision b7644e82bd0bafac713bbd32cdf553a06bee096b) +++ src/test/groovy/com/lemans/media/temp/TemporaryMediaFunctionalSpec.groovy (.../TemporaryMediaFunctionalSpec.groovy) (revision 76ca411ee08798be231525205bf920166f62b7db) @@ -34,7 +34,7 @@ path() when: - multiPartPost(['src/resources/parts.csv']) + multiPartPost(['src/resources/parts.csv'], [:], 'tempFiles') then: payload.results[0].tempId @@ -55,7 +55,7 @@ invalid() when: - multiPartPost(['src/resources/parts.csv']) + multiPartPost(['src/resources/parts.csv'], [:], 'tempFiles') then: with(payload) { @@ -74,7 +74,7 @@ invalid() when: - multiPartPost(['src/resources/parts.csv']) + multiPartPost(['src/resources/parts.csv'], [:], 'tempFiles') then: with(payload) { @@ -94,7 +94,7 @@ invalid() when: - multiPartPost([]) + multiPartPost([], [:], 'tempFiles') then: with(payload) { @@ -112,7 +112,7 @@ path('temp') when: - multiPartPost(['src/resources/parts.csv']) + multiPartPost(['src/resources/parts.csv'], [:], 'tempFiles') then: with (payload.results) { @@ -134,7 +134,7 @@ invalid() when: - multiPartPost([]) + multiPartPost([], [:], 'tempFiles') then: with(payload) {