Commit 43c2ea77 authored by Noel Alonso's avatar Noel Alonso
Browse files

Reutiliza creación de vesselDTO a partir de aisDTO

parent 47f1aa4c

vessels-commands/src/main/java/es/redmic/vesselscommands/service/VesselCommandService.java

+1 −1
Original line number Diff line number Diff line
@@ -59,7 +59,7 @@ public class VesselCommandService implements CommandServiceItfc<VesselDTO> { 
		return commandHandler.update(id, new DeleteVesselCommand(id));

	}



	private VesselDTO convertTrackToVessel(AISTrackingDTO aisTracking) {

	public static VesselDTO convertTrackToVessel(AISTrackingDTO aisTracking) {



		VesselDTO vessel = new VesselDTO();

vessels-commands/src/main/java/es/redmic/vesselscommands/service/VesselTrackingCommandService.java

+2 −9
Original line number Diff line number Diff line
@@ -20,7 +20,6 @@ import es.redmic.vesselscommands.commands.vesseltracking.UpdateVesselTrackingCom 
import es.redmic.vesselscommands.handler.VesselTrackingCommandHandler;

import es.redmic.vesselslib.dto.tracking.VesselTrackingDTO;

import es.redmic.vesselslib.dto.tracking.VesselTrackingPropertiesDTO;

import es.redmic.vesselslib.dto.vessel.VesselDTO;



@Service

public class VesselTrackingCommandService implements CommandGeoServiceItfc<VesselTrackingDTO> {
@@ -86,7 +85,7 @@ public class VesselTrackingCommandService implements CommandGeoServiceItfc<Vesse 
			throw new FieldNotValidException("activityId", requestId);

	}



	private VesselTrackingDTO convertTrackToVesselTracking(AISTrackingDTO aisTracking) {

	public static VesselTrackingDTO convertTrackToVesselTracking(AISTrackingDTO aisTracking) {



		if (aisTracking.getMmsi() == null)

			throw new FieldNotValidException("mmsi", "null");
@@ -105,13 +104,7 @@ public class VesselTrackingCommandService implements CommandGeoServiceItfc<Vesse 


		VesselTrackingPropertiesDTO properties = new VesselTrackingPropertiesDTO();



		// TODO: asignar una actividad para este tipo de datos?

		// properties.setActivityId(activityId);



		VesselDTO vessel = new VesselDTO();

		vessel.setMmsi(aisTracking.getMmsi());

		vessel.setImo(aisTracking.getImo());

		properties.setVessel(vessel);

		properties.setVessel(VesselCommandService.convertTrackToVessel(aisTracking));



		properties.setDate(aisTracking.getTstamp());