ci: always use same document bucket

Author: Willem (W.F.) Veelenturf

src/main/kotlin/services/DocumentService.kt

@@ -1,50 +1,39 @@
 package community.flock.eco.workday.services
 
-import com.google.cloud.storage.BlobId
 import com.google.cloud.storage.BlobInfo
 import com.google.cloud.storage.StorageOptions
-import community.flock.eco.core.utils.toNullable
-import community.flock.eco.workday.forms.WorkDayForm
-import community.flock.eco.workday.model.CostExpense
-import community.flock.eco.workday.model.Document
-import community.flock.eco.workday.model.Expense
-import community.flock.eco.workday.model.Status
-import community.flock.eco.workday.model.TravelExpense
-import community.flock.eco.workday.model.WorkDay
-import community.flock.eco.workday.model.WorkDaySheet
-import community.flock.eco.workday.repository.CostExpenseRepository
-import community.flock.eco.workday.repository.ExpenseRepository
-import community.flock.eco.workday.repository.TravelExpenseRepository
-import community.flock.eco.workday.repository.WorkDayRepository
+import org.slf4j.LoggerFactory
 import org.springframework.beans.factory.annotation.Value
-import org.springframework.data.domain.Page
-import org.springframework.data.domain.Pageable
 import org.springframework.stereotype.Service
-import org.springframework.transaction.annotation.Transactional
-import java.time.LocalDate
-import java.time.temporal.ChronoUnit
 import java.util.UUID
-import javax.persistence.EntityManager
 
 
 @Service
 class DocumentService(
     @Value("\${flock.eco.workday.bucket.documents}") val bucketName:String
 ) {
+    companion object {
+        val storage = StorageOptions.getDefaultInstance().service
+        var logger = LoggerFactory.getLogger(DocumentService::class.java)
+
+    }
+
     fun storeDocument(byteArray: ByteArray): UUID {
+        logger.debug("Store document to bucket: $bucketName")
         return UUID.randomUUID()
             .apply {
                 BlobInfo
                     .newBuilder(bucketName, toString())
                     .build()
                     .apply {
-                        WorkDayService.storage.create(this, byteArray)
+                        storage.create(this, byteArray)
                     }
             }
     }
 
     fun readDocument(uuid: UUID): ByteArray {
-        val blob = WorkDayService.storage.get(bucketName, uuid.toString())
+        logger.debug("Read document to bucket: $bucketName")
+        val blob = storage.get(bucketName, uuid.toString())
         return blob.getContent()
     }
 

src/main/kotlin/services/WorkDayService.kt

@@ -9,6 +9,7 @@ import community.flock.eco.workday.model.Status
 import community.flock.eco.workday.model.WorkDay
 import community.flock.eco.workday.model.WorkDaySheet
 import community.flock.eco.workday.repository.WorkDayRepository
+import org.springframework.beans.factory.annotation.Value
 import org.springframework.stereotype.Service
 import org.springframework.transaction.annotation.Transactional
 import java.time.LocalDate
@@ -21,7 +22,8 @@ import javax.persistence.EntityManager
 class WorkDayService(
     private val workDayRepository: WorkDayRepository,
     private val assignmentService: AssignmentService,
-    private val entityManager: EntityManager
+    private val entityManager: EntityManager,
+    @Value("\${flock.eco.workday.bucket.documents}") val bucketName:String
 ) {
 
     fun findByCode(code: String): WorkDay? = workDayRepository
@@ -59,7 +61,6 @@ class WorkDayService(
         }
 
     fun uploadSheet(byteArray: ByteArray): UUID {
-        val bucketName = "flock-workday-hour-sheets"
         return UUID.randomUUID()
             .apply {
                 BlobInfo
@@ -72,7 +73,6 @@ class WorkDayService(
     }
 
     fun readSheet(uuid: UUID): ByteArray {
-        val bucketName = "flock-workday-hour-sheets"
         val blob = storage.get(bucketName, uuid.toString())
         return blob.getContent()
     }

src/main/resources/application-eco.properties

@@ -1,5 +1,5 @@
 flock.eco.workday.login=DATABASE
-flock.eco.workday.develop=true
+flock.eco.workday.develop=false
 flock.eco.workday.bucket.documents=flock-eco-workday-documents
 
 spring.cloud.gcp.sql.enabled=true