Skip to content

Commit

Permalink
reception phase refactored
Browse files Browse the repository at this point in the history
  • Loading branch information
@Nolife999
Nolife999 committed Sep 27, 2023
1 parent 7a41a06 commit 714dee3
Show file tree
Hide file tree
Showing 33 changed files with 1,492 additions and 891 deletions.
10 changes: 5 additions & 5 deletions arc-batch/src/main/java/fr/insee/arc/batch/BatchARC.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
import fr.insee.arc.core.model.TraitementEtat;
import fr.insee.arc.core.model.TraitementPhase;
import fr.insee.arc.core.service.global.dao.DatabaseMaintenance;
import fr.insee.arc.core.service.p1reception.ApiReceptionService;
import fr.insee.arc.core.service.p1reception.provider.DirectoryPath;
import fr.insee.arc.core.util.BDParameters;
import fr.insee.arc.utils.batch.IReturnCode;
import fr.insee.arc.utils.dao.UtilitaireDao;
Expand Down Expand Up @@ -291,7 +291,7 @@ private void effacerRepertoireChargement(String directory, String envExecution)

private static void cleanDirectory(String directory, String envExecution, String envDirectory, TraitementEtat etat)
throws ArcException {
File f = Paths.get(ApiReceptionService.directoryReceptionEtat(directory, envDirectory, etat)).toFile();
File f = Paths.get(DirectoryPath.directoryReceptionEtat(directory, envDirectory, etat)).toFile();
if (!f.exists()) {
return;
}
Expand Down Expand Up @@ -322,7 +322,7 @@ private static void deleteIfArchived(String repertoire, String envExecution, Fil

// ajout d'un garde fou : si le fichier n'est pas archivé : pas touche
File fCheck = Paths
.get(ApiReceptionService.directoryReceptionEntrepotArchive(repertoire, envExecution, entrepot),
.get(DirectoryPath.directoryReceptionEntrepotArchive(repertoire, envExecution, entrepot),
filename)
.toFile();

Expand Down Expand Up @@ -435,10 +435,10 @@ private void copyFileFromArchiveDirectoryToOK(String envExecution, String repert
String originalContainer = ManipString.substringAfterFirst(container, "_");

File fIn = Paths.get(
ApiReceptionService.directoryReceptionEntrepotArchive(repertoire, envExecution, entrepotContainer),
DirectoryPath.directoryReceptionEntrepotArchive(repertoire, envExecution, entrepotContainer),
originalContainer).toFile();

File fOut = Paths.get(ApiReceptionService.directoryReceptionEtatOK(repertoire, envExecution), container)
File fOut = Paths.get(DirectoryPath.directoryReceptionEtatOK(repertoire, envExecution), container)
.toFile();

Files.copy(fIn.toPath(), fOut.toPath());
Expand Down
16 changes: 0 additions & 16 deletions ...ore/src/main/java/fr/insee/arc/core/service/p0initialisation/ResetEnvironmentService.java
View file
Original file line number Diff line number Diff line change
@@ -1,29 +1,13 @@
package fr.insee.arc.core.service.p0initialisation;

import java.nio.file.Paths;
import java.util.ArrayList;
import java.util.Arrays;

import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;

import fr.insee.arc.core.dataobjects.ArcPreparedStatementBuilder;
import fr.insee.arc.core.model.TraitementEtat;
import fr.insee.arc.core.model.TraitementPhase;
import fr.insee.arc.core.service.global.bo.Sandbox;
import fr.insee.arc.core.service.global.dao.DatabaseMaintenance;
import fr.insee.arc.core.service.global.dao.FileSystemManagement;
import fr.insee.arc.core.service.global.dao.TableNaming;
import fr.insee.arc.core.service.p0initialisation.pilotage.SynchronizeDataByPilotage;
import fr.insee.arc.core.service.p0initialisation.useroperation.ResetEnvironmentOperation;
import fr.insee.arc.core.service.p1reception.ApiReceptionService;
import fr.insee.arc.core.util.StaticLoggerDispatcher;
import fr.insee.arc.utils.dao.UtilitaireDao;
import fr.insee.arc.utils.exception.ArcException;
import fr.insee.arc.utils.files.FileUtilsArc;
import fr.insee.arc.utils.structure.GenericBean;
import fr.insee.arc.utils.utils.FormatSQL;
import fr.insee.arc.utils.utils.LoggerHelper;

public class ResetEnvironmentService {

Expand Down
12 changes: 6 additions & 6 deletions .../src/main/java/fr/insee/arc/core/service/p0initialisation/filesystem/BuildFileSystem.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
import java.util.List;

import fr.insee.arc.core.service.global.dao.DataStorage;
import fr.insee.arc.core.service.p1reception.ApiReceptionService;
import fr.insee.arc.core.service.p1reception.provider.DirectoryPath;
import fr.insee.arc.utils.exception.ArcException;
import fr.insee.arc.utils.files.FileUtilsArc;
import fr.insee.arc.utils.ressourceUtils.PropertiesHandler;
Expand Down Expand Up @@ -45,17 +45,17 @@ public void execute() {
for (String envExecution : Arrays.asList(envExecutions)) {

for (String d : listEntrepot) {
FileUtilsArc.createDirIfNotexist(ApiReceptionService
FileUtilsArc.createDirIfNotexist(DirectoryPath
.directoryReceptionEntrepot(properties.getBatchParametersDirectory(), envExecution, d));
FileUtilsArc.createDirIfNotexist(ApiReceptionService.directoryReceptionEntrepotArchive(
FileUtilsArc.createDirIfNotexist(DirectoryPath.directoryReceptionEntrepotArchive(
properties.getBatchParametersDirectory(), envExecution, d));
}

FileUtilsArc.createDirIfNotexist(ApiReceptionService
FileUtilsArc.createDirIfNotexist(DirectoryPath
.directoryReceptionEtatEnCours(properties.getBatchParametersDirectory(), envExecution));
FileUtilsArc.createDirIfNotexist(ApiReceptionService
FileUtilsArc.createDirIfNotexist(DirectoryPath
.directoryReceptionEtatOK(properties.getBatchParametersDirectory(), envExecution));
FileUtilsArc.createDirIfNotexist(ApiReceptionService
FileUtilsArc.createDirIfNotexist(DirectoryPath
.directoryReceptionEtatKO(properties.getBatchParametersDirectory(), envExecution));
}

Expand Down
10 changes: 5 additions & 5 deletions ...rc/main/java/fr/insee/arc/core/service/p0initialisation/filesystem/RestoreFileSystem.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
import fr.insee.arc.core.service.global.bo.Sandbox;
import fr.insee.arc.core.service.global.dao.DataStorage;
import fr.insee.arc.core.service.global.dao.FileSystemManagement;
import fr.insee.arc.core.service.p1reception.ApiReceptionService;
import fr.insee.arc.core.service.p1reception.provider.DirectoryPath;
import fr.insee.arc.utils.exception.ArcException;
import fr.insee.arc.utils.files.FileUtilsArc;
import fr.insee.arc.utils.ressourceUtils.PropertiesHandler;
Expand Down Expand Up @@ -61,9 +61,9 @@ public void execute() throws ArcException {

private void rebuildFileSystemInEntrepot(String rootDirectory, String entrepot) throws ArcException
{
String dirEntrepotArchive = ApiReceptionService.directoryReceptionEntrepotArchive(rootDirectory, envExecution,
String dirEntrepotArchive = DirectoryPath.directoryReceptionEntrepotArchive(rootDirectory, envExecution,
entrepot);
String dirEntrepot = ApiReceptionService.directoryReceptionEntrepot(rootDirectory, envExecution, entrepot);
String dirEntrepot = DirectoryPath.directoryReceptionEntrepot(rootDirectory, envExecution, entrepot);

FileUtilsArc.createDirIfNotexist(dirEntrepotArchive);
FileUtilsArc.createDirIfNotexist(dirEntrepot);
Expand All @@ -79,7 +79,7 @@ private void rebuildFileSystemInEntrepot(String rootDirectory, String entrepot)

List<String> fileToBeMoved = DataStorage.execQuerySelectFilesNotInRegisteredArchives(connection, envExecution);
for (String fname : fileToBeMoved) {
ApiReceptionService.deplacerFichier(dirEntrepotArchive, dirEntrepot, fname, fname);
FileUtilsArc.deplacerFichier(dirEntrepotArchive, dirEntrepot, fname, fname);
}

moveBackNotRegisteredFilesFromEntrepotArchiveToEntrepot(dirEntrepot, dirEntrepotArchive);
Expand Down Expand Up @@ -108,7 +108,7 @@ private void moveBackNotRegisteredFilesFromEntrepotArchiveToEntrepot(String dirE

List<String> fileToBeMoved = DataStorage.execQuerySelectFilesNotInRegisteredArchives(connection, envExecution);
for (String fname : fileToBeMoved) {
ApiReceptionService.deplacerFichier(dirEntrepotArchive, dirEntrepot, fname, fname);
FileUtilsArc.deplacerFichier(dirEntrepotArchive, dirEntrepot, fname, fname);
}
}

Expand Down
8 changes: 4 additions & 4 deletions ...core/src/main/java/fr/insee/arc/core/service/p0initialisation/pilotage/CleanPilotage.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
import fr.insee.arc.core.model.TraitementPhase;
import fr.insee.arc.core.service.global.bo.Sandbox;
import fr.insee.arc.core.service.global.dao.TableNaming;
import fr.insee.arc.core.service.p1reception.ApiReceptionService;
import fr.insee.arc.core.service.p1reception.provider.DirectoryPath;
import fr.insee.arc.core.util.BDParameters;
import fr.insee.arc.utils.dao.UtilitaireDao;
import fr.insee.arc.utils.exception.ArcException;
Expand Down Expand Up @@ -185,9 +185,9 @@ public void removeDeprecatedFiles() throws ArcException {
for (int i = 0; i < m.get("entrepot").size(); i++) {
String entrepot = m.get("entrepot").get(i);
String archive = m.get("nom_archive").get(i);
String dirIn = ApiReceptionService.directoryReceptionEntrepotArchive(repertoire, this.sandbox.getSchema(),
String dirIn = DirectoryPath.directoryReceptionEntrepotArchive(repertoire, this.sandbox.getSchema(),
entrepot);
String dirOut = ApiReceptionService.directoryReceptionEntrepotArchiveOldYearStamped(repertoire,
String dirOut = DirectoryPath.directoryReceptionEntrepotArchiveOldYearStamped(repertoire,
this.sandbox.getSchema(), entrepot);

// création du répertoire "OLD" s'il n'existe pas
Expand All @@ -198,7 +198,7 @@ public void removeDeprecatedFiles() throws ArcException {
}

// déplacement de l'archive de dirIn vers dirOut
ApiReceptionService.deplacerFichier(dirIn, dirOut, archive, archive);
FileUtilsArc.deplacerFichier(dirIn, dirOut, archive, archive);

}

Expand Down
9 changes: 5 additions & 4 deletions ...in/java/fr/insee/arc/core/service/p0initialisation/useroperation/ReplayOrDeleteFiles.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,9 @@

import fr.insee.arc.core.service.global.bo.Sandbox;
import fr.insee.arc.core.service.p0initialisation.useroperation.dao.ReplayOrDeleteFilesDao;
import fr.insee.arc.core.service.p1reception.ApiReceptionService;
import fr.insee.arc.core.service.p1reception.provider.DirectoryPath;
import fr.insee.arc.utils.exception.ArcException;
import fr.insee.arc.utils.files.FileUtilsArc;
import fr.insee.arc.utils.ressourceUtils.PropertiesHandler;
import fr.insee.arc.utils.utils.LoggerHelper;
import fr.insee.arc.utils.utils.ManipString;
Expand Down Expand Up @@ -62,10 +63,10 @@ public void replayMarkedFiles() throws ArcException {
String entrepot = ManipString.substringBeforeFirst(s, "_");
String archive = ManipString.substringAfterFirst(s, "_");

String dirIn = ApiReceptionService.directoryReceptionEntrepotArchive(repertoire, envDir, entrepot);
String dirOut = ApiReceptionService.directoryReceptionEntrepot(repertoire, envDir, entrepot);
String dirIn = DirectoryPath.directoryReceptionEntrepotArchive(repertoire, envDir, entrepot);
String dirOut = DirectoryPath.directoryReceptionEntrepot(repertoire, envDir, entrepot);

ApiReceptionService.deplacerFichier(dirIn, dirOut, archive, archive);
FileUtilsArc.deplacerFichier(dirIn, dirOut, archive, archive);

}

Expand Down
14 changes: 6 additions & 8 deletions ...a/fr/insee/arc/core/service/p0initialisation/useroperation/ResetEnvironmentOperation.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,22 +3,20 @@
import java.nio.file.Paths;
import java.sql.Connection;
import java.util.ArrayList;
import java.util.List;

import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;

import fr.insee.arc.core.dataobjects.ArcPreparedStatementBuilder;
import fr.insee.arc.core.dataobjects.ColumnEnum;
import fr.insee.arc.core.dataobjects.ViewEnum;
import fr.insee.arc.core.model.TraitementEtat;
import fr.insee.arc.core.model.TraitementPhase;
import fr.insee.arc.core.service.global.bo.Sandbox;
import fr.insee.arc.core.service.global.dao.DatabaseMaintenance;
import fr.insee.arc.core.service.global.dao.FileSystemManagement;
import fr.insee.arc.core.service.global.dao.PilotageOperations;
import fr.insee.arc.core.service.p0initialisation.pilotage.SynchronizeDataByPilotage;
import fr.insee.arc.core.service.p1reception.ApiReceptionService;
import fr.insee.arc.core.service.p1reception.provider.DirectoryPath;
import fr.insee.arc.utils.dao.UtilitaireDao;
import fr.insee.arc.utils.exception.ArcException;
import fr.insee.arc.utils.files.FileUtilsArc;
Expand Down Expand Up @@ -144,18 +142,18 @@ public void clearPilotageAndDirectories(String repertoire) throws ArcException {
if (entrepotList != null) {
for (String s : entrepotList) {
FileUtilsArc.deleteAndRecreateDirectory(
Paths.get(ApiReceptionService.directoryReceptionEntrepot(repertoire, envExecution, s)).toFile());
Paths.get(DirectoryPath.directoryReceptionEntrepot(repertoire, envExecution, s)).toFile());
FileUtilsArc.deleteAndRecreateDirectory(Paths
.get(ApiReceptionService.directoryReceptionEntrepotArchive(repertoire, envExecution, s)).toFile());
.get(DirectoryPath.directoryReceptionEntrepotArchive(repertoire, envExecution, s)).toFile());
}
}
}
FileUtilsArc.deleteAndRecreateDirectory(
Paths.get(ApiReceptionService.directoryReceptionEtatEnCours(repertoire, envExecution)).toFile());
Paths.get(DirectoryPath.directoryReceptionEtatEnCours(repertoire, envExecution)).toFile());
FileUtilsArc.deleteAndRecreateDirectory(
Paths.get(ApiReceptionService.directoryReceptionEtatOK(repertoire, envExecution)).toFile());
Paths.get(DirectoryPath.directoryReceptionEtatOK(repertoire, envExecution)).toFile());
FileUtilsArc.deleteAndRecreateDirectory(
Paths.get(ApiReceptionService.directoryReceptionEtatKO(repertoire, envExecution)).toFile());
Paths.get(DirectoryPath.directoryReceptionEtatKO(repertoire, envExecution)).toFile());
FileUtilsArc.deleteAndRecreateDirectory(
Paths.get(FileSystemManagement.directoryEnvExport(repertoire, envExecution)).toFile());
}
Expand Down
2 changes: 1 addition & 1 deletion .../fr/insee/arc/core/service/p0initialisation/useroperation/dao/ReplayOrDeleteFilesDao.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ public static List<String> execQuerySelectArchiveToReplay(Connection connection,

query.build(SQL.WHERE, ColumnEnum.TO_DELETE, SQL.IN);

query.build(query.tuple(TraitementOperationFichier.R.getDbValue(), TraitementOperationFichier.RA.getDbValue()));
query.build(query.tupleOfValues(TraitementOperationFichier.R.getDbValue(), TraitementOperationFichier.RA.getDbValue()));

return new GenericBean(UtilitaireDao.get(0).executeRequest(connection, query))
.getColumnValues(ColumnEnum.CONTAINER.getColumnName());
Expand Down
Loading

0 comments on commit 714dee3

Please sign in to comment.