chore: remove walletId from WalletUnitAttestationDto (#43)

Signed-off-by: Erik Eriksson <erik.eriksson@digg.se>

Author: erik-eriksson34

src/main/java/se/digg/wallet/provider/application/model/WalletUnitAttestationDto.java

@@ -4,7 +4,5 @@
 
 package se.digg.wallet.provider.application.model;
 
-import java.util.UUID;
-
-public record WalletUnitAttestationDto(UUID walletId, String jwk, String nonce) {
+public record WalletUnitAttestationDto(String jwk, String nonce) {
 }

src/test/java/se/digg/wallet/provider/application/controller/WalletUnitAttestationControllerTest.java

@@ -16,7 +16,6 @@
 import com.fasterxml.jackson.databind.ObjectWriter;
 import com.nimbusds.jwt.SignedJWT;
 import java.util.List;
-import java.util.UUID;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.FieldSource;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -60,7 +59,7 @@ void assertThatPostWalletUnitAttestation_givenPublicKeyAndNonce_shouldReturnOk(S
             """;
     String nonce = "123123123123";
     WalletUnitAttestationDto input =
-        new WalletUnitAttestationDto(UUID.randomUUID(), jwk, nonce);
+        new WalletUnitAttestationDto(jwk, nonce);
 
     mockMvc
         .perform(
@@ -71,6 +70,34 @@ void assertThatPostWalletUnitAttestation_givenPublicKeyAndNonce_shouldReturnOk(S
         .andExpect(content().string(expectedJwt));
   }
 
+  @ParameterizedTest
+  @FieldSource("PATHS")
+  void assertThatPostWalletUnitAttestation_givenIncorrectDatatype_shouldReturnBadRequest(
+      String path)
+      throws Exception {
+
+    String jsonString = """
+        {
+        "jwk":{
+                "kty": "EC",
+                "use": "sig",
+                "crv": "P-256",
+                "x": "18wHLeIgW9wVN6VD1Txgpqy2LszYkMf6J8njVAibvhM",
+                "y": "-V4dS4UaLMgP_4fY4j8ir7cl1TXlFdAgcx55o7TkcSA"
+            },
+        "nonce":"123123123",
+        "walletId":"abc"
+        }
+        """;
+
+    mockMvc
+        .perform(
+            post(path)
+                .contentType(MediaType.APPLICATION_JSON)
+                .content(jsonString))
+        .andExpect(status().isBadRequest());
+  }
+
   @ParameterizedTest
   @FieldSource("PATHS")
   void assertThatPostWalletUnitAttestation_givenPublicKeyAndEmptyNonce_shouldReturnOk(String path)
@@ -91,7 +118,7 @@ void assertThatPostWalletUnitAttestation_givenPublicKeyAndEmptyNonce_shouldRetur
             """;
     String nonce = "";
     WalletUnitAttestationDto input =
-        new WalletUnitAttestationDto(UUID.randomUUID(), jwk, nonce);
+        new WalletUnitAttestationDto(jwk, nonce);
 
     mockMvc
         .perform(
@@ -122,7 +149,7 @@ void assertThatPostWalletUnitAttestation_givenPublicKeyAndNullNonce_shouldReturn
             """;
 
     WalletUnitAttestationDto input =
-        new WalletUnitAttestationDto(UUID.randomUUID(), jwk, null);
+        new WalletUnitAttestationDto(jwk, null);
 
     mockMvc
         .perform(

src/test/java/se/digg/wallet/provider/application/service/WalletUnitAttestationServiceTest.java

@@ -67,7 +67,6 @@ private static void verifyAttestedKeysClaim(SignedJWT jwt, ECKey jwk) throws Par
     assertEquals(jwk.getCurve().toString(), attestedKey.get("crv"));
   }
 
-  @SuppressWarnings("unchecked")
   @Test
   void assertThatCreateWalletUnitAttestation_givenValidJwk_shouldSucceed() throws Exception {
     ECKey jwk = createJWK();