Implement goal deletion

LikeLionHGU · Aug 6, 2024 · 2123255 · 2123255
1 parent 0341d56
commit 2123255
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 0 deletions.
diff --git a/src/main/kotlin/com/likelionhgu/stepper/goal/Goal.kt b/src/main/kotlin/com/likelionhgu/stepper/goal/Goal.kt
@@ -2,7 +2,9 @@ package com.likelionhgu.stepper.goal
 
 import com.likelionhgu.stepper.common.BaseTime
 import com.likelionhgu.stepper.goal.enums.GoalStatus
+import com.likelionhgu.stepper.journal.Journal
 import com.likelionhgu.stepper.member.Member
+import jakarta.persistence.CascadeType
 import jakarta.persistence.Column
 import jakarta.persistence.Entity
 import jakarta.persistence.FetchType
@@ -11,6 +13,7 @@ import jakarta.persistence.GenerationType
 import jakarta.persistence.Id
 import jakarta.persistence.JoinColumn
 import jakarta.persistence.ManyToOne
+import jakarta.persistence.OneToMany
 import java.time.LocalDate
 
 @Entity
@@ -45,6 +48,9 @@ class Goal(
     @Column
     var lastEntryDate: LocalDate? = null
 
+    @OneToMany(mappedBy = "goal", cascade = [CascadeType.REMOVE])
+    val journals: MutableList<Journal> = mutableListOf()
+
     fun update(targetGoal: Goal) {
         title = targetGoal.title
         startDate = targetGoal.startDate

diff --git a/src/main/kotlin/com/likelionhgu/stepper/journal/JournalService.kt b/src/main/kotlin/com/likelionhgu/stepper/journal/JournalService.kt
@@ -29,7 +29,9 @@ class JournalService(
             member = member,
             goal = goal
         ).let(journalRepository::save)
+
         goal.updateStreak(journal.createdDate.toLocalDate())
+        goal.journals.add(journal)
 
         return journal.journalId
     }
@@ -64,6 +66,9 @@ class JournalService(
     }
 
     fun deleteJournal(journalId: Long) {
+        val journal = journalRepository.findById(journalId).getOrNull()
+            ?: throw JournalNotFoundException("Journal not found with ID: $journalId")
+        journal.goal?.journals?.remove(journal)
         journalRepository.deleteById(journalId)
     }
 }
diff --git a/src/test/kotlin/com/likelionhgu/stepper/journal/JournalServiceTest.kt b/src/test/kotlin/com/likelionhgu/stepper/journal/JournalServiceTest.kt
@@ -26,6 +26,7 @@ class JournalServiceTest : BehaviorSpec({
             goal = mockk()
         )
         every { goal.updateStreak(any<LocalDate>()) } returns Unit
+        every { goal.journals } returns mutableListOf()
         val request = JournalRequest("title", "content")
 
         `when`("the member writes the journal entry") {