Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

159 fix issue when journaldocked message is missing landing pad info #160

Merged
merged 2 commits into from
Mar 25, 2024
+112 −9
Merged

159 fix issue when journaldocked message is missing landing pad info #160

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f365f0e
#159 Refactor MybatisStationEntityMapper and expand tests
pveeckhout Mar 24, 2024
4e8180a
#159 Add null-check to landingPadSizeFromPayload method
pveeckhout Mar 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 10 additions & 4 deletions ...dpn/backend/exploration/adapter/persistence/entity/mapper/MybatisStationEntityMapper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,16 @@ public class MybatisStationEntityMapper {
private final MybatisSystemEntityMapper systemEntityMapper;

private static Map<String, Integer> getLandingPads(Station station) {
return LandingPadSize.KNOWN_LANDING_PAD_SIZES.stream()
.collect(Collectors.toMap(
LandingPadSize::name,
landingPadSize -> station.landingPads().getOrDefault(landingPadSize, 0)));
return Optional.ofNullable(station.landingPads())
.flatMap(MybatisStationEntityMapper::filterLandingPads)
.orElse(null);
}

private static Optional<Map<String, Integer>> filterLandingPads(Map<LandingPadSize, Integer> landingPads) {
Map<String, Integer> filteredLandingPadsMap = landingPads.entrySet().stream()
.filter(entry -> LandingPadSize.KNOWN_LANDING_PAD_SIZES.contains(entry.getKey()))
.collect(Collectors.toMap(entry -> entry.getKey().name(), Map.Entry::getValue));
return filteredLandingPadsMap.isEmpty() ? Optional.empty() : Optional.of(filteredLandingPadsMap);
}

private static Map<LandingPadSize, Integer> getLandingPads(MybatisStationEntity stationEntity) {
Expand Down
12 changes: 7 additions & 5 deletions ...ain/java/io/edpn/backend/exploration/application/service/ReceiveJournalDockedService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@

import java.time.LocalDateTime;
import java.util.Map;
import java.util.Optional;
import java.util.concurrent.ExecutorService;
import java.util.stream.Collectors;

Expand Down Expand Up @@ -65,11 +66,12 @@ private void createOrUpdateFromPayload(DockedMessage.V1.Payload payload, LocalDa
}

private Map<LandingPadSize, Integer> landingPadSizeFromPayload(DockedMessage.V1.Payload payload) {
return Map.of(
LandingPadSize.LARGE, payload.landingPads().large(),
LandingPadSize.MEDIUM, payload.landingPads().medium(),
LandingPadSize.SMALL, payload.landingPads().small()
);
return Optional.ofNullable(payload.landingPads())
.map(landingPads -> Map.of(
LandingPadSize.LARGE, landingPads.large(),
LandingPadSize.MEDIUM, landingPads.medium(),
LandingPadSize.SMALL, landingPads.small()
)).orElse(null);
}

private Map<String, Double> stationEconomiesFromPayload(DockedMessage.V1.Payload payload) {
Expand Down
95 changes: 95 additions & 0 deletions ...backend/exploration/adapter/persistence/entity/mapper/MybatisStationEntityMapperTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,6 +128,101 @@ public void testMap_givenStation_shouldReturnStationEntity() {
MybatisStationEntity result = underTest.map(station);


assertThat(result.getId(), equalTo(station.id()));
assertThat(result.getMarketId(), equalTo(station.marketId()));
assertThat(result.getName(), equalTo(station.name()));
assertThat(result.getType(), equalTo(station.type()));
assertThat(result.getDistanceFromStar(), equalTo(station.distanceFromStar()));
assertThat(result.getSystem(), equalTo(systemEntity));
assertThat(result.getLandingPads(), equalTo(expectedLandingPadSizes));
assertThat(result.getEconomies(), equalTo(station.economies()));
assertThat(result.getServices(), equalTo(station.services()));
assertThat(result.getEconomy(), equalTo(station.economy()));
assertThat(result.getGovernment(), equalTo(station.government()));
assertThat(result.getOdyssey(), equalTo(station.odyssey()));
assertThat(result.getHorizons(), equalTo(station.horizons()));
assertThat(result.getUpdatedAt(), equalTo(station.updatedAt()));
}
@Test
public void testMap_givenStation_withEmptyLandingPads() {
UUID stationId = UUID.randomUUID();
System system = mock(System.class);
MybatisSystemEntity systemEntity = mock(MybatisSystemEntity.class);
when(systemEntityMapper.map(any(System.class))).thenReturn(systemEntity);
Map<String, Integer> expectedLandingPadSizes = null;

Station station = new Station(
stationId,
123L,
"stationName",
"Corriolis",
1000.0,
system,
Map.of(),
Map.of(
"economy1", 0.1,
"economy2", 0.9
),
List.of("service1", "service2"),
"economy2",
"government",
true,
true,
LocalDateTime.of(2020, 1, 1, 0, 0, 0)
);


MybatisStationEntity result = underTest.map(station);


assertThat(result.getId(), equalTo(station.id()));
assertThat(result.getMarketId(), equalTo(station.marketId()));
assertThat(result.getName(), equalTo(station.name()));
assertThat(result.getType(), equalTo(station.type()));
assertThat(result.getDistanceFromStar(), equalTo(station.distanceFromStar()));
assertThat(result.getSystem(), equalTo(systemEntity));
assertThat(result.getLandingPads(), equalTo(expectedLandingPadSizes));
assertThat(result.getEconomies(), equalTo(station.economies()));
assertThat(result.getServices(), equalTo(station.services()));
assertThat(result.getEconomy(), equalTo(station.economy()));
assertThat(result.getGovernment(), equalTo(station.government()));
assertThat(result.getOdyssey(), equalTo(station.odyssey()));
assertThat(result.getHorizons(), equalTo(station.horizons()));
assertThat(result.getUpdatedAt(), equalTo(station.updatedAt()));
}

@Test
public void testMap_givenStation_withNullLandingPads() {
UUID stationId = UUID.randomUUID();
System system = mock(System.class);
MybatisSystemEntity systemEntity = mock(MybatisSystemEntity.class);
when(systemEntityMapper.map(any(System.class))).thenReturn(systemEntity);
Map<String, Integer> expectedLandingPadSizes = null;

Station station = new Station(
stationId,
123L,
"stationName",
"Corriolis",
1000.0,
system,
null,
Map.of(
"economy1", 0.1,
"economy2", 0.9
),
List.of("service1", "service2"),
"economy2",
"government",
true,
true,
LocalDateTime.of(2020, 1, 1, 0, 0, 0)
);


MybatisStationEntity result = underTest.map(station);


assertThat(result.getId(), equalTo(station.id()));
assertThat(result.getMarketId(), equalTo(station.marketId()));
assertThat(result.getName(), equalTo(station.name()));
Expand Down
Loading