ivan-igorevich/dc-observatio
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev' into route-processing

Browse Source 
Conflict resolution:
- build.gradle.kts: dev version (keep nstart.cloud repo + jacoco/asm mavenCentral)
- settings.gradle.kts: project name from route-processing (observatio-terrae), rest from dev
- config addresses (application-local, pcp-mission-planing-service, pcp-dynamic-plan application.yaml): dev versions
- menu.html: merged both branches (TGU planning + bookings items)
- CatalogControllerTest.kt: merged both mocks (TguPlanningService + BallisticsService)

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
Дмитрий Соловьев
2026-06-01 09:19:29 +03:00
parent da753b4ca9 24af140213
commit 58d067c36f
120 changed files with 5180 additions and 345 deletions
Download Patch File Download Diff File Expand all files Collapse all files
services/pcp-ballistics-service/src/test/kotlin/space/nstart/pcp/pcp_request_service/message/SatelliteIcRvKafkaListenerTest.kt
+5 -1
View File
@@ -4,6 +4,7 @@ import org.junit.jupiter.api.Assertions.assertEquals
import org.junit.jupiter.api.Test
import org.springframework.beans.factory.ObjectProvider
import space.nstart.pcp.pcp_request_service.service.SatelliteIcEventService
import space.nstart.pcp.pcp_types_lib.dto.ballistics.MovementModel
import space.nstart.pcp.pcp_types_lib.dto.ballistics.SatelliteICDTO
import tools.jackson.databind.ObjectMapper
@@ -46,6 +47,7 @@ class SatelliteIcRvKafkaListenerTest {
assertEquals(56756L, satelliteIcEventService.lastMessage?.satelliteId)
assertEquals(42L, satelliteIcEventService.lastMessage?.ic?.orbPoint?.revolution)
assertEquals(140.0, satelliteIcEventService.lastMessage?.ic?.f81)
assertEquals(MovementModel.FOTO, satelliteIcEventService.lastMessage?.movementModel)
}
@Test
@@ -54,8 +56,9 @@ class SatelliteIcRvKafkaListenerTest {
"""
{
"type": "ICRVPlacedEvent",
"data": {
"data": {
"satelliteId": 56756,
"movementModel": null,
"ic": {
"orbPoint": {
"time": "2026-04-16T12:00:00",
@@ -77,6 +80,7 @@ class SatelliteIcRvKafkaListenerTest {
assertEquals(0.0, satelliteIcEventService.lastMessage?.ic?.sBall)
assertEquals(147.8, satelliteIcEventService.lastMessage?.ic?.f81)
assertEquals(MovementModel.FOTO, satelliteIcEventService.lastMessage?.movementModel)
}
private class RecordingSatelliteIcEventService : SatelliteIcEventService() {
services/pcp-ballistics-service/src/test/kotlin/space/nstart/pcp/pcp_request_service/repository/PDCMRepositoryTest.kt
+58
View File
@@ -14,6 +14,11 @@ import org.springframework.kafka.core.DefaultKafkaConsumerFactory
import org.springframework.kafka.listener.adapter.RecordFilterStrategy
import org.springframework.transaction.annotation.Transactional
import space.nstart.pcp.pcp_request_service.entity.PDCMEntity
import space.nstart.pcp.pcp_request_service.entity.SatelliteInitialConditionEntity
import space.nstart.pcp.pcp_types_lib.dto.ballistics.InitialConditionsDTO
import space.nstart.pcp.pcp_types_lib.dto.ballistics.MovementModel
import space.nstart.pcp.pcp_types_lib.dto.ballistics.OrbPointDTO
import space.nstart.pcp.pcp_types_lib.dto.ballistics.SatelliteICDTO
import java.time.LocalDateTime
import kotlin.test.assertEquals
@@ -41,6 +46,9 @@ class PDCMRepositoryTest {
@Autowired
private lateinit var repository: PDCMRepository
@Autowired
private lateinit var satelliteInitialConditionRepository: SatelliteInitialConditionRepository
@Test
fun `find satellite orbit availability returns all satellites with points when time is null`() {
persistPoint(11L, LocalDateTime.of(2026, 4, 14, 10, 0))
@@ -74,6 +82,34 @@ class PDCMRepositoryTest {
assertEquals(LocalDateTime.of(2026, 4, 14, 12, 0), actual.single().timeStop)
}
@Test
fun `satellite initial conditions repository returns last calculated condition`() {
val oldCondition = satelliteInitialConditionRepository.save(sampleInitialCondition(11L, 1L))
oldCondition.markLastCalculated(LocalDateTime.of(2026, 4, 14, 10, 0))
satelliteInitialConditionRepository.save(oldCondition)
val newCondition = satelliteInitialConditionRepository.save(sampleInitialCondition(11L, 2L))
satelliteInitialConditionRepository.clearLastCalculated(11L)
newCondition.markLastCalculated(LocalDateTime.of(2026, 4, 14, 12, 0))
satelliteInitialConditionRepository.save(newCondition)
satelliteInitialConditionRepository.save(sampleInitialCondition(11L, 3L))
entityManager.flush()
entityManager.clear()
val actual = satelliteInitialConditionRepository
.findFirstBySatelliteIdAndLastCalculatedTrueOrderByCalculatedAtDescIdDesc(11L)
assertEquals(2L, actual?.toDto()?.ic?.orbPoint?.revolution)
assertEquals(MovementModel.KONDOR, actual?.movementModel)
assertEquals(
1,
satelliteInitialConditionRepository.findAll().count { entity ->
entity.satelliteId == 11L && entity.lastCalculated
}
)
}
private fun persistPoint(satelliteId: Long, time: LocalDateTime) {
entityManager.persist(
PDCMEntity(
@@ -91,6 +127,28 @@ class PDCMRepositoryTest {
entityManager.flush()
}
private fun sampleInitialCondition(satelliteId: Long, revolution: Long) =
SatelliteInitialConditionEntity(
SatelliteICDTO(
satelliteId = satelliteId,
movementModel = MovementModel.KONDOR,
ic = InitialConditionsDTO(
orbPoint = OrbPointDTO(
time = LocalDateTime.of(2026, 4, 14, 10, 0).plusHours(revolution),
revolution = revolution,
vx = 1.0,
vy = 2.0,
vz = 3.0,
x = 4.0,
y = 5.0,
z = 6.0
),
sBall = 0.2,
f81 = 141.0
)
)
)
@TestConfiguration
class KafkaFilterStubConfiguration {
@Bean("kafkaListenerContainerFactory")