Commit b245363f authored by Noel Alonso's avatar Noel Alonso
Browse files

Elimina edición parcial de vessel en tracking 

Elimina funcionalidad por no ser usada de momento + test
parent 73d0eb58

vessels-view/src/main/java/es/redmic/vesselsview/controller/vesseltracking/VesselTrackingController.java

+0 −28
Original line number Diff line number Diff line
@@ -17,9 +17,7 @@ import es.redmic.vesselslib.events.vesseltracking.VesselTrackingEventFactory; 
import es.redmic.vesselslib.events.vesseltracking.VesselTrackingEventTypes;

import es.redmic.vesselslib.events.vesseltracking.create.CreateVesselTrackingEvent;

import es.redmic.vesselslib.events.vesseltracking.delete.DeleteVesselTrackingEvent;

import es.redmic.vesselslib.events.vesseltracking.partialupdate.vessel.UpdateVesselInVesselTrackingEvent;

import es.redmic.vesselslib.events.vesseltracking.update.UpdateVesselTrackingEvent;

import es.redmic.vesselsview.model.vessel.Vessel;

import es.redmic.vesselsview.model.vesseltracking.VesselTracking;

import es.redmic.vesselsview.service.vesseltracking.VesselTrackingESService;

import es.redmic.viewlib.config.MapperScanBeanItfc;
@@ -98,32 +96,6 @@ public class VesselTrackingController extends GeoDataController<VesselTracking, 
		}

	}



	@KafkaHandler

	public void listen(UpdateVesselInVesselTrackingEvent event) {



		logger.info("Modificar vessel en vesseltracking");



		EventApplicationResult result = null;



		try {

			result = service.updateVesselInVesselTracking(event.getAggregateId(),

					mapper.getMapperFacade().map(event.getVessel(), Vessel.class));

		} catch (Exception e) {

			publishFailedEvent(VesselTrackingEventFactory.getEvent(event, VesselTrackingEventTypes.UPDATE_FAILED,

					ExceptionType.INTERNAL_EXCEPTION.name(), null), vesseltracking_topic);

			return;

		}



		if (result.isSuccess()) {

			logger.info("VesselTracking modificado en la vista");

			publishConfirmedEvent(VesselTrackingEventFactory.getEvent(event, VesselTrackingEventTypes.UPDATE_CONFIRMED),

					vesseltracking_topic);

		} else {

			publishFailedEvent(VesselTrackingEventFactory.getEvent(event, VesselTrackingEventTypes.UPDATE_FAILED,

					result.getExeptionType(), result.getExceptionArguments()), vesseltracking_topic);

		}

	}



	@KafkaHandler

	public void listen(DeleteVesselTrackingEvent event) {

vessels-view/src/test/java/es/redmic/test/vesselsview/integration/handler/VesselTrackingEventHandlerTest.java

+0 −46
Original line number Diff line number Diff line
@@ -57,7 +57,6 @@ import es.redmic.vesselslib.events.vesseltracking.create.CreateVesselTrackingFai 
import es.redmic.vesselslib.events.vesseltracking.delete.DeleteVesselTrackingConfirmedEvent;

import es.redmic.vesselslib.events.vesseltracking.delete.DeleteVesselTrackingEvent;

import es.redmic.vesselslib.events.vesseltracking.delete.DeleteVesselTrackingFailedEvent;

import es.redmic.vesselslib.events.vesseltracking.partialupdate.vessel.UpdateVesselInVesselTrackingEvent;

import es.redmic.vesselslib.events.vesseltracking.update.UpdateVesselTrackingConfirmedEvent;

import es.redmic.vesselslib.events.vesseltracking.update.UpdateVesselTrackingEvent;

import es.redmic.vesselslib.events.vesseltracking.update.UpdateVesselTrackingFailedEvent;
@@ -175,35 +174,6 @@ public class VesselTrackingEventHandlerTest extends DocumentationViewBaseTest { 
		assertEqualsVesselTracking(vesselTracking, event.getVesselTracking());

	}



	@Test

	public void sendUpdateVesselInVesselTrackingEvent_UpdateItem_IfEventIsOk() throws Exception {



		VesselTrackingDTO dto = getVesselTracking();



		repository.save(mapper.getMapperFacade().map(dto, VesselTracking.class));



		UpdateVesselInVesselTrackingEvent updateEvent = getUpdateVesselInVesselTrackingEvent();

		updateEvent.setAggregateId(dto.getId());



		ListenableFuture<SendResult<String, Event>> future = kafkaTemplate.send(VESSELTRACKING_TOPIC,

				updateEvent.getAggregateId(), updateEvent);

		future.addCallback(new SendListener());



		Event confirm = (Event) blockingQueue.poll(50, TimeUnit.SECONDS);



		GeoHitWrapper<?> item = repository.findById(dto.getId());

		assertNotNull(item.get_source());



		// Se restablece el estado de la vista

		repository.delete(dto.getId());



		assertNotNull(confirm);

		assertEquals(VesselTrackingEventTypes.UPDATE_CONFIRMED.toString(), confirm.getType());



		VesselTracking vesselTracking = (VesselTracking) item.get_source();

		assertEqualsVesselTracking(vesselTracking, dto);

	}



	@Test(expected = ItemNotFoundException.class)

	public void sendVesselTrackingDeleteEvent_DeleteItem_IfEventIsOk() throws Exception {
@@ -431,22 +401,6 @@ public class VesselTrackingEventHandlerTest extends DocumentationViewBaseTest { 
		return updatedEvent;

	}



	protected UpdateVesselInVesselTrackingEvent getUpdateVesselInVesselTrackingEvent() {



		UpdateVesselInVesselTrackingEvent event = new UpdateVesselInVesselTrackingEvent()

				.buildFrom(getUpdateVesselTrackingEvent());



		VesselTrackingDTO vesselTracking = getVesselTracking();

		vesselTracking.getProperties().getVessel().setName("Nombre cambiado");

		event.setVessel(vesselTracking.getProperties().getVessel());

		event.setAggregateId(vesselTracking.getId());

		event.setVersion(3);

		event.setSessionId(UUID.randomUUID().toString());

		event.setUserId(USER_ID);



		return event;

	}



	protected DeleteVesselTrackingEvent getDeleteVesselTrackingEvent() {



		DeleteVesselTrackingEvent deletedEvent = new DeleteVesselTrackingEvent();