From 6d0409c6c840dcce75c5b32bbb1b3bfdd1cabdfc Mon Sep 17 00:00:00 2001
From: ScarletRedMan <terentev.andrey.2002@gmail.com>
Date: Mon, 27 May 2024 08:52:22 +0700
Subject: [PATCH] fixed response object

---
 .../api/impl/exception/GraphqlException.java       | 14 ++------------
 .../picker/api/impl/util/RestTemplate.java         |  9 ++-------
 .../picker/controller/response/ResponseObject.java |  2 +-
 3 files changed, 5 insertions(+), 20 deletions(-)

diff --git a/client-impl/src/main/java/ru/dragonestia/picker/api/impl/exception/GraphqlException.java b/client-impl/src/main/java/ru/dragonestia/picker/api/impl/exception/GraphqlException.java
index d8fb4e3..542e813 100644
--- a/client-impl/src/main/java/ru/dragonestia/picker/api/impl/exception/GraphqlException.java
+++ b/client-impl/src/main/java/ru/dragonestia/picker/api/impl/exception/GraphqlException.java
@@ -2,20 +2,10 @@ package ru.dragonestia.picker.api.impl.exception;
 
 import ru.dragonestia.picker.api.exception.ApiException;
 
-import java.util.Collections;
-import java.util.Map;
-
 @ApiException
 public class GraphqlException extends RuntimeException {
 
-    private final Map<String, String> details;
-
-    public GraphqlException(Map<String, String> details) {
-        super(details.get("message"));
-        this.details = details;
-    }
-
-    public Map<String, String> getDetails() {
-        return Collections.unmodifiableMap(details);
+    public GraphqlException(String message) {
+        super(message);
     }
 }
diff --git a/client-impl/src/main/java/ru/dragonestia/picker/api/impl/util/RestTemplate.java b/client-impl/src/main/java/ru/dragonestia/picker/api/impl/util/RestTemplate.java
index 07677fd..2160826 100644
--- a/client-impl/src/main/java/ru/dragonestia/picker/api/impl/util/RestTemplate.java
+++ b/client-impl/src/main/java/ru/dragonestia/picker/api/impl/util/RestTemplate.java
@@ -107,13 +107,8 @@ public class RestTemplate {
         }
 
         if (node.has("errors")) {
-            var details = new HashMap<String, String>();
-            for (Iterator<Map.Entry<String, JsonNode>> it = node.fields(); it.hasNext(); ) {
-                var entry = it.next();
-
-                details.put(entry.getKey(), entry.getValue().textValue());
-            }
-            throw new GraphqlException(details);
+            var details = node.get("errors").get(0);
+            throw new GraphqlException(details.get("message").asText());
         }
 
         try {
diff --git a/server/src/main/java/ru/dragonestia/picker/controller/response/ResponseObject.java b/server/src/main/java/ru/dragonestia/picker/controller/response/ResponseObject.java
index c3012c6..cfa625f 100644
--- a/server/src/main/java/ru/dragonestia/picker/controller/response/ResponseObject.java
+++ b/server/src/main/java/ru/dragonestia/picker/controller/response/ResponseObject.java
@@ -15,7 +15,7 @@ public final class ResponseObject {
         }
     }
 
-    public record Room(String id, String nodeId, int slots, boolean locked, boolean persist, String payload) {
+    public record Room(String id, String instanceId, int slots, boolean locked, boolean persist, String payload) {
 
         public static ResponseObject.Room of(ru.dragonestia.picker.model.room.Room room) {
             return new Room(room.getId().getValue(),