tenth commit

2 files changed, 31 insertions, 39 deletions

diff --git a/src/main/java/files/entity/TelegramUser.java b/src/main/java/files/entity/TelegramUser.java
new file mode 100644
index 0000000..d32189a
--- /dev/null
+++ b/src/main/java/files/entity/TelegramUser.java
@@ -0,0 +1,31 @@
+package files.entity;
+
+import com.pengrad.telegrambot.model.User;
+
+import javax.persistence.Entity;
+import javax.persistence.Id;
+
+@Entity
+public class TelegramUser {
+    @Id
+    private Long id;
+    private String username;
+    private Boolean isBot;
+    private String fullName;
+    private String date;
+
+    public TelegramUser() {}
+
+    public TelegramUser(long id, String username, boolean isBot, String fullName, String date) {
+        this.id = id;
+        this.username = username;
+        this.isBot = isBot;
+        this.fullName = fullName;
+        this.date = date;
+    }
+
+    public static String checkIfHasLastName(User user) {
+        String lastName = user.lastName();
+        return (lastName != null) ? (" " + lastName) : ("");
+    }
+}
diff --git a/src/main/java/files/entity/User.java b/src/main/java/files/entity/User.java
deleted file mode 100644
index 973d781..0000000
--- a/src/main/java/files/entity/User.java
+++ /dev/null
@@ -1,39 +0,0 @@
-package files.entity;
-
-import javax.persistence.Entity;
-import javax.persistence.Id;
-
-@Entity
-public class User {
-    @Id
-    private Long id;
-    private String username;
-    private Boolean isBot;
-    private String fullName;
-    private String date;
-
-    public User() {}
-
-    public User(long id, String username, boolean isBot, String fullName, String date) {
-        this.id = id;
-        this.isBot = isBot;
-        this.fullName = fullName;
-        this.date = date;
-    }
-
-    public Long getId() {
-        return id;
-    }
-
-    public Boolean getIsBot() {
-        return isBot;
-    }
-
-    public String getFullName() {
-        return fullName;
-    }
-
-    public String getDate() {
-        return date;
-    }
-}