From f23c9c3998dd1508ac311a54d21d3e35ec3a9b3d Mon Sep 17 00:00:00 2001
From: javieralvarezin2 <javier.alvarez@in2.es>
Date: Wed, 2 Oct 2024 12:45:59 +0200
Subject: [PATCH] fix some attributes from LearCredentialEmployee

---
 .../credentials/employee/CredentialSubjectLCEmployee.java     | 2 +-
 .../model/credentials/employee/LEARCredentialEmployee.java    | 2 +-
 .../model/credentials/employee/MandateLCEmployee.java         | 4 ++--
 .../security/filters/CustomAuthenticationProvider.java        | 2 +-
 .../java/es/in2/vcverifier/service/impl/VpServiceImpl.java    | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/main/java/es/in2/vcverifier/model/credentials/employee/CredentialSubjectLCEmployee.java b/src/main/java/es/in2/vcverifier/model/credentials/employee/CredentialSubjectLCEmployee.java
index 86b070d..1061499 100644
--- a/src/main/java/es/in2/vcverifier/model/credentials/employee/CredentialSubjectLCEmployee.java
+++ b/src/main/java/es/in2/vcverifier/model/credentials/employee/CredentialSubjectLCEmployee.java
@@ -5,5 +5,5 @@
 
 @Builder
 public record CredentialSubjectLCEmployee(
-        @JsonProperty("mandate") MandateLCEmployee mandateLCEmployee
+        @JsonProperty("mandate") MandateLCEmployee mandate
 ) {}
\ No newline at end of file
diff --git a/src/main/java/es/in2/vcverifier/model/credentials/employee/LEARCredentialEmployee.java b/src/main/java/es/in2/vcverifier/model/credentials/employee/LEARCredentialEmployee.java
index 5e3de91..1042e93 100644
--- a/src/main/java/es/in2/vcverifier/model/credentials/employee/LEARCredentialEmployee.java
+++ b/src/main/java/es/in2/vcverifier/model/credentials/employee/LEARCredentialEmployee.java
@@ -10,7 +10,7 @@ public record LEARCredentialEmployee(
         @JsonProperty("@context") List<String> context,
         @JsonProperty("id") String id,
         @JsonProperty("type") List<String> type,
-        @JsonProperty("credentialSubject") CredentialSubjectLCEmployee credentialSubjectLCEmployee,
+        @JsonProperty("credentialSubject") CredentialSubjectLCEmployee credentialSubject,
         @JsonProperty("expirationDate") String expirationDate,
         @JsonProperty("issuanceDate") String issuanceDate,
         @JsonProperty("issuer") String issuer,
diff --git a/src/main/java/es/in2/vcverifier/model/credentials/employee/MandateLCEmployee.java b/src/main/java/es/in2/vcverifier/model/credentials/employee/MandateLCEmployee.java
index 14ae9c8..0cce2d6 100644
--- a/src/main/java/es/in2/vcverifier/model/credentials/employee/MandateLCEmployee.java
+++ b/src/main/java/es/in2/vcverifier/model/credentials/employee/MandateLCEmployee.java
@@ -12,8 +12,8 @@
 public record MandateLCEmployee(
         @JsonProperty("id") String id,
         @JsonProperty("life_span") LifeSpan lifeSpan,
-        @JsonProperty("mandatee") MandateeLCEmployee mandateeLCEmployee,
+        @JsonProperty("mandatee") MandateeLCEmployee mandatee,
         @JsonProperty("mandator") Mandator mandator,
-        @JsonProperty("power") List<PowerLCEmployee> powerLCEmployee,
+        @JsonProperty("power") List<PowerLCEmployee> power,
         @JsonProperty("signer") Signer signer
 ) {}
\ No newline at end of file
diff --git a/src/main/java/es/in2/vcverifier/security/filters/CustomAuthenticationProvider.java b/src/main/java/es/in2/vcverifier/security/filters/CustomAuthenticationProvider.java
index 27e6ba0..a459448 100644
--- a/src/main/java/es/in2/vcverifier/security/filters/CustomAuthenticationProvider.java
+++ b/src/main/java/es/in2/vcverifier/security/filters/CustomAuthenticationProvider.java
@@ -113,7 +113,7 @@ private Object getVerifiableCredential(OAuth2AuthorizationGrantAuthenticationTok
     private String getCredentialSubjectFromVerifiableCredential(Object verifiableCredential) {
         if (verifiableCredential instanceof LEARCredentialEmployee learCredentialEmployee) {
             // Extrae y retorna el credentialSubject específico para `LEARCredentialEmployee`
-            return learCredentialEmployee.credentialSubjectLCEmployee().mandateLCEmployee().mandateeLCEmployee().id();
+            return learCredentialEmployee.credentialSubject().mandate().mandatee().id();
         } else if (verifiableCredential instanceof LEARCredentialMachine learCredentialMachine) {
             // Extrae y retorna el credentialSubject específico para `LEARCredentialMachine`
             return learCredentialMachine.credentialSubject().mandate().mandatee().id();
diff --git a/src/main/java/es/in2/vcverifier/service/impl/VpServiceImpl.java b/src/main/java/es/in2/vcverifier/service/impl/VpServiceImpl.java
index 00fab96..9472fff 100644
--- a/src/main/java/es/in2/vcverifier/service/impl/VpServiceImpl.java
+++ b/src/main/java/es/in2/vcverifier/service/impl/VpServiceImpl.java
@@ -142,7 +142,7 @@ private String extractMandateeId(List<String> credentialTypes, Payload payload)
 
         if (credentialTypes.contains(LEARCredentialType.LEARCredentialEmployee.getValue())) {
             LEARCredentialEmployee learCredentialEmployee = mapCredentialToLEARCredentialEmployee(vcObject);
-            return learCredentialEmployee.credentialSubjectLCEmployee().mandateLCEmployee().mandateeLCEmployee().id();
+            return learCredentialEmployee.credentialSubject().mandate().mandatee().id();
         } else if (credentialTypes.contains(LEARCredentialType.LEARCredentialMachine.getValue())) {
             LEARCredentialMachine learCredentialMachine = mapCredentialToLEARCredentialMachine(vcObject);
             return learCredentialMachine.credentialSubject().mandate().mandatee().id();