diff --git a/asset-transfer-basic/chaincode-go/chaincode/smartcontract.go b/asset-transfer-basic/chaincode-go/chaincode/smartcontract.go index 04991a24..6a3635f7 100644 --- a/asset-transfer-basic/chaincode-go/chaincode/smartcontract.go +++ b/asset-transfer-basic/chaincode-go/chaincode/smartcontract.go @@ -25,7 +25,7 @@ type Receta struct { PeriodoDeTratamiento string `json:"periodoDeTratamiento"` InstruccionesTratamiento string `json:"instruccionesTratamiento"` PeriodoDeValidez string `json:"periodoDeValidez"` - DniPaciente string `json:"dniPaciente"` + PatientDocumentNumber string `json:"patientDocumentNumber"` FechaDeAutorizacion string `json:"fechaDeAutorizacion"` Cantidad string `json:"cantidad"` ExpectedSupplyDuration string `json:"expectedSupplyDuration"` @@ -42,7 +42,7 @@ type Vacuna struct { Manufacturer string `json:"manufacturer"` LotNumber string `json:"lotNumber"` ExpirationDate string `json:"expirationDate"` // como string ISO8601 - DniPaciente string `json:"dniPaciente"` + PatientDocumentNumber string `json:"patientDocumentNumber"` Reactions string `json:"reactions"` // puede ser un string o una estructura si querés después } @@ -63,7 +63,7 @@ func (s *SmartContract) InitLedger(ctx contractapi.TransactionContextInterface) PeriodoDeTratamiento: "30 dias", InstruccionesTratamiento: "una por dia", PeriodoDeValidez: "1 anio", - DniPaciente: "12345678", + PatientDocumentNumber: "12345678", FechaDeAutorizacion: "2024-01-01T09:00:00Z", Cantidad: "5", ExpectedSupplyDuration: "2024-02-01T09:00:00Z", @@ -82,7 +82,7 @@ func (s *SmartContract) InitLedger(ctx contractapi.TransactionContextInterface) PeriodoDeTratamiento: "60 dias", InstruccionesTratamiento: "dos por dia", PeriodoDeValidez: "2 anios", - DniPaciente: "87654321", + PatientDocumentNumber: "87654321", FechaDeAutorizacion: "2024-01-10T10:00:00Z", Cantidad: "10", ExpectedSupplyDuration: "2024-04-10T10:00:00Z", @@ -291,7 +291,7 @@ func (s *SmartContract) GetRecetasPorDniYEstado(ctx contractapi.TransactionConte return nil, err } - if receta.DniPaciente == dni && receta.Status == estado { + if receta.PatientDocumentNumber == dni && receta.Status == estado { recetasFiltradas = append(recetasFiltradas, &receta) } } @@ -367,7 +367,7 @@ func (s *SmartContract) GetVacunasPorDniYEstado(ctx contractapi.TransactionConte } // Validamos que tenga un DNI y coincida - if vacuna.DniPaciente != dni { + if vacuna.PatientDocumentNumber != dni { continue } diff --git a/asset-transfer-basic/maven-API-SiMeDi/src/main/java/com/code/hyperledger/controllers/RecetaController.java b/asset-transfer-basic/maven-API-SiMeDi/src/main/java/com/code/hyperledger/controllers/RecetaController.java index bfdb8965..90c4f6d8 100644 --- a/asset-transfer-basic/maven-API-SiMeDi/src/main/java/com/code/hyperledger/controllers/RecetaController.java +++ b/asset-transfer-basic/maven-API-SiMeDi/src/main/java/com/code/hyperledger/controllers/RecetaController.java @@ -29,7 +29,7 @@ public class RecetaController { System.out.println("\n--> Submit Transaction: CrearReceta"); String now = LocalDateTime.now().toString(); - String dni = receta.getDniPaciente(); + String dni = receta.getPatientDocumentNumber(); String id = dni + now; String assetId = Hashing.sha256(id); receta.setId(assetId); @@ -66,7 +66,7 @@ public class RecetaController { try { List ids = requestBody.get("ids"); if (ids == null || ids.isEmpty()) { - return new ResponseEntity<>(HttpStatus.BAD_REQUEST); + return new ResponseEntity<>(new ArrayList<>(), HttpStatus.OK); } List recetas = recetaService.obtenerRecetasPorIds(ids); @@ -119,7 +119,7 @@ public class RecetaController { dto.setPeriodoDeTratamiento(receta.getPeriodoDeTratamiento()); dto.setInstruccionesTratamiento(receta.getInstruccionesTratamiento()); dto.setPeriodoDeValidez(receta.getPeriodoDeValidez()); - dto.setDniPaciente(receta.getDniPaciente()); + dto.setPatientDocumentNumber(receta.getPatientDocumentNumber()); dto.setFechaDeAutorizacion(receta.getFechaDeAutorizacion()); dto.setCantidad(receta.getCantidad()); dto.setExpectedSupplyDuration(receta.getExpectedSupplyDuration()); diff --git a/asset-transfer-basic/maven-API-SiMeDi/src/main/java/com/code/hyperledger/controllers/VacunaController.java b/asset-transfer-basic/maven-API-SiMeDi/src/main/java/com/code/hyperledger/controllers/VacunaController.java index c3423759..ee999ade 100644 --- a/asset-transfer-basic/maven-API-SiMeDi/src/main/java/com/code/hyperledger/controllers/VacunaController.java +++ b/asset-transfer-basic/maven-API-SiMeDi/src/main/java/com/code/hyperledger/controllers/VacunaController.java @@ -27,7 +27,7 @@ public class VacunaController { System.out.println("\n--> Submit Transaction: CrearVacuna"); String now = LocalDateTime.now().toString(); - String dni = vacuna.getDniPaciente(); + String dni = vacuna.getPatientDocumentNumber(); String id = dni + now; String assetId = Hashing.sha256(id); vacuna.setId(assetId); diff --git a/asset-transfer-basic/maven-API-SiMeDi/src/main/java/com/code/hyperledger/models/Receta.java b/asset-transfer-basic/maven-API-SiMeDi/src/main/java/com/code/hyperledger/models/Receta.java index 5b76eaae..2deb0d26 100644 --- a/asset-transfer-basic/maven-API-SiMeDi/src/main/java/com/code/hyperledger/models/Receta.java +++ b/asset-transfer-basic/maven-API-SiMeDi/src/main/java/com/code/hyperledger/models/Receta.java @@ -22,7 +22,7 @@ public class Receta { private String periodoDeTratamiento; private String instruccionesTratamiento; private String periodoDeValidez; - private String dniPaciente; + private String patientDocumentNumber; //@JsonFormat(pattern = "yyyy-MM-dd") private String fechaDeAutorizacion; private int cantidad; diff --git a/asset-transfer-basic/maven-API-SiMeDi/src/main/java/com/code/hyperledger/models/RecetaDto.java b/asset-transfer-basic/maven-API-SiMeDi/src/main/java/com/code/hyperledger/models/RecetaDto.java index d0f5f5fe..eb925d4d 100644 --- a/asset-transfer-basic/maven-API-SiMeDi/src/main/java/com/code/hyperledger/models/RecetaDto.java +++ b/asset-transfer-basic/maven-API-SiMeDi/src/main/java/com/code/hyperledger/models/RecetaDto.java @@ -21,7 +21,7 @@ public class RecetaDto { private String periodoDeTratamiento; private String instruccionesTratamiento; private String periodoDeValidez; - private String dniPaciente; + private String patientDocumentNumber; //@JsonFormat(pattern = "yyyy-MM-dd") private String fechaDeAutorizacion; private int cantidad; diff --git a/asset-transfer-basic/maven-API-SiMeDi/src/main/java/com/code/hyperledger/models/Vacuna.java b/asset-transfer-basic/maven-API-SiMeDi/src/main/java/com/code/hyperledger/models/Vacuna.java index 7c9e6e74..f280d003 100644 --- a/asset-transfer-basic/maven-API-SiMeDi/src/main/java/com/code/hyperledger/models/Vacuna.java +++ b/asset-transfer-basic/maven-API-SiMeDi/src/main/java/com/code/hyperledger/models/Vacuna.java @@ -19,7 +19,7 @@ public class Vacuna { private String manufacturer; private String lotNumber; private String expirationDate; - private String dniPaciente; + private String patientDocumentNumber; private String reactions; } diff --git a/asset-transfer-basic/maven-API-SiMeDi/src/main/java/com/code/hyperledger/models/VacunaDto.java b/asset-transfer-basic/maven-API-SiMeDi/src/main/java/com/code/hyperledger/models/VacunaDto.java index a27a34b0..6886fa30 100644 --- a/asset-transfer-basic/maven-API-SiMeDi/src/main/java/com/code/hyperledger/models/VacunaDto.java +++ b/asset-transfer-basic/maven-API-SiMeDi/src/main/java/com/code/hyperledger/models/VacunaDto.java @@ -18,6 +18,6 @@ public class VacunaDto { private String manufacturer; private String lotNumber; private String expirationDate; - private String dniPaciente; + private String patientDocumentNumber; private String reactions; } diff --git a/asset-transfer-basic/maven-API-SiMeDi/src/main/java/com/code/hyperledger/services/RecetaService.java b/asset-transfer-basic/maven-API-SiMeDi/src/main/java/com/code/hyperledger/services/RecetaService.java index 528ea3e0..0849307e 100644 --- a/asset-transfer-basic/maven-API-SiMeDi/src/main/java/com/code/hyperledger/services/RecetaService.java +++ b/asset-transfer-basic/maven-API-SiMeDi/src/main/java/com/code/hyperledger/services/RecetaService.java @@ -117,7 +117,7 @@ public class RecetaService { receta.getPeriodoDeTratamiento(), receta.getInstruccionesTratamiento(), receta.getPeriodoDeValidez(), - receta.getDniPaciente(), + receta.getPatientDocumentNumber(), receta.getFechaDeAutorizacion(), Integer.toString(receta.getCantidad()), receta.getExpectedSupplyDuration()); diff --git a/asset-transfer-basic/maven-API-SiMeDi/src/main/java/com/code/hyperledger/services/VacunaService.java b/asset-transfer-basic/maven-API-SiMeDi/src/main/java/com/code/hyperledger/services/VacunaService.java index 032365ba..e6411438 100644 --- a/asset-transfer-basic/maven-API-SiMeDi/src/main/java/com/code/hyperledger/services/VacunaService.java +++ b/asset-transfer-basic/maven-API-SiMeDi/src/main/java/com/code/hyperledger/services/VacunaService.java @@ -108,7 +108,7 @@ public class VacunaService { vacuna.getManufacturer(), vacuna.getLotNumber(), vacuna.getExpirationDate(), - vacuna.getDniPaciente(), + vacuna.getPatientDocumentNumber(), vacuna.getReactions() ); }