feat(backend): persist tasks and generated message history
- add EntityTask domain and CRUD API backed by PostgreSQL - relate generated messages directly to tasks and delete on task removal - move preview generation to backend Llama endpoint - migrate frontend task APIs from localStorage to backend endpoints - update tests and CLAUDE rules for backend-owned LLM/persistence
This commit is contained in:
@@ -0,0 +1,141 @@
|
||||
package com.condado.newsletter.controller
|
||||
|
||||
import com.condado.newsletter.model.GeneratedMessageHistory
|
||||
import com.condado.newsletter.model.EntityTask
|
||||
import com.condado.newsletter.model.VirtualEntity
|
||||
import com.condado.newsletter.repository.EntityTaskRepository
|
||||
import com.condado.newsletter.repository.GeneratedMessageHistoryRepository
|
||||
import com.condado.newsletter.repository.VirtualEntityRepository
|
||||
import com.condado.newsletter.scheduler.EntityScheduler
|
||||
import com.condado.newsletter.service.JwtService
|
||||
import com.condado.newsletter.service.LlamaPreviewService
|
||||
import com.ninjasquad.springmockk.MockkBean
|
||||
import io.mockk.every
|
||||
import jakarta.servlet.http.Cookie
|
||||
import org.junit.jupiter.api.AfterEach
|
||||
import org.junit.jupiter.api.Test
|
||||
import org.springframework.beans.factory.annotation.Autowired
|
||||
import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc
|
||||
import org.springframework.boot.test.context.SpringBootTest
|
||||
import org.springframework.http.MediaType
|
||||
import org.springframework.test.web.servlet.MockMvc
|
||||
import org.springframework.test.web.servlet.request.MockMvcRequestBuilders.delete
|
||||
import org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get
|
||||
import org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post
|
||||
import org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath
|
||||
import org.springframework.test.web.servlet.result.MockMvcResultMatchers.status
|
||||
import java.util.UUID
|
||||
|
||||
@SpringBootTest
|
||||
@AutoConfigureMockMvc
|
||||
class TaskGeneratedMessageControllerTest {
|
||||
|
||||
@Autowired lateinit var mockMvc: MockMvc
|
||||
@Autowired lateinit var jwtService: JwtService
|
||||
@Autowired lateinit var generatedMessageHistoryRepository: GeneratedMessageHistoryRepository
|
||||
@Autowired lateinit var virtualEntityRepository: VirtualEntityRepository
|
||||
@Autowired lateinit var entityTaskRepository: EntityTaskRepository
|
||||
|
||||
@MockkBean lateinit var entityScheduler: EntityScheduler
|
||||
@MockkBean lateinit var llamaPreviewService: LlamaPreviewService
|
||||
|
||||
private fun authCookie() = Cookie("jwt", jwtService.generateToken())
|
||||
|
||||
@AfterEach
|
||||
fun cleanUp() {
|
||||
generatedMessageHistoryRepository.deleteAll()
|
||||
entityTaskRepository.deleteAll()
|
||||
virtualEntityRepository.deleteAll()
|
||||
}
|
||||
|
||||
private fun createTask(taskName: String = "Task"): EntityTask {
|
||||
val entity = virtualEntityRepository.save(
|
||||
VirtualEntity(name = "Entity A", email = "entity-a@condado.com", jobTitle = "Ops")
|
||||
)
|
||||
return entityTaskRepository.save(
|
||||
EntityTask(
|
||||
virtualEntity = entity,
|
||||
name = taskName,
|
||||
prompt = "Prompt",
|
||||
scheduleCron = "0 9 * * 1",
|
||||
emailLookback = "last_week"
|
||||
)
|
||||
)
|
||||
}
|
||||
|
||||
@Test
|
||||
fun should_returnPersistedHistory_when_getByTaskId() {
|
||||
val task = createTask()
|
||||
generatedMessageHistoryRepository.save(
|
||||
GeneratedMessageHistory(
|
||||
task = task,
|
||||
label = "Message #1",
|
||||
content = "SUBJECT: A\\nBODY:\\nHello"
|
||||
)
|
||||
)
|
||||
|
||||
mockMvc.perform(get("/api/v1/tasks/${task.id}/generated-messages").cookie(authCookie()))
|
||||
.andExpect(status().isOk)
|
||||
.andExpect(jsonPath("$[0].taskId").value(task.id.toString()))
|
||||
.andExpect(jsonPath("$[0].label").value("Message #1"))
|
||||
}
|
||||
|
||||
@Test
|
||||
fun should_generateAndPersistMessage_when_generateEndpointCalled() {
|
||||
val task = createTask("Morning Blast")
|
||||
every { llamaPreviewService.generate(any()) } returns "SUBJECT: Generated\\nBODY:\\nFrom backend"
|
||||
|
||||
val payload = """
|
||||
{
|
||||
"entity": {
|
||||
"id": "${UUID.randomUUID()}",
|
||||
"name": "Entity A",
|
||||
"email": "entity@example.com",
|
||||
"jobTitle": "Ops",
|
||||
"personality": "Formal",
|
||||
"scheduleCron": "0 9 * * 1",
|
||||
"contextWindowDays": 3,
|
||||
"active": true
|
||||
},
|
||||
"task": {
|
||||
"entityId": "${UUID.randomUUID()}",
|
||||
"name": "Morning Blast",
|
||||
"prompt": "Talk about coffee",
|
||||
"scheduleCron": "0 8 * * 1-5",
|
||||
"emailLookback": "last_week"
|
||||
}
|
||||
}
|
||||
""".trimIndent()
|
||||
|
||||
mockMvc.perform(
|
||||
post("/api/v1/tasks/${task.id}/generated-messages/generate")
|
||||
.cookie(authCookie())
|
||||
.contentType(MediaType.APPLICATION_JSON)
|
||||
.content(payload)
|
||||
)
|
||||
.andExpect(status().isCreated)
|
||||
.andExpect(jsonPath("$.taskId").value(task.id.toString()))
|
||||
.andExpect(jsonPath("$.content").value("SUBJECT: Generated\\nBODY:\\nFrom backend"))
|
||||
.andExpect(jsonPath("$.label").value("Message #1"))
|
||||
}
|
||||
|
||||
@Test
|
||||
fun should_deleteHistoryItem_when_deleteEndpointCalled() {
|
||||
val task = createTask()
|
||||
val saved = generatedMessageHistoryRepository.save(
|
||||
GeneratedMessageHistory(
|
||||
task = task,
|
||||
label = "Message #1",
|
||||
content = "SUBJECT: A\\nBODY:\\nHello"
|
||||
)
|
||||
)
|
||||
|
||||
mockMvc.perform(delete("/api/v1/tasks/${task.id}/generated-messages/${saved.id}").cookie(authCookie()))
|
||||
.andExpect(status().isNoContent)
|
||||
|
||||
mockMvc.perform(get("/api/v1/tasks/${task.id}/generated-messages").cookie(authCookie()))
|
||||
.andExpect(status().isOk)
|
||||
.andExpect(jsonPath("$").isArray)
|
||||
.andExpect(jsonPath("$.length()").value(0))
|
||||
}
|
||||
}
|
||||
@@ -2,6 +2,8 @@ package com.condado.newsletter.repository
|
||||
|
||||
import com.condado.newsletter.model.DispatchLog
|
||||
import com.condado.newsletter.model.DispatchStatus
|
||||
import com.condado.newsletter.model.EntityTask
|
||||
import com.condado.newsletter.model.GeneratedMessageHistory
|
||||
import com.condado.newsletter.model.VirtualEntity
|
||||
import org.assertj.core.api.Assertions.assertThat
|
||||
import org.junit.jupiter.api.BeforeEach
|
||||
@@ -9,6 +11,7 @@ import org.junit.jupiter.api.Test
|
||||
import org.springframework.beans.factory.annotation.Autowired
|
||||
import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest
|
||||
import org.springframework.boot.test.autoconfigure.orm.jpa.TestEntityManager
|
||||
import java.util.UUID
|
||||
|
||||
@DataJpaTest
|
||||
class RepositoryTest {
|
||||
@@ -22,6 +25,12 @@ class RepositoryTest {
|
||||
@Autowired
|
||||
lateinit var dispatchLogRepository: DispatchLogRepository
|
||||
|
||||
@Autowired
|
||||
lateinit var generatedMessageHistoryRepository: GeneratedMessageHistoryRepository
|
||||
|
||||
@Autowired
|
||||
lateinit var entityTaskRepository: EntityTaskRepository
|
||||
|
||||
private lateinit var activeEntity: VirtualEntity
|
||||
private lateinit var inactiveEntity: VirtualEntity
|
||||
|
||||
@@ -88,4 +97,38 @@ class RepositoryTest {
|
||||
assertThat(result).isPresent
|
||||
assertThat(result.get().id).isEqualTo(latestLog.id)
|
||||
}
|
||||
|
||||
@Test
|
||||
fun should_returnTaskHistoryOrderedByCreatedAtDesc_when_findAllByTaskIdOrderByCreatedAtDescCalled() {
|
||||
val task = entityTaskRepository.save(
|
||||
EntityTask(
|
||||
virtualEntity = activeEntity,
|
||||
name = "Task One",
|
||||
prompt = "Prompt",
|
||||
scheduleCron = "0 9 * * 1",
|
||||
emailLookback = "last_week"
|
||||
)
|
||||
)
|
||||
generatedMessageHistoryRepository.save(
|
||||
GeneratedMessageHistory(
|
||||
task = task,
|
||||
label = "Message #1",
|
||||
content = "SUBJECT: One\nBODY:\nFirst"
|
||||
)
|
||||
)
|
||||
Thread.sleep(10)
|
||||
generatedMessageHistoryRepository.save(
|
||||
GeneratedMessageHistory(
|
||||
task = task,
|
||||
label = "Message #2",
|
||||
content = "SUBJECT: Two\nBODY:\nSecond"
|
||||
)
|
||||
)
|
||||
|
||||
val result = generatedMessageHistoryRepository.findAllByTask_IdOrderByCreatedAtDesc(task.id!!)
|
||||
|
||||
assertThat(result).hasSize(2)
|
||||
assertThat(result[0].label).isEqualTo("Message #2")
|
||||
assertThat(result[1].label).isEqualTo("Message #1")
|
||||
}
|
||||
}
|
||||
|
||||
@@ -0,0 +1,84 @@
|
||||
package com.condado.newsletter.service
|
||||
|
||||
import com.condado.newsletter.dto.TaskPreviewEntityDto
|
||||
import com.condado.newsletter.dto.TaskPreviewGenerateRequestDto
|
||||
import com.condado.newsletter.dto.TaskPreviewTaskDto
|
||||
import com.condado.newsletter.model.EntityTask
|
||||
import com.condado.newsletter.model.GeneratedMessageHistory
|
||||
import com.condado.newsletter.model.VirtualEntity
|
||||
import com.condado.newsletter.repository.EntityTaskRepository
|
||||
import com.condado.newsletter.repository.GeneratedMessageHistoryRepository
|
||||
import io.mockk.every
|
||||
import io.mockk.mockk
|
||||
import io.mockk.slot
|
||||
import io.mockk.verify
|
||||
import org.assertj.core.api.Assertions.assertThat
|
||||
import org.junit.jupiter.api.Test
|
||||
import java.util.UUID
|
||||
|
||||
class TaskGeneratedMessageServiceTest {
|
||||
|
||||
private val generatedMessageHistoryRepository: GeneratedMessageHistoryRepository = mockk()
|
||||
private val entityTaskRepository: EntityTaskRepository = mockk()
|
||||
private val llamaPreviewService: LlamaPreviewService = mockk()
|
||||
|
||||
private val service = TaskGeneratedMessageService(
|
||||
generatedMessageHistoryRepository = generatedMessageHistoryRepository,
|
||||
entityTaskRepository = entityTaskRepository,
|
||||
llamaPreviewService = llamaPreviewService
|
||||
)
|
||||
|
||||
@Test
|
||||
fun should_generateAndPersistMessage_when_generateAndSaveCalled() {
|
||||
val taskId = UUID.randomUUID()
|
||||
val entity = VirtualEntity(name = "Entity", email = "e@x.com", jobTitle = "Ops").apply { id = UUID.randomUUID() }
|
||||
val task = EntityTask(
|
||||
virtualEntity = entity,
|
||||
name = "Task",
|
||||
prompt = "Prompt",
|
||||
scheduleCron = "0 9 * * 1",
|
||||
emailLookback = "last_week"
|
||||
).apply { id = taskId }
|
||||
val captured = slot<GeneratedMessageHistory>()
|
||||
|
||||
every { llamaPreviewService.generate(any()) } returns "SUBJECT: Test\nBODY:\nGenerated by backend"
|
||||
every { entityTaskRepository.findById(taskId) } returns java.util.Optional.of(task)
|
||||
every { generatedMessageHistoryRepository.countByTask_Id(taskId) } returns 0
|
||||
every { generatedMessageHistoryRepository.save(capture(captured)) } answers {
|
||||
captured.captured.apply {
|
||||
id = UUID.fromString("00000000-0000-0000-0000-000000000001")
|
||||
}
|
||||
}
|
||||
|
||||
val response = service.generateAndSave(taskId, sampleRequest())
|
||||
|
||||
assertThat(response.id).isEqualTo(UUID.fromString("00000000-0000-0000-0000-000000000001"))
|
||||
assertThat(response.taskId).isEqualTo(taskId)
|
||||
assertThat(response.label).isEqualTo("Message #1")
|
||||
assertThat(response.content).contains("Generated by backend")
|
||||
assertThat(captured.captured.task.id).isEqualTo(taskId)
|
||||
|
||||
verify(exactly = 1) { llamaPreviewService.generate(any()) }
|
||||
verify(exactly = 1) { generatedMessageHistoryRepository.save(any()) }
|
||||
}
|
||||
|
||||
private fun sampleRequest() = TaskPreviewGenerateRequestDto(
|
||||
entity = TaskPreviewEntityDto(
|
||||
id = UUID.randomUUID().toString(),
|
||||
name = "Entity A",
|
||||
email = "entity@example.com",
|
||||
jobTitle = "Ops",
|
||||
personality = "Formal",
|
||||
scheduleCron = "0 9 * * 1",
|
||||
contextWindowDays = 3,
|
||||
active = true
|
||||
),
|
||||
task = TaskPreviewTaskDto(
|
||||
entityId = UUID.randomUUID().toString(),
|
||||
name = "Morning Blast",
|
||||
prompt = "Talk about coffee",
|
||||
scheduleCron = "0 8 * * 1-5",
|
||||
emailLookback = "last_week"
|
||||
)
|
||||
)
|
||||
}
|
||||
Reference in New Issue
Block a user