From 43bd254b8d941febbeb71d68ca72d5e919e4933b Mon Sep 17 00:00:00 2001
From: v228a <v228a@proton.me>
Date: Thu, 20 Feb 2025 16:17:54 +0300
Subject: [PATCH] fix 02.51

---
 .../java/ru/myitschool/work/data/mapper/UserInfoMapper.kt    | 4 +---
 .../work/domain/profile/entities/UserInfoEntity.kt           | 2 +-
 .../java/ru/myitschool/work/ui/profile/ProfileFragment.kt    | 2 ++
 .../java/ru/myitschool/work/ui/profile/ProfileViewModel.kt   | 5 ++++-
 4 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/ru/myitschool/work/data/mapper/UserInfoMapper.kt b/app/src/main/java/ru/myitschool/work/data/mapper/UserInfoMapper.kt
index 3e90287..ba344f8 100644
--- a/app/src/main/java/ru/myitschool/work/data/mapper/UserInfoMapper.kt
+++ b/app/src/main/java/ru/myitschool/work/data/mapper/UserInfoMapper.kt
@@ -14,9 +14,7 @@ class UserInfoMapper @Inject constructor() {
                 fullname = model.fullname ?: error("fullname is null"),
                 imageUrl = model.imageUrl ?: error("imageUrl is null"),
                 position = model.position ?: error("position is null"),
-                lastEntryMillis = model.lastEntry.let { date ->
-                    simpleDateFormat.parse(date)?.time ?: error("parse lastEntry error")
-                } ?: error("lastEntry is null"),
+                lastEntry = model.lastEntry ?: error("lastEntry is null"),
                 role = model.role,
                 blocked = model.blocked
             )
diff --git a/app/src/main/java/ru/myitschool/work/domain/profile/entities/UserInfoEntity.kt b/app/src/main/java/ru/myitschool/work/domain/profile/entities/UserInfoEntity.kt
index 4e7c213..d356c4c 100644
--- a/app/src/main/java/ru/myitschool/work/domain/profile/entities/UserInfoEntity.kt
+++ b/app/src/main/java/ru/myitschool/work/domain/profile/entities/UserInfoEntity.kt
@@ -8,5 +8,5 @@ class UserInfoEntity(
     val position: String,
     val role: Role,
     val blocked: Boolean,
-    val lastEntryMillis: Long,
+    val lastEntry: String,
 )
\ No newline at end of file
diff --git a/app/src/main/java/ru/myitschool/work/ui/profile/ProfileFragment.kt b/app/src/main/java/ru/myitschool/work/ui/profile/ProfileFragment.kt
index 853948d..676c043 100644
--- a/app/src/main/java/ru/myitschool/work/ui/profile/ProfileFragment.kt
+++ b/app/src/main/java/ru/myitschool/work/ui/profile/ProfileFragment.kt
@@ -3,6 +3,7 @@ package ru.myitschool.work.ui.profile
 import android.content.DialogInterface
 import android.content.res.ColorStateList
 import android.os.Bundle
+import android.util.Log
 import android.view.View
 import android.widget.TextView
 import androidx.annotation.Nullable
@@ -66,6 +67,7 @@ class ProfileFragment : Fragment(R.layout.fragment_profile) {
                     swipeRefreshLayout.isRefreshing = false
                     binding.position.text = state.position
                     binding.lastEntry.text = state.lastEntry
+                    Log.d("ff",state.lastEntry)
                     binding.fullname.text = state.fullname
                     if (state.admin){
                         binding.admin.visibility = View.VISIBLE
diff --git a/app/src/main/java/ru/myitschool/work/ui/profile/ProfileViewModel.kt b/app/src/main/java/ru/myitschool/work/ui/profile/ProfileViewModel.kt
index c11efc7..0754b0c 100644
--- a/app/src/main/java/ru/myitschool/work/ui/profile/ProfileViewModel.kt
+++ b/app/src/main/java/ru/myitschool/work/ui/profile/ProfileViewModel.kt
@@ -17,6 +17,8 @@ import ru.myitschool.work.domain.auth.LogoutUseCase
 import ru.myitschool.work.domain.profile.GetUserInfoUseCase
 import ru.myitschool.work.utils.MutablePublishFlow
 import java.text.SimpleDateFormat
+import java.time.LocalDateTime
+import java.time.format.DateTimeFormatter
 import java.util.Date
 import java.util.Locale
 import javax.inject.Inject
@@ -78,7 +80,8 @@ class ProfileViewModel @Inject constructor(
                             fullname = value.fullname,
                             imageUrl = value.imageUrl,
                             position = value.position,
-                            lastEntry = simpleDateFormat.format(Date(value.lastEntryMillis)),
+                            lastEntry = LocalDateTime.parse(value.lastEntry).format(
+                                DateTimeFormatter.ofPattern("d MMMM yyyy, HH:mm:ss", Locale.getDefault())),
                             admin = value.role == Role.ADMIN,
                             blocked = value.blocked
                         )