From 628fb039d63c61b96ba8e7969fc1e133f3596501 Mon Sep 17 00:00:00 2001
From: KP9lKk <devdmitriizhukov@gmail.com>
Date: Mon, 27 Jan 2025 13:51:16 +0300
Subject: [PATCH] add logic for changepassword

---
 .idea/gradle.xml                               |  1 +
 src/main/kotlin/Main.kt                        |  3 ++-
 src/main/kotlin/data/UserRepositoryImpl.kt     |  7 ++++---
 src/main/kotlin/domain/UserUseCase.kt          |  3 ++-
 src/main/kotlin/domain/UserUseCaseImpl.kt      | 12 ++++++++----
 .../domain/request/ChangePasswordRequest.kt    |  6 ++++++
 src/main/kotlin/ui/UserUI.kt                   | 18 ++++++++++++++++++
 7 files changed, 41 insertions(+), 9 deletions(-)
 create mode 100644 src/main/kotlin/domain/request/ChangePasswordRequest.kt

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 14746e7..2a65317 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
+  <component name="GradleMigrationSettings" migrationVersion="1" />
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
diff --git a/src/main/kotlin/Main.kt b/src/main/kotlin/Main.kt
index eddd3bd..944ca99 100644
--- a/src/main/kotlin/Main.kt
+++ b/src/main/kotlin/Main.kt
@@ -9,6 +9,7 @@ fun main() {
     val userRepository = UserRepositoryImpl()
     val userUseCase = UserUseCaseImpl(userRepository)
     val userUI = UserUI(userUseCase)
-    userUI.registration()
+    userUI.authorize()
+    userUI.changePassword()
     userUI.authorize()
 }
\ No newline at end of file
diff --git a/src/main/kotlin/data/UserRepositoryImpl.kt b/src/main/kotlin/data/UserRepositoryImpl.kt
index ae9fc56..c0b78ec 100644
--- a/src/main/kotlin/data/UserRepositoryImpl.kt
+++ b/src/main/kotlin/data/UserRepositoryImpl.kt
@@ -23,7 +23,8 @@ class UserRepositoryImpl: UserRepository {
     }
 
     override fun updateUserById(userId: Int, updatedUser: UserDTO): UserDTO {
-        val oldUser = userSource.first { it.userId == userId }
+        val oldUser = userSource.firstOrNull { it.userId == userId }
+        checkNotNull(oldUser)
         oldUser.phone = updatedUser.phone
         oldUser.address = updatedUser.address
         oldUser.firstName = updatedUser.firstName
@@ -33,10 +34,10 @@ class UserRepositoryImpl: UserRepository {
         return oldUser
     }
 
-    override fun getAllUsers(): List<UserDTO> = userList
+    override fun getAllUsers(): List<UserDTO> = userSource
 
     override fun findUserById(userId: Int): UserDTO {
-        val findUser = userList.firstOrNull { it.userId == userId }
+        val findUser = userSource.firstOrNull { it.userId == userId }
         checkNotNull(findUser)
         return findUser
     }
diff --git a/src/main/kotlin/domain/UserUseCase.kt b/src/main/kotlin/domain/UserUseCase.kt
index 504fb54..a59e837 100644
--- a/src/main/kotlin/domain/UserUseCase.kt
+++ b/src/main/kotlin/domain/UserUseCase.kt
@@ -1,12 +1,13 @@
 package org.example.domain
 
 import org.example.domain.request.AuthorizeRequest
+import org.example.domain.request.ChangePasswordRequest
 import org.example.domain.request.RegistrationRequest
 import org.example.domain.response.UserResponse
 
 interface UserUseCase {
     fun authorize(authorizeRequest: AuthorizeRequest): UserResponse
     fun registration(registrationRequest: RegistrationRequest): UserResponse
-    fun changePassword()
+    fun changePassword(changePasswordRequest: ChangePasswordRequest)
     fun changeProfile()
 }
\ No newline at end of file
diff --git a/src/main/kotlin/domain/UserUseCaseImpl.kt b/src/main/kotlin/domain/UserUseCaseImpl.kt
index cbc9e08..e649f0e 100644
--- a/src/main/kotlin/domain/UserUseCaseImpl.kt
+++ b/src/main/kotlin/domain/UserUseCaseImpl.kt
@@ -2,6 +2,7 @@ package org.example.domain
 
 import org.example.data.UserRepository
 import org.example.domain.request.AuthorizeRequest
+import org.example.domain.request.ChangePasswordRequest
 import org.example.domain.request.RegistrationRequest
 import org.example.domain.response.UserResponse
 
@@ -32,12 +33,15 @@ class UserUseCaseImpl(private val userRepository: UserRepository): UserUseCase {
         return UserDtoToUserResponse(newUser)
     }
 
-
-
-    override fun changePassword() {
-        TODO("Not yet implemented")
+    override fun changePassword(changePasswordRequest: ChangePasswordRequest) {
+        val updatedUser = userRepository.findUserById(changePasswordRequest.userId)
+        updatedUser.password = changePasswordRequest.newPassword
+        userRepository.updateUserById(changePasswordRequest.userId, updatedUser)
     }
 
+
+
+
     override fun changeProfile() {
         TODO("Not yet implemented")
     }
diff --git a/src/main/kotlin/domain/request/ChangePasswordRequest.kt b/src/main/kotlin/domain/request/ChangePasswordRequest.kt
new file mode 100644
index 0000000..dbc50f8
--- /dev/null
+++ b/src/main/kotlin/domain/request/ChangePasswordRequest.kt
@@ -0,0 +1,6 @@
+package org.example.domain.request
+
+data class ChangePasswordRequest(
+    val userId: Int,
+    val newPassword: String
+)
\ No newline at end of file
diff --git a/src/main/kotlin/ui/UserUI.kt b/src/main/kotlin/ui/UserUI.kt
index 485a73c..c3c5ce1 100644
--- a/src/main/kotlin/ui/UserUI.kt
+++ b/src/main/kotlin/ui/UserUI.kt
@@ -2,10 +2,12 @@ package org.example.ui
 
 import org.example.domain.UserUseCase
 import org.example.domain.request.AuthorizeRequest
+import org.example.domain.request.ChangePasswordRequest
 import org.example.domain.request.RegistrationRequest
 import org.example.domain.response.UserResponse
 
 class UserUI(private val userUseCase: UserUseCase) {
+    var userAuthorized: UserResponse? = null
     fun authorize(){
         println("Введите почту")
         val email = readlnOrNull()
@@ -21,9 +23,25 @@ class UserUI(private val userUseCase: UserUseCase) {
             email = email,
             password = password,)
         val user = userUseCase.authorize(authorizeRequest)
+        userAuthorized = user
         println(userResponseToString(user))
     }
+    fun changePassword(){
+        checkNotNull(userAuthorized){
+            "Вы не авторизованы"
+        }
+        println("Введите пароль")
+        val password = readlnOrNull()
+        checkNotNull(password){
+            "Пароль не должен отсутствовать"
+        }
+        val changePasswordRequest = ChangePasswordRequest(
+            userId = userAuthorized!!.userId,
+            newPassword = password
+        )
+        userUseCase.changePassword(changePasswordRequest)
 
+    }
     fun registration(){
         println("Введите имя")
         val firstName = readlnOrNull()