Prøv å bygge med foreløpig versjon

Author: Erik Vårdal Itland

README.md

@@ -1,5 +1,7 @@
 # Kravbank backend README
 
+TODO: Remove this, it is only to trigger a new build in GitHub
+
 ## Prerequisites
 
 * In order to run the application locally, you need a .env file

src/main/kotlin/org/kravbank/domain/Publication.kt

@@ -1,14 +1,14 @@
-package org.kravbank.domain;
+package org.kravbank.domain
 
 import com.fasterxml.jackson.annotation.JsonIgnore
 import com.fasterxml.jackson.annotation.JsonManagedReference
-import io.quarkus.hibernate.orm.panache.PanacheEntity;
+import io.quarkus.hibernate.orm.panache.PanacheEntity
 import java.time.LocalDateTime
 import java.util.*
 import javax.persistence.*
 
 @Entity
-class Publication : PanacheEntity() {
+class Publication : PanacheEntity(), SoftDeletable {
 
     var comment: String = ""
 
@@ -19,7 +19,7 @@ class Publication : PanacheEntity() {
     @Column(unique = true)
     var ref: String = UUID.randomUUID().toString()
 
-    var deletedDate: LocalDateTime? = null
+    override var deletedDate: LocalDateTime? = null
 
     @ManyToOne(
         cascade = [CascadeType.MERGE, CascadeType.PERSIST, CascadeType.REFRESH], //CascadeType.Detach

src/main/kotlin/org/kravbank/domain/SoftDeletable.kt

@@ -0,0 +1,7 @@
+package org.kravbank.domain
+
+import java.time.LocalDateTime
+
+interface SoftDeletable {
+    var deletedDate: LocalDateTime?
+}

src/main/kotlin/org/kravbank/repository/BackendRepository.kt

@@ -0,0 +1,19 @@
+package org.kravbank.repository
+
+import io.quarkus.hibernate.orm.panache.PanacheRepository
+import org.kravbank.domain.SoftDeletable
+import java.time.LocalDateTime
+
+//private var <T> T.deletedDate: LocalDateTime?
+//    get() {}
+//    set() {}
+
+open class BackendRepository<T : SoftDeletable> : PanacheRepository<T> {
+    fun deletePublication(publication: T): T {
+        val deletedDate = LocalDateTime.now()
+        //val updates = update("deleteddate = ?1 where id = ?2", deletedDate, publication)
+        publication.deletedDate = deletedDate
+        persistAndFlush(publication)
+        return  publication
+    }
+}

src/main/kotlin/org/kravbank/repository/PublicationRepository.kt

@@ -1,20 +1,17 @@
 package org.kravbank.repository
 
-import io.quarkus.hibernate.orm.panache.PanacheRepository
 import org.kravbank.domain.Publication
 import org.kravbank.lang.BackendException
 import org.kravbank.lang.BadRequestException
 import org.kravbank.lang.NotFoundException
 import org.kravbank.utils.Messages.RepoErrorMsg.PUBLICATION_BADREQUEST_CREATE
 import org.kravbank.utils.Messages.RepoErrorMsg.PUBLICATION_BADREQUEST_UPDATE
 import org.kravbank.utils.Messages.RepoErrorMsg.PUBLICATION_NOTFOUND
-import java.time.LocalDateTime
 import java.util.*
 import javax.enterprise.context.ApplicationScoped
-import kotlin.streams.toList
 
 @ApplicationScoped
-class PublicationRepository : PanacheRepository<Publication> {
+class PublicationRepository : BackendRepository<Publication>() {
     @Throws(BackendException::class)
     fun findByRef(projectId: Long, ref: String): Publication {
         val publication =
@@ -43,13 +40,6 @@ class PublicationRepository : PanacheRepository<Publication> {
         }
     }
 
-    fun deletePublication(id: Long): Boolean {
-        val deletedDate = LocalDateTime.now()
-        val updates = update("deleteddate = ?1 where id = ?2", deletedDate, id)
-        if (updates > 0) return true
-        return false
-    }
-
     @Throws(BackendException::class)
     fun updatePublication(id: Long, publication: Publication) {
         val updated = update(

src/main/kotlin/org/kravbank/service/PublicationService.kt

@@ -3,7 +3,6 @@ package org.kravbank.service
 import org.kravbank.dao.PublicationForm
 import org.kravbank.domain.Publication
 import org.kravbank.lang.BackendException
-import org.kravbank.lang.BadRequestException
 import org.kravbank.repository.ProjectRepository
 import org.kravbank.repository.PublicationRepository
 import java.time.LocalDateTime
@@ -39,9 +38,9 @@ class PublicationService(
     fun delete(projectRef: String, publicationRef: String): Publication {
         val foundProject = projectRepository.findByRef(projectRef)
         val publication = publicationRepository.findByRef(foundProject.id, publicationRef)
-        val deleted = publicationRepository.deletePublication(publication.id)
-        if (deleted) return publication
-        throw BadRequestException("Bad request! Did not delete publication")
+        return publicationRepository.deletePublication(publication)
+
+        // throw BadRequestException("Bad request! Did not delete publication") TODO: Put somewhere else further up in chain
     }
 
     @Throws(BackendException::class)