Commit 822a76d4 authored by Noel Alonso's avatar Noel Alonso
Browse files

Hace uso de la util para generar los ids

parent e9ffe56d

vessels-commands/src/main/java/es/redmic/vesselscommands/commands/vessel/CreateVesselCommand.java

+4 −5
Original line number Diff line number Diff line
@@ -4,13 +4,12 @@ import org.joda.time.DateTime; 


import es.redmic.commandslib.commands.Command;

import es.redmic.exception.databinding.FieldNotValidException;

import es.redmic.vesselscommands.commands.vesseltype.CreateVesselTypeCommand;

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

import es.redmic.vesselslib.utils.VesselTypeUtil;

import es.redmic.vesselslib.utils.VesselUtil;



public class CreateVesselCommand extends Command {



	private final String PREFIX = "vessel-mmsi-";



	private VesselDTO vessel;



	public CreateVesselCommand() {
@@ -23,7 +22,7 @@ public class CreateVesselCommand extends Command { 


		if (vessel.getId() == null && vessel.getMmsi() != null) {

			// Se crea un id único para el vessel

			vessel.setId(PREFIX + vessel.getMmsi());

			vessel.setId(VesselUtil.generateId(vessel.getMmsi()));

		}



		vessel.setInserted(DateTime.now());
@@ -31,7 +30,7 @@ public class CreateVesselCommand extends Command { 


		// Se añade id generado a vesselType para poder buscarlo

		if (vessel.getType() != null && vessel.getType().getId() == null) {

			vessel.getType().setId(new CreateVesselTypeCommand(vessel.getType()).getVesselType().getId());

			vessel.getType().setId(VesselTypeUtil.generateId(vessel.getType().getCode()));

		}



		this.setVessel(vessel);

vessels-commands/src/main/java/es/redmic/vesselscommands/commands/vessel/UpdateVesselCommand.java

+2 −2
Original line number Diff line number Diff line
@@ -3,8 +3,8 @@ package es.redmic.vesselscommands.commands.vessel; 
import org.joda.time.DateTime;



import es.redmic.commandslib.commands.Command;

import es.redmic.vesselscommands.commands.vesseltype.CreateVesselTypeCommand;

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

import es.redmic.vesselslib.utils.VesselTypeUtil;



public class UpdateVesselCommand extends Command {
@@ -19,7 +19,7 @@ public class UpdateVesselCommand extends Command { 


		// Se añade id generado a vesselType para poder buscarlo

		if (vessel.getType() != null && vessel.getType().getId() == null) {

			vessel.getType().setId(new CreateVesselTypeCommand(vessel.getType()).getVesselType().getId());

			vessel.getType().setId(VesselTypeUtil.generateId(vessel.getType().getCode()));

		}



		this.setVessel(vessel);

vessels-commands/src/main/java/es/redmic/vesselscommands/commands/vesseltracking/UpdateVesselTrackingCommand.java

+2 −2
Original line number Diff line number Diff line
@@ -3,9 +3,9 @@ package es.redmic.vesselscommands.commands.vesseltracking; 
import org.joda.time.DateTime;



import es.redmic.commandslib.commands.Command;

import es.redmic.vesselscommands.commands.vessel.CreateVesselCommand;

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

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

import es.redmic.vesselslib.utils.VesselUtil;



public class UpdateVesselTrackingCommand extends Command {
@@ -22,7 +22,7 @@ public class UpdateVesselTrackingCommand extends Command { 


		// Se añade id generado a vesselType para poder buscarlo

		if (vessel != null && vessel.getId() == null) {

			vesselTracking.getProperties().getVessel().setId(new CreateVesselCommand(vessel).getVessel().getId());

			vesselTracking.getProperties().getVessel().setId(VesselUtil.generateId(vessel.getMmsi()));

		}



		this.setVesselTracking(vesselTracking);

vessels-commands/src/main/java/es/redmic/vesselscommands/commands/vesseltype/CreateVesselTypeCommand.java

+2 −3
Original line number Diff line number Diff line
@@ -3,11 +3,10 @@ package es.redmic.vesselscommands.commands.vesseltype; 
import es.redmic.commandslib.commands.Command;

import es.redmic.exception.databinding.FieldNotValidException;

import es.redmic.vesselslib.dto.vesseltype.VesselTypeDTO;

import es.redmic.vesselslib.utils.VesselTypeUtil;



public class CreateVesselTypeCommand extends Command {



	private final String PREFIX = "vesseltype-code-";



	private VesselTypeDTO vesselType;



	public CreateVesselTypeCommand() {
@@ -20,7 +19,7 @@ public class CreateVesselTypeCommand extends Command { 


		if (vesselType.getId() == null && vesselType.getCode() != null) {

			// Se crea un id único para el vessel

			vesselType.setId(PREFIX + vesselType.getCode());

			vesselType.setId(VesselTypeUtil.generateId(vesselType.getCode()));

		}

		this.setVessel(vesselType);

	}