Merge pull request #9 from pagopa/fix-csv-headers

Fixed CSV headers and updated postman collection
pagopa · Sep 6, 2023 · 3b4d793 · 3b4d793
2 parents 6fb86c8 + 3a08147
commit 3b4d793
Show file tree

Hide file tree

Showing 3 changed files with 59 additions and 32 deletions.
diff --git a/postman-collection/Taxonomy LOCAL.postman_environment.json b/postman-collection/Taxonomy LOCAL.postman_environment.json
@@ -0,0 +1,15 @@
+{
+	"id": "25d82bc3-973f-42dc-9f31-e9c40fa8cec1",
+	"name": "Taxonomy LOCAL",
+	"values": [
+		{
+			"key": "host_config",
+			"value": "http://localhost:7071",
+			"type": "default",
+			"enabled": true
+		}
+	],
+	"_postman_variable_scope": "environment",
+	"_postman_exported_at": "2023-09-06T08:43:00.468Z",
+	"_postman_exported_using": "Postman/10.17.6"
+}
diff --git a/postman-collection/Taxonomy.postman_collection.json b/postman-collection/Taxonomy.postman_collection.json
@@ -1,14 +1,13 @@
 {
 	"info": {
-		"_postman_id": "7807f410-403e-40ed-8c70-7e4c04df054e",
+		"_postman_id": "b6cca8e2-4eec-4995-9dc6-1bed8f5e8469",
 		"name": "Taxonomy",
 		"schema": "https://schema.getpostman.com/json/collection/v2.1.0/collection.json",
-		"_exporter_id": "2040508",
-		"_collection_link": "https://speeding-station-482612.postman.co/workspace/Nodo-doc~ec880f84-0a42-4ca9-bbd1-454d00bbe20c/collection/2040508-7807f410-403e-40ed-8c70-7e4c04df054e?action=share&creator=2040508&source=collection_link"
+		"_exporter_id": "26451960"
 	},
 	"item": [
 		{
-			"name": "generate",
+			"name": "Generate",
 			"request": {
 				"method": "GET",
 				"header": [
@@ -19,27 +18,19 @@
 					}
 				],
 				"url": {
-					"raw": "https://api.dev.platform.pagopa.it/taxonomy/service/v1/generate",
-					"protocol": "https",
+					"raw": "{{host_config}}/generate",
 					"host": [
-						"api",
-						"dev",
-						"platform",
-						"pagopa",
-						"it"
+						"{{host_config}}"
 					],
 					"path": [
-						"taxonomy",
-						"service",
-						"v1",
 						"generate"
 					]
 				}
 			},
 			"response": []
 		},
 		{
-			"name": "taxonomy",
+			"name": "GET Taxonomy",
 			"request": {
 				"method": "GET",
 				"header": [
@@ -50,24 +41,45 @@
 					}
 				],
 				"url": {
-					"raw": "https://api.dev.platform.pagopa.it/taxonomy/service/v1/taxonomy",
-					"protocol": "https",
+					"raw": "{{host_config}}/taxonomy",
 					"host": [
-						"api",
-						"dev",
-						"platform",
-						"pagopa",
-						"it"
+						"{{host_config}}"
 					],
 					"path": [
-						"taxonomy",
-						"service",
-						"v1",
 						"taxonomy"
 					]
 				}
 			},
 			"response": []
+		},
+		{
+			"name": "GET Taxonomy TopicFlag",
+			"request": {
+				"method": "GET",
+				"header": [
+					{
+						"key": "Ocp-Apim-Subscription-Key",
+						"value": "0b82eb24a5ce441d9a65e3d8b62a2574",
+						"type": "text"
+					}
+				],
+				"url": {
+					"raw": "{{host_config}}/taxonomy?version=topicflag",
+					"host": [
+						"{{host_config}}"
+					],
+					"path": [
+						"taxonomy"
+					],
+					"query": [
+						{
+							"key": "version",
+							"value": "topicflag"
+						}
+					]
+				}
+			},
+			"response": []
 		}
 	]
 }
diff --git a/src/main/java/it/gov/pagopa/taxonomy/model/csv/TaxonomyCsv.java b/src/main/java/it/gov/pagopa/taxonomy/model/csv/TaxonomyCsv.java
@@ -17,7 +17,7 @@ public class TaxonomyCsv {
   private String creditorEntityTypeCode;
   @CsvBindByName(column = "TIPO ENTE CREDITORE", required = true)
   private String creditorEntityType;
-  @CsvBindByName(column = "PROGRESSIVO MACRO AREA PER ENTE CREDITORE", required = true)
+  @CsvBindByName(column = "# Progressivo Macro Area per Ente Creditore", required = true)
   private String creditorEntityMacroAreaProgressive;
   @CsvBindByName(column = "NOME MACRO AREA", required = true)
   private String macroAreaName;
@@ -27,20 +27,20 @@ public class TaxonomyCsv {
   private String serviceTypologyCode;
   @CsvBindByName(column = "TIPO SERVIZIO", required = true)
   private String serviceType;
-  @CsvBindByName(column = "MOTIVO GIURIDICO DELLA RISCOSSIONE", required = true)
+  @CsvBindByName(column = "Motivo Giuridico della riscossione", required = true)
   private String legalBasisOfCollection;
   @CsvBindByName(column = "DESCRIZIONE TIPO SERVIZIO", required = true)
   private String serviceTypeDescription;
-  @CsvBindByName(column = "VERSIONE TASSONOMIA", required = true)
+  @CsvBindByName(column = "# VERSIONE TASSONOMIA", required = true)
   private String taxonomyVersion;
   @CsvBindByName(column = "DATI SPECIFICI DI INCASSO", required = true)
   private String specificCollectionData;
-  @CsvBindByName(column = "DATA INIZIO VALIDITA", required = true)
+  @CsvBindByName(column = "DATA INIZIO VALIDITA (mm/gg/aaaa)", required = true)
   private String validityStartDate;
-  @CsvBindByName(column = "DATA FINE VALIDITA", required = true)
+  @CsvBindByName(column = "DATA FINE VALIDITA (mm/gg/aaaa)", required = true)
   private String validityEndDate;
-  @CsvBindByName(column = "COMBINAZIONE TOPIC E SUBTOPIC", required = true)
+  @CsvBindByName(column = "combinazione topic&subtopic", required = true)
   private String topicSubtopicCombination;
-  @CsvBindByName(column = "FLAG NUOVA COMBINAZIONE", required = true)
+  @CsvBindByName(column = "Flag_Nuova_Combinazione", required = true)
   private String newCombinationFlag;
 }