Pivotal ID # 183126684: Log Submission Draft ID

client/fire-webclient/src/main/kotlin/uk/ac/ebi/fire/client/retry/RetryTemplateExtensions.kt

@@ -17,12 +17,14 @@ private val logger = KotlinLogging.logger {}
  */
 @OptIn(ExperimentalTime::class)
 internal fun <T> RetryTemplate.execute(opt: String, func: () -> T): T {
-    logger.debug(opt) { "Executing operation: $opt" }
+    logger.debug(opt) { "Started executing operation: $opt" }
     val response = execute(
-        onError = { error, cxt -> logger.error(error) { "Fail to perform operation: $opt, ${cxt.retryCount + 1}" } },
+        onError = { error, cxt ->
+            logger.warn(error) { "Failed to perform operation: $opt. Attempt # ${cxt.retryCount + 1}" }
+        },
         func = { measureTimedValue(func) }
     )
-    logger.debug { "Executed operation: $opt in ${response.duration.inWholeMilliseconds}" }
+    logger.debug { "Finished executing operation: $opt in ${response.duration.inWholeMilliseconds}" }
     return response.value
 }
 

submission/submission-webapp/src/main/kotlin/ac/uk/ebi/biostd/submission/domain/service/SubmissionDraftService.kt

@@ -17,8 +17,11 @@ import ebi.ac.uk.extended.mapping.to.ToSubmissionMapper
 import ebi.ac.uk.model.Submission
 import ebi.ac.uk.security.integration.components.IUserPrivilegesService
 import ebi.ac.uk.security.integration.model.api.SecurityUser
+import mu.KotlinLogging
 import java.time.Instant
 
