Integry/IntegryManagementSystem
19
0
Fork 0
Code Actions Packages Projects Releases Activity

Merge remote-tracking branch 'origin/develop' into develop

Browse Source
This commit is contained in:
Mina Ruggiero
2024-03-13 16:35:08 +01:00
parent 238927a736 e4efb0d485
commit 9ab03280b3
10 changed files with 38 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ems-core/src/main/java/it/integry/ems/migration/MigrationService.java → ems-core/src/main/java/it/integry/ems/migration/MigrationComponent.java
View File

@@ -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();

11
ems-core/src/main/java/it/integry/ems/migration/_base/BaseMigration.java
View File

@@ -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;
}
}

14
ems-core/src/main/java/it/integry/ems/migration/service/MigrationSetupService.java
View File

@@ -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<MigrationStatusDTO> retrieveAll() throws Exception {
final List<Long> migrationCodes = migrationService.getMigrationCodes();
final List<Long> migrationCodes = migrationComponent.getMigrationCodes();
final List<MigrationStatusDTO> 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);
}
}

6
ems-core/src/main/java/it/integry/ems/system/SystemRequisiteCheckInterceptor.java
View File

@@ -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");
}
}

3
ems-core/src/main/java/it/integry/ems_model/entity/AtbOffr.java
View File

@@ -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;

2
ems-core/src/main/java/it/integry/ems_model/entity/AtbPianoLogisticoDet.java
View File

@@ -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;

8
ems-core/src/main/java/it/integry/ems_model/entity/Azienda.java
View File

@@ -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;
}

2
ems-core/src/main/java/it/integry/ems_model/entity/VtbBdgr.java
View File

@@ -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;

3
ems-core/src/main/java/it/integry/ems_model/entity/VtbOffr.java
View File

@@ -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;

3
ems-core/src/main/java/it/integry/ems_model/entity/WtbNotificationImage.java
View File

@@ -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;