diff --git a/backend/src/main/kotlin/org/loculus/backend/controller/SubmissionController.kt b/backend/src/main/kotlin/org/loculus/backend/controller/SubmissionController.kt index 7420815501..054adba6d6 100644 --- a/backend/src/main/kotlin/org/loculus/backend/controller/SubmissionController.kt +++ b/backend/src/main/kotlin/org/loculus/backend/controller/SubmissionController.kt @@ -78,6 +78,7 @@ open class SubmissionController( private val requestIdContext: RequestIdContext, ) { + /* TODO change to be made here - similar to restrictedUntil the parameter will conditionally be mandatory */ @Operation(description = SUBMIT_DESCRIPTION) @ApiResponse(responseCode = "200", description = SUBMIT_RESPONSE_DESCRIPTION) @PostMapping("/submit", consumes = ["multipart/form-data"]) @@ -96,6 +97,8 @@ open class SubmissionController( " Format: YYYY-MM-DD", ) @RequestParam restrictedUntil: String?, ): List { + // in here, just default to open DataUseTerms and then don't worry anymore + // throw an error if the parameter is given val params = SubmissionParams.OriginalSubmissionParams( organism, authenticatedUser, diff --git a/backend/src/main/kotlin/org/loculus/backend/model/ReleasedDataModel.kt b/backend/src/main/kotlin/org/loculus/backend/model/ReleasedDataModel.kt index 3cccc63b84..3ef235ee85 100644 --- a/backend/src/main/kotlin/org/loculus/backend/model/ReleasedDataModel.kt +++ b/backend/src/main/kotlin/org/loculus/backend/model/ReleasedDataModel.kt @@ -126,6 +126,7 @@ open class ReleasedDataModel( ("releasedAtTimestamp" to LongNode(rawProcessedData.releasedAtTimestamp.toTimestamp())), ("releasedDate" to TextNode(rawProcessedData.releasedAtTimestamp.toUtcDateString())), ("versionStatus" to TextNode(versionStatus.name)), + // TODO changes made here - don't include these fields ("dataUseTerms" to TextNode(currentDataUseTerms.type.name)), ("dataUseTermsRestrictedUntil" to restrictedDataUseTermsUntil), ("pipelineVersion" to LongNode(rawProcessedData.pipelineVersion)),