feat: Update ad2.5

src/main/java/it/finanze/sanita/fse2/ms/gtw/dispatcher/client/impl/FhirMappingClient.java

@@ -14,8 +14,6 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpEntity;
 import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpMethod;
-import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Component;
 import org.springframework.web.client.ResourceAccessException;
 import org.springframework.web.client.RestTemplate;
@@ -41,16 +39,14 @@ public class FhirMappingClient implements IFhirMappingClient {
 	public TransformResDTO callConvertCdaInBundle(final FhirResourceDTO resourceToConvert) {
 		TransformResDTO out = null;
 		log.debug("Fhir Mapping Client - Calling Fhir Mapping to execute conversion");
-		ResponseEntity<TransformResDTO> response = null;
 		String url = msUrlCFG.getFhirMappingEngineHost() + "/v1/documents/transform";
 		HttpHeaders headers = new HttpHeaders();
 		headers.set("Content-Type", "application/json");
 		HttpEntity<?> entity = new HttpEntity<>(resourceToConvert, headers);
 		try {
-			response = restTemplate.exchange(url, HttpMethod.POST, entity, TransformResDTO.class);
-			out = response.getBody();
+			out = restTemplate.postForObject(url, entity, TransformResDTO.class);
 		} catch(ResourceAccessException cex) {
-			log.error("Connect error while call document transform :" + msUrlCFG.getFhirMappingEngineHost(),cex);
+			log.error("Connect error while call document transform :",cex);
 			throw new ConnectionRefusedException(msUrlCFG.getFhirMappingEngineHost(),"Connection refused");
 		}  
 		return out;

src/main/java/it/finanze/sanita/fse2/ms/gtw/dispatcher/dto/DocumentEntryDTO.java

@@ -28,11 +28,9 @@ public class DocumentEntryDTO {
 	private String author;
 	private String authorRole;
 	private String authorInstitution;
-	private String languageCode;
 	private String repositoryUniqueId;
 	private String patientId;
 	private String conservazioneANorma;
-	private String firma;
 	private List<String> description;
 	private String serviceStartTime;
 	private String serviceStopTime;

src/main/java/it/finanze/sanita/fse2/ms/gtw/dispatcher/dto/KafkaStatusManagerDTO.java

@@ -24,7 +24,7 @@
  */
 @Getter
 @Builder
-public class KafkaStatusManagerDTO extends AbstractDTO {
+public class KafkaStatusManagerDTO {
 
 	private String traceId;
 

src/main/java/it/finanze/sanita/fse2/ms/gtw/dispatcher/dto/request/PublicationMetadataReqDTO.java

@@ -17,7 +17,6 @@
 
 import io.swagger.v3.oas.annotations.media.ArraySchema;
 import io.swagger.v3.oas.annotations.media.Schema;
-import it.finanze.sanita.fse2.ms.gtw.dispatcher.dto.AbstractDTO;
 import it.finanze.sanita.fse2.ms.gtw.dispatcher.enums.AdministrativeReqEnum;
 import it.finanze.sanita.fse2.ms.gtw.dispatcher.enums.AttivitaClinicaEnum;
 import it.finanze.sanita.fse2.ms.gtw.dispatcher.enums.HealthcareFacilityEnum;
@@ -32,7 +31,7 @@
 @Setter
 @NoArgsConstructor
 @AllArgsConstructor
-public class PublicationMetadataReqDTO extends AbstractDTO {
+public class PublicationMetadataReqDTO {
 
 	@Schema(description = "Tipologia struttura che ha prodotto il documento", required = true)
 	private HealthcareFacilityEnum tipologiaStruttura;

src/main/java/it/finanze/sanita/fse2/ms/gtw/dispatcher/dto/request/TSPublicationCreationReqDTO.java

@@ -16,7 +16,6 @@
 import javax.validation.constraints.Size;
 
 import io.swagger.v3.oas.annotations.media.Schema;
-import it.finanze.sanita.fse2.ms.gtw.dispatcher.dto.AbstractDTO;
 import it.finanze.sanita.fse2.ms.gtw.dispatcher.enums.AttivitaClinicaEnum;
 import it.finanze.sanita.fse2.ms.gtw.dispatcher.enums.HealthDataFormatEnum;
 import it.finanze.sanita.fse2.ms.gtw.dispatcher.enums.HealthcareFacilityEnum;
@@ -37,7 +36,7 @@
 @NoArgsConstructor
 @AllArgsConstructor
 @Builder
-public class TSPublicationCreationReqDTO extends AbstractDTO {
+public class TSPublicationCreationReqDTO {
 
 	@Schema(description = "Formato dei dati sanitari")
 	private HealthDataFormatEnum healthDataFormat;

src/main/java/it/finanze/sanita/fse2/ms/gtw/dispatcher/dto/request/ValidationCDAReqDTO.java

@@ -14,7 +14,6 @@
 import com.fasterxml.jackson.databind.annotation.JacksonStdImpl;
 
 import io.swagger.v3.oas.annotations.media.Schema;
-import it.finanze.sanita.fse2.ms.gtw.dispatcher.dto.AbstractDTO;
 import it.finanze.sanita.fse2.ms.gtw.dispatcher.enums.ActivityEnum;
 import it.finanze.sanita.fse2.ms.gtw.dispatcher.enums.HealthDataFormatEnum;
 import it.finanze.sanita.fse2.ms.gtw.dispatcher.enums.InjectionModeEnum;
@@ -35,7 +34,7 @@
 @Jacksonized
 @Builder
 @JacksonStdImpl
-public class ValidationCDAReqDTO extends AbstractDTO {
+public class ValidationCDAReqDTO{
 
     @Schema(description = "Formato dei dati sanitari")
     private HealthDataFormatEnum healthDataFormat;

src/main/java/it/finanze/sanita/fse2/ms/gtw/dispatcher/dto/request/client/ValidationRequestDTO.java

@@ -12,7 +12,6 @@
 package it.finanze.sanita.fse2.ms.gtw.dispatcher.dto.request.client;
 
 import io.swagger.v3.oas.annotations.media.Schema;
-import it.finanze.sanita.fse2.ms.gtw.dispatcher.dto.AbstractDTO;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
@@ -25,7 +24,7 @@
 @Setter
 @NoArgsConstructor
 @AllArgsConstructor
-public class ValidationRequestDTO extends AbstractDTO {
+public class ValidationRequestDTO {
 
 	@Schema(description = "cda")
     private String cda;

src/main/java/it/finanze/sanita/fse2/ms/gtw/dispatcher/dto/response/EdsResponseDTO.java

@@ -11,17 +11,14 @@
  */
 package it.finanze.sanita.fse2.ms.gtw.dispatcher.dto.response;
 
-import it.finanze.sanita.fse2.ms.gtw.dispatcher.dto.AbstractDTO;
 import lombok.AllArgsConstructor;
 import lombok.Data;
-import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 
 @Data
-@EqualsAndHashCode(callSuper = true)
 @NoArgsConstructor
 @AllArgsConstructor
-public class EdsResponseDTO extends AbstractDTO {
+public class EdsResponseDTO {
 
 	private boolean esito;
 

src/main/java/it/finanze/sanita/fse2/ms/gtw/dispatcher/dto/response/ErrorResponseDTO.java

@@ -16,7 +16,6 @@
 import javax.validation.constraints.Size;
 
 import io.swagger.v3.oas.annotations.media.Schema;
-import it.finanze.sanita.fse2.ms.gtw.dispatcher.dto.AbstractDTO;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
@@ -30,7 +29,7 @@
 @Builder
 @AllArgsConstructor
 @EqualsAndHashCode(callSuper=false)
-public class ErrorResponseDTO extends AbstractDTO {
+public class ErrorResponseDTO {
 
 	/**
 	 * Trace id log.

src/main/java/it/finanze/sanita/fse2/ms/gtw/dispatcher/dto/response/LogTraceInfoDTO.java

@@ -11,13 +11,12 @@
  */
 package it.finanze.sanita.fse2.ms.gtw.dispatcher.dto.response;
 
-import it.finanze.sanita.fse2.ms.gtw.dispatcher.dto.AbstractDTO;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 @Data
 @EqualsAndHashCode(callSuper = false)
-public class LogTraceInfoDTO extends AbstractDTO {
+public class LogTraceInfoDTO {
 
 	/**
 	 * Span.

src/main/java/it/finanze/sanita/fse2/ms/gtw/dispatcher/dto/response/client/TransformResDTO.java

@@ -13,7 +13,6 @@
 
 import org.bson.Document;
 
-import it.finanze.sanita.fse2.ms.gtw.dispatcher.dto.AbstractDTO;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -25,8 +24,7 @@
 @Data
 @NoArgsConstructor
 @AllArgsConstructor
-@EqualsAndHashCode(callSuper=true)
-public class TransformResDTO extends AbstractDTO {
+public class TransformResDTO {
 
 	private String errorMessage;
 

src/main/java/it/finanze/sanita/fse2/ms/gtw/dispatcher/enums/DescriptionEnum.java

@@ -16,14 +16,15 @@
 @Getter
 public enum DescriptionEnum {
 
-	DESC_OID1("2.16.840.1.113883.2.9.6.1.5"),
-	DESC_OID2("2.16.840.1.113883.2.9.6.1.51"),
-	DESC_OID3("2.16.840.1.113883.6.73"),
-	DESC_OID4("2.16.840.1.113883.2.9.6.1.11"),
-	DESC_OID5("2.16.840.1.113883.2.9.2.COD_REGIONE.6.1.11"),
-	DESC_OID6("2.16.840.1.113883.2.9.6.1.5"),
-	DESC_OID7("2.16.840.1.113883.6.73");
-
+	PRESCRIZIONE_FARMACEUTICA_AIC("2.16.840.1.113883.2.9.6.1.5"),
+	PRESCRIZIONE_FARMACEUTICA_GRUPPOEQ("2.16.840.1.113883.2.9.6.1.51"),
+	PRESCRIZIONE_FARMACEUTICA_ATC("2.16.840.1.113883.6.73"),
+	PRESCRIZIONE_SPECIALISTICA_CAT_NAZ("2.16.840.1.113883.2.9.6.1.11"),
+	PRESCRIZIONE_SPECIALISTICA_CAT_REG("2.16.840.1.113883.2.9.2.COD_REGIONE.6.1.11"),
+	EROGAZIONE_FARMACEUTICA_AIC("2.16.840.1.113883.2.9.6.1.5"),
+	EROGAZIONE_FARMACEUTICA_ATC("2.16.840.1.113883.6.73");
+
+
 	private String oid;
 
 	private DescriptionEnum(String inOid) {

src/main/java/it/finanze/sanita/fse2/ms/gtw/dispatcher/enums/EventCodeEnum.java

@@ -15,19 +15,6 @@
 
 public enum EventCodeEnum {
 
-	P99("P99", "Oscuramento del documento"),
-	P97("P97", "Oscuramento al genitore"),
-	P98("P98", "Oscuramento all’assistito"),
-	J07BX03("J07BX03", "Vaccino per Covid-19"),
-	LP418019_8("LP418019-8", "Tampone antigenico per Covid-19"),
-	LP417541_2("LP417541-2", "Tampone molecolare per Covid-19"),
-	_96118_5("96118-5", "Test Sierologico qualitativo"),
-	_94503_0("94503-0", "Test Sierologico quantitativo"),
-	pay("pay", "Prescrizione farmaceutica non a carico SSN"),
-	PUBLICPOL("PUBLICPOL", "Prescrizione farmaceutica SSN"),
-	LP267463_0("LP267463-0", "Reddito"),
-	LP199190_2("LP199190-2", "Patologia"),
-	_90768_3("90768-3", "Analisi sangue donatore"),
 	J07AC("J07AC","Anthrax vaccines"),
 	J07AC01("J07AC01","anthrax antigen"),
 	J07AD("J07AD","Brucellosis vaccines"),
@@ -125,7 +112,6 @@ public enum EventCodeEnum {
 	J07BM01("J07BM01","papillomavirus (human types 6, 11, 16, 18)"),
 	J07BM02("J07BM02","papillomavirus (human types 16, 18)"),
 	J07BM03("J07BM03","papillomavirus (human types 6, 11, 16, 18, 31, 33, 45, 52, 58)"),
-	J07BN("J07BN","Covid-19 vaccines"),
 	J07BN01("J07BN01","covid-19, RNA-based vaccine"),
 	J07BN02("J07BN02","covid-19, viral vector, non-replicating"),
 	J07BN03("J07BN03","covid-19, inactivated virus"),
@@ -149,7 +135,115 @@ public enum EventCodeEnum {
 	J07CA12("J07CA12","diphtheria-pertussis-poliomyelitis-tetanus-hepatitis B"),
 	J07CA13("J07CA13","diphtheria-haemophilus influenzae B-pertussis-tetanus-hepatitis B-meningococcus A + C"),
 	J07XA("J07XA","Parasitic vaccines"),
-	J07XA01("J07XA01","malaria vaccines");
+	J07XA01("J07XA01","malaria vaccines"),
+	_1001000221103("1001000221103","Inactivated whole Vibrio cholerae antigen only vaccine product in oral dose form"),
+	_1011000221100("1011000221100","Live attenuated Vibrio cholerae antigen only vaccine product in oral dose form"),
+	_1031000221108("1031000221108","Human poliovirus antigen-containing vaccine product"),
+	_1051000221104("1051000221104","Live attenuated Human poliovirus serotypes 1 and 3 antigens only vaccine product in oral dose form"),
+	_1052328007("1052328007","Streptococcus pneumoniae Danish serotype 4, 6B, 9V, 14, 18C, 19F, and 23F capsular polysaccharide antigens conjugated only vaccine product"),
+	_1081000221109("1081000221109","Live attenuated Rotavirus antigen only vaccine product"),
+	_1101000221104("1101000221104","Clostridium tetani toxoid antigen-containing vaccine product"),
+	_1119254000("1119254000","Streptococcus pneumoniae Danish serotype 1, 3, 4, 5, 6A, 6B, 7F, 9V, 14, 18C, 19A, 19F, and 23F capsular polysaccharide antigens only vaccine product"),
+	_1119305005("1119305005","SARS-CoV-2 antigen vaccine"),
+	_1119349007("1119349007","SARS-CoV-2 mRNA vaccine"),
+	_1121000221106("1121000221106","Live attenuated Yellow fever virus antigen only vaccine product"),
+	_1131000221109("1131000221109","Vaccine product containing only inactivated whole Rabies lyssavirus antigen"),
+	_1157024006("1157024006","Inactivated whole SARS-CoV-2 antigen vaccine"),
+	_1162643001("1162643001","SARS-CoV-2 recombinant spike protein antigen vaccine"),
+	_1181000221105("1181000221105","Influenza virus antigen only vaccine product"),
+	_1801000221105("1801000221105","Streptococcus pneumoniae capsular polysaccharide antigen conjugated only vaccine product"),
+	_1861000221106("1861000221106","Bacillus Calmette-Guerin antigen only vaccine product"),
+	_1981000221108("1981000221108","Neisseria meningitidis serogroup B antigen only vaccine product"),
+	_2171000221104("2171000221104","Salmonella enterica subspecies enterica serovar Typhi capsular polysaccharide unconjugated antigen only vaccine product in parenteral dose form"),
+	_2221000221107("2221000221107","Live attenuated Human alphaherpesvirus 3 only vaccine product"),
+	_28531000087107("28531000087107","COVID-19 vaccine"),
+	_29061000087103("29061000087103","COVID-19 non-replicating viral vector vaccine"),
+	_37146000("37146000","Typhus vaccine"),
+	_409568008("409568008","Pentavalent botulinum toxoid vaccine"),
+	_428601009("428601009","Paratyphoid vaccine"),
+	_601000221108("601000221108","Bordetella pertussis antigen-containing vaccine product"),
+	_774618008("774618008","Whole cell Bordetella pertussis and Clostridium tetani toxoid adsorbed and Corynebacterium diphtheriae toxoid antigens only vaccine product"),
+	_775641005("775641005","Clostridium tetani toxoid adsorbed and Corynebacterium diphtheriae toxoid antigens only vaccine product"),
+	_777725002("777725002","Clostridium tetani toxoid antigen adsorbed only vaccine product"),
+	_836368004("836368004","Bacteria antigen-containing vaccine product"),
+	_836369007("836369007","Virus antigen-containing vaccine product"),
+	_836374004("836374004","Hepatitis B virus antigen-containing vaccine product"),
+	_836375003("836375003","Hepatitis A virus antigen-containing vaccine product"),
+	_836377006("836377006","Influenza virus antigen-containing vaccine product"),
+	_836378001("836378001","Japanese encephalitis virus antigen-containing vaccine product"),
+	_836379009("836379009","Human papillomavirus antigen-containing vaccine product"),
+	_836380007("836380007","Haemophilus influenzae type B antigen-containing vaccine product"),
+	_836381006("836381006","Corynebacterium diphtheriae antigen-containing vaccine product"),
+	_836382004("836382004","Measles morbillivirus antigen-containing vaccine product"),
+	_836383009("836383009","Vibrio cholerae antigen-containing vaccine product"),
+	_836384003("836384003","Bacillus anthracis antigen-containing vaccine product"),
+	_836385002("836385002","Yellow fever virus antigen-containing vaccine product"),
+	_836387005("836387005","Rotavirus antigen-containing vaccine product"),
+	_836388000("836388000","Rubella virus antigen-containing vaccine product"),
+	_836389008("836389008","Vaccinia virus antigen-containing vaccine product"),
+	_836390004("836390004","Salmonella enterica subspecies enterica serovar Typhi antigen-containing vaccine product"),
+	_836393002("836393002","Rabies lyssavirus antigen-containing vaccine product"),
+	_836397001("836397001","Coxiella burnetii antigen-containing vaccine product"),
+	_836398006("836398006","Streptococcus pneumoniae antigen-containing vaccine product"),
+	_836401009("836401009","Neisseria meningitidis antigen-containing vaccine product"),
+	_836402002("836402002","Bacillus Calmette-Guerin antigen-containing vaccine product"),
+	_836403007("836403007","Tick-borne encephalitis virus antigen-containing vaccine product"),
+	_836495005("836495005","Human alphaherpesvirus 3 antigen-containing vaccine product"),
+	_836498007("836498007","Mumps orthorubulavirus antigen-containing vaccine product"),
+	_836500008("836500008","Haemophilus influenzae type B and Neisseria meningitidis serogroup C antigens only vaccine product"),
+	_840549009("840549009","Yersinia pestis antigen-containing vaccine product"),
+	_840563003("840563003","Dengue virus antigen-containing vaccine product"),
+	_840599008("840599008","Borrelia burgdorferi antigen-containing vaccine product"),
+	_863911006("863911006","Clostridium tetani antigen-containing vaccine product"),
+	_871726005("871726005","Rabies lyssavirus antigen only vaccine product"),
+	_871737006("871737006","Mumps orthorubulavirus antigen only vaccine product"),
+	_871738001("871738001","Live attenuated Mumps orthorubulavirus antigen only vaccine product"),
+	_871739009("871739009","Human poliovirus antigen only vaccine product"),
+	_871740006("871740006","Inactivated whole Human poliovirus antigen only vaccine product"),
+	_871742003("871742003","Clostridium tetani antigen only vaccine product"),
+	_871751006("871751006","Hepatitis A virus antigen only vaccine product"),
+	_871759008("871759008","Acellular Bordetella pertussis only vaccine product"),
+	_871764007("871764007","Haemophilus influenzae type b antigen only vaccine product"),
+	_871765008("871765008","Measles morbillivirus antigen only vaccine product"),
+	_871768005("871768005","Influenza virus antigen only vaccine product in nasal dose form"),
+	_871772009("871772009","Influenza A virus subtype H1N1 antigen only vaccine product"),
+	_871803007("871803007","Hepatitis A and Hepatitis B virus antigens only vaccine product"),
+	_871804001("871804001","Hepatitis A virus and Salmonella enterica subspecies enterica serovar Typhi antigens only vaccine product"),
+	_871806004("871806004","Haemophilus influenzae type B and Hepatitis B virus antigens only vaccine product"),
+	_871826000("871826000","Clostridium tetani and Corynebacterium diphtheriae antigens only vaccine product"),
+	_871831003("871831003","Measles morbillivirus and Mumps orthorubulavirus and Rubella virus antigens only vaccine product"),
+	_871837004("871837004","Clostridium tetani and Corynebacterium diphtheriae and Human poliovirus antigens only vaccine product"),
+	_871839001("871839001","Bordetella pertussis and Clostridium tetani and Corynebacterium diphtheriae and Haemophilus influenzae type B antigens only vaccine product"),
+	_871866001("871866001","Neisseria meningitidis serogroup C only vaccine product"),
+	_871871008("871871008","Neisseria meningitidis serogroup A and C only vaccine product"),
+	_871873006("871873006","Neisseria meningitidis serogroup A, C, W135 and Y only vaccine product"),
+	_871875004("871875004","Bordetella pertussis and Clostridium tetani and Corynebacterium diphtheriae antigens only vaccine product"),
+	_871876003("871876003","Acellular Bordetella pertussis and Clostridium tetani and Corynebacterium diphtheriae antigens only vaccine product"),
+	_871878002("871878002","Bordetella pertussis and Clostridium tetani and Corynebacterium diphtheriae and Human poliovirus antigens only vaccine product"),
+	_871887006("871887006","Bordetella pertussis and Clostridium tetani and Corynebacterium diphtheriae and Haemophilus influenzae type B and Human poliovirus antigens only vaccine product"),
+	_871889009("871889009","Acellular Bordetella pertussis and Corynebacterium diphtheriae and Hepatitis B virus and inactivated whole Human poliovirus antigens only vaccine product"),
+	_871895005("871895005","Bordetella pertussis and Clostridium tetani and Corynebacterium diphtheriae and Haemophilus influenzae type B and Hepatitis B virus and Human poliovirus antigens only vaccine product"),
+	_871908002("871908002","Human alphaherpesvirus 3 and Measles morbillivirus and Mumps orthorubulavirus and Rubella virus antigens only vaccine product"),
+	_871918007("871918007","Rickettsia antigen-containing vaccine product"),
+	_871921009("871921009","Staphylococcus toxoid vaccine"),
+	_921000221108("921000221108","Neisseria meningitidis antigen only vaccine product"),
+	_971000221109("971000221109","Live attenuated Salmonella enterica subspecies enterica serovar Typhi antigen only vaccine product in oral dose form"),
+	_981000221107("981000221107","Streptococcus pneumoniae antigen only vaccine product"),
+	P99("P99", "Oscuramento del documento"),
+	P97("P97", "Oscuramento al genitore"),
+	P98("P98", "Oscuramento all’assistito"),
+	J07BN("J07BN", "Vaccino per Covid-19"),
+	LP418019_8("LP418019-8", "Tampone antigenico per Covid-19"),
+	LP417541_2("LP417541-2", "Tampone molecolare per Covid-19"),
+	_96118_5("96118-5", "Test Sierologico qualitativo"),
+	_94503_0("94503-0", "Test Sierologico quantitativo"),
+	pay("pay" ,"Prescrizione farmaceutica non a carico SSN"),
+	PUBLICPOL("PUBLICPOL", "Prescrizione farmaceutica SSN"),
+	LP267463_0("LP267463-0", "Reddito"),
+	LP199190_2("LP199190-2", "Patologia"),
+	_90768_3("90768-3" ,"Analisi sangue donatore");
+
+
 	@Getter
 	private String code;