Mueve gestión de usuarios a agregado (24f2138c) · Commits · REDMIC Project / Server / Atlas

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

+8 −2

Original line number	Diff line number	Diff line
		@@ -37,6 +37,7 @@ import es.redmic.atlaslib.events.category.update.UpdateCategoryEvent;
		import es.redmic.brokerlib.avro.common.Event;
		import es.redmic.commandslib.aggregate.Aggregate;
		import es.redmic.commandslib.exceptions.ItemLockedException;
		import es.redmic.restlib.config.UserService;

		public class CategoryAggregate extends Aggregate {

		@@ -44,9 +45,12 @@ public class CategoryAggregate extends Aggregate {

		private CategoryStateStore categoryStateStore;

		public CategoryAggregate(CategoryStateStore categoryStateStore) {
		private UserService userService;

		public CategoryAggregate(CategoryStateStore categoryStateStore, UserService userService) {

		this.categoryStateStore = categoryStateStore;
		this.userService = userService;
		}

		public CreateCategoryEvent process(CreateCategoryCommand cmd) {
		@@ -65,6 +69,7 @@ public class CategoryAggregate extends Aggregate {
		CreateCategoryEvent evt = new CreateCategoryEvent(cmd.getCategory());
		evt.setAggregateId(id);
		evt.setVersion(1);
		evt.setUserId(userService.getUserId());
		return evt;
		}

		@@ -83,6 +88,7 @@ public class CategoryAggregate extends Aggregate {
		UpdateCategoryEvent evt = new UpdateCategoryEvent(cmd.getCategory());
		evt.setAggregateId(id);
		evt.setVersion(getVersion() + 1);
		evt.setUserId(userService.getUserId());
		return evt;
		}

		@@ -101,7 +107,7 @@ public class CategoryAggregate extends Aggregate {
		CheckDeleteCategoryEvent evt = new CheckDeleteCategoryEvent();
		evt.setAggregateId(id);
		evt.setVersion(getVersion() + 1);

		evt.setUserId(userService.getUserId());
		return evt;
		}

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

+9 −3

Original line number	Diff line number	Diff line
		@@ -42,6 +42,7 @@ import es.redmic.atlaslib.events.layer.update.UpdateLayerEvent;
		import es.redmic.brokerlib.avro.common.Event;
		import es.redmic.commandslib.aggregate.Aggregate;
		import es.redmic.commandslib.exceptions.ItemLockedException;
		import es.redmic.restlib.config.UserService;

		public class LayerAggregate extends Aggregate {

		@@ -49,9 +50,12 @@ public class LayerAggregate extends Aggregate {

		private LayerStateStore layerStateStore;

		public LayerAggregate(LayerStateStore layerStateStore) {
		private UserService userService;

		public LayerAggregate(LayerStateStore layerStateStore, UserService userService) {

		this.layerStateStore = layerStateStore;
		this.userService = userService;
		}

		public LayerEvent process(CreateLayerCommand cmd) {
		@@ -77,6 +81,7 @@ public class LayerAggregate extends Aggregate {

		evt.setAggregateId(id);
		evt.setVersion(1);
		evt.setUserId(userService.getUserId());
		return evt;
		}

		@@ -102,6 +107,7 @@ public class LayerAggregate extends Aggregate {

		evt.setAggregateId(id);
		evt.setVersion(getVersion() + 1);
		evt.setUserId(userService.getUserId());
		return evt;
		}

		@@ -120,7 +126,7 @@ public class LayerAggregate extends Aggregate {
		CheckDeleteLayerEvent evt = new CheckDeleteLayerEvent();
		evt.setAggregateId(id);
		evt.setVersion(getVersion() + 1);

		evt.setUserId(userService.getUserId());
		return evt;
		}

		@@ -139,7 +145,7 @@ public class LayerAggregate extends Aggregate {
		RefreshLayerEvent evt = new RefreshLayerEvent(cmd.getLayer());
		evt.setAggregateId(id);
		evt.setVersion(getVersion() + 1);

		evt.setUserId(userService.getUserId());
		return evt;
		}

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

+8 −2

Original line number	Diff line number	Diff line
		@@ -36,6 +36,7 @@ import es.redmic.atlaslib.events.themeinspire.update.UpdateThemeInspireEvent;
		import es.redmic.brokerlib.avro.common.Event;
		import es.redmic.commandslib.aggregate.Aggregate;
		import es.redmic.commandslib.exceptions.ItemLockedException;
		import es.redmic.restlib.config.UserService;

		public class ThemeInspireAggregate extends Aggregate {

		@@ -43,9 +44,12 @@ public class ThemeInspireAggregate extends Aggregate {

		private ThemeInspireStateStore themeInspireStateStore;

		public ThemeInspireAggregate(ThemeInspireStateStore themeInspireStateStore) {
		private UserService userService;

		public ThemeInspireAggregate(ThemeInspireStateStore themeInspireStateStore, UserService userService) {

		this.themeInspireStateStore = themeInspireStateStore;
		this.userService = userService;
		}

		public CreateThemeInspireEvent process(CreateThemeInspireCommand cmd) {
		@@ -64,6 +68,7 @@ public class ThemeInspireAggregate extends Aggregate {
		CreateThemeInspireEvent evt = new CreateThemeInspireEvent(cmd.getThemeInspire());
		evt.setAggregateId(id);
		evt.setVersion(1);
		evt.setUserId(userService.getUserId());
		return evt;
		}

		@@ -82,6 +87,7 @@ public class ThemeInspireAggregate extends Aggregate {
		UpdateThemeInspireEvent evt = new UpdateThemeInspireEvent(cmd.getThemeInspire());
		evt.setAggregateId(id);
		evt.setVersion(getVersion() + 1);
		evt.setUserId(userService.getUserId());
		return evt;
		}

		@@ -100,7 +106,7 @@ public class ThemeInspireAggregate extends Aggregate {
		CheckDeleteThemeInspireEvent evt = new CheckDeleteThemeInspireEvent();
		evt.setAggregateId(id);
		evt.setVersion(getVersion() + 1);

		evt.setUserId(userService.getUserId());
		return evt;
		}