2 files changed, 31 insertions, 19 deletions

diff --git a/src/main/java/files/App.java b/src/main/java/files/App.java
index c0e1919..23bf859 100644
--- a/src/main/java/files/App.java
+++ b/src/main/java/files/App.java
@@ -11,36 +11,41 @@ import javax.persistence.EntityManagerFactory;
 import javax.persistence.Persistence;
 import java.io.FileInputStream;
 import java.io.IOException;
-import java.util.HashMap;
-import java.util.Map;
 import java.util.Properties;
 
 public class App {
     public static void main(String[] args) throws IOException {
-
         Properties properties = new Properties();
         properties.load(new FileInputStream("app.properties"));
         TelegramBot bot = new TelegramBot(properties.getProperty("telegram_token"));
 
-        EntityManagerFactory entityManagerFactory = Persistence.createEntityManagerFactory("animarfo");
-        EntityManager manager = entityManagerFactory.createEntityManager();
-
         bot.setUpdatesListener(updates -> {
             updates.forEach(update -> {
                 Long telegramId = update.message().from().id();
+
+                EntityManagerFactory entityManagerFactory = Persistence.createEntityManagerFactory("animarfo");
+                EntityManager manager = entityManagerFactory.createEntityManager();
                 if(manager.find(User.class, telegramId) == null) {
+                    String fullName = update.message().from().firstName();
+                    Boolean isBot = update.message().from().isBot();
+                    String username = update.message().from().username();
+                    String date = new java.text.SimpleDateFormat("dd.MM.yyyy HH:mm:ss").format(new java.util.Date(update.message().date() * 1000L));
+                    if (update.message().chat().lastName() != null) fullName += " " + update.message().chat().lastName();
+                    System.out.println(update.message().from().firstName() + " " + update.message().chat().lastName());
                     bot.execute(new SendMessage(update.message().chat().id(), "Привет!"));
 
-                    User user = new User(telegramId);
+                    User user = new User(telegramId, isBot, fullName, date);
+                    System.out.println(user.getFullName());
                     manager.getTransaction().begin();
                     manager.merge(user);
                     manager.getTransaction().commit();
+
+                    manager.close();
+                    entityManagerFactory.close();
                 }
                 bot.execute(new SendMessage(update.message().chat().id(), telegramId.toString()));
             });
             return UpdatesListener.CONFIRMED_UPDATES_ALL;
         });
-//        manager.close();
-//        entityManagerFactory.close();
     }
 }
diff --git a/src/main/java/files/entity/User.java b/src/main/java/files/entity/User.java
index b7660d2..31eca82 100644
--- a/src/main/java/files/entity/User.java
+++ b/src/main/java/files/entity/User.java
@@ -1,31 +1,38 @@
 package files.entity;
 
 import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
 import javax.persistence.Id;
 
 @Entity
 public class User {
     @Id
-    private long id;
-
-    private String login;
+    private Long id;
+    private Boolean isBot;
+    private String fullName;
+    private String date;
 
     public User() {}
 
-    public User(long id) {
+    public User(long id, boolean isBot, String fullName, String date) {
         this.id = id;
+        this.isBot = isBot;
+        this.fullName = fullName;
+        this.date = date;
     }
 
-    public long getId() {
+    public Long getId() {
         return id;
     }
 
-    public String getLogin() {
-        return login;
+    public Boolean getIsBot() {
+        return isBot;
+    }
+
+    public String getFullName() {
+        return fullName;
     }
 
-    public void setLogin(String login) {
-        this.login = login;
+    public String getDate() {
+        return date;
     }
 }