+private val logger = KotlinLogging.logger {}
+
 @Suppress("LongParameterList")
 class SubmissionDraftService(
     private val submitWebHandler: SubmitWebHandler,
@@ -46,17 +49,25 @@ class SubmissionDraftService(
 
     fun deleteSubmissionDraft(userEmail: String, key: String) {
         draftPersistenceService.deleteSubmissionDraft(userEmail, key)
+        logger.info { "$key $userEmail Draft with key '$key' DELETED for user '$userEmail'" }
     }
 
     fun updateSubmissionDraft(userEmail: String, key: String, content: String): SubmissionDraft {
-        return draftPersistenceService.updateSubmissionDraft(userEmail, key, content)
+        val updated = draftPersistenceService.updateSubmissionDraft(userEmail, key, content)
+        logger.info { "$key $userEmail Draft with key '$key' UPDATED for user '$userEmail'" }
+
+        return updated
     }
 
     fun createSubmissionDraft(userEmail: String, content: String): SubmissionDraft {
-        return draftPersistenceService.createSubmissionDraft(userEmail, "TMP_${Instant.now().toEpochMilli()}", content)
+        val draftKey = "TMP_${Instant.now().toEpochMilli()}"
+        val draft = draftPersistenceService.createSubmissionDraft(userEmail, draftKey, content)
+        logger.info { "$draftKey $userEmail Draft with key '$draftKey' CREATED for user '$userEmail'" }
+
+        return draft
     }
 
-    fun submitDraft(
+    fun submitDraftAsync(
         key: String,
         user: SecurityUser,
         onBehalfRequest: OnBehalfRequest?,
@@ -66,6 +77,8 @@ class SubmissionDraftService(
         val buildRequest = SubmitBuilderRequest(user, onBehalfRequest, parameters, key)
         val request = submitRequestBuilder.buildContentRequest(submission, SubFormat.JSON_PRETTY, buildRequest)
         submitWebHandler.submitAsync(request)
+
+        logger.info { "$key ${user.email} Draft with key '$key' SUBMITTED" }
     }
 
     fun submitDraftSync(
@@ -77,6 +90,9 @@ class SubmissionDraftService(
         val submission = getOrCreateSubmissionDraft(user.email, key).content
         val buildRequest = SubmitBuilderRequest(user, onBehalfRequest, parameters, key)
         val request = submitRequestBuilder.buildContentRequest(submission, SubFormat.JSON_PRETTY, buildRequest)
+
+        logger.info { "$key ${user.email} Started SUBMITTED process draft with key '$key'" }
+
         return submitWebHandler.submit(request)
     }
 

submission/submission-webapp/src/main/kotlin/ac/uk/ebi/biostd/submission/domain/service/SubmissionService.kt

@@ -28,12 +28,12 @@ class SubmissionService(
     private val submissionPersistenceService: SubmissionPersistenceService,
 ) {
     fun submit(rqt: SubmitRequest): ExtSubmission {
-        logger.info { "${rqt.accNo} ${rqt.owner} Received sync submit request for submission ${rqt.accNo}" }
+        logger.info { "${rqt.accNo} ${rqt.owner} Received sync submit request with draft key '${rqt.draftKey}'" }
         return submissionSubmitter.submit(rqt)
     }
 
     fun submitAsync(rqt: SubmitRequest) {
-        logger.info { "${rqt.accNo} ${rqt.owner} Received async submit request for submission ${rqt.accNo}" }
+        logger.info { "${rqt.accNo} ${rqt.owner} Received async submit request with draft key '${rqt.draftKey}'" }
         val (accNo, version) = submissionSubmitter.createRequest(rqt)
         eventsPublisherService.requestCreated(accNo, version)
     }

submission/submission-webapp/src/main/kotlin/ac/uk/ebi/biostd/submission/web/resources/SubmissionDraftResource.kt

@@ -82,7 +82,7 @@ internal class SubmissionDraftResource(
         onBehalfRequest: OnBehalfRequest?,
         @ModelAttribute parameters: SubmissionRequestParameters,
     ) {
-        submissionDraftService.submitDraft(key, user, onBehalfRequest, parameters)
+        submissionDraftService.submitDraftAsync(key, user, onBehalfRequest, parameters)
     }
 
     @PostMapping("/{key}/submit/sync")

submission/submission-webapp/src/test/kotlin/ac/uk/ebi/biostd/submission/domain/service/SubmissionDraftServiceTest.kt

@@ -172,7 +172,7 @@ class SubmissionDraftServiceTest(
             submitRequestBuilder.buildContentRequest(DRAFT_CONTENT, SubFormat.JSON_PRETTY, capture(requestSlot))
         } returns contentRequest
 
-        testInstance.submitDraft(DRAFT_KEY, user, onBehalfRequest, parameters)
+        testInstance.submitDraftAsync(DRAFT_KEY, user, onBehalfRequest, parameters)
 
         val submitRequest = requestSlot.captured
         assertThat(submitRequest.user).isEqualTo(user)

submission/submitter/src/main/kotlin/ac/uk/ebi/biostd/submission/submitter/SubmissionSubmitter.kt

@@ -65,16 +65,26 @@ class SubmissionSubmitter(
         try {
             logger.info { "${rqt.accNo} ${rqt.owner} Started processing submission request" }
 
-            rqt.draftKey?.let { draftService.setProcessingStatus(rqt.owner, it) }
+            rqt.draftKey?.let {
+                draftService.setProcessingStatus(rqt.owner, it)
+                logger.info { "${rqt.accNo} ${rqt.owner} Status of draft with key '$it' set to PROCESSING" }
+            }
             val processed = submissionProcessor.processSubmission(rqt)
             parentInfoService.executeCollectionValidators(processed)
-            rqt.draftKey?.let { draftService.setAcceptedStatus(it) }
+            rqt.draftKey?.let {
+                logger.info { "${rqt.accNo} ${rqt.owner} Assigned accNo '${processed.accNo}' to draft with key '$it'" }
+                draftService.setAcceptedStatus(it)
+                logger.info { "${rqt.accNo} ${rqt.owner} Status of draft with key '$it' set to ACCEPTED" }
+            }
             logger.info { "${rqt.accNo} ${rqt.owner} Finished processing submission request" }
 
             return processed
         } catch (exception: RuntimeException) {
             logger.error(exception) { "${rqt.accNo} ${rqt.owner} Error processing submission request" }
-            rqt.draftKey?.let { draftService.setActiveStatus(it) }
+            rqt.draftKey?.let {
+                draftService.setActiveStatus(it)
+                logger.info { "${rqt.accNo} ${rqt.owner} Status of draft with key '$it' set to ACTIVE" }
+            }
             throw InvalidSubmissionException("Submission validation errors", listOf(exception))
         }
     }