From a05aba031451d6841443d69e557a4080a35fee3e Mon Sep 17 00:00:00 2001
From: alterdekim <alterwain@protonmail.com>
Date: Wed, 27 Nov 2024 21:07:45 +0300
Subject: [PATCH] Theme in cards

---
 .../javabot/controller/PanelController.java   | 24 ++++++++++++++-----
 1 file changed, 18 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/alterdekim/javabot/controller/PanelController.java b/src/main/java/com/alterdekim/javabot/controller/PanelController.java
index 64b28e1..1e1967f 100644
--- a/src/main/java/com/alterdekim/javabot/controller/PanelController.java
+++ b/src/main/java/com/alterdekim/javabot/controller/PanelController.java
@@ -41,7 +41,8 @@ public class PanelController {
             Card card = new Card();
             card.setId(b.getId());
             card.setTitle(textDataValService.getTextDataValById(b.getNameTextId()).getText());
-            card.setBody(Collections.singletonList("Description: " + textDataValService.getTextDataValById(b.getDescTextId()).getText()));
+            card.setBody(List.of("Description: " + textDataValService.getTextDataValById(b.getDescTextId()).getText(),
+                    "Theme: " + textDataValService.getTextDataValById(gameThemeService.getThemeById(b.getTheme()).getTextNameId()).getText()));
             cards.add(card);
         }
         cards.sort(Comparator.comparing(Card::getId));
@@ -56,7 +57,8 @@ public class PanelController {
             Card card = new Card();
             card.setId(b.getId());
             card.setTitle(textDataValService.getTextDataValById(b.getGenderTextId()).getText());
-            card.setBody(Arrays.asList("canDie: " + b.getCanDie(), "isMale: " + b.getIsMale(), "isFemale: " + b.getIsFemale()));
+            card.setBody(Arrays.asList("canDie: " + b.getCanDie(), "isMale: " + b.getIsMale(), "isFemale: " + b.getIsFemale(),
+                    "Theme: " + textDataValService.getTextDataValById(gameThemeService.getThemeById(b.getTheme()).getTextNameId()).getText()));
             cards.add(card);
         }
         cards.sort(Comparator.comparing(Card::getId));
@@ -71,7 +73,8 @@ public class PanelController {
             Card card = new Card();
             card.setId(b.getId());
             card.setTitle(textDataValService.getTextDataValById(b.getTextDescId()).getText());
-            card.setBody(Arrays.asList("Foodstuffs: " + b.getFoodstuffs(), "Asocial: " + b.getAsocial(), "Power: " + b.getPower(), "Violence:" + b.getViolence()));
+            card.setBody(Arrays.asList("Foodstuffs: " + b.getFoodstuffs(), "Asocial: " + b.getAsocial(), "Power: " + b.getPower(), "Violence:" + b.getViolence(),
+                    "Theme: " + textDataValService.getTextDataValById(gameThemeService.getThemeById(b.getTheme()).getTextNameId()).getText()));
             cards.add(card);
         }
         cards.sort(Comparator.comparing(Card::getId));
@@ -86,7 +89,8 @@ public class PanelController {
             Card card = new Card();
             card.setId(b.getId());
             card.setTitle(textDataValService.getTextDataValById(b.getTextNameId()).getText());
-            card.setBody(Arrays.asList("Foodstuffs: " + b.getFoodstuffs(), "Power: " + b.getPower(), "Violence: " + b.getViolence(), "Asocial: " + b.getAsocial(), "Description: " + textDataValService.getTextDataValById(b.getTextDescId()).getText()));
+            card.setBody(Arrays.asList("Foodstuffs: " + b.getFoodstuffs(), "Power: " + b.getPower(), "Violence: " + b.getViolence(), "Asocial: " + b.getAsocial(), "Description: " + textDataValService.getTextDataValById(b.getTextDescId()).getText(),
+                    "Theme: " + textDataValService.getTextDataValById(gameThemeService.getThemeById(b.getTheme()).getTextNameId()).getText()));
             cards.add(card);
         }
         cards.sort(Comparator.comparing(Card::getId));
@@ -101,7 +105,8 @@ public class PanelController {
             Card card = new Card();
             card.setId(b.getId());
             card.setTitle(textDataValService.getTextDataValById(b.getTextNameId()).getText());
-            card.setBody(Arrays.asList("Health index: " + b.getHealth_index(),"isChildfree: " + b.getIsChildfree(), "Description: " + textDataValService.getTextDataValById(b.getTextDescId()).getText()));
+            card.setBody(Arrays.asList("Health index: " + b.getHealth_index(),"isChildfree: " + b.getIsChildfree(), "Description: " + textDataValService.getTextDataValById(b.getTextDescId()).getText(),
+                    "Theme: " + textDataValService.getTextDataValById(gameThemeService.getThemeById(b.getTheme()).getTextNameId()).getText()));
             cards.add(card);
         }
         cards.sort(Comparator.comparing(Card::getId));
@@ -116,7 +121,14 @@ public class PanelController {
             Card card = new Card();
             card.setId(b.getId());
             card.setTitle(textDataValService.getTextDataValById(b.getTextNameId()).getText());
-            card.setBody(Arrays.asList("Foodstuffs: " + b.getFoodstuffs(), "Power: " + b.getPower(), "Asocial: " + b.getAsocial(), "Violence: " + b.getViolence(), "Is garbage: " + b.getGarbage(), "Description: " + textDataValService.getTextDataValById(b.getTextDescId()).getText()));
+            card.setBody(Arrays.asList("Foodstuffs: " + b.getFoodstuffs(),
+                    "Power: " + b.getPower(),
+                    "Asocial: " + b.getAsocial(),
+                    "Violence: " + b.getViolence(),
+                    "Is garbage: " + b.getGarbage(),
+                    "Description: " + textDataValService.getTextDataValById(b.getTextDescId()).getText(),
+                    "Theme: " + textDataValService.getTextDataValById(gameThemeService.getThemeById(b.getTheme()).getTextNameId()).getText()
+            ));
             cards.add(card);
         }
         cards.sort(Comparator.comparing(Card::getId));