feat: export gui

Nolife999 · Nolife999 · commit c11d0485b441 · 2026-04-16T10:55:36.000+02:00
diff --git a/arc-core/src/main/java/fr/insee/arc/core/dataobjects/ColumnEnum.java b/arc-core/src/main/java/fr/insee/arc/core/dataobjects/ColumnEnum.java
@@ -31,7 +31,7 @@ public enum ColumnEnum {
 	, ENVIRONMENT("environment", TypeEnum.TEXT, "") // ihm_ws_context
 	, ENV_DESCRIPTION("env_description", TypeEnum.TEXT, "") // ext_etat_jeuderegle
 	, ERROR_ROW_PROCESSING("error_row_processing", TypeEnum.TEXT, "") // ihm_controle_regle
-	, ETAT("etat", TypeEnum.TEXT, "") // ihm_jeuderegle,ihm_norme,ihm_calendrier, export
+	, ETAT("etat", TypeEnum.TEXT, "") // ihm_jeuderegle,ihm_norme,ihm_calendrier,export
 	, EVENT_TIMESTAMP("event_timestamp", TypeEnum.TIMESTAMP, "") // security_webservice_log
 	, EXPRESSION("expression", TypeEnum.TEXT, "") // ihm_ws_query
 	, EXPR_NOM("expr_nom", TypeEnum.TEXT, "") // ihm_expression
@@ -95,12 +95,12 @@ public enum ColumnEnum {
 	, XSD_ORDRE("xsd_ordre", TypeEnum.INTEGER, "") // ihm_controle_regle
 	, XSD_ROLE("xsd_role", TypeEnum.TEXT, "") // ihm_controle_regle
 
+	, TIMESTAMP_DIRECTORY("timestamp_directory", TypeEnum.TEXT, "") // export
 	, FILE_NAME("file_name", TypeEnum.TEXT, "") // export
 	, TABLE_TO_EXPORT("table_to_export", TypeEnum.TEXT, "") // export
 	, NOMENCLATURE_EXPORT("nomenclature_export", TypeEnum.TEXT, "") // export
 	, FILTER_TABLE("filter_table", TypeEnum.TEXT, "") // export
-	, COLUMNS_ARRAY_HEADER("columns_array_header", TypeEnum.TEXT, "") // export
-	, COLUMNS_ARRAY_VALUE("columns_array_value", TypeEnum.TEXT, "") // export
+	, JSON_KEY_VALUE("json_key_value", TypeEnum.TEXT, "") //export
 	, NULLS("nulls", TypeEnum.TEXT, "") // export
 	, HEADERS("headers", TypeEnum.TEXT, "") // export
 	, ORDER_TABLE("order_table", TypeEnum.TEXT, "") // export
diff --git a/arc-core/src/main/java/fr/insee/arc/core/dataobjects/ViewEnum.java b/arc-core/src/main/java/fr/insee/arc/core/dataobjects/ViewEnum.java
@@ -81,10 +81,9 @@ public enum ViewEnum {
 	, PARAMETER("parameter", SchemaEnum.ARC_METADATA, ColumnEnum.KEY, ColumnEnum.VAL, ColumnEnum.DESCRIPTION) //
 
 	// table d'export
-	, EXPORT("export", SchemaEnum.SANDBOX, ColumnEnum.FILE_NAME, ColumnEnum.ZIP, ColumnEnum.TABLE_TO_EXPORT,
+	, EXPORT("export", SchemaEnum.SANDBOX, ColumnEnum.TIMESTAMP_DIRECTORY, ColumnEnum.FILE_NAME, ColumnEnum.ZIP, ColumnEnum.TABLE_TO_EXPORT,
 			ColumnEnum.HEADERS, ColumnEnum.NULLS, ColumnEnum.FILTER_TABLE, ColumnEnum.ORDER_TABLE,
-			ColumnEnum.NOMENCLATURE_EXPORT, ColumnEnum.COLUMNS_ARRAY_HEADER, ColumnEnum.COLUMNS_ARRAY_VALUE,
-			ColumnEnum.ETAT) //
+			ColumnEnum.NOMENCLATURE_EXPORT, ColumnEnum.JSON_KEY_VALUE, ColumnEnum.ETAT) //
 	, EXPORT_OPTION("export_option",  SchemaEnum.SANDBOX, ColumnEnum.NOM_TABLE_METIER
 			, ColumnEnum.EXPORT_PARQUET_OPTION, ColumnEnum.EXPORT_COORDINATOR_OPTION) //
 	
diff --git a/arc-core/src/main/resources/BdD/script_global.sql b/arc-core/src/main/resources/BdD/script_global.sql
@@ -420,8 +420,12 @@ val text,
 CONSTRAINT ext_export_format_pkey PRIMARY KEY (id) 
 ); 
 
-INSERT INTO arc.ext_export_format VALUES ('0','NA'), ('1','ZIP'), ('2','GZ') ON CONFLICT DO NOTHING; 
+-- patch 13/04/2026 : export change
+UPDATE arc.ext_export_format set val='parquet' where id='0' and val!='parquet';
+UPDATE arc.ext_export_format set val='csv' where id='1' and val!='csv';
+UPDATE arc.ext_export_format set val='csv.gz' where id='2' and val!='csv.gz';
 
+INSERT INTO arc.ext_export_format VALUES ('0','parquet'), ('1','csv'), ('2','csv.gz') ON CONFLICT DO NOTHING; 
 
 /*
  *  PATCHS version
diff --git a/arc-core/src/main/resources/BdD/script_sandbox_constraint.sql b/arc-core/src/main/resources/BdD/script_sandbox_constraint.sql
@@ -4,8 +4,7 @@ commit;do $$ begin alter table {{envExecution}}.export add CONSTRAINT export_zip
 select public.check_function('{{envExecution}}.export', 'file_name', 'public.check_identifier_with_schema');
 select public.check_function('{{envExecution}}.export', 'table_to_export', 'public.check_identifier');
 select public.check_function('{{envExecution}}.export', 'nomenclature_export', 'public.check_identifier');
-select public.check_function('{{envExecution}}.export', 'columns_array_header', 'public.check_identifier');
-select public.check_function('{{envExecution}}.export', 'columns_array_value', 'public.check_identifier');
+select public.check_function('{{envExecution}}.export', 'json_key_value', 'public.check_identifier');
 select public.check_function('{{envExecution}}.export', 'filter_table', 'public.check_sql');
 select public.check_function('{{envExecution}}.export', 'order_table', 'public.check_sql');
 
diff --git a/arc-core/src/main/resources/BdD/script_sandbox_phase_export.sql b/arc-core/src/main/resources/BdD/script_sandbox_phase_export.sql
@@ -1,20 +1,28 @@
 -- create export rules table
 CREATE TABLE IF NOT EXISTS {{envExecution}}.export
 (
+timestamp_directory text,
 file_name text,
 table_to_export text,
 nomenclature_export text,
 filter_table text,
-columns_array_header text,
-columns_array_value text,
-etat text,
+json_key_value text,
 nulls text,
 headers text,
 order_table text,
 zip text,
+etat text,
 PRIMARY KEY (file_name)
 );
 
+-- patch 13/04/2026 : columns_array_header and columns_array_value are replaced by json_key_value
+ALTER TABLE {{envExecution}}.export DROP COLUMN IF EXISTS columns_array_header;
+ALTER TABLE {{envExecution}}.export DROP COLUMN IF EXISTS columns_array_value;
+ALTER TABLE {{envExecution}}.export ADD COLUMN IF NOT EXISTS json_key_value text;
+ALTER TABLE {{envExecution}}.export ADD COLUMN IF NOT EXISTS etat text;
+ALTER TABLE {{envExecution}}.export ADD COLUMN IF NOT EXISTS timestamp_directory text;
+
+
 CREATE TABLE IF NOT EXISTS {{envExecution}}.export_option
 ( 
   nom_table_metier text NOT NULL,
diff --git a/arc-utils/src/main/java/fr/insee/arc/utils/structure/GenericBean.java b/arc-utils/src/main/java/fr/insee/arc/utils/structure/GenericBean.java
@@ -51,7 +51,11 @@ public GenericBean(String headers, String types, List<String> contentList) {
 		this.content = reworkListAsContent(contentList);
 	}
 	
-	
+	/**
+	 * Translate a list as a genericBean content
+	 * @param contentList
+	 * @return
+	 */
 	protected static List<List<String>> reworkListAsContent(List<String> contentList) {
 		
 		List<List<String>> contentReworked =new ArrayList<>();
diff --git a/arc-web/src/main/java/fr/insee/arc/web/gui/export/dao/ExportDao.java b/arc-web/src/main/java/fr/insee/arc/web/gui/export/dao/ExportDao.java
@@ -16,6 +16,8 @@
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Component;
 
+import com.fasterxml.jackson.databind.ObjectMapper;
+
 import fr.insee.arc.core.dataobjects.ArcPreparedStatementBuilder;
 import fr.insee.arc.core.dataobjects.ColumnEnum;
 import fr.insee.arc.core.dataobjects.DataObjectService;
@@ -163,21 +165,20 @@ public ResultSet exportFileFilteredOrdered(Statement stmt, int n, List<String> t
 	 * @throws IOException
 	 * @throws SQLException
 	 */
-	public void exportFile(Map<String, List<String>> h, int n, BufferedWriter bw, FileOutputStream fw)
+	public void exportFile(Map<String, List<String>> exportparameter, int n, BufferedWriter bw, FileOutputStream fw)
 			throws ArcException, IOException, SQLException {
-		List<String> tablesToExport = h.get("table_to_export");
-		List<String> headers = h.get("headers");
-		List<String> nulls = h.get("nulls");
-		List<String> filterTable = h.get("filter_table");
-		List<String> orderTable = h.get("order_table");
-		List<String> howToExport = h.get("nomenclature_export");
-		List<String> headersToScan = h.get("columns_array_header");
-		List<String> valuesToScan = h.get("columns_array_value");
+		List<String> tablesToExport = exportparameter.get("table_to_export");
+		List<String> headers = exportparameter.get("headers");
+		List<String> nulls = exportparameter.get("nulls");
+		List<String> filterTable = exportparameter.get("filter_table");
+		List<String> orderTable = exportparameter.get("order_table");
+		List<String> howToExport = exportparameter.get("nomenclature_export");
+		List<String> jsonKeyValueToConvert = exportparameter.get("json_key_value");
 
 		Map<String, Integer> pos = new HashMap<>();
 		List<String> headerLine = new ArrayList<>();
 
-		h = exportFileRetrieveRules(n, howToExport, tablesToExport, this.dataObjectService.getSandboxSchema());
+		Map<String, List<String>> h = exportFileRetrieveRules(n, howToExport, tablesToExport, this.dataObjectService.getSandboxSchema());
 		
 		if (h.isEmpty()) {
 			throw new ArcException(ArcExceptionMessage.GUI_EXPORT_TABLE_NOT_EXISTS);
@@ -208,33 +209,32 @@ public void exportFile(Map<String, List<String>> h, int n, BufferedWriter bw, Fi
 			try (ResultSet res = exportFileFilteredOrdered(stmt, n, tablesToExport, filterTable, orderTable, this.dataObjectService.getSandboxSchema())) {
 				ResultSetMetaData rsmd = res.getMetaData();
 	
-				ArrayList<String> output;
-				String[] tabH;
-				String[] tabV;
 				String colName;
 				while (res.next()) {
 					// reinitialiser l'arraylist de sortie
-					output = new ArrayList<>();
+					ArrayList<String> output = new ArrayList<>();
 					for (int k = 0; k < maxPos; k++) {
 						output.add("");
 					}
-	
+				
 					boolean todo = false;
-					tabH = null;
-					tabV = null;
+
+					List<String> tabH=new ArrayList<>();
+					List<String> tabV=new ArrayList<>();
+
+					
 					for (int i = 1; i <= rsmd.getColumnCount(); i++) {
 						colName = rsmd.getColumnLabel(i).toLowerCase();
 	
 						todo = true;
 						// cas ou on est dans un tableau
-						if (todo && colName.equals(headersToScan.get(n))) {
-							todo = false;
-							tabH = (String[]) res.getArray(i).getArray();
-						}
-						if (todo && colName.equals(valuesToScan.get(n))) {
+						if (todo && colName.equals(jsonKeyValueToConvert.get(n))) {
 							todo = false;
-							tabV = (String[]) res.getArray(i).getArray();
+							
+							Map<String,String> m= convertKeyValueJsonToArray(res.getString(i));
+						    m.entrySet().stream().forEach(t-> { tabH.add(t.getKey()); tabV.add(t.getValue());});
 						}
+
 						if (todo) {
 							todo = false;
 							if (pos.get(colName) != null) {
@@ -247,12 +247,12 @@ public void exportFile(Map<String, List<String>> h, int n, BufferedWriter bw, Fi
 					}
 	
 					// traitement des variables tableaux
-					if (tabH != null && tabV != null) {
-						for (int k = 0; k < tabH.length; k++) {
-							if (pos.get(tabH[k].toLowerCase()) != null) {
+					if (!tabH.isEmpty() && !tabV.isEmpty()) {
+						for (int k = 0; k < tabH.size(); k++) {
+							if (pos.get(tabH.get(k).toLowerCase()) != null) {
 								// if nulls value musn't be quoted as "null" and element is null then don't write
-								if (!(StringUtils.isEmpty(nulls.get(n)) && StringUtils.isEmpty(tabV[k]))) {
-									output.set(pos.get(tabH[k].toLowerCase()), tabV[k]);
+								if (!(StringUtils.isEmpty(nulls.get(n)) && StringUtils.isEmpty(tabV.get(k)))) {
+									output.set(pos.get(tabH.get(k).toLowerCase()), tabV.get(k));
 								}
 							}
 						}
@@ -271,6 +271,20 @@ public void exportFile(Map<String, List<String>> h, int n, BufferedWriter bw, Fi
 	}
 	
 	
+	@SuppressWarnings("unchecked")
+	private Map<String,String> convertKeyValueJsonToArray(String keyValueJson) {
+		  ObjectMapper mapper = new ObjectMapper();
+		  		  try {
+		  return mapper.readValue(keyValueJson, Map.class);
+		  }
+		  catch (Exception e)
+		  {
+			  System.out.println("not deserializable");  
+		  }
+		  return new HashMap<>();
+		
+	}
+
 	public VObjectService getvObjectService() {
 		return vObjectService;
 	}
diff --git a/arc-web/src/main/java/fr/insee/arc/web/gui/export/model/ViewExport.java b/arc-web/src/main/java/fr/insee/arc/web/gui/export/model/ViewExport.java
@@ -3,6 +3,8 @@
 import java.util.HashMap;
 
 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.web.gui.all.util.ConstantVObject;
 import fr.insee.arc.web.gui.all.util.VObject;
 import fr.insee.arc.web.gui.all.util.ConstantVObject.ColumnRendering;
@@ -25,19 +27,17 @@ public ViewExport() {
             private static final long serialVersionUID = -3124381932840827423L;
 
             {
-                put("file_name", new ColumnRendering(true, "Nom du fichier à créer", "11%", "text", null, true));
-                put("zip", new ColumnRendering(true, "Format d'export", "4%", "select", new ArcPreparedStatementBuilder("select id, val from arc.ext_export_format order by id"), true));
-                put("headers", new ColumnRendering(true, "Créer la ligne d'entête ?", "10%", "text", null, true));
-                put("nulls", new ColumnRendering(true, "Mettre null pour les valeurs à null ?", "10%", "text", null, true));
-                put("table_to_export", new ColumnRendering(true, "Table à exporter", "11%", "text", null, true));
-                put("nomenclature_export", new ColumnRendering(true, "Nomenclature de définition de l'export", "11%", "text", null, true));
-                put("filter_table", new ColumnRendering(true, "Filtre", "11%", "text", null, true));
-                put("order_table", new ColumnRendering(true, "Tri", "11%", "text", null, true));
-                put("columns_array_header", new ColumnRendering(true, "Colonne tableau contenant des entetes", "11%", "text", null, true));
-                put("columns_array_value", new ColumnRendering(true, "Colonne tableau contenant des valeurs", "11%", "text", null, true));
-                put("etat", new ColumnRendering(true, "Etat du dernier export", "10%", "text", null, false));
-
-                
+                put(ColumnEnum.TIMESTAMP_DIRECTORY.getColumnName(), new ColumnRendering(true, "label.export.timestamp", "8%", "text", null, true));
+            	put(ColumnEnum.FILE_NAME.getColumnName(), new ColumnRendering(true, "label.export.file.name", "15%", "text", null, true));
+                put(ColumnEnum.ZIP.getColumnName(), new ColumnRendering(true, "label.export.file.format", "6%", "select", new ArcPreparedStatementBuilder("select id, val from arc.ext_export_format order by id"), true));
+                put(ColumnEnum.HEADERS.getColumnName(), new ColumnRendering(true, "label.export.table.headers", "8%", "text", null, true));
+                put(ColumnEnum.NULLS.getColumnName(), new ColumnRendering(true, "label.export.table.nulls", "8%", "text", null, true));
+                put(ColumnEnum.TABLE_TO_EXPORT.getColumnName(), new ColumnRendering(true, "label.export.table.name", "15%", "text", null, true));
+                put(ColumnEnum.NOMENCLATURE_EXPORT.getColumnName(), new ColumnRendering(true, "label.export.file.schema", "15%", "text", null, true));
+                put(ColumnEnum.FILTER_TABLE.getColumnName(), new ColumnRendering(true, "label.export.table.filter", "10%", "text", null, true));
+                put(ColumnEnum.ORDER_TABLE.getColumnName(), new ColumnRendering(true, "label.export.table.order", "10%", "text", null, true));
+                put(ColumnEnum.JSON_KEY_VALUE.getColumnName(), new ColumnRendering(true, "label.export.table.json", "15%", "text", null, true));
+                put(ColumnEnum.ETAT.getColumnName(), new ColumnRendering(true, "label.export.etat", "15%", "text", null, true));
              }
         }));
     }
diff --git a/arc-web/src/main/java/fr/insee/arc/web/gui/export/model/ViewExportOption.java b/arc-web/src/main/java/fr/insee/arc/web/gui/export/model/ViewExportOption.java
@@ -21,12 +21,12 @@ public ViewExportOption() {
         new HashMap<String, ColumnRendering>() {
         	private static final long serialVersionUID = -4260429835977421646L;
 			{
-            put("nom_table_metier", new ColumnRendering(true, "label.tablename", "80%", "text", null, true));
-            put("export_parquet_option", new ColumnRendering(true, "label.export.parquet", "10%", 
+            put("nom_table_metier", new ColumnRendering(true, "label.tablename", "60%", "text", null, true));
+            put("export_parquet_option", new ColumnRendering(true, "label.export.parquet", "20%", 
             		"select",
 					new ArcPreparedStatementBuilder("select id, val from arc.ext_etat order by id desc")
             		, true));
-            put("export_coordinator_option", new ColumnRendering(true, "label.export.coordinator", "10%",
+            put("export_coordinator_option", new ColumnRendering(true, "label.export.coordinator", "20%",
             		"select",
 					new ArcPreparedStatementBuilder("select id, val from arc.ext_etat order by id desc")
             		, true));
diff --git a/arc-web/src/main/java/fr/insee/arc/web/gui/export/service/ServiceViewExport.java b/arc-web/src/main/java/fr/insee/arc/web/gui/export/service/ServiceViewExport.java
@@ -88,7 +88,7 @@ public String startExport(Model model) {
 				dao.startExportUpdateState(fileName, fileIndex, false);
 
 				switch (zip.get(fileIndex)) {
-				case "1": // Zip
+				case "0": // Zip
 					exportZip(dirOut, rules, fileIndex);
 					break;
 				case "2": // GZ
diff --git a/arc-web/src/main/resources/messages_en.properties b/arc-web/src/main/resources/messages_en.properties
@@ -187,7 +187,7 @@ gui.button.applyRulesProd=Apply production rules
 gui.button.applyRulesProd.confirm=The rules will be applied to production. It is recommended to stop the production before. Model rules cannot be set in production by this action and require a full initialization to be applied. Are you sure?
 gui.textarea.envDescription.placeholder=Comment the sandbox usage here
 
-gui.button.exportStart=Start exports
+gui.button.exportStart=Start unit exports
 gui.button.startParquetExport=Start parquet exports
 gui.button.downloadFileExport=Download
 
@@ -268,6 +268,18 @@ label.step.export.client=Export clients
 label.step.export.date=Export dates
 label.step.XML=XML hierarchy
 
+label.export.timestamp=Time-stamped export ?
+label.export.file.name=File name
+label.export.file.format=File format
+label.export.table.name=Table to export
+label.export.table.headers=Generate headers ?
+label.export.table.nulls=Write null values as "null" ?
+label.export.table.filter=SQL filter
+label.export.table.order=SQL sort
+label.export.table.json=Json column to unserialize
+label.export.file.schema=File schema
+label.export.etat=Unit export state
+
 label.usergroup=Group
 label.usergroup.description=Group description
 label.user.id=Id
@@ -318,8 +330,8 @@ view.webserviceQuery=Webservices Queries
 
 view.entrepot=Filestores
 
-view.export=Export definitions
-view.exportOption=Export options
+view.export=Exports configuration
+view.exportOption=Export phase actions
 view.exportFile=Exported files
 
 view.userprofiles=User groups for ARC
diff --git a/arc-web/src/main/resources/messages_fr.properties b/arc-web/src/main/resources/messages_fr.properties
@@ -188,7 +188,7 @@ gui.textarea.envDescription.placeholder=Commentez l''utilisation du bac \u00e0 s
 gui.button.applyRulesProd=Appliquer les r\u00e8gles en production
 gui.button.applyRulesProd.confirm=Voulez-vous appliquer les r\u00e8gles en production ? Il est recommand\u00e9 de pr\u00e9alablement arr\u00e9ter la production. Les modifications concernant les familles de norme ne peuvent pas \u00eatre mise en production via cette action et requierent une initialisation compl\u00e8te pour s''appliquer.
 
-gui.button.exportStart=Lancer les exports
+gui.button.exportStart=Lancer des exports unitaires
 gui.button.startParquetExport=Lancer les exports parquet
 gui.button.downloadFileExport=T\u00e9l\u00e9charger
 
@@ -232,7 +232,7 @@ label.todo=todo
 label.client.software=Application cliente
 label.tablename=Nom de la table
 label.export.parquet=Export vers fichier
-label.export.coordinator=Export vers la base ma\u00eetre
+label.export.coordinator=Export vers base ma\u00eetre
 label.mapmodel.field=Nom de variable
 label.mapmodel.field.type=Type de variable
 label.mapmodel.field.aggregate=Type de consolidation
@@ -269,6 +269,18 @@ label.step.export.client=Exports client
 label.step.export.date=Date des exports
 label.step.XML=Jointure XML
 
+label.export.timestamp=Export horodat\u00e9 ?
+label.export.file.name=Nom du fichier \u00e0 cr\u00e9er
+label.export.file.format=Format d''export
+label.export.table.name=Table \u00e0 exporter
+label.export.table.headers=Ligne d''ent\u00eate ?
+label.export.table.nulls="null" pour les valeurs nulles ?
+label.export.table.filter=Filtre SQL
+label.export.table.order=Tri SQL
+label.export.table.json=Colonne json \u00e0 convertir en colonnes 
+label.export.file.schema=Dessin de fichier attendu
+label.export.etat=Etat de l''export unitaire
+
 label.usergroup=Groupe
 label.usergroup.description=Libell\u00e9 du groupe
 label.user.id=Idep
@@ -319,8 +331,8 @@ view.webserviceQuery=Requ\u00eate des webservices
 
 view.entrepot=Liste des entrep\u00f4ts
 
-view.export=D\u00e9finition des exports
-view.exportOption=Options d''exports
+view.export=Configuration des exports
+view.exportOption=Actions de la phase d''export
 view.exportFile=Fichiers export\u00e9s
 
 view.userprofiles=Liste des groupes applicatifs de Arc
diff --git a/arc-web/src/main/webapp/WEB-INF/jsp/gererExport.jsp b/arc-web/src/main/webapp/WEB-INF/jsp/gererExport.jsp
diff --git a/arc-web/src/main/webapp/WEB-INF/jsp/tiles/header.jsp b/arc-web/src/main/webapp/WEB-INF/jsp/tiles/header.jsp
