[issues/1] Ping Model was no following DDD

👀 It was moved to PingMapper class

Author: luismr

src/main/java/dev/luismachadoreis/flighttracker/server/flightdata/infrastructure/pubsub/FlightDataSubscriber.java

@@ -3,7 +3,7 @@
 import dev.luismachadoreis.blueprint.cqs.SpringCommanderMediator;
 import dev.luismachadoreis.flighttracker.server.ping.application.CreatePingCommand;
 import dev.luismachadoreis.flighttracker.server.ping.application.dto.FlightDataDTO;
-import dev.luismachadoreis.flighttracker.server.ping.application.dto.PingDTOMapper;
+import dev.luismachadoreis.flighttracker.server.ping.application.dto.PingMapper;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.kafka.annotation.KafkaListener;
@@ -15,11 +15,12 @@
 public class FlightDataSubscriber {
 
     private final SpringCommanderMediator mediator;
+    private final PingMapper pingMapper;
 
     @KafkaListener(topics = "${spring.kafka.topic.flight-positions}", groupId = "${spring.kafka.consumer.group-id}")
     public void consumeFlightData(FlightDataDTO data) {
         log.debug("Received flight data: {}", data);
-        mediator.send(new CreatePingCommand(PingDTOMapper.fromFlightData(data)));
+        mediator.send(new CreatePingCommand(pingMapper.fromFlightData(data)));
     }
 
 } 

src/main/java/dev/luismachadoreis/flighttracker/server/ping/application/CreatePingCommandHandler.java

@@ -3,6 +3,7 @@
 import dev.luismachadoreis.blueprint.cqs.command.CommandHandler;
 import dev.luismachadoreis.flighttracker.server.ping.domain.Ping;
 import dev.luismachadoreis.flighttracker.server.ping.domain.PingRepository;
+import dev.luismachadoreis.flighttracker.server.ping.application.dto.PingMapper;
 import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -16,12 +17,14 @@
 public class CreatePingCommandHandler implements CommandHandler<CreatePingCommand, UUID> {
 
     private final PingRepository pingRepository;
+    private final PingMapper pingMapper;
 
     /*
      * This constructor injects the ping repository into the command handler.
      */
-    public CreatePingCommandHandler(PingRepository pingRepository) {
+    public CreatePingCommandHandler(PingRepository pingRepository, PingMapper pingMapper) {
         this.pingRepository = pingRepository;
+        this.pingMapper = pingMapper;
     }
 
     /*
@@ -32,7 +35,7 @@ public CreatePingCommandHandler(PingRepository pingRepository) {
     public UUID handle(CreatePingCommand command) {
         Objects.requireNonNull(command, "Command cannot be null");
 
-        var ping = Ping.fromDTO(command.pingDTO());
+        var ping = pingMapper.toDomain(command.pingDTO());
         ping.registerPingCreated();
         pingRepository.save(ping);
 

src/main/java/dev/luismachadoreis/flighttracker/server/ping/application/GetRecentPingsQueryHandler.java

@@ -3,6 +3,7 @@
 import dev.luismachadoreis.blueprint.cqs.query.QueryHandler;
 import dev.luismachadoreis.flighttracker.server.ping.application.dto.PingDTO;
 import dev.luismachadoreis.flighttracker.server.ping.domain.PingRepository;
+import dev.luismachadoreis.flighttracker.server.ping.application.dto.PingMapper;
 import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -14,12 +15,14 @@
 @Component
 public class GetRecentPingsQueryHandler implements QueryHandler<GetRecentPingsQuery, List<PingDTO>> {
     private final PingRepository pingRepository;
+    private final PingMapper pingMapper;
 
     /*
      * This constructor injects the ping repository into the query handler.
      */
-    public GetRecentPingsQueryHandler(PingRepository pingRepository) {
+    public GetRecentPingsQueryHandler(PingRepository pingRepository, PingMapper pingMapper) {
         this.pingRepository = pingRepository;
+        this.pingMapper = pingMapper;
     }
 
     /*
@@ -32,7 +35,7 @@ public List<PingDTO> handle(GetRecentPingsQuery query) {
 
         return pingRepository.findTopNPings(query.limit())
             .stream()
-            .map(ping -> ping.toDTO())
+            .map(pingMapper::toDTO)
             .toList();
     }
 } 

src/main/java/dev/luismachadoreis/flighttracker/server/ping/application/dto/PingDTOMapper.java

@@ -0,0 +1,113 @@
+package dev.luismachadoreis.flighttracker.server.ping.application.dto;
+
+import dev.luismachadoreis.flighttracker.server.ping.domain.Ping;
+import org.springframework.stereotype.Component;
+import java.time.Instant;
+import java.util.UUID;
+
+@Component
+public class PingMapper {
+    
+    /**
+     * Map a Ping to a PingDTO.
+     * @param ping The Ping to map.
+     * @return The PingDTO.
+     */
+    public PingDTO toDTO(Ping ping) {
+        return new PingDTO(
+            ping.getId(),
+            new PingDTO.Aircraft(
+                ping.getAircraft().icao24(),
+                ping.getAircraft().callsign(),
+                ping.getAircraft().originCountry(),
+                ping.getAircraft().lastContact(),
+                ping.getAircraft().squawk(),
+                ping.getAircraft().spi(),
+                ping.getAircraft().sensors()
+            ),
+            new PingDTO.Vector(
+                ping.getVector().velocity(),
+                ping.getVector().trueTrack(),
+                ping.getVector().verticalRate()
+            ),
+            new PingDTO.Position(
+                ping.getPosition().longitude(),
+                ping.getPosition().latitude(),
+                ping.getPosition().geoAltitude(),
+                ping.getPosition().baroAltitude(),
+                ping.getPosition().onGround(),
+                ping.getPosition().source(),
+                ping.getPosition().time()
+            ),
+            ping.getLastUpdate()
+        );
+    }
+
+    /**
+     * Map a PingDTO to a Ping.
+     * @param dto The PingDTO to map.
+     * @return The Ping.
+     */
+    public Ping toDomain(PingDTO dto) {
+        return new Ping(
+            new Ping.Aircraft(
+                dto.aircraft().icao24(),
+                dto.aircraft().callsign(),
+                dto.aircraft().originCountry(),
+                dto.aircraft().lastContact(),
+                dto.aircraft().squawk(),
+                dto.aircraft().spi(),
+                dto.aircraft().sensors()
+            ),
+            new Ping.Vector(
+                dto.vector().velocity(),
+                dto.vector().trueTrack(),
+                dto.vector().verticalRate()
+            ),
+            new Ping.Position(
+                dto.position().longitude(),
+                dto.position().latitude(),
+                dto.position().geoAltitude(),
+                dto.position().baroAltitude(),
+                dto.position().onGround(),
+                dto.position().source(),
+                dto.position().time()
+            )
+        );
+    }
+
+    /**
+     * Map a FlightDataDTO to a PingDTO.
+     * @param flightData The FlightDataDTO to map.
+     * @return The PingDTO.
+     */
+    public PingDTO fromFlightData(FlightDataDTO flightData) {
+        return new PingDTO(
+            UUID.randomUUID(),
+            new PingDTO.Aircraft(
+                flightData.icao24(),
+                flightData.callsign(),
+                flightData.originCountry(),
+                flightData.lastContact() != null ? Instant.ofEpochSecond(flightData.lastContact()) : null,
+                flightData.squawk(),
+                flightData.spi(),
+                flightData.sensors()
+            ),
+            new PingDTO.Vector(
+                flightData.velocity(),
+                flightData.trueTrack(),
+                flightData.verticalRate()
+            ),
+            new PingDTO.Position(
+                flightData.longitude(),
+                flightData.latitude(),
+                flightData.geoAltitude(),
+                flightData.baroAltitude(),
+                flightData.onGround(),
+                flightData.positionSource(),
+                flightData.timePosition() != null ? Instant.ofEpochSecond(flightData.timePosition()) : null
+            ),
+            Instant.now()
+        );
+    }
+} 

src/main/java/dev/luismachadoreis/flighttracker/server/ping/application/dto/PingMapper.java

@@ -1,7 +1,6 @@
 package dev.luismachadoreis.flighttracker.server.ping.domain;
 
 import dev.luismachadoreis.flighttracker.server.ping.domain.event.PingCreated;
-import dev.luismachadoreis.flighttracker.server.ping.application.dto.PingDTO;
 import jakarta.persistence.*;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
@@ -38,64 +37,6 @@ public Ping(final Aircraft aircraft, final Vector vector, final Position positio
         this.lastUpdate = Instant.now();
     }
 
-    public PingDTO toDTO() {
-        return new PingDTO(
-            this.id,
-            new PingDTO.Aircraft(
-                this.aircraft.icao24(),
-                this.aircraft.callsign(),
-                this.aircraft.originCountry(),
-                this.aircraft.lastContact(),
-                this.aircraft.squawk(),
-                this.aircraft.spi(),
-                this.aircraft.sensors()
-            ),
-            new PingDTO.Vector(
-                this.vector.velocity(),
-                this.vector.trueTrack(),
-                this.vector.verticalRate()
-            ),
-            new PingDTO.Position(
-                this.position.longitude(),
-                this.position.latitude(),
-                this.position.geoAltitude(),
-                this.position.baroAltitude(),
-                this.position.onGround(),
-                this.position.source(),
-                this.position.time()
-            ),
-            this.lastUpdate
-        );
-    }
-
-    public static Ping fromDTO(PingDTO dto) {
-        return new Ping(
-            new Aircraft(
-                dto.aircraft().icao24(),
-                dto.aircraft().callsign(),
-                dto.aircraft().originCountry(),
-                dto.aircraft().lastContact(),
-                dto.aircraft().squawk(),
-                dto.aircraft().spi(),
-                dto.aircraft().sensors()
-            ),
-            new Vector(
-                dto.vector().velocity(),
-                dto.vector().trueTrack(),
-                dto.vector().verticalRate()
-            ),
-            new Position(
-                dto.position().longitude(),
-                dto.position().latitude(),
-                dto.position().geoAltitude(),
-                dto.position().baroAltitude(),
-                dto.position().onGround(),
-                dto.position().source(),
-                dto.position().time()
-            )
-        );
-    }
-
     @Embeddable
     public record Aircraft(
         @Column(name = "icao24")
@@ -205,5 +146,4 @@ public void registerPingCreated() {
             this.lastUpdate
         ));
     }
-    
 }