Loading src/main/java/es/redmic/viewlib/usersettings/controller/SelectionController.java +30 −3 Original line number Diff line number Diff line Loading @@ -41,6 +41,7 @@ import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; import es.redmic.brokerlib.avro.fail.RollbackFailedEvent; import es.redmic.exception.common.ExceptionType; import es.redmic.exception.data.ItemNotFoundException; import es.redmic.exception.databinding.DTONotValidException; Loading @@ -56,12 +57,13 @@ import es.redmic.usersettingslib.events.SettingsEventTypes; import es.redmic.usersettingslib.events.clearselection.ClearSelectionEvent; import es.redmic.usersettingslib.events.delete.DeleteSettingsEvent; import es.redmic.usersettingslib.events.deselect.DeselectEvent; import es.redmic.usersettingslib.events.fail.SettingsRollbackEvent; import es.redmic.usersettingslib.events.save.SaveSettingsEvent; import es.redmic.usersettingslib.events.select.SelectEvent; import es.redmic.usersettingslib.model.Settings; import es.redmic.viewlib.common.controller.RController; import es.redmic.viewlib.usersettings.mapper.SettingsESMapper; import es.redmic.viewlib.usersettings.service.SelectionService; import es.redmic.viewlib.usersettings.service.SettingsService; @Controller @ConditionalOnProperty(name = "redmic.user-settings.enabled", havingValue = "true") Loading @@ -75,9 +77,9 @@ public class SelectionController extends RController<Settings, SettingsDTO, Simp @Autowired UserService userService; SelectionService service; SettingsService service; public SelectionController(SelectionService service) { public SelectionController(SettingsService service) { super(service); this.service = service; } Loading Loading @@ -204,6 +206,31 @@ public class SelectionController extends RController<Settings, SettingsDTO, Simp } } @KafkaHandler public void listen(SettingsRollbackEvent event) { EventApplicationResult result = null; try { result = service.rollback(Mappers.getMapper(SettingsESMapper.class).map(event.getLastSnapshotItem()), event.getAggregateId()); } catch (Exception e) { e.printStackTrace(); publishFailedEvent(new RollbackFailedEvent(event.getFailEventType()).buildFrom(event), settings_topic); return; } if (result.isSuccess()) { publishConfirmedEvent( SettingsEventFactory.getEvent(event, SettingsEventTypes.getEventFailedTypeByActionType(event.getFailEventType())), settings_topic); } else { publishFailedEvent(new RollbackFailedEvent(event.getFailEventType()).buildFrom(event), settings_topic); } } @KafkaHandler(isDefault = true) public void listenDefualt(Object event) { } Loading src/main/java/es/redmic/viewlib/usersettings/service/SettingsService.java +2 −2 Original line number Diff line number Diff line Loading @@ -39,9 +39,9 @@ import es.redmic.viewlib.usersettings.repository.SettingsRepository; @Service @ConditionalOnProperty(name = "redmic.user-settings.enabled", havingValue = "true") public class SelectionService extends RWDataService<Settings, SettingsDTO, SimpleQueryDTO> { public class SettingsService extends RWDataService<Settings, SettingsDTO, SimpleQueryDTO> { public SelectionService(SettingsRepository repository) { public SettingsService(SettingsRepository repository) { super(repository); } Loading Loading
src/main/java/es/redmic/viewlib/usersettings/controller/SelectionController.java +30 −3 Original line number Diff line number Diff line Loading @@ -41,6 +41,7 @@ import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.ResponseBody; import es.redmic.brokerlib.avro.fail.RollbackFailedEvent; import es.redmic.exception.common.ExceptionType; import es.redmic.exception.data.ItemNotFoundException; import es.redmic.exception.databinding.DTONotValidException; Loading @@ -56,12 +57,13 @@ import es.redmic.usersettingslib.events.SettingsEventTypes; import es.redmic.usersettingslib.events.clearselection.ClearSelectionEvent; import es.redmic.usersettingslib.events.delete.DeleteSettingsEvent; import es.redmic.usersettingslib.events.deselect.DeselectEvent; import es.redmic.usersettingslib.events.fail.SettingsRollbackEvent; import es.redmic.usersettingslib.events.save.SaveSettingsEvent; import es.redmic.usersettingslib.events.select.SelectEvent; import es.redmic.usersettingslib.model.Settings; import es.redmic.viewlib.common.controller.RController; import es.redmic.viewlib.usersettings.mapper.SettingsESMapper; import es.redmic.viewlib.usersettings.service.SelectionService; import es.redmic.viewlib.usersettings.service.SettingsService; @Controller @ConditionalOnProperty(name = "redmic.user-settings.enabled", havingValue = "true") Loading @@ -75,9 +77,9 @@ public class SelectionController extends RController<Settings, SettingsDTO, Simp @Autowired UserService userService; SelectionService service; SettingsService service; public SelectionController(SelectionService service) { public SelectionController(SettingsService service) { super(service); this.service = service; } Loading Loading @@ -204,6 +206,31 @@ public class SelectionController extends RController<Settings, SettingsDTO, Simp } } @KafkaHandler public void listen(SettingsRollbackEvent event) { EventApplicationResult result = null; try { result = service.rollback(Mappers.getMapper(SettingsESMapper.class).map(event.getLastSnapshotItem()), event.getAggregateId()); } catch (Exception e) { e.printStackTrace(); publishFailedEvent(new RollbackFailedEvent(event.getFailEventType()).buildFrom(event), settings_topic); return; } if (result.isSuccess()) { publishConfirmedEvent( SettingsEventFactory.getEvent(event, SettingsEventTypes.getEventFailedTypeByActionType(event.getFailEventType())), settings_topic); } else { publishFailedEvent(new RollbackFailedEvent(event.getFailEventType()).buildFrom(event), settings_topic); } } @KafkaHandler(isDefault = true) public void listenDefualt(Object event) { } Loading
src/main/java/es/redmic/viewlib/usersettings/service/SettingsService.java +2 −2 Original line number Diff line number Diff line Loading @@ -39,9 +39,9 @@ import es.redmic.viewlib.usersettings.repository.SettingsRepository; @Service @ConditionalOnProperty(name = "redmic.user-settings.enabled", havingValue = "true") public class SelectionService extends RWDataService<Settings, SettingsDTO, SimpleQueryDTO> { public class SettingsService extends RWDataService<Settings, SettingsDTO, SimpleQueryDTO> { public SelectionService(SettingsRepository repository) { public SettingsService(SettingsRepository repository) { super(repository); } Loading