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

Arregla problema al aplicar evento de cancelación 

Añade tests para estos casos
parent afeecc1c

atlas-commands/src/main/java/es/redmic/atlascommands/aggregate/CategoryAggregate.java

+7 −1
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ import es.redmic.atlascommands.statestore.CategoryStateStore; 


import es.redmic.atlaslib.dto.category.CategoryDTO;

import es.redmic.atlaslib.events.category.CategoryEventTypes;

import es.redmic.atlaslib.events.category.common.CategoryCancelledEvent;

import es.redmic.atlaslib.events.category.common.CategoryEvent;

import es.redmic.atlaslib.events.category.create.CreateCategoryCancelledEvent;

import es.redmic.atlaslib.events.category.create.CreateCategoryEvent;
@@ -149,7 +150,7 @@ public class CategoryAggregate extends Aggregate { 
		case "UPDATE_CANCELLED":

		case "DELETE_CANCELLED":

			logger.debug("Compensación por edición/borrado fallido");

			apply((CategoryEvent) event);

			apply((CategoryCancelledEvent) event);

			break;

		default:

			logger.debug("Evento no manejado ", event.getType());
@@ -166,6 +167,11 @@ public class CategoryAggregate extends Aggregate { 
		super.apply(event);

	}



	public void apply(CategoryCancelledEvent event) {

		this.category = event.getCategory();

		super.apply(event);

	}



	public void apply(CategoryEvent event) {

		this.category = event.getCategory();

		super.apply(event);

atlas-commands/src/main/java/es/redmic/atlascommands/aggregate/LayerAggregate.java

+7 −1
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ import es.redmic.atlascommands.statestore.LayerStateStore; 


import es.redmic.atlaslib.dto.layer.LayerDTO;

import es.redmic.atlaslib.events.layer.LayerEventTypes;

import es.redmic.atlaslib.events.layer.common.LayerCancelledEvent;

import es.redmic.atlaslib.events.layer.common.LayerEvent;

import es.redmic.atlaslib.events.layer.common.LayerRefreshEvent;

import es.redmic.atlaslib.events.layer.create.CreateLayerCancelledEvent;
@@ -192,7 +193,7 @@ public class LayerAggregate extends Aggregate { 
		case "DELETE_CANCELLED":

		case "REFRESH_CANCELLED":

			logger.debug("Compensación por edición/borrado/refresco fallido");

			apply((LayerEvent) event);

			apply((LayerCancelledEvent) event);

			break;

		default:

			logger.debug("Evento no manejado ", event.getType());
@@ -209,6 +210,11 @@ public class LayerAggregate extends Aggregate { 
		super.apply(event);

	}



	public void apply(LayerCancelledEvent event) {

		this.layer = event.getLayer();

		super.apply(event);

	}



	public void apply(LayerEvent event) {

		this.layer = event.getLayer();

		super.apply(event);

atlas-commands/src/main/java/es/redmic/atlascommands/aggregate/ThemeInspireAggregate.java

+7 −1
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ import es.redmic.atlascommands.commands.themeinspire.UpdateThemeInspireCommand; 
import es.redmic.atlascommands.statestore.ThemeInspireStateStore;

import es.redmic.atlaslib.dto.themeinspire.ThemeInspireDTO;

import es.redmic.atlaslib.events.themeinspire.ThemeInspireEventTypes;

import es.redmic.atlaslib.events.themeinspire.common.ThemeInspireCancelledEvent;

import es.redmic.atlaslib.events.themeinspire.common.ThemeInspireEvent;

import es.redmic.atlaslib.events.themeinspire.create.CreateThemeInspireCancelledEvent;

import es.redmic.atlaslib.events.themeinspire.create.CreateThemeInspireEvent;
@@ -148,7 +149,7 @@ public class ThemeInspireAggregate extends Aggregate { 
		case "UPDATE_CANCELLED":

		case "DELETE_CANCELLED":

			logger.debug("Compensación por edición/borrado fallido");

			apply((ThemeInspireEvent) event);

			apply((ThemeInspireCancelledEvent) event);

			break;

		default:

			logger.debug("Evento no manejado ", event.getType());
@@ -165,6 +166,11 @@ public class ThemeInspireAggregate extends Aggregate { 
		super.apply(event);

	}



	public void apply(ThemeInspireCancelledEvent event) {

		this.themeInspire = event.getThemeInspire();

		super.apply(event);

	}



	public void apply(ThemeInspireEvent event) {

		this.themeInspire = event.getThemeInspire();

		super.apply(event);

atlas-commands/src/test/java/es/redmic/test/atlascommands/integration/category/CategoryDataUtil.java

+31 −0
Original line number Diff line number Diff line
@@ -34,10 +34,12 @@ import es.redmic.atlaslib.events.category.create.CreateCategoryEvent; 
import es.redmic.atlaslib.events.category.create.CreateCategoryFailedEvent;

import es.redmic.atlaslib.events.category.delete.CategoryDeletedEvent;

import es.redmic.atlaslib.events.category.delete.CheckDeleteCategoryEvent;

import es.redmic.atlaslib.events.category.delete.DeleteCategoryCancelledEvent;

import es.redmic.atlaslib.events.category.delete.DeleteCategoryConfirmedEvent;

import es.redmic.atlaslib.events.category.delete.DeleteCategoryEvent;

import es.redmic.atlaslib.events.category.delete.DeleteCategoryFailedEvent;

import es.redmic.atlaslib.events.category.update.CategoryUpdatedEvent;

import es.redmic.atlaslib.events.category.update.UpdateCategoryCancelledEvent;

import es.redmic.atlaslib.events.category.update.UpdateCategoryConfirmedEvent;

import es.redmic.atlaslib.events.category.update.UpdateCategoryEvent;

import es.redmic.atlaslib.events.category.update.UpdateCategoryFailedEvent;
@@ -126,6 +128,20 @@ public abstract class CategoryDataUtil { 
		return event;

	}



	public static UpdateCategoryCancelledEvent getUpdateCategoryCancelledEvent(String code) {



		UpdateCategoryCancelledEvent event = new UpdateCategoryCancelledEvent().buildFrom(getUpdateEvent(code));



		event.setCategory(getCategory(code));



		event.setExceptionType(ExceptionType.ES_UPDATE_DOCUMENT.name());



		Map<String, String> arguments = new HashMap<>();

		// arguments.put("A", "B");

		event.setArguments(arguments);

		return event;

	}



	public static UpdateCategoryFailedEvent getUpdateCategoryFailedEvent(String code) {



		UpdateCategoryFailedEvent event = new UpdateCategoryFailedEvent().buildFrom(getUpdateEvent(code));
@@ -169,6 +185,21 @@ public abstract class CategoryDataUtil { 
		return new CategoryDeletedEvent().buildFrom(getDeleteEvent(code));

	}



	public static DeleteCategoryCancelledEvent getDeleteCategoryCancelledEvent(String code) {



		DeleteCategoryCancelledEvent event = new DeleteCategoryCancelledEvent().buildFrom(getDeleteEvent(code));



		event.setCategory(getCategory(code));



		event.setExceptionType(ExceptionType.DELETE_ITEM_EXCEPTION.name());



		Map<String, String> arguments = new HashMap<>();

		// arguments.put("A", "B");

		event.setArguments(arguments);



		return event;

	}



	public static DeleteCategoryFailedEvent getDeleteCategoryFailedEvent(String code) {



		DeleteCategoryFailedEvent event = new DeleteCategoryFailedEvent().buildFrom(getDeleteEvent(code));

atlas-commands/src/test/java/es/redmic/test/atlascommands/integration/layer/LayerDataUtil.java

+31 −1
Original line number Diff line number Diff line
@@ -52,6 +52,7 @@ import es.redmic.atlaslib.events.layer.create.CreateLayerFailedEvent; 
import es.redmic.atlaslib.events.layer.create.EnrichCreateLayerEvent;

import es.redmic.atlaslib.events.layer.create.LayerCreatedEvent;

import es.redmic.atlaslib.events.layer.delete.CheckDeleteLayerEvent;

import es.redmic.atlaslib.events.layer.delete.DeleteLayerCancelledEvent;

import es.redmic.atlaslib.events.layer.delete.DeleteLayerConfirmedEvent;

import es.redmic.atlaslib.events.layer.delete.DeleteLayerEvent;

import es.redmic.atlaslib.events.layer.delete.DeleteLayerFailedEvent;
@@ -63,6 +64,7 @@ import es.redmic.atlaslib.events.layer.refresh.RefreshLayerEvent; 
import es.redmic.atlaslib.events.layer.refresh.RefreshLayerFailedEvent;

import es.redmic.atlaslib.events.layer.update.EnrichUpdateLayerEvent;

import es.redmic.atlaslib.events.layer.update.LayerUpdatedEvent;

import es.redmic.atlaslib.events.layer.update.UpdateLayerCancelledEvent;

import es.redmic.atlaslib.events.layer.update.UpdateLayerConfirmedEvent;

import es.redmic.atlaslib.events.layer.update.UpdateLayerEvent;

import es.redmic.atlaslib.events.layer.update.UpdateLayerFailedEvent;
@@ -171,6 +173,20 @@ public abstract class LayerDataUtil { 
		return event;

	}



	public static UpdateLayerCancelledEvent getUpdateLayerCancelledEvent(String code) {



		UpdateLayerCancelledEvent event = new UpdateLayerCancelledEvent().buildFrom(getUpdateEvent(code));



		event.setLayer(getLayer(code));



		event.setExceptionType(ExceptionType.ES_UPDATE_DOCUMENT.name());



		Map<String, String> arguments = new HashMap<>();

		// arguments.put("A", "B");

		event.setArguments(arguments);

		return event;

	}



	public static UpdateLayerFailedEvent getUpdateLayerFailedEvent(String code) {



		UpdateLayerFailedEvent event = new UpdateLayerFailedEvent().buildFrom(getUpdateEvent(code));
@@ -180,7 +196,6 @@ public abstract class LayerDataUtil { 
		Map<String, String> arguments = new HashMap<String, String>();

		arguments.put("a", "b");

		event.setArguments(arguments);



		return event;

	}
@@ -214,6 +229,21 @@ public abstract class LayerDataUtil { 
		return new LayerDeletedEvent().buildFrom(getDeleteEvent(code));

	}



	public static DeleteLayerCancelledEvent getDeleteLayerCancelledEvent(String code) {



		DeleteLayerCancelledEvent event = new DeleteLayerCancelledEvent().buildFrom(getDeleteEvent(code));



		event.setLayer(getLayer(code));



		event.setExceptionType(ExceptionType.DELETE_ITEM_EXCEPTION.name());



		Map<String, String> arguments = new HashMap<>();

		// arguments.put("A", "B");

		event.setArguments(arguments);



		return event;

	}



	public static DeleteLayerFailedEvent getDeleteLayerFailedEvent(String code) {



		DeleteLayerFailedEvent event = new DeleteLayerFailedEvent().buildFrom(getDeleteEvent(code));