diff --git a/asset-transfer-basic/chaincode-go/chaincode/smartcontract.go b/asset-transfer-basic/chaincode-go/chaincode/smartcontract.go index d1503782..d73de622 100644 --- a/asset-transfer-basic/chaincode-go/chaincode/smartcontract.go +++ b/asset-transfer-basic/chaincode-go/chaincode/smartcontract.go @@ -33,7 +33,7 @@ type Receta struct { type Vacuna struct { ID string `json:"id"` // identificador único para el ledger - Identificador string `json:"identificador"` + Identifier string `json:"identifier"` Status string `json:"status"` // podés validarlo con enums si querés StatusChange string `json:"statusChange"` // como string (ISO8601) StatusReason string `json:"statusReason"` 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 c5908874..4f55795a 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 @@ -63,7 +63,7 @@ public class VacunaController { // Log antes de intentar registrar la vacuna System.out.println("Intentando registrar la vacuna..."); - vacunaService.registrarVacuna(vacuna); + vacunaService.cargarVacuna(vacuna); // Log después de que la vacuna fue registrada System.out.println("Vacuna registrada correctamente."); 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 3a70bda9..174b6f78 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 @@ -9,7 +9,7 @@ import lombok.NoArgsConstructor; @NoArgsConstructor public class Vacuna { private String id; - private String identificador; + private String identifier; private String status; private String statusChange; private String statusReason; 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 7ac59616..0826b22b 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 @@ -9,18 +9,20 @@ import io.grpc.Grpc; import io.grpc.ManagedChannel; import io.grpc.TlsChannelCredentials; import lombok.SneakyThrows; +import main.java.com.code.hyperledger.models.VacunaDto; + import org.hyperledger.fabric.client.*; import org.hyperledger.fabric.client.identity.*; import org.springframework.stereotype.Service; -import org.hyperledger.fabric.client.identity.Identity; -import org.hyperledger.fabric.client.identity.Signer; import javax.annotation.PostConstruct; import java.io.IOException; import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.Paths; +import java.security.Identity; import java.security.InvalidKeyException; +import java.security.Signer; import java.security.cert.CertificateException; import java.util.ArrayList; import java.util.List; @@ -98,12 +100,12 @@ public class VacunaService { contract = network.getContract(CHAINCODE_NAME); } - public void registrarVacuna(Vacuna vacuna) + public void cargarVacuna(Vacuna vacuna) throws CommitStatusException, EndorseException, CommitException, SubmitException { contract.submitTransaction( "CreateVacuna", vacuna.getId(), - vacuna.getIdentificador(), + vacuna.getIdentifier(), vacuna.getStatus(), vacuna.getStatusChange(), vacuna.getStatusReason(), @@ -113,8 +115,7 @@ public class VacunaService { vacuna.getLotNumber(), vacuna.getExpirationDate(), vacuna.getPatientDocumentNumber(), - vacuna.getReactions() - ); + vacuna.getReactions()); } public Vacuna obtenerVacuna(String vacunaId) throws GatewayException, IOException {