diff --git a/ems-core/src/main/java/it/integry/ems/migration/MigrationService.java b/ems-core/src/main/java/it/integry/ems/migration/MigrationComponent.java similarity index 99% rename from ems-core/src/main/java/it/integry/ems/migration/MigrationService.java rename to ems-core/src/main/java/it/integry/ems/migration/MigrationComponent.java index 86e72d6500..19dcd19fe0 100644 --- a/ems-core/src/main/java/it/integry/ems/migration/MigrationService.java +++ b/ems-core/src/main/java/it/integry/ems/migration/MigrationComponent.java @@ -24,7 +24,7 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.reflections.Reflections; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; +import org.springframework.stereotype.Component; import java.io.IOException; import java.lang.reflect.Modifier; @@ -32,8 +32,8 @@ import java.sql.SQLException; import java.util.*; import java.util.stream.Collectors; -@Service -public class MigrationService { +@Component +public class MigrationComponent { private final Logger logger = LogManager.getLogger(); diff --git a/ems-core/src/main/java/it/integry/ems/migration/_base/BaseMigration.java b/ems-core/src/main/java/it/integry/ems/migration/_base/BaseMigration.java index 956b75857d..b43acae0a5 100644 --- a/ems-core/src/main/java/it/integry/ems/migration/_base/BaseMigration.java +++ b/ems-core/src/main/java/it/integry/ems/migration/_base/BaseMigration.java @@ -8,8 +8,11 @@ import it.integry.ems.settings.Model.SettingsModel; import it.integry.ems.settings.SettingsController; import it.integry.ems.sync.MultiDBTransaction.AdvancedDataSource; import it.integry.ems.utility.UtilityDebug; +import it.integry.ems_model.entity.Azienda; import it.integry.ems_model.entity.StbGestSetup; +import it.integry.ems_model.exception.DataConverterNotFoundException; import it.integry.ems_model.rulescompleting.DroolsDataCompleting; +import it.integry.ems_model.types.ApplicationName; import it.integry.ems_model.types.OperationType; import it.integry.ems_model.utility.Query; import it.integry.ems_model.utility.UtilityDB; @@ -225,6 +228,14 @@ public abstract class BaseMigration implements MigrationModelInterface { } + protected boolean isWingest() throws SQLException, IOException, DataConverterNotFoundException, InstantiationException, IllegalAccessException { + Azienda currentAzienda = Azienda.getDefaultAzienda(advancedDataSource.getConnection()); + return currentAzienda.getApplicationNameEnum() == ApplicationName.WINGEST; + } + protected boolean isTextiles() throws SQLException, IOException, DataConverterNotFoundException, InstantiationException, IllegalAccessException { + Azienda currentAzienda = Azienda.getDefaultAzienda(advancedDataSource.getConnection()); + return currentAzienda.getApplicationNameEnum() == ApplicationName.TEXTILES; + } } diff --git a/ems-core/src/main/java/it/integry/ems/migration/service/MigrationSetupService.java b/ems-core/src/main/java/it/integry/ems/migration/service/MigrationSetupService.java index 2319a6d7c8..a355c1e97b 100644 --- a/ems-core/src/main/java/it/integry/ems/migration/service/MigrationSetupService.java +++ b/ems-core/src/main/java/it/integry/ems/migration/service/MigrationSetupService.java @@ -2,7 +2,7 @@ package it.integry.ems.migration.service; import com.annimon.stream.Stream; import it.integry.ems.javabeans.RequestDataDTO; -import it.integry.ems.migration.MigrationService; +import it.integry.ems.migration.MigrationComponent; import it.integry.ems.migration.dto.MigrationStatusDTO; import it.integry.ems.migration.dto.MigrationStatusEnum; import it.integry.ems.service.EntityProcessor; @@ -33,7 +33,7 @@ public class MigrationSetupService { private SettingsModel settingsModel; @Autowired - private MigrationService migrationService; + private MigrationComponent migrationComponent; @Autowired private EntityProcessor entityProcessor; @@ -45,7 +45,7 @@ public class MigrationSetupService { private MultiDBTransactionManager multiDBTransactionManager; public List retrieveAll() throws Exception { - final List migrationCodes = migrationService.getMigrationCodes(); + final List migrationCodes = migrationComponent.getMigrationCodes(); final List migrationStatuses = new ArrayList<>(); @@ -103,7 +103,7 @@ public class MigrationSetupService { } public void retry(long migrationCode) throws Exception { - migrationService.executeMigrationGroup(multiDBTransactionManager.getActiveConnections().get(0)); + migrationComponent.executeMigrationGroup(multiDBTransactionManager.getActiveConnections().get(0)); } public void skip(long migrationCode) throws Exception { @@ -122,8 +122,8 @@ public class MigrationSetupService { entityProcessor.processEntity(stbMigrationStatus, multiDBTransactionManager); } - migrationService.updateLastMigrationIntoDB(advancedDataSource, migrationCode); - migrationService.executeMigrationGroup(advancedDataSource); + migrationComponent.updateLastMigrationIntoDB(advancedDataSource, migrationCode); + migrationComponent.executeMigrationGroup(advancedDataSource); } @@ -135,6 +135,6 @@ public class MigrationSetupService { } } - migrationService.startMigrationsGlobally(multiDBTransactionManager); + migrationComponent.startMigrationsGlobally(multiDBTransactionManager); } } diff --git a/ems-core/src/main/java/it/integry/ems/system/SystemRequisiteCheckInterceptor.java b/ems-core/src/main/java/it/integry/ems/system/SystemRequisiteCheckInterceptor.java index 0fc0c34908..c950e25a63 100644 --- a/ems-core/src/main/java/it/integry/ems/system/SystemRequisiteCheckInterceptor.java +++ b/ems-core/src/main/java/it/integry/ems/system/SystemRequisiteCheckInterceptor.java @@ -6,7 +6,7 @@ import it.integry.common.var.CommonConstants; import it.integry.common.var.EmsDBConst; import it.integry.ems._context.EmsCoreContext; import it.integry.ems.exception.SystemNotInitializedException; -import it.integry.ems.migration.MigrationService; +import it.integry.ems.migration.MigrationComponent; import it.integry.ems.settings.Model.AvailableConnectionsModel; import it.integry.ems.settings.Model.SettingsModel; import it.integry.ems_model.utility.UtilityHashMap; @@ -27,7 +27,7 @@ public class SystemRequisiteCheckInterceptor extends HandlerInterceptorAdapter { EmsCoreContext emsCoreContext; @Autowired - MigrationService migrationService; + MigrationComponent migrationComponent; @Autowired EmsDBConst emsDBConst; @@ -58,7 +58,7 @@ public class SystemRequisiteCheckInterceptor extends HandlerInterceptorAdapter { throw new SystemNotInitializedException(551, "System not initialized yet"); } - if (migrationService.isAnyMigrationFailed()) { + if (migrationComponent.isAnyMigrationFailed()) { throw new SystemNotInitializedException(552, "Some migrations have failed"); } } diff --git a/ems-core/src/main/java/it/integry/ems_model/entity/AtbOffr.java b/ems-core/src/main/java/it/integry/ems_model/entity/AtbOffr.java index 6f4747125a..67050a6653 100644 --- a/ems-core/src/main/java/it/integry/ems_model/entity/AtbOffr.java +++ b/ems-core/src/main/java/it/integry/ems_model/entity/AtbOffr.java @@ -4,6 +4,7 @@ import com.fasterxml.jackson.annotation.JsonTypeName; import it.integry.ems_model.annotation.*; import it.integry.ems_model.base.EntityBase; import org.kie.api.definition.type.PropertyReactive; + import java.math.BigDecimal; import java.util.Date; @@ -28,7 +29,7 @@ public class AtbOffr extends EntityBase { private Integer numOff; @PK - @ImportFromParent( value = "id_contratto") + @ImportFromParent( value = "idContratto") @SqlField(value = "id_contratto", nullable = false) private Long idContratto; diff --git a/ems-core/src/main/java/it/integry/ems_model/entity/AtbPianoLogisticoDet.java b/ems-core/src/main/java/it/integry/ems_model/entity/AtbPianoLogisticoDet.java index 681d428215..232566c08a 100644 --- a/ems-core/src/main/java/it/integry/ems_model/entity/AtbPianoLogisticoDet.java +++ b/ems-core/src/main/java/it/integry/ems_model/entity/AtbPianoLogisticoDet.java @@ -35,7 +35,7 @@ public class AtbPianoLogisticoDet extends EntityBase { private Integer ggOrd; @Unique - @ImportFromParent(value = "id_piano") + @ImportFromParent(value = "idPiano") @SqlField(value = "id_piano", nullable = false) private Long idPiano; diff --git a/ems-core/src/main/java/it/integry/ems_model/entity/Azienda.java b/ems-core/src/main/java/it/integry/ems_model/entity/Azienda.java index 3b2ad42029..d1ef16e4a9 100644 --- a/ems-core/src/main/java/it/integry/ems_model/entity/Azienda.java +++ b/ems-core/src/main/java/it/integry/ems_model/entity/Azienda.java @@ -7,6 +7,8 @@ import it.integry.ems_model.annotation.PK; import it.integry.ems_model.annotation.SqlField; import it.integry.ems_model.annotation.Table; import it.integry.ems_model.base.EntityBase; +import it.integry.ems_model.exception.DataConverterNotFoundException; +import it.integry.ems_model.types.ApplicationName; import it.integry.ems_model.utility.UtilityDB; import org.kie.api.definition.type.PropertyReactive; @@ -303,7 +305,7 @@ public class Azienda extends EntityBase { return UtilityDB.executeSimpleQueryOnlyFirstRow(conn, sql); } - public static Azienda getDefaultAzienda(Connection conn) throws Exception { + public static Azienda getDefaultAzienda(Connection conn) throws DataConverterNotFoundException, SQLException, InstantiationException, IllegalAccessException { String sql = "SELECT TOP 1 * FROM azienda"; return UtilityDB.executeSimpleQueryOnlyFirstRowDTO(conn, sql, Azienda.class); } @@ -733,6 +735,10 @@ public class Azienda extends EntityBase { return applicationName; } + public ApplicationName getApplicationNameEnum() { + return ApplicationName.valueOf(getApplicationName()); + } + public void setApplicationName(String applicationName) { this.applicationName = applicationName; } diff --git a/ems-core/src/main/java/it/integry/ems_model/entity/VtbBdgr.java b/ems-core/src/main/java/it/integry/ems_model/entity/VtbBdgr.java index 147065e06b..de947c2ae4 100644 --- a/ems-core/src/main/java/it/integry/ems_model/entity/VtbBdgr.java +++ b/ems-core/src/main/java/it/integry/ems_model/entity/VtbBdgr.java @@ -18,7 +18,7 @@ public class VtbBdgr extends EntityBase { @SqlField(value = "id_row", nullable = false) private Long idRow; - @ImportFromParent("id_bdg") + @ImportFromParent("idBdg") @SqlField(value = "id_bdg", nullable = false) private Long idBdg; diff --git a/ems-core/src/main/java/it/integry/ems_model/entity/VtbOffr.java b/ems-core/src/main/java/it/integry/ems_model/entity/VtbOffr.java index f4c7160052..4ff8da07d7 100644 --- a/ems-core/src/main/java/it/integry/ems_model/entity/VtbOffr.java +++ b/ems-core/src/main/java/it/integry/ems_model/entity/VtbOffr.java @@ -5,6 +5,7 @@ import it.integry.common.var.CommonConstants; import it.integry.ems_model.annotation.*; import it.integry.ems_model.base.EntityBase; import org.kie.api.definition.type.PropertyReactive; + import java.math.BigDecimal; import java.util.Date; @@ -16,7 +17,7 @@ public class VtbOffr extends EntityBase { public static final String ENTITY = "vtb_offr"; @PK - @ImportFromParent(value = "id_offerta") + @ImportFromParent(value = "idOfferta") @SqlField(value = "id_offerta", nullable = false) private Long idOfferta; diff --git a/ems-core/src/main/java/it/integry/ems_model/entity/WtbNotificationImage.java b/ems-core/src/main/java/it/integry/ems_model/entity/WtbNotificationImage.java index cd63a8f1e9..6fbf525401 100644 --- a/ems-core/src/main/java/it/integry/ems_model/entity/WtbNotificationImage.java +++ b/ems-core/src/main/java/it/integry/ems_model/entity/WtbNotificationImage.java @@ -7,7 +7,6 @@ import it.integry.ems_model.annotation.SqlField; import it.integry.ems_model.annotation.Table; import it.integry.ems_model.base.EntityBase; import org.kie.api.definition.type.PropertyReactive; -import it.integry.ems_model.annotation.FK; @PropertyReactive @Table(WtbNotificationImage.ENTITY) @@ -22,7 +21,7 @@ public class WtbNotificationImage extends EntityBase { private long notificationId; @PK - @ImportFromParent(value = "id_attach", parentEntity = StbFilesAttached.class) + @ImportFromParent(value = "idAttach", parentEntity = StbFilesAttached.class) @SqlField(value = "attach_id", maxLength = 40, nullable = false) private String attachId